From efd97d66799ceb3abcfe92a5752ed000e504572b Mon Sep 17 00:00:00 2001 From: "EQUILIBRIUM\\hirondino.van-dunem" Date: Fri, 24 Jun 2022 16:57:35 +0100 Subject: [PATCH] put the comment deferimento and efectuar despacho on pedidos and expediente fuction --- src/app/Rules/despacho.service.ts | 6 +++--- src/app/Rules/pedido.service.ts | 4 ++-- src/app/modals/create-process/create-process.page.ts | 8 ++++---- .../expedient-task-modal/expedient-task-modal.page.ts | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 4fef648da..2420dab1d 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -100,7 +100,7 @@ export class DespachoService { return this.processes.CompleteTask(body) } - EfectuarDespacho({note = '', documents = [], serialnumber, activityInstanceName}) { + EfectuarDespacho({note, documents = [], serialnumber, activityInstanceName}) { let body; if(activityInstanceName == 'Concluir Despacho' || activityInstanceName == 'Concluir Parecer' @@ -150,14 +150,14 @@ export class DespachoService { /** * @description efetuar despacho */ - CompleteTask({serialNumber}) { + CompleteTask({serialNumber, note}) { const body = { "serialNumber": serialNumber, "action": "Despacho", "ActionTypeId": 94, "dataFields": { - "ReviewUserComment": '', + "ReviewUserComment": note, }, "AttachmentList" :null, } diff --git a/src/app/Rules/pedido.service.ts b/src/app/Rules/pedido.service.ts index c49a32a2b..f93b7b821 100644 --- a/src/app/Rules/pedido.service.ts +++ b/src/app/Rules/pedido.service.ts @@ -42,14 +42,14 @@ export class PedidoService { return this.processes.CompleteTask(body) } - taskCompleteDeferimento({serialNumber}) { + taskCompleteDeferimento({serialNumber, note}) { const body = { "serialNumber": serialNumber, "action": "Deferimento", "ActionTypeId": 93, // Pedido de deferimento "dataFields": { - "ReviewUserComment": '', + "ReviewUserComment": note, }, "AttachmentList" :null, } diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index dc725e043..ab55030c8 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -290,7 +290,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise(); - await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); + await this.despachoService.EfectuarDespacho({note: this.dispatchFolder.Message, serialnumber: this.task.serialNumber, activityInstanceName: this.task.activityInstanceName}).toPromise(); this.modalController.dismiss(); this.toastService._successMessage('Despacho criado'); @@ -346,7 +346,7 @@ export class CreateProcessPage implements OnInit { try { await this.pedidoService.createDeferimento(this.postData).toPromise(); - await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise(); + await this.pedidoService.taskCompleteDeferimento({note: this.postData.DispatchFolder.Message,serialNumber:this.task.serialNumber}).toPromise(); this.modalController.dismiss(); this.toastService._successMessage('Pedido de Deferimento criado'); @@ -375,7 +375,7 @@ export class CreateProcessPage implements OnInit { if(this.postData.DispatchFolder.Message){ try { await this.despachoService.createDespacho(this.postData).toPromise(); - await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber}).toPromise(); + await this.despachoService.CompleteTask({serialNumber: this.task.serialNumber, note: this.dispatchFolder.Message}).toPromise(); this.modalController.dismiss(); this.toastService._successMessage('Despacho criado'); @@ -435,7 +435,7 @@ export class CreateProcessPage implements OnInit { try { await this.pedidoService.createDeferimento(this.postData).toPromise(); - await this.pedidoService.taskCompleteDeferimento({serialNumber:this.task.serialNumber}).toPromise(); + await this.pedidoService.taskCompleteDeferimento({note: this.postData.DispatchFolder.Message, serialNumber:this.task.serialNumber}).toPromise(); this.modalController.dismiss(); this.toastService._successMessage('Pedido de Deferimento criado'); 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 1609edf62..71f43ab05 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 @@ -308,7 +308,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 94, "dataFields": { - "Note": this.postData.DispatchFolder.Subject, + "Note": this.postData.DispatchFolder.Message, } } @@ -343,7 +343,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 92, "dataFields": { - "Note": this.postData.DispatchFolder.Subject, + "Note": this.postData.DispatchFolder.Message, } } @@ -374,7 +374,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 93, "dataFields": { - "Note": this.postData.DispatchFolder.Subject, + "Note": this.postData.DispatchFolder.Message, } } @@ -412,7 +412,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 99999881 , "dataFields": { - "Note": this.postData.DispatchFolder.Subject, + "Note": this.postData.DispatchFolder.Message, } } @@ -451,7 +451,7 @@ export class ExpedientTaskModalPage implements OnInit { "action": "Tratado", "ActionTypeId": 99999881, "dataFields": { - "Note": this.postData.DispatchFolder.Subject, + "Note": this.postData.DispatchFolder.Message, } }