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 @@ + [routerLink]="['/home/gabinete-digital/expediente/events/', event.EventId, 'gabinete-digital/expediente/' + serialnumber]">
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()