{{ message }}
- - -diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 32abc8554..5fc93cac4 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -220,8 +220,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postParecer(this.postData).toPromise(); - this.FinalizarParecer(); - this.toastService.successMessage('Pedido de Parecer criado'); + this.FinalizarParecer('Pedido de Parecer criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -241,8 +240,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDeferimento(this.postData).toPromise(); - this.executado(); - this.toastService.successMessage('Pedido de Deferimento criado'); + this.executado('Pedido de Deferimento criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); @@ -270,11 +268,9 @@ export class CreateProcessPage implements OnInit { } console.log('this.postData', this.postData, this.taskType); - alert('nice !!') try { - // await this.processes.postDespatcho(this.postData).toPromise(); - this.executado(); - // this.toastService.successMessage('Despacho criado'); + await this.processes.postDespatcho(this.postData).toPromise(); + this.executado('Despacho criado'); } catch (error) { this.toastService.badRequest('Processo não efectuado'); } @@ -329,7 +325,7 @@ export class CreateProcessPage implements OnInit { } - async executado() { + async executado(message?) { let body = { "serialNumber": this.task.serialNumber, "action": "Conhecimento", @@ -339,7 +335,13 @@ export class CreateProcessPage implements OnInit { }, "AttachmentList" :null, } - await this.processes.CompleteTask(body).toPromise(); + + try { + await this.processes.CompleteTask(body).toPromise(); + this.toastService.successMessage(message) + } catch(e) { + this.toastService.badRequest() + } } async FinalizarDespacho() { @@ -381,7 +383,7 @@ export class CreateProcessPage implements OnInit { } - async FinalizarParecer() { + async FinalizarParecer(message?) { let body = { "serialNumber": this.task.serialNumber, "action": "Parecer", @@ -391,7 +393,15 @@ export class CreateProcessPage implements OnInit { }, "AttachmentList" :null, } - await this.processes.CompleteTask(body).toPromise(); + + + try { + await this.processes.CompleteTask(body).toPromise(); + this.toastService.successMessage(message) + } catch (e) { + this.toastService.badRequest() + } + } async addParticipants() { @@ -570,73 +580,4 @@ export class CreateProcessPage implements OnInit { }); } - - - async successMessage(message?: any, callback?) { - var notification = document.createElement('div') - notification.id = 'notification' - notification.innerHTML = ` - -
{{ message }}
- - -