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] 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() {