From f06f92f101a20f73be9c1d5694e49bda8631710f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 15:13:47 +0100 Subject: [PATCH 1/4] save --- .../discart-expedient-modal.page.html | 2 +- .../expedient-task-modal.page.ts | 112 +++++++++--------- .../expediente-detail.page.ts | 7 +- 3 files changed, 56 insertions(+), 65 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html index 13571d2d5..e74ac8dcf 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.html @@ -4,7 +4,7 @@
-

Deseja retirar este expediente da sua caixa de correspondência?

+

Deseja retirar este expediente da sua caixa de correspondência?

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 101711a1e..0767ac284 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 @@ -163,12 +163,9 @@ export class ExpedientTaskModalPage implements OnInit { }; }) - let docs = { ProcessInstanceID: "", - Attachments: [ - - ] + Attachments: [] } const DocumentToSave = this.documents.map((e) => { @@ -196,21 +193,22 @@ export class ExpedientTaskModalPage implements OnInit { //SubjectTypes: [], } try { + let action_despacho = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 94, + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_despacho); + //await this.successMessage('Processo efetuado'); + } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_despacho = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 94, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_despacho); break; case '1': @@ -225,21 +223,20 @@ export class ExpedientTaskModalPage implements OnInit { } try { - this.taskResult = await this.processes.postParecer(this.postData).toPromise() - await this.successMessage('Processo efetuado') + let action_parecer = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 92, + "dataFields": { + "Note": "", + } + } + this.taskResult = await this.processes.postParecer(this.postData).toPromise(); + this.modalController.dismiss(action_parecer); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } - - let action_parecer = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 92, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_parecer); break; case '2': this.postData = { @@ -253,21 +250,21 @@ export class ExpedientTaskModalPage implements OnInit { } //console.log(this.postData); try { - this.taskResult = await this.processes.postDeferimento(this.postData).toPromise() - await this.successMessage('Processo efetuado') + let action_deferimento = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 93, + "dataFields": { + "Note": "", + } + } + this.taskResult = await this.processes.postDeferimento(this.postData).toPromise(); + this.modalController.dismiss(action_deferimento); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_deferimento = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 93, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_deferimento); break; } } @@ -290,21 +287,21 @@ export class ExpedientTaskModalPage implements OnInit { } console.log(this.postData); try { + let action_despacho_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881 , + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postDespatchoPr(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_despacho_pr); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } console.log('this.taskResult', this.taskResult); - let action_despacho_pr = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 99999881 , - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_despacho_pr); break; case '1': @@ -319,21 +316,20 @@ export class ExpedientTaskModalPage implements OnInit { } try { + let action_parecer_pr = { + "serialNumber": this.task.serialNumber, + "action": "Tratado", + "ActionTypeId": 99999881, + "dataFields": { + "Note": "", + } + } this.taskResult = await this.processes.postParecerPr(this.postData).toPromise(); - await this.successMessage('Processo efetuado') + this.modalController.dismiss(action_parecer_pr); + //await this.successMessage('Processo efetuado') } catch (error) { await this.badRequest('Processo não efetuado') } - - let action_parecer_pr = { - "serialNumber": this.task.serialNumber, - "action": "Tratado", - "ActionTypeId": 99999881, - "dataFields": { - "Note": "", - } - } - this.modalController.dismiss(action_parecer_pr); break; } break; 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 be6428a04..764c4133f 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 @@ -196,18 +196,13 @@ export class ExpedienteDetailPage implements OnInit { modal.onDidDismiss().then(res=>{ console.log(res['data']); let body = res['data']; - // alert('close '+ res['data']) if(res['data']){ - console.log('open discart'); - + console.log('open discart') this.distartExpedientModal(body); - } else{ console.log('Not open'); - } - }); } From fa3155702e0bb2ce86751d14ec7ff158a009e161 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 15:33:05 +0100 Subject: [PATCH 2/4] save --- .../gabinete-digital/pedidos/pedidos.page.ts | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 6d13eb463..d00e0b5a7 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -65,17 +65,20 @@ export class PedidosPage implements OnInit { this.openPedido.emit(data); } - LoadList(){ + async LoadList(){ if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; - this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { - this.taskslist = result; - console.log(result); - - this.parecerList = new Array(); - let res = result.reverse(); - res.forEach(element => { - let task = { + + let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); + let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); + + let allParecer = parecer.concat(parecerPr).reverse(); + console.log(allParecer); + + this.parecerList = new Array(); + + allParecer.forEach(element => { + let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.originator.email, @@ -86,12 +89,11 @@ export class PedidosPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, - } - this.parecerList.push(task); - }); - console.log(this.parecerList); - + } + this.parecerList.push(task); }); + console.log(this.parecerList); + } else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; From 1cde73e3677cfa2a79a6da5ebb11b7d9c86e061a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 15:38:07 +0100 Subject: [PATCH 3/4] save --- .../expediente/expediente-detail/expediente-detail.page.ts | 3 ++- .../expedientes-pr/expediente-pr/expediente-pr.page.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 764c4133f..aa46a1180 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 @@ -224,7 +224,8 @@ export class ExpedienteDetailPage implements OnInit { console.log(res['data']); if(res['data']== 'Yes'){ - this.processes.CompleteTask(body); + this.processes.CompleteTask(body); + this.goBack(); } else if(res['data'] == 'No'){ let otherbody = { 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 54b142fac..f5116c04e 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 @@ -313,7 +313,8 @@ export class ExpedientePrPage implements OnInit { modal.onDidDismiss().then(res=>{ console.log(res['data']); if(res['data']== 'Yes'){ - this.processes.CompleteTask(body); + this.processes.CompleteTask(body); + this.goBack(); } else if(res['data'] == 'No'){ let otherbody = { From 71f4e7cc3e59e3068125302a77a2506b59d5568b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 26 May 2021 15:41:23 +0100 Subject: [PATCH 4/4] save --- .../pages/gabinete-digital/expediente/expediente.page.ts | 7 ++++++- .../gabinete-digital/expedientes-pr/expedientes-pr.page.ts | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 8604f87a2..8fd2c21f3 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationExtras, Router } from '@angular/router'; +import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -40,6 +40,11 @@ export class ExpedientePage implements OnInit { ngOnInit() { this.LoadList(); + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.LoadList(); + } + }); } notImplemented(){ diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index ab8242539..42dc06236 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { NavigationExtras, Router } from '@angular/router'; +import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; import { CalendarComponent } from 'ionic2-calendar'; import { DailyWorkTask } from '../../../models/dailyworktask.model'; @@ -40,6 +40,11 @@ export class ExpedientesPrPage implements OnInit { ngOnInit() { this.LoadList(); + this.router.events.forEach((event) => { + if(event instanceof NavigationEnd && event.url == this.router.url) { + this.LoadList(); + } + }); } notImplemented(){