diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html index b5352d06b..e30169a18 100644 --- a/src/app/shared/agenda/event-list/event-list.page.html +++ b/src/app/shared/agenda/event-list/event-list.page.html @@ -4,7 +4,7 @@ - + Meu calendário @@ -22,14 +22,14 @@ -
+
- - + + -
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts index 19f64b4a7..2b5ad7733 100644 --- a/src/app/shared/agenda/event-list/event-list.page.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -5,6 +5,8 @@ import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController, NavParams } from '@ionic/angular'; import { NavigationEnd, Router } from '@angular/router'; +import { AuthService } from 'src/app/services/auth.service'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-event-list', @@ -21,6 +23,8 @@ export class EventListPage implements OnInit { eventBody: EventBody; categories: string[]; serialnumber:string; + loggeduser: User; + segment:string; @Input() profile:string; @Output() cloneAllmobileComponent = new EventEmitter(); @@ -31,22 +35,19 @@ export class EventListPage implements OnInit { private processes:ProcessesService, private modalController: ModalController, private router: Router, - ) { } + private userAuth: AuthService, + ) { + this.loggeduser = userAuth.ValidatedUser; + } ngOnInit() { - /* console.log(this.profile); */ - - if(this.profile == "mdgpr") { - this.profile = 'MDGPR' - } else { - this.profile = 'PR' - } + this.segment = this.loggeduser.Profile; this.LoadToApproveEvents(); - + const pathname = window.location.pathname - + this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname) { this.LoadToApproveEvents(); @@ -54,18 +55,26 @@ export class EventListPage implements OnInit { }); } - LoadToApproveEvents() { - this.showLoader = true; - - this.processes.GetToApprovedEvents('PR','false').subscribe(res=>{ - this.showLoader = false; - this.eventsPRList = res; - }); - this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{ - this.showLoader = false; - this.eventsMDGPRList = res; - }); + segmentChanged(ev: any) { + this.LoadToApproveEvents(); } + + async LoadToApproveEvents() { + this.showLoader = true; + 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; + } + async openApproveModal(eventSerialNumber, data) { let a =this.eventsMDGPRList.filter((elem)=>{ @@ -73,9 +82,9 @@ export class EventListPage implements OnInit { return eventSerialNumber == elem.serialNumber }); - this.approveEventDismiss.emit({ + this.approveEventDismiss.emit({ "serialNumber": eventSerialNumber, - "action": "Aprovar", + "action": "Aprovar", "saveData": data }); }