diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 26873ce2b..3e973bf34 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -200,7 +200,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise(); - this.FinalizarDespacho(); + this.FinalizarDespacho('Despacho criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); } @@ -220,7 +220,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise(); - this.FinalizarParecer('Pedido de Parecer criado'); + this.FinalizarParecer('Pedido de Parecer enviado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -240,7 +240,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise(); - this.executado('Pedido de Deferimento criado'); + this.FinalizarDeferimento('Pedido de deferimento enviado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -357,17 +357,18 @@ export class CreateProcessPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); - this.toastService.successMessage(''); + this.toastService.successMessage(message); } catch (error) { this.toastService.badRequest('Processo não efectuado'); } } - async FinalizarDespacho() { + async FinalizarDespacho(message?) { let body; - if(this.task.activityInstanceName =='Tarefa de Despacho' || this.task.activityInstanceName =='Reexecutar Despacho') { + if(this.task.activityInstanceName =='Tarefa de Despacho' || + this.task.activityInstanceName =='Reexecutar Despacho') { body = { "serialNumber": this.task.serialNumber, @@ -379,7 +380,11 @@ export class CreateProcessPage implements OnInit { "AttachmentList" :null, } } - else if(this.task.activityInstanceName =='Concluir Despacho' || this.task.activityInstanceName == 'Concluir Parecer') { + else if(this.task.activityInstanceName =='Concluir Despacho' || + this.task.activityInstanceName == 'Concluir Parecer' || + this.task.activityInstanceName =='Concluir de Deferimento' || + this.task.activityInstanceName =='Reapreciar Deferimento' + ) { body = { "serialNumber": this.task.serialNumber, @@ -395,7 +400,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); - this.toastService.successMessage(''); + this.toastService.successMessage(message); } catch (error) { this.toastService.badRequest('Processo não efectuado'); } @@ -403,16 +408,32 @@ export class CreateProcessPage implements OnInit { } async FinalizarParecer(message?) { - let body = { - "serialNumber": this.task.serialNumber, - "action": "Parecer", - "ActionTypeId": 96, - "dataFields": { - "ReviewUserComment": '', - }, - "AttachmentList" :null, - } + let body; + if(this.task.activityInstanceName =='Concluir Deferimento' || + this.task.activityInstanceName =='Reapreciar Deferimento' + ){ + body = { + "serialNumber": this.task.serialNumber, + "action": "Parecer", + "ActionTypeId": 92, + "dataFields": { + "ReviewUserComment": message, + }, + "AttachmentList" :null, + } + } + else{ + body = { + "serialNumber": this.task.serialNumber, + "action": "Parecer", + "ActionTypeId": 96, + "dataFields": { + "ReviewUserComment": message, + }, + "AttachmentList" :null, + } + } try { await this.processes.CompleteTask(body).toPromise(); @@ -422,6 +443,26 @@ export class CreateProcessPage implements OnInit { } } + + async FinalizarDeferimento(message?){ + if(this.task.activityInstanceName =='Reapreciar Deferimento'){ + let body = { + "serialNumber": this.task.serialNumber, + "action": "Parecer", + "ActionTypeId": 92, + "dataFields": { + "ReviewUserComment": '', + }, + "AttachmentList" :null, + } + try { + await this.processes.CompleteTask(body).toPromise(); + this.toastService.successMessage(message) + } catch (e) { + this.toastService.badRequest() + } + } + } async addParticipants() {