From 06c8d525b09822a052d9b7a331ef06c9955d559b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 18 Jun 2021 15:12:34 +0100 Subject: [PATCH] save --- src/app/modals/forward/forward.page.html | 2 +- .../despacho-pr/despacho-pr.page.ts | 17 ++++++++++------- .../despachos/despacho/despacho.page.ts | 14 ++++++++------ .../diploma-assinar/diploma-assinar.page.ts | 14 +++++++++----- .../diplomas/diploma/diploma.page.ts | 14 ++++++++------ 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index 00f97ee0b..44bba9acb 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -4,7 +4,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 6a687823c..d5c8c46fa 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -85,13 +85,16 @@ export class DespachoPrPage implements OnInit { } goBack(){ - let navigationExtras: NavigationExtras = { - queryParams: { - "despachospr": true, - } - }; - this.router.navigate(['/home/gabinete-digital'], navigationExtras); - + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/despachos-pr']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "despachospr": true, + } + }; + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } } diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index b2490b13d..b79c2a7ee 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -90,15 +90,17 @@ export class DespachoPage implements OnInit { goBack() { // window.history.back() - let navigationExtras: NavigationExtras = { - queryParams: { - // "serialNumber": serialNumber, - //'despachos': true + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/despachos']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + 'despachos': true + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); - } diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index df663c0fa..efc0b9380 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -56,13 +56,17 @@ export class DiplomaAssinarPage implements OnInit { } goBack() { - let navigationExtras: NavigationExtras = { - queryParams: { - "diplomas": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/diplomas-assinar']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomasassinar": true, + } } + + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } async openOptions(taskAction?: any) { diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index 8e76d7eee..19cf3bffe 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -57,14 +57,16 @@ export class DiplomaPage implements OnInit { } goBack() { - - let navigationExtras: NavigationExtras = { - queryParams: { - "diplomas": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/diplomas']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "diplomas": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); }