save

src/app/home/home-routing.module.ts

@@ -27,6 +27,10 @@ const routes: Routes = [
             path:':eventId/:caller',
             loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
           },
+          {
+            path:':SerialNumber/:caller',
+            loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule),
+          },
         ]
       },
       {

src/app/pages/agenda/agenda.page.ts

@@ -253,8 +253,10 @@ export class AgendaPage implements OnInit {
 
   //Show information of the event
   async onEventSelected(ev: { event: Event}){
-    this.viewEventDetail(ev.event.EventId);
-   /*  this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']); */
+    /* this.viewEventDetail(ev.event.EventId); */
+    console.log('DOVE');
+    
+    this.router.navigate(["/home/agenda", ev.event.EventId, 'agenda']);
   }
 
   onCurrentChanged = (ev: Date) => {
@@ -1206,7 +1208,8 @@ export class AgendaPage implements OnInit {
 
   // open component
   async viewEventDetail(eventId:any) {
-    console.log(this.profile);
+    this.router.navigate(['/home/agenda', eventId, 'agenda']);
+    /* console.log(this.profile);
     
     const modal = await this.modalCtrl.create({
       component: ViewEventPage,
@@ -1222,7 +1225,7 @@ export class AgendaPage implements OnInit {
       if(res){
         // this.viewEventDetailDismiss(res);
       }
-    });
+    }); */
   }
 
   // open component

src/app/pages/events/events.page.html

@@ -57,7 +57,7 @@
         <div class="content">
           <ion-list>
             <ion-item class="cursor-pointer" lines="none" *ngFor="let event of eventsList"
-            (click)="viewEventDetail(event.EventId)"
+            (click)="goToEvent(event.EventId)"
             >
             <div class="d-flex  content-{{profile}}-{{event.CalendarName}}">
               <div class="schedule-time">

src/app/pages/events/events.page.ts

@@ -325,14 +325,24 @@ export class EventsPage implements OnInit {
     });
   }
 
+  goToEvent(eventId:any){
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        "eventId": eventId,
+        "caller": "agenda"
+      }
+    };
+    this.router.navigate(['/home/events', eventId, 'events']);
+  }
+
   goToExpediente(serialNumber:any){
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
-        "from": "inicio"
+        "caller": "agenda"
       }
     };
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'events']);
   }
 
   async viewExpedientDetail(serialNumber:any) {

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

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

@@ -98,12 +98,11 @@ export class ExpedientePage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
-        "from": "gabinete",
-        "type": "pendentes"
+        "caller": "gabinete"
       }
     }
 
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
   
   }
 

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -107,7 +107,7 @@ export class ExpedientsPage implements OnInit {
         "type": "pendentes"
       }
     };
-    this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
+    this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
   }
 
   async viewExpedientDetail(serialNumber:any) {