Pull made

src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -22,6 +22,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { environment } from 'src/environments/environment';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -75,7 +76,8 @@ export class DespachosPrPage implements OnInit {
     private backgroundservice: BackgroundService,
     private sortService: SortService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
 
     this.profile = 'mdgpr';
@@ -289,7 +291,7 @@ export class DespachosPrPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
 }

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts

@@ -220,7 +220,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.executado(note, documents, this.serialnumber).toPromise();
       this.httpErrorHandle.httpsSucessMessagge('Executado')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -237,7 +237,7 @@ export class DespachoPage implements OnInit {
       await this.despachoService.arquivar(note, documents, this.serialnumber).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Arquivar')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
     }
@@ -264,7 +264,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Reexecução')
       this.TaskService.loadDespachos();
-      this.close();
+       //this.close();
 
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error)
@@ -292,7 +292,7 @@ export class DespachoPage implements OnInit {
       await this.processes.CompleteTask(body).toPromise()
       this.httpErrorHandle.httpsSucessMessagge('Gerar Diploma')
       this.TaskService.loadDespachos();
-      this.close();
+      // this.close();
     } catch (error) {
       this.httpErrorHandle.httpStatusHandle(error);
     }   finally {
@@ -496,9 +496,16 @@ export class DespachoPage implements OnInit {
       },
       translucent: true
     });
-    return await popover.present().then(()=> {
-      this.TaskService.loadDespachos();
+    await popover.present();
+    
+    popover.onDidDismiss().then((res)=> {
+      console.log('res', res.data)
+      if(res.data == 'back') {
+        this.goBack();
+      }
+      
     })
+
   }
 
 

src/app/pages/gabinete-digital/despachos/despachos.page.html

@@ -29,15 +29,15 @@
             </mat-option>
   
             <mat-option value="Novos" >
-              Novos
+              Novas
             </mat-option>
   
             <mat-option value="Lidos" >
-              Lidos
+              Lidas
             </mat-option>
   
             <mat-option value="Não lidos" >
-              Não lidos
+              Não lidas
             </mat-option>
   
             <mat-option value="OverdueTasks">
@@ -45,7 +45,7 @@
             </mat-option>
   
             <mat-option value="Todos" >
-              Todos
+              Todas
             </mat-option>
   
           </mat-select>

src/app/pages/gabinete-digital/despachos/despachos.page.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { DespachoStore } from 'src/app/store/despacho-store.service';
-
+import { RouteService } from 'src/app/services/route.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
@@ -32,7 +32,8 @@ export class DespachosPage implements OnInit {
     private platform: Platform,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {}
 
   ngOnInit() {
@@ -139,11 +140,7 @@ export class DespachosPage implements OnInit {
 
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
-  }
-
-  goToList() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
+    this.RouteService.goBack();
   }
 
 }

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html

@@ -23,15 +23,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -39,7 +39,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>

src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -9,6 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas-assinar',
@@ -41,7 +42,8 @@ export class DiplomasAssinarPage implements OnInit {
    private router: Router,
    private sortService: SortService,
   public ThemeService: ThemeService,
-  public TaskService: TaskService) {
+  public TaskService: TaskService,
+  private RouteService: RouteService,) {
    }
 
   ngOnInit() {
@@ -126,8 +128,9 @@ export class DiplomasAssinarPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    // this.router.navigate(['/home/gabinete-digital']);
     // window.history.back()
+    this.RouteService.goBack();
   }
 
 }

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.ts

@@ -9,7 +9,7 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-diplomas-gerars',
   templateUrl: './diplomas-gerar.page.html',
@@ -42,7 +42,8 @@ export class DiplomasGerarPage implements OnInit {
     private router: Router,
     private sortService: SortService,
    public ThemeService: ThemeService,
-   public TaskService: TaskService) {
+   public TaskService: TaskService,
+   private RouteService: RouteService,) {
     }
  
    ngOnInit() {
@@ -139,7 +140,7 @@ export class DiplomasGerarPage implements OnInit {
    }
  
    goBack() {
-     this.router.navigate(['/home/gabinete-digital']);
+     this.RouteService.goBack();
      // window.history.back()
    }
 }

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts

