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

Fix refresh

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-09 15:12:52 +01:00
parent f375b5403b
commit 4ab349c47e
1 changed files with 42 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+42 -12
View File
@@ -184,7 +184,7 @@ export class AgendaPage implements OnInit {
this.profile = "mdgpr";
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == "/home/agenda") {
@@ -511,7 +511,9 @@ export class AgendaPage implements OnInit {
this.showTimeline = true;
});
}).finally(()=>{
this.showLoader = false;
})
}
else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR'){
@@ -555,7 +557,9 @@ export class AgendaPage implements OnInit {
});
}).finally(()=>{
this.showLoader = false;
})
}
@@ -599,7 +603,9 @@ export class AgendaPage implements OnInit {
});
}).finally(()=>{
this.showLoader = false;
})
}
break;
@@ -642,7 +648,9 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
this.showTimeline = true;
});
}).finally(()=>{
this.showLoader = false;
})
}
else{
@@ -677,7 +685,9 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
this.showTimeline = true;
});
}).finally(()=>{
this.showLoader = false;
})
}
break;
@@ -717,7 +727,9 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
this.showTimeline = true;
});
}).finally(()=>{
this.showLoader = false;
})
} else {
this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((res:any) => {
this.eventSource=[];
@@ -749,7 +761,9 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
this.showTimeline = true;
});
}).finally(()=>{
this.showLoader = false;
})
}
break;
@@ -815,7 +829,13 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
}
});
}).finally(() =>{
counter++;
if(counter==2) {
this.showLoader = false;
}
})
this.eventService.getAllSharedEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => {
@@ -862,7 +882,13 @@ export class AgendaPage implements OnInit {
this.showLoader = false;
}
});
}).finally(() =>{
counter++;
if(counter==2) {
this.showLoader = false;
}
})
} else {
@@ -909,11 +935,15 @@ export class AgendaPage implements OnInit {
counter++;
if(counter==2 || this.loggeduser.Profile == 'PR') {
if(counter==1 || this.loggeduser.Profile == 'PR') {
this.showLoader = false;
}
});
}).finally(()=>{
if(counter==1 || this.loggeduser.Profile == 'PR') {
this.showLoader = false;
}
})
}