This commit is contained in:
Peter Maquiran
2023-01-17 17:04:26 +01:00
parent 85eafdea13
commit 5595eccae5
5 changed files with 67 additions and 12 deletions
+12
View File
@@ -441,9 +441,15 @@ export class EventsService {
for (let calendar of this.loggeduser.OwnerCalendars) {
if (calendar.CalendarName == 'Oficial') {
prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise();
if(!Array.isArray(prO)) {
prO = []
}
}
if(calendar.CalendarName == 'Pessoal') {
prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise();
if(!Array.isArray(prP)) {
prP = []
}
}
}
@@ -462,10 +468,16 @@ export class EventsService {
if(this.hasOwnOficial) {
ownO = await this.getAllOwnOficialEvents(startdate, enddate).toPromise();
if(!Array.isArray(ownO)) {
ownO = []
}
}
if(this.hasOwnPessoal) {
ownP = await this.getAllOwnPessoalEvents(startdate, enddate).toPromise();
if(!Array.isArray(ownP)) {
ownP = []
}
}
const resFinal = ownO.concat(ownP);