peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Events em Expediente - Correcções 1

Browse Source
This commit is contained in:
Paulo Pinto
2020-09-08 09:42:34 +01:00
parent 4689b71b3a
commit 8ddd262d86
3 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/home/home-routing.module.ts
+4 -10
View File
@@ -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),
}
]
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -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">
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+12 -10
View File
@@ -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()