Pull made

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