diff --git a/config.xml b/config.xml index 2e850bb20..7cb062033 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index c351bf471..39c75e824 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -522,7 +522,8 @@ export class AgendaPage implements OnInit { }) } - else if (this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') { + // view PR calendar with MDGPR profile + else if(this.profile == "pr" && this.loggeduser.Profile == 'MDGPR') { 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) => { @@ -551,8 +552,9 @@ export class AgendaPage implements OnInit { this.addEventToDB(response, "pr"); // clear the current month only + // response == september + // startTime = 1, endTime = 31 this.CalendarStore.removeRange(startTime, endTime, 'pr') - this.CalendarStore.pushEvent(response, 'pr'); let array = [] response.array.forEach(element => { @@ -570,6 +572,8 @@ export class AgendaPage implements OnInit { this.listToPresent = array; + // this.CalendarStore.eventSource + this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) @@ -587,11 +591,12 @@ export class AgendaPage implements OnInit { } } else { - // calendar + // Desktop only let counter = 0; - if (this.loggeduser.Profile == 'MDGPR') { + // view MDGPR calendar with MDGPR profile + if(this.loggeduser.Profile == 'MDGPR') { this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => { @@ -655,7 +660,8 @@ export class AgendaPage implements OnInit { } 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((response: any) => { + // view PR calendar with PR profile + this.eventService.getAllPrEvents(momentG(new Date(startTime),'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime),'yyyy-MM-dd 23:59:59')).then((response:any) => { let eventsList; if (this.segment == 'Oficial') {