diff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts index eabad807b..3b122f16a 100644 --- a/src/app/modals/view-document/view-document.page.ts +++ b/src/app/modals/view-document/view-document.page.ts @@ -41,7 +41,9 @@ export class ViewDocumentPage implements OnInit { if(!this.file.title) { this.file.title = 'Sem Título' } - + + console.log(this.task) + } ngOnInit() { @@ -72,13 +74,17 @@ export class ViewDocumentPage implements OnInit { await modal.present(); modal.onDidDismiss().then((res)=>{ - if(res.data.component == 'openBookMeetingModal') { - this.openBookMeetingModal() - } else if(res.data.component == 'openExpedientActionsModal') { - this.openExpedientActionsModal(res.data.taskAction) - } else { - console.log('component not found') + + if(res.data) { + if(res.data.component == 'openBookMeetingModal') { + this.openBookMeetingModal() + } else if(res.data.component == 'openExpedientActionsModal') { + this.openExpedientActionsModal(res.data.taskAction) + } else { + console.log('component not found') + } } + }) } @@ -106,7 +112,7 @@ export class ViewDocumentPage implements OnInit { } // efetuar despacho - + async openExpedientActionsModal( taskAction: any) { let classs; diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 48104a7d7..da94d56f5 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -124,7 +124,7 @@ export class DespachoPrPage implements OnInit { this.cc = users.filter(user=>{ return user.Type == 'CC'; }) || [] - + if(!this.cc) { this.cc = [] } @@ -160,12 +160,13 @@ export class DespachoPrPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); await modal.present(); - + } openMenu() { @@ -497,8 +498,8 @@ export class DespachoPrPage implements OnInit { popover.onDidDismiss().then(( res =>{ if( res['data'] == 'close') { - this.goBack() - + this.goBack() + } })) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 77e9d9242..cd9838aad 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -53,7 +53,7 @@ export class DespachoPage implements OnInit { private despachoService: DespachoService, private location: Location, public p: PermissionService) { - + this.activatedRoute.paramMap.subscribe(params => { if(params["params"].SerialNumber) { this.serialnumber = params["params"].SerialNumber; @@ -113,7 +113,7 @@ export class DespachoPage implements OnInit { async LoadTaskDetail(serial: string) { this.processes.GetTask(serial).subscribe( (res: fullTask) => { - + this.task = { "SerialNumber": res.serialNumber, "Folio": res.workflowInstanceDataFields.Subject, @@ -162,6 +162,9 @@ export class DespachoPage implements OnInit { async viewDocument(docId:string, Document) { + + console.log(this.fulltask) + const modal = await this.modalController.create({ component: ViewDocumentPage, componentProps: { diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index ca0cdb81f..36fc4cc0f 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -149,12 +149,13 @@ export class DiplomaAssinarPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); await modal.present(); - + } getDocumentDetails(forlderId:string, applicationId:string) { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index e3d25f9d1..01359a26a 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -170,12 +170,13 @@ export class DiplomaPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); await modal.present(); - + } getDocumentDetails(forlderId:string, applicationId:string) { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 1c771adfd..a81b1a617 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -320,7 +320,8 @@ export class ExpedienteDetailPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 142d94b54..00159506b 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -210,12 +210,13 @@ export class ExpedientePrPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); await modal.present(); - + } attachDocument() { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 0fcfdc815..32278a5ee 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -193,12 +193,13 @@ export class PedidoPage implements OnInit { Document, applicationId: Document.ApplicationId, docId: Document.DocId || Document.SourceId, - folderId: this.task.FolderId + folderId: this.task.FolderId, + task: this.fulltask }, cssClass: 'modal modal-desktop' }); await modal.present(); - + } openMenu() { @@ -224,7 +225,7 @@ export class PedidoPage implements OnInit { popover.onDidDismiss().then(( res =>{ if( res['data'] == 'close') { - this.goBack() + this.goBack() } // alert(JSON.stringify(res)+' nada') @@ -370,7 +371,7 @@ export class PedidoPage implements OnInit { // } // }); // } - + async distartExpedientModal(){ console.log(this.fulltask); const modal = await this.modalController.create({ diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index 5226c4525..f547c4ae1 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -5,7 +5,7 @@
- +