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

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

@@ -39,6 +39,9 @@ export class ExpedienteDetailPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
+  hideSendToPendentes = true
+
+
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
@@ -53,12 +56,19 @@ export class ExpedienteDetailPage implements OnInit {
     private toastService: ToastService,
     private animationController: AnimationController
     ) {
+      
       this.activatedRoute.queryParams.subscribe(params => {
+
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
-          console.log(params["serialNumber"]);
         }
+        
+        if(params["type"] == "pendentes") {
+          this.hideSendToPendentes = false
+        }
+
       });
+
     }
 
   ngOnInit() {
@@ -76,29 +86,45 @@ export class ExpedienteDetailPage implements OnInit {
     this.LoadRelatedEvents(this.serialnumber);
   }
 
-  close(){
+  close() {
     this.modalController.dismiss();
   }
 
-  showToast(){
+  showToast() {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-  /* goBack() {
-    window.history.back()
-  } */
 
-  goBack(){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "expedientes": true,
+  goBack() {
+
+
+    this.activatedRoute.queryParams.subscribe(params => {
+      if(params["from"] == "inicio") {
+
+        
+        this.router.navigate(['/home/events']);
+
+      } else {
+
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+            "expedientes": true,
+          }
+        }
+
+        if( window.innerWidth < 801) {
+          this.router.navigate(['/home/gabinete-digital/expediente']);
+        } else {
+          this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        }
+      
       }
-    };
-    if( window.innerWidth < 801){
-      this.router.navigate(['/home/gabinete-digital/expediente']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
+
+
+
+
+    });
+    
   }
 
   sendExpedienteToPending(){
@@ -334,7 +360,7 @@ export class ExpedienteDetailPage implements OnInit {
 
 
 
-  async successMessage(message?: string) {
+  async successMessage(message?: any, callback?) {
     
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -373,12 +399,15 @@ export class ExpedienteDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
     
   }
 
-  async badRequest(message?: string) {
+  async badRequest(message?: string, callback?) {
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
         .addElement(baseEl.querySelector('ion-backdrop')!)
@@ -416,8 +445,11 @@ export class ExpedienteDetailPage implements OnInit {
     modal.present()
     
     setTimeout(()=>{
+      if (callback) {
+        callback()
+      }
       modal.dismiss()
-    },3000)
+    },7000)
   }
 
 }