peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-15 15:24:18 +01:00
parent 4a7317f137
commit 378435c3c3
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/event-list.page.html
+1 -1
View File
@@ -19,7 +19,7 @@
<label>Eventos para Aprovação</label> <label>Eventos para Aprovação</label>
</div> </div>
<ion-toolbar> <ion-toolbar>
<ion-segment [(ngModel)]="segment"> <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
<ion-segment-button value="MDGPR"> <ion-segment-button value="MDGPR">
Meu calendário Meu calendário
</ion-segment-button> </ion-segment-button>
src/app/pages/gabinete-digital/event-list/event-list.page.ts
+16 -9
View File
@@ -52,17 +52,24 @@ export class EventListPage implements OnInit {
} }
LoadToApproveEvents(){ segmentChanged(ev: any) {
this.showLoader = true; this.LoadToApproveEvents();
}
this.processes.GetToApprovedEvents('PR','false').subscribe(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; this.showLoader = false;
this.eventsPRList = res;
});
this.processes.GetToApprovedEvents('MDGPR','false').subscribe(res=>{
this.showLoader = false;
this.eventsMDGPRList = res;
});
} }
async openApproveModal(eventSerialNumber, event){ async openApproveModal(eventSerialNumber, event){
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+11 -9
View File
@@ -56,15 +56,17 @@ export class EventsToApprovePage implements OnInit {
async LoadToApproveEvents() { async LoadToApproveEvents() {
this.showLoader = true; this.showLoader = true;
console.log(this.segment);
let prEvents = await this.processes.GetToApprovedEvents('PR','false').toPromise(); if(this.segment == 'MDGPR'){
this.eventsPRList = prEvents; let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
console.log(this.eventsPRList); let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
let mdEvents = await this.processes.GetToApprovedEvents('MDGPR','false').toPromise(); }
this.eventsMDGPRList = mdEvents; else if(this.segment == 'PR'){
console.log(this.eventsMDGPRList); 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; this.showLoader = false;
} }