Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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>

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

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">

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

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')
@@ -144,7 +145,13 @@ export class DespachosOptionsPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
           this.goBack();
+        }
+      }
+
     });
   }
 
@@ -309,7 +316,7 @@ export class DespachosOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos']);
+    this.location.back();
   }
 
 }

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() {
@@ -174,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) {
@@ -363,7 +372,7 @@ export class DespachosPrOptionsPage implements OnInit {
   }
 
   goBack() {
-    this.router.navigate(['/home/gabinete-digital/despachos-pr'])
+    this.location.back();
   }
 
   cancle() {