From 4f52f914200c43d4bbbb51b6bf63fedc79b57b75 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 18 Nov 2021 14:07:04 +0100
Subject: [PATCH 1/3] Send

---
 src/app/home/home-routing.module.ts                        | 2 +-
 .../popover/despachos-options/despachos-options.page.ts    | 7 ++++---
 .../despachos-pr-options/despachos-pr-options.page.ts      | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 564db5b3e..996e1b413 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -400,7 +400,7 @@ const routes: Routes = [
         loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
       },
     ],
-    canActivate: [InactivityGuard]
+    // canActivate: [InactivityGuard]
 
   },
 ];
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index bd2ea5e42..d6685fb0b 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -11,7 +11,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { customTask, fullTask } from 'src/app/models/dailyworktask.model';
 import { PermissionService } from 'src/app/services/worker/permission.service';
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { Location } from '@angular/common'
 
 @Component({
   selector: 'app-despachos-options',
@@ -32,7 +32,8 @@ export class DespachosOptionsPage implements OnInit {
     private navParams: NavParams,
     private toastService: ToastService,
     public p: PermissionService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private location: Location,
     ) { 
       this.task = this.navParams.get('task')
       this.fulltask = this.navParams.get('fulltask')
@@ -309,7 +310,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
+    this.location.back();
   }
 
 }
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index abe5d0913..9a49dec53 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -35,7 +35,8 @@ export class DespachosPrOptionsPage implements OnInit {
     private toastService: ToastService,
     private location: Location,
     public p: PermissionService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    
   ) { }
 
   ngOnInit() {
@@ -363,7 +364,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos-pr'])
+    this.location.back();
   }
 
   cancle() {

From 95557c86dd24e2e4d052a8edeff9c2f44d489f28 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 18 Nov 2021 15:13:11 +0100
Subject: [PATCH 2/3] Improve

---
 src/app/home/home-routing.module.ts                             | 2 +-
 .../despachos-pr/despacho-pr/despacho-pr.page.html              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 996e1b413..564db5b3e 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -400,7 +400,7 @@ const routes: Routes = [
         loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule)
       },
     ],
-    // canActivate: [InactivityGuard]
+    canActivate: [InactivityGuard]
 
   },
 ];
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 3df1fa9ac..d0b92ddcb 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border px-20">
+<ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
 <ion-content>

From 5553645b3b9343b6cb9e55e4b15d9aee1bab6f8c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 18 Nov 2021 15:30:11 +0100
Subject: [PATCH 3/3] Improve

---
 .../despachos-pr/despacho-pr/despacho-pr.page.ts       | 10 +++++++++-
 .../pages/gabinete-digital/gabinete-digital.page.html  |  4 ++--
 .../gabinete-digital/pedidos/pedido/pedido.page.ts     | 10 +++++++++-
 .../despachos-options/despachos-options.page.ts        | 10 ++++++++--
 .../despachos-pr-options/despachos-pr-options.page.ts  | 10 +++++++++-
 5 files changed, 37 insertions(+), 7 deletions(-)

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 6b51387c7..8cd38b474 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
@@ -535,7 +535,15 @@ export class DespachoPrPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async distartExpedientModal() {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index e71f518e0..bcdf3a838 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -181,7 +181,7 @@
 
 
             <!-- <div *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100 white-background">
-              <div class="center-div">
+              <div class="center-div">F
                 <div class="exp-card-icon">
                   <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
                 </div>
@@ -217,7 +217,7 @@
               </div>
               <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas por Validar</p>
               <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Diplomas por Assinar</p>
-              <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} bug <span class="title1">Documentos</span> </p>
+              <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
             </div>
 
             <div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
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 9a80658a7..f6dc796ef 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
@@ -537,7 +537,15 @@ export class PedidoPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async openForwardModal(task: any) {
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts
index d6685fb0b..bd0343cf6 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.ts
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts
@@ -144,8 +144,14 @@ export class DespachosOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss().then(res=>{
-      this.goBack();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
     });
   }
 
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
index 9a49dec53..d132333af 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts
@@ -175,7 +175,15 @@ export class DespachosPrOptionsPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async generateDiploma(note:string, documents:any) {