From 8ddd262d862a079924a6d2f5aaf1db364be3e6cd Mon Sep 17 00:00:00 2001
From: Paulo Pinto <paulo.pinto@equilibrium.co.ao>
Date: Tue, 8 Sep 2020 09:42:34 +0100
Subject: [PATCH] =?UTF-8?q?Events=20em=20Expediente=20-=20Correc=C3=A7?=
 =?UTF-8?q?=C3=B5es=201?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/home/home-routing.module.ts           | 14 ++++--------
 .../expediente-detail.page.html               |  2 +-
 .../expediente-detail.page.ts                 | 22 ++++++++++---------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts
index ea9eb57db..eda051408 100644
--- a/src/app/home/home-routing.module.ts
+++ b/src/app/home/home-routing.module.ts
@@ -18,16 +18,6 @@ const routes: Routes = [
           {
             path:':eventId/:caller',
             loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            // children: [
-            //   {
-            //     path:'',
-            //     loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            //   },
-            //   {
-            //     path:':caller',
-            //     loadChildren: ()=> import('../pages/events/event-detail/event-detail.module').then(m => m.EventDetailPageModule),
-            //   }
-            // ]
           },
         ]
       },
@@ -89,6 +79,10 @@ const routes: Routes = [
               {
                 path:':SerialNumber',
                 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/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 937803520..4bb79c8c7 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -32,7 +32,7 @@
         <ion-item-sliding>
           <ion-item lines="none" 
           *ngFor="let event of eventsList"
-          [routerLink]="['/home/events', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
+          [routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
             <div class="div-item-{{event.CalendarName}}">
               <div class="div-up">
                 <div class="div-icon">
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 22fb4a551..98747d6d9 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -51,18 +51,20 @@ export class ExpedienteDetailPage implements OnInit {
 
   async LoadRelatedEvents(serial:string)
   {
-    this.eventsList = null;
-    this.attachments.getAttachments(2, serial).subscribe(result => {
-      result.forEach(att =>{
-        if (this.eventsList == null)
-        {
-          this.eventsList = new Array();
-        }
-        this.events.getEvent(att.ParentId).subscribe(event => {
-          this.eventsList.push(event);
+    if (this.eventsList == null)
+    {
+      this.attachments.getAttachments(2, serial).subscribe(result => {
+        result.forEach(att =>{
+          if (this.eventsList == null)
+          {
+            this.eventsList = new Array();
+          }
+          this.events.getEvent(att.ParentId).subscribe(event => {
+            this.eventsList.push(event);
+          });
         });
       });
-    });
+    }
   }
 
   viewDocument()