peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve agenda request

Browse Source
This commit is contained in:
Peter Maquiran
2022-10-07 11:01:54 +01:00
parent 2ec28c95de
commit 972173413e
5 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/events.service.ts
+34 -16
View File
@@ -133,7 +133,7 @@ export class EventsService {
if (this.loggeduser) {
if (this.loggeduser.Profile == 'MDGPR') {
this.loggeduser.OwnerCalendars.forEach(calendar => {
for (let calendar of this.loggeduser.OwnerCalendars) {
if (calendar.CalendarName == 'Oficial') {
@@ -153,10 +153,10 @@ export class EventsService {
this.headersMdPessoal = this.headersMdPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
}
});
this.loggeduser.SharedCalendars.forEach(sharedCalendar => {
}
for (let sharedCalendar of this.loggeduser.SharedCalendars) {
if (sharedCalendar.CalendarName == 'Oficial') {
this.hasSharedOficial = true
@@ -173,13 +173,13 @@ export class EventsService {
this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarId', sharedCalendar.CalendarId);
this.headersSharedPessoal = this.headersSharedPessoal.set('CalendarRoleId', sharedCalendar.CalendarRoleId);
}
});
}
}
else if (this.loggeduser.Profile == 'PR') {
this.loggeduser.OwnerCalendars.forEach(calendar => {
for (let calendar of this.loggeduser.OwnerCalendars) {
if (calendar.CalendarName == 'Oficial') {
this.hasOwnOficial = true
@@ -197,11 +197,11 @@ export class EventsService {
this.headersPrPessoal = this.headersPrPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
}
});
}
}
this.loggeduser.OwnerCalendars.forEach(calendar => {
for (let calendar of this.loggeduser.OwnerCalendars) {
if(!this.usersCalendarIds.includes(calendar.OwnerUserId)) {
this.usersCalendarIds.push(calendar.OwnerUserId)
}
@@ -230,7 +230,7 @@ export class EventsService {
this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarName', calendar.CalendarName);
}
});
}
for (let sharedCalendar of this.loggeduser.SharedCalendars) {
@@ -423,8 +423,15 @@ export class EventsService {
let prO = [], prP = [];
prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
for (let calendar of this.loggeduser.OwnerCalendars) {
if (calendar.CalendarName == 'Oficial') {
prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
}
if(calendar.CalendarName == 'Pessoal') {
prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
}
}
const resFinal = prO.concat(prP);
return new Promise(resolve => {
return resolve(resFinal)
@@ -554,8 +561,19 @@ export class EventsService {
}
async getAllSharedEvents(startdate: string, enddate: string) {
let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
let prO = [], prP = [];
for(let calendar of this.loggeduser.SharedCalendars) {
if (calendar.CalendarName == 'Oficial') {
prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise();
}
if(calendar.CalendarName == 'Pessoal') {
prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise();
}
}
const resFinal = prO.concat(prP);
return new Promise(resolve => {