From 1180912911ff5d2c2b9f25b5e3d52ba94260d57f Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 28 May 2021 14:48:39 +0100 Subject: [PATCH 1/4] save --- .../event-list/approve-event/approve-event.page.ts | 3 +-- .../expediente-detail/expediente-detail.page.html | 1 + .../expediente/expediente-detail/expediente-detail.page.ts | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 279a101c3..3a2fe5408 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -118,8 +118,7 @@ export class ApproveEventPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); this.processes.PostTaskAction(body); - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); + this.goBack(); } async getAttachments(instanceId:string){ 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 02f653f4f..440d392ae 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 @@ -147,6 +147,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 1c4efdefc..5c2cf3291 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 @@ -17,6 +17,7 @@ import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; +import { ToastService } from 'src/app/services/toast.service'; @Component({ selector: 'app-expediente-detail', @@ -49,6 +50,7 @@ export class ExpedienteDetailPage implements OnInit { private alertService: AlertService, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, + private toastService: ToastService, ) { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { @@ -80,6 +82,10 @@ export class ExpedienteDetailPage implements OnInit { this.modalController.dismiss(); } + showToast(){ + this.toastService.presentToast('Não foi possível fazer login"'); + } + goBack(){ let navigationExtras: NavigationExtras = { queryParams: { From ef1efe172bf97db5a63c359d627277fe51d9b2ec Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 28 May 2021 15:05:12 +0100 Subject: [PATCH 2/4] save --- package-lock.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbfb9d27f..9623efb6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18862,8 +18862,7 @@ }, "ssri": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "resolved": "", "dev": true, "requires": { "figgy-pudding": "^3.5.1" From d4d3a3f5bc6c8ce78bb9ca24bbb7ce7029693e02 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 28 May 2021 15:05:22 +0100 Subject: [PATCH 3/4] save --- .../expediente/expediente-detail/expediente-detail.page.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5c2cf3291..b3db40684 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 @@ -232,7 +232,7 @@ export class ExpedienteDetailPage implements OnInit { if(body == 'descartar'){ if(res['data']== 'Yes'){ let otherbody = { - "serialNumber": body.serialNumber, + "serialNumber": this.task.SerialNumber, "action": "Passivo", "ActionTypeId": 94, "dataFields": { From e4972576d352014bc75de72bcd212621e8701c51 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 28 May 2021 15:11:45 +0100 Subject: [PATCH 4/4] save --- .../event-list/approve-event/approve-event.page.ts | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 3a2fe5408..306303b78 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -94,23 +94,14 @@ export class ApproveEventPage implements OnInit { let body = { "serialNumber": serialNumber, "action": "Aprovar" } console.log(body); this.processes.PostTaskAction(body); - this.modalController.dismiss(serialNumber); - /* this.approveEventDismiss.emit({ - "serialNumber": serialNumber, - "action": "Aprovar", - "saveData": { - loadedEvent: this.loadedEvent, - today: this.today, - customDate: this.customDate - } - }); */ + this.goBack(); } emendTask(serialNumber:string){ /* console.log('Emendar'); */ this.menu.close(); this.openEmendMessageModal(serialNumber); - this.modalController.dismiss(null); + this.goBack(); } rejectTask(serialNumber:string){