@@ -85,31 +85,7 @@ export class DiplomaPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      if (window.innerWidth < 801) {
-        this.router.navigate(['/home/gabinete-digital/diplomas']);
-      } else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-            'diplomas': true
-          }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    } */
+
   }
 
   async openOptions(taskAction?: any) {

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -11,6 +11,7 @@ import { PermissionService } from 'src/app/services/permission.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { TaskService } from 'src/app/services/task.service'
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-diplomas',
@@ -46,7 +47,8 @@ export class DiplomasPage implements OnInit, OnDestroy {
     private sortService: SortService,
     public ThemeService: ThemeService,
     public p: PermissionService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     //Inicializar segment
 
@@ -223,8 +225,7 @@ export class DiplomasPage implements OnInit, OnDestroy {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
-    // window.history.back()
+    this.RouteService.goBack();
   }
 
 }

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -71,7 +71,6 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   close(){
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.modalController.dismiss(null);
   }
 

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -95,16 +95,6 @@ export class ApproveEventPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    /* let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "eventos": true,
-      }
-    };
-    if( window.innerWidth < 801) {
-      this.router.navigate(['/home',this.caller, 'event-list']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    } */
 
   }
 
@@ -121,7 +111,6 @@ export class ApproveEventPage implements OnInit {
     this.processes.GetTask(this.serialNumber).subscribe(async res => {
 
       this.loadedEvent = res
-      console.log('1111=1=1=1=')
       this.addProcessToDB(this.loadedEvent)
       
       try {

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -31,15 +31,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não Lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
         </mat-select>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts

@@ -25,6 +25,8 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { RouteService } from 'src/app/services/route.service';
+
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -113,6 +115,7 @@ export class ExpedientTaskModalPage implements OnInit {
     public ThemeService: ThemeService,
     public p: PermissionService,
     private httpErroHandle: HttpErrorHandle,
+    private RouteService: RouteService,
     ) {
 
       this.loggeduser = SessionStore.user;
@@ -178,7 +181,7 @@ export class ExpedientTaskModalPage implements OnInit {
   }
 
   close() {
-    this.router.navigate(['/home/gabinete-digital/expediente']);
+    this.RouteService.goBack();
     this.modalController.dismiss(null);
   }
 

src/app/pages/gabinete-digital/expediente/expediente.page.html

@@ -32,15 +32,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
 
@@ -49,7 +49,7 @@
           </mat-option>
 
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
           

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -13,7 +13,7 @@ import { Storage } from '@ionic/storage';
 import { EventTrigger } from 'src/app/services/eventTrigger.service';
 import { TaskDeadlineService } from 'src/app/services/task-deadline.service'
 import { TaskService } from 'src/app/services/task.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-expediente',
   templateUrl: './expediente.page.html',
@@ -51,7 +51,8 @@ export class ExpedientePage implements OnInit {
     private storage: Storage,
     private eventTriger: EventTrigger,
     public TaskDeadlineService: TaskDeadlineService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) { 
 
     this.eventTriger.getObservable().subscribe((event) => {
@@ -158,7 +159,7 @@ export class ExpedientePage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   goToExpediente(serialNumber: any) {

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -101,41 +101,6 @@ export class ExpedientePrPage implements OnInit {
   goBack() {
     this.TaskService.loadExpedientes()
     this.RouteService.goBack();
-    /* if(this.task.Status == "Pending" && this.caller != 'events'){
-      if (window.innerWidth <= 800) {
-        this.router.navigate(['/home/gabinete-digital/pendentes']);
-      }
-      else {
-        let navigationExtras: NavigationExtras = {
-          queryParams: {
-              "pendentes": true,
-            }
-        }
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-      }
-    }
-    else{
-      this.activatedRoute.paramMap.subscribe(params => {
-        switch (params["params"].caller) {
-          case 'events':
-            this.router.navigate(['/home',params["params"].caller]);
-            break;
-
-          case 'gabinete-digital':
-            let navigationExtras: NavigationExtras = {
-              queryParams: {
-                "expedientes-pr": true,
-              }
-            }
-            if( window.innerWidth < 801) {
-              this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
-            } else {
-              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-            }
-            break;
-        }
-      });
-    } */
   }
 
   sendExpedienteToPending() {

src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -143,7 +143,6 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   goToExpediente({SerialNumber}){
-    //this.router.navigate(['/home/gabinete-digital/expedientes-pr',serialNumber,'gabinete-digital']);
     this.router.navigate(['/home/gabinete-digital/expediente', SerialNumber, 'gabinete-digital']);
   }
 

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -22,15 +22,15 @@
                   </mat-option>
         
                   <mat-option value="Novos" >
-                    Novos
+                    Novas
                   </mat-option>
         
                   <mat-option value="Lidos" >
-                    Lidos
+                    Lidas
                   </mat-option>
         
                   <mat-option value="Não lidos" >
-                    Não lidos
+                    Não lidas
                   </mat-option>
         
                   <mat-option value="OverdueTasks">
@@ -38,7 +38,7 @@
                   </mat-option>
       
                   <mat-option value="Todos" >
-                    Todos
+                    Todas
                   </mat-option>
         
                 </mat-select>
@@ -114,22 +114,22 @@
 
           <div *ngIf="hideSearchBtn">
             <mat-form-field class="task-filter-input" appearance="none"   color="ion-color-secondary"  placeholder="Selecione agenda">
-              <mat-select [(value)]="filterName">
+              <mat-select [(value)]="filterName" (change)="dynamicSearch()">
       
                 <mat-option value="Para hoje" >
                   Para hoje
                 </mat-option>
       
                 <mat-option value="Novos" >
-                  Novos
+                  Novas
                 </mat-option>
       
                 <mat-option value="Lidos" >
-                  Lidos
+                  Lidas
                 </mat-option>
       
                 <mat-option value="Não lidos" >
-                  Não lidos
+                  Não lidas
                 </mat-option>
       
                 <mat-option value="OverdueTasks">
@@ -137,7 +137,7 @@
                 </mat-option>
     
                 <mat-option value="Todos" >
-                  Todos
+                  Todas
                 </mat-option>
       
               </mat-select>
@@ -159,7 +159,7 @@
                     class=" box-hover ion-no-padding cursor-pointer"
                     *ngFor = "let task of AllProcess"
                     (click)="goToProcess(task.SerialNumber || task.serialNumber, task.WorkflowName || task.workflowName || task.workflowDisplayName || task.workflowName, task.activityInstanceName)">
-                    <div class="item-wrapper" *ngIf="TaskService.filter(task, filterName)">
+                    <div class="item-wrapper">
                       <div class="item width-100">
                         <div class="item-top-detail">
                           <div class="item-subject">

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -217,12 +217,14 @@ export class GabineteDigitalPage implements OnInit {
       
       if(ordinance == this.ordinance) {
         this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
+          .filter( task => this.TaskService.filter(task, this.filterName))
       }
     } else {
-      const AllProcess = this.TaskService.AllProcess
+      const AllProcess = this.TaskService.AllProcess.filter( task => this.TaskService.filter(task, this.filterName))
       
       if(ordinance == this.ordinance) {
         this.AllProcess = this.TaskService.reorderList(this.ordinance, AllProcess)
+          .filter( task => this.TaskService.filter(task, this.filterName))
       }
     }
 
@@ -260,6 +262,7 @@ export class GabineteDigitalPage implements OnInit {
       }
     });
 
+    this.checkRoutes()
     this.hideRefreshButton();
 
     // console.log(' this.scroll',  this.scroll)
@@ -388,9 +391,12 @@ export class GabineteDigitalPage implements OnInit {
 
   checkRoutes() {
     this.closeAllDesktopComponents();
-    if (this.router.url == 'processes=true') {
+    
+    // console.log(this.router.url, this.router.url.includes('processes=true'))
+    // alert('hello')
+    if (this.router.url.includes('processes=true')) {
       this.openAllProcessesPage();
-      this.selectedElement = 'allProcessesTag';
+      this.checkUser()
     }
     if (this.router.url == '/home/gabinete-digital?eventos=true') {
       this.openEventsToApprovePage();
@@ -512,7 +518,7 @@ export class GabineteDigitalPage implements OnInit {
       this.router.navigate(['/home/gabinete-digital']);
     }
     else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      // this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showAllProcesses = true;
       this.selectedElement = "allProcessesTag";
     }

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -608,40 +608,6 @@ export class PedidoPage implements OnInit {
 
   goBack() {
     this.RouteService.goBack();
-    // if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
-    // else {
-    //   if (window.innerWidth <= 700) {
-    //     this.router.navigate(['/home/gabinete-digital/pedidos']);
-    //   }
-    //   else {
-
-    //     let navigationExtras: NavigationExtras;
-
-    //     if (this.task.activityInstanceName == 'Concluir Deferimento') {
-    //       navigationExtras= { queryParams: {"deferimento": true,}};
-    //     } else if (this.task.activityInstanceName == 'Tarefa de Parecer' ) {
-
-    //       navigationExtras = { queryParams: {"parecer": true,}};
-    //     }
-    //     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    //   }
-    // }
   }
 
 }

src/app/pages/gabinete-digital/pedidos/pedidos.page.html

@@ -34,15 +34,15 @@
           </mat-option>
 
           <mat-option value="Novos" >
-            Novos
+            Novas
           </mat-option>
 
           <mat-option value="Lidos" >
-            Lidos
+            Lidas
           </mat-option>
 
           <mat-option value="Não lidos" >
-            Não lidos
+            Não lidas
           </mat-option>
 
           <mat-option value="OverdueTasks">
@@ -51,7 +51,7 @@
 
           
           <mat-option value="Todos" >
-            Todos
+            Todas
           </mat-option>
 
 

src/app/pages/gabinete-digital/pedidos/pedidos.page.ts

@@ -14,6 +14,9 @@ import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { TaskService } from 'src/app/services/task.service'
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
+import { RouteService } from 'src/app/services/route.service';
+
+
 @Component({
   selector: 'app-pedidos',
   templateUrl: './pedidos.page.html',
@@ -62,7 +65,8 @@ export class PedidosPage implements OnInit {
     private backgroundservice: BackgroundService,
     private platform: Platform,
     public ThemeService: ThemeService,
-    public TaskService: TaskService
+    public TaskService: TaskService,
+    private RouteService: RouteService,
   ) {
     this.segment = 'parecer';
 
@@ -138,23 +142,9 @@ export class PedidosPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
-  /* segmentChanged(ev: any) {
-
-    let navigationExtras: NavigationExtras;
-
-    if (this.segment == 'deferimento') {
-      navigationExtras= { queryParams: {"deferimento": true,}};
-    } else if (this.segment == 'parecer') {
-      navigationExtras = { queryParams: {"parecer": true,}};
-    }
-
-    this.router.navigate(['/home/gabinete-digital/pedidos'], navigationExtras);
-
-    // this.LoadList();
-  } */
 
   goToPedido(serialNumber: any) {
     this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -19,7 +19,7 @@ import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { TaskService } from 'src/app/services/task.service'
 import { ThemeService } from 'src/app/services/theme.service'
-
+import { RouteService } from 'src/app/services/route.service';
 @Component({
   selector: 'app-pendentes',
   templateUrl: './pendentes.page.html',
@@ -62,6 +62,7 @@ export class PendentesPage implements OnInit {
     private httpErroHandle: HttpErrorHandle,
     public TaskService: TaskService,
     public ThemeService: ThemeService,
+    private RouteService: RouteService,
   ) {
     this.loggeduser = SessionStore.user;
     this.profile = 'mdgpr';
@@ -128,7 +129,7 @@ export class PendentesPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital']);
+    this.RouteService.goBack();
   }
 
   notImplemented() {