From 08ac723ed3b7751d298331373bddd0cb307a7410 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 10 Jun 2021 09:54:02 +0100
Subject: [PATCH] save

---
 src/app/home/home-routing.module.ts                         | 4 ++++
 .../event-list/approve-event/approve-event.page.html        | 2 +-
 .../event-list/approve-event/approve-event.page.ts          | 6 +++++-
 .../pages/gabinete-digital/event-list/event-list.page.html  | 2 +-
 src/app/shared/agenda/approve-event/approve-event.page.html | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index 5c636ea0e..db3db8400 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -113,6 +113,10 @@ const routes: Routes = [
                 path:':SerialNumber',
                 loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
               },
+              {
+                path:':SerialNumber/:caller',
+                loadChildren: ()=> import('../pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module').then(m => m.ExpedienteDetailPageModule)
+              },
               {
                 path:'events/:eventId/:caller',
                 loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
index e7e807b34..649d14cd9 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html
@@ -10,7 +10,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>11{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-true">
           <ion-icon src="assets/images/icons-edit.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 2d45475df..09d8e8fe4 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -69,7 +69,11 @@ export class ApproveEventPage implements OnInit {
         "eventos": true,
       }
     };
-    this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    if( window.innerWidth < 801) {
+      this.router.navigate(['/home/gabinete-digital/event-list']);
+    } else {
+      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+    }
 
 
   }
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index d540dd5eb..544505032 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -57,7 +57,7 @@
       <div *ngIf="eventsPRList">
         <ion-item-sliding>
           <ion-item class="Rectangle cursor-pointer" lines="none" 
-              *ngFor="let event of eventsPRList" (click)="openApproveModal(event.serialNumber, event)">
+              *ngFor="let event of eventsPRList" (click)="goToEventDetail(event)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index f0eba1f3d..fa7cad6fd 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -20,7 +20,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>12{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
           <ion-icon src="assets/images/icons-edit.svg"></ion-icon>