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

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

@@ -83,13 +83,23 @@ export class DespachoPage implements OnInit {
     this.modalController.dismiss();
   }
 
-  goBack(){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-        "despachos": true,
-      }
-    };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+  goBack() {
+
+    // this.activatedRoute.queryParams.subscribe(params => {
+    //   if(params["from"] == 'pendentes') {
+    //     this.router.navigate(['/home/gabinete-digital/pendentes']);
+    //   } else {
+    //     let navigationExtras: NavigationExtras = {
+    //       queryParams: {
+    //         "despachos": true,
+    //       }
+    //     };
+    //     this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
+    //   }
+    // });
+
+    window.history.back()
+    
   }
 
 
@@ -293,7 +303,7 @@ export class DespachoPage implements OnInit {
   }
 
   async openExpedientActionsModal(taskAction: any, task: any) {
-    //this.modalController.dismiss();
+
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'

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

@@ -4,7 +4,6 @@
 
 <ion-header class="ion-no-border header-2">
   
-  
   <div class="title">
     <app-btn-modal-dismiss (click)="goBack()" ></app-btn-modal-dismiss>
 

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

@@ -69,16 +69,13 @@ export class DespachosPage implements OnInit {
     this.LoadList();
   }
 
-  goBack(){
-    this.router.navigate(['/home/gabinete-digital']);
-  }
 
-  notImplemented(){
+
+  notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  openExpedientDetailPage(data){
-    console.log(data);
+  openExpedientDetailPage(data) {
     this.openExpedientDetail.emit(data);
   }
 
@@ -145,7 +142,7 @@ export class DespachosPage implements OnInit {
 
     let navigationExtras: NavigationExtras = {
     queryParams: {
-        "serialNumber": serialNumber,
+      "serialNumber": serialNumber,
       }
     };
 
@@ -156,5 +153,13 @@ export class DespachosPage implements OnInit {
  docIndex(index: number) {
   this.dicIndex = index;
  }
+
+  goBack() {
+    this.router.navigate(['/home/gabinete-digital']);
+  }
+
+  goToList() {
+    this.router.navigate(['/home/gabinete-digital/despachos']);
+  }
  
 }