From 0a5767a3a5ae0872a7e331fa5acf39168dabc950 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Feb 2022 11:37:56 +0100 Subject: [PATCH 1/5] save --- .../modals/dar-parecer/dar-parecer.page.ts | 20 +++++++++---------- .../pedidos/pedido/pedido.page.ts | 6 ++++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index e31ff5945..5e464bcf9 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -24,7 +24,7 @@ export class DarParecerPage implements OnInit { private animationController: AnimationController, private toastService: ToastService, public ThemeService: ThemeService - ) { + ) { this.serialNumber = this.navParams.get('serialNumber'); this.instanceId = this.navParams.get('ProcessInstanceID'); } @@ -32,15 +32,15 @@ export class DarParecerPage implements OnInit { ngOnInit() { console.log(this.serialNumber ); - + } - + cancel() { this.modalController.dismiss(); } - + async save() { - + const DocumentToSave = this.documents.map((e) => { return { ApplicationId: e.ApplicationType, @@ -53,8 +53,8 @@ export class DarParecerPage implements OnInit { Attachments: DocumentToSave, } - let body = { - "serialNumber": this.serialNumber, + let body = { + "serialNumber": this.serialNumber, "action": "Registar", "ActionTypeId": 104, "dataFields": { @@ -68,7 +68,7 @@ export class DarParecerPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); - this.modalController.dismiss(); + this.modalController.dismiss('sucess'); this.toastService._successMessage('Parecer enviado'); } catch (error) { this.toastService._badRequest("Parecer não solicitado"); @@ -81,7 +81,7 @@ export class DarParecerPage implements OnInit { removeAttachment(index: number){ this.documents = this.documents.filter( (e, i) => index != i); } - + async getDoc() { const modal = await this.modalController.create({ component: SearchPage, @@ -102,5 +102,5 @@ export class DarParecerPage implements OnInit { } - + } diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 0152cfd80..0874bd07e 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -602,7 +602,7 @@ export class PedidoPage implements OnInit { console.log(task); let classs; - if (window.innerWidth <= 800) { + if (window.innerWidth < 701) { classs = 'book-meeting-modal modal modal-desktop' } else { classs = 'add-note-modal-no-height showAsideOptions' @@ -618,7 +618,9 @@ export class PedidoPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then(res => { - this.goBack(); + if(res.data == 'sucess'){ + this.goBack(); + } }); } From d3f20417ac6c01186ee2b1fd9984f7fe49aee60c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Feb 2022 21:08:48 +0100 Subject: [PATCH 2/5] add top spacing at header --- src/app/shared/header/header.page.html | 6 +++--- src/app/shared/header/header.page.scss | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index fb691770c..d64b7ded8 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -2,7 +2,7 @@
-
+
-