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

Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

Browse Source
This commit is contained in:
Peter Maquiran
2021-07-15 15:26:45 +01:00
parent f652568cee 378435c3c3
commit 44296e6008
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+15 -13
View File
@@ -29,7 +29,7 @@ export class EventsToApprovePage implements OnInit {
private modalController: ModalController,
private router: Router,
private userAuth: AuthService,
)
)
{
this.loggeduser = userAuth.ValidatedUser;
}
@@ -37,11 +37,11 @@ export class EventsToApprovePage implements OnInit {
ngOnInit() {
this.segment = this.loggeduser.Profile;
console.log(this.segment);
this.LoadToApproveEvents();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents();
@@ -56,15 +56,17 @@ export class EventsToApprovePage implements OnInit {
async LoadToApproveEvents() {
this.showLoader = true;
let prEvents = await this.processes.GetToApprovedEvents('PR','false').toPromise();
this.eventsPRList = prEvents;
console.log(this.eventsPRList);
let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise();
this.eventsMDGPRList = mdEvents;
console.log(this.eventsMDGPRList);
console.log(this.segment);
if(this.segment == 'MDGPR'){
let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
}
else if(this.segment == 'PR'){
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
}
this.showLoader = false;
}
@@ -100,7 +102,7 @@ export class EventsToApprovePage implements OnInit {
await modal.present();
modal.onDidDismiss().then((res) => {
console.log(res['data']);
this.LoadToApproveEvents();
});
} */