diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 4dcb21d4e..ce4083ac4 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -52,17 +52,24 @@ export class EventListPage implements OnInit {
}
- LoadToApproveEvents(){
- this.showLoader = true;
+ segmentChanged(ev: any) {
+ this.LoadToApproveEvents();
+ }
- 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;
- });
+ 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, event){
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index cd21180ff..d850f7d05 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -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();
});
} */