diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts index f3f6eadcf..fca534e33 100644 --- a/src/app/modals/document-detail/document-detail.page.ts +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -176,7 +176,18 @@ export class DocumentDetailPage implements OnInit { }, translucent: true }); - return await popover.present(); + await popover.present() + + popover.onDidDismiss().then((res:any) => { + if(res.data.component == 'openBookMeetingModal') { + this.openBookMeetingModal() + } else if(res.data.component == 'openExpedientActionsModal') { + this.openExpedientActionsModal(res.data.taskAction) + } else { + console.log(res.data) + alert('component not found') + } + }); } } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index 5b95e3b3d..f70b1cf8b 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -136,16 +136,16 @@ export class DespachosPrPage implements OnInit { let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": taskDate, + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, } this.despachoList.push(task); diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index d99bc46da..143c49cc6 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -143,7 +143,7 @@ export class ExpedientTaskModalPage implements OnInit { this.dispatchFolder.SourceId = this.task.workflowInstanceDataFields.DocId } else { - alert('component !!!!') + alert('aplicationId not found !!!!') } this.postData.DispatchFolder = this.dispatchFolder; diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts index 800d2583f..dbdda1bc1 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.ts +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.ts @@ -31,65 +31,19 @@ export class SearchedDocumentOptionsPage implements OnInit { } close() { - this.modalController.dismiss(); + this.popoverController.dismiss(); } goBack() { - this.modalController.dismiss(); + this.popoverController.dismiss(); } async openBookMeetingModal() { - - const task: ExpedientTaskModalPageNavParamsTask = this.task - - let classs; - if( window.innerWidth <= 800) { - classs = 'book-meeting-modal modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - - console.log(this.LoadedDocument, task, ':Cars:') - - const modal = await this.modalController.create({ - component: DocumentSetUpMeetingPage, - componentProps: { - task: this.task, - document: this.LoadedDocument - }, - cssClass: classs, - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then( async(res)=>{ - this.popoverController.dismiss(); - }); - + this.popoverController.dismiss({component:'openBookMeetingModal', taskAction: ''}); } async openExpedientActionsModal( taskAction: any) { - - const task: ExpedientTaskModalPageNavParamsTask = this.task - - let classs; - if( window.innerWidth <= 800) { - classs = 'modal modal-desktop' - } else { - classs = 'modal modal-desktop showAsideOptions' - } - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: this.task, - }, - cssClass: classs, - }); - await modal.present(); - modal.onDidDismiss().then( async(res) => { - this.popoverController.dismiss(); - }); - + this.popoverController.dismiss({component:'openExpedientActionsModal', taskAction}); } async distartExpedientModal(body:any) {} diff --git a/tsconfig.json b/tsconfig.json index e2129afcb..ba1f0eb2d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,7 +10,7 @@ "module": "es2020", "moduleResolution": "node", "importHelpers": true, - "target": "es2015", + "target": "es5", "lib": [ "es2018", "dom"