Gabinete Digital -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d3001864e..d0fc37eea 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -260,7 +260,7 @@ export class GabineteDigitalPage implements OnInit { } - doRefresh() { + doRefresh(event) { this.closeAllDesktopComponents(); switch(this.loggeduser.Profile){ case 'MDGPR': @@ -276,8 +276,7 @@ export class GabineteDigitalPage implements OnInit { this.LoadCounts(); //this.refreshExpedientes(); - setTimeout(() => { - }, 2000); + event.target.complete(); } notImplemented(){ 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 9ec4fe614..0f0325345 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -445,14 +445,16 @@ export class PedidoPage implements OnInit { } goBack() { - - let navigationExtras: NavigationExtras = { - queryParams: { - "pedidos": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pedidos']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 9f39fd6a8..c071b0d24 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ -
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 60b18bd50..4e9224928 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -68,13 +68,12 @@ export class PublicationsPage implements OnInit { } }); } - doRefresh() { - /* this.getActions(); */ + doRefresh(event) { + this.getActions(); setTimeout(() => { - this.getActions(); - /* event.target.complete(); */ - }, 2000); + event.target.complete(); + }, 250); } get windowInnerWidth(): number { @@ -125,7 +124,7 @@ export class PublicationsPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then(()=>{ - this.doRefresh(); + this.getActions(); }); } else { this.desktopComponent.showAddActions = true; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 6b4b28eaf..6a382fb71 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -139,6 +139,7 @@ export class ProcessesService { }; return this.http.post(`${geturl}`, body, options) } + CompleteTask(body:any){ const geturl = environment.apiURL + 'Tasks/CompleteTask'; @@ -148,6 +149,15 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } + CompleteParecerPrTask(body:any){ + const geturl = environment.apiURL + 'Tasks/CompleteTaskParecerPr'; + + let options = { + headers: this.headers, + }; + return this.http.post(`${geturl}`, body, options) + } + UpdateTaskStatus(FolderId:string): Observable{ const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus'; let params = new HttpParams(); diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 5d9909a2d..9742c71e6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -127,10 +127,9 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); this.toastService.successMessage('Evento rejeitado') } catch (error) { - this.toastService.badRequest('Evento não rejeitado') + this.toastService.badRequest('Processo não efectuado') } }