save

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

@@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit {
   fulltask: any;
   eventsList: Event[];
   serialnumber: string;
+  serialNumber: string;
   profile: string;
   intervenientes: any;
   cc: any = [];
@@ -42,7 +43,8 @@ export class ExpedienteDetailPage implements OnInit {
   hideSendToPendentes = true
 
 
-  constructor(private activateRoute: ActivatedRoute,
+  constructor(
+    private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
     private iab: InAppBrowser,
     private attachments: AttachmentsService,
@@ -57,14 +59,11 @@ export class ExpedienteDetailPage implements OnInit {
     private animationController: AnimationController
     ) {
       
-      this.activatedRoute.queryParams.subscribe(params => {
-
-        if(params["serialNumber"]) {
-          this.serialnumber = params["serialNumber"];
-        }
+      this.activateRoute.paramMap.subscribe(params => {
+        console.log(params["params"]);
         
-        if(params["type"] == "pendentes") {
-          this.hideSendToPendentes = false
+        if(params["params"].SerialNumber) {
+          this.serialnumber = params["params"].SerialNumber;
         }
 
       });
@@ -75,9 +74,11 @@ export class ExpedienteDetailPage implements OnInit {
     this.profile = "mdgpr";
     
     this.activateRoute.paramMap.subscribe(paramMap => {
-      if (!paramMap.has('SerialNumber')) {
+      if (!paramMap["params"].SerialNumber) {
         return;
       }
+      console.log(paramMap);
+      
       /* this.serialnumber = paramMap.get('SerialNumber'); */
       this.LoadTaskDetail(this.serialnumber);
       this.LoadRelatedEvents(this.serialnumber);
@@ -94,37 +95,27 @@ export class ExpedienteDetailPage implements OnInit {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-
   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);
-        }
-      
-      }
-
-
-
-
-    });
+    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": true,
+            }
+          }
+          if( window.innerWidth < 801) {
+            this.router.navigate(['/home/gabinete-digital/expediente']);
+          } else {
+            this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+          }
+          break;
+      }
+    });
   }
 
   sendExpedienteToPending(){
@@ -140,6 +131,7 @@ export class ExpedienteDetailPage implements OnInit {
 
 
   async LoadTaskDetail(serial: string) {
+
     this.processes.GetTask(serial).subscribe(res => {
       console.log(res);
       
@@ -178,6 +170,9 @@ export class ExpedienteDetailPage implements OnInit {
       })
 
     });
+    
+
+
   }
 
   async LoadRelatedEvents(serial: string) {