diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index fe9034bd6..803ddd2aa 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -16,16 +16,10 @@ export class DiscartExpedientModalPage implements OnInit { private modalController: ModalController, private processes:ProcessesService, private router:Router, - private navParams: NavParams, ) { - this.serialNumber = this.navParams.get('serialNumber'); - this.folderId = this.navParams.get('folderId'); - this.action = this.navParams.get('action'); } ngOnInit() { - console.log(this.serialNumber); - } close(){ this.modalController.dismiss('No'); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 924754022..439b22565 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -139,7 +139,7 @@
- +
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 b277bf141..3b81b2615 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 @@ -211,13 +211,9 @@ export class ExpedienteDetailPage implements OnInit { } async distartExpedientModal(body:any){ - console.log(this.fulltask); const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { - serialNumber: this.fulltask.serialNumber, - folderId: this.fulltask.workflowInstanceDataFields.FolderID, - action: 'complete', }, cssClass: 'discart-expedient-modal', backdropDismiss: false @@ -226,42 +222,40 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss().then(res=>{ console.log(res['data']); - - if(res['data']== 'Yes'){ - this.processes.CompleteTask(body); - this.goBack(); - } - else if(res['data'] == 'No'){ - let otherbody = { - "serialNumber": body.serialNumber, - "action": "Passivo", - "ActionTypeId": 94, - "dataFields": { - "Note": "", - } - } - this.processes.CompleteTask(otherbody); - } - //Volta na lista principal - this.modalController.dismiss(); - - }); - } + console.log(body); - async distartExpedientModal2(task: any){ - const modal = await this.modalController.create({ - component: DiscartExpedientModalPage, - componentProps: { - serialNumber: task.serialNumber, - folderId: task.workflowInstanceDataFields.FolderID, - action: 'discart', - }, - cssClass: 'discart-expedient-modal', - backdropDismiss: false + if(body == 'descartar'){ + if(res['data']== 'Yes'){ + let otherbody = { + "serialNumber": body.serialNumber, + "action": "Passivo", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } + } + this.processes.CompleteTask(otherbody); + } + else if(res['data'] == 'No'){ + //Do nothing + } + + } + else{ + if(res['data']== 'Yes'){ + this.processes.CompleteTask(body); + + this.goBack(); + } + else if(res['data'] == 'No'){ + console.log('Update'); + + this.processes.UpdateTaskStatus(this.task.FolderId); + } + } + + }); - - await modal.present(); - modal.onDidDismiss(); } async openBookMeetingModal(task: any) {