From 83853bbbc4e055eed9c6c56288d61899391ce593 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 13 Jul 2021 13:41:09 +0100 Subject: [PATCH] Fix missing loader --- src/app/pages/agenda/agenda.page.ts | 247 ++++++++++-------- .../agenda/new-event/new-event.page.html | 2 +- .../pages/agenda/new-event/new-event.page.ts | 6 +- .../approve-event-modal.page.ts | 2 +- .../approve-event/approve-event.page.ts | 4 +- src/app/services/events.service.ts | 4 +- .../approve-event/approve-event.page.ts | 1 + 7 files changed, 146 insertions(+), 120 deletions(-) diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 60d5a3004..1e383dc80 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -184,25 +184,27 @@ export class AgendaPage implements OnInit { ngOnInit() { - // const loader = this.toastService.loading() - this.profile = "mdgpr"; const pathname = window.location.pathname - let rrealoadCounter = 0 + let realoadCounter = 0 this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == pathname ) { - if (this.segment == null){ + + if (this.segment == null) { this.segment = "Combinado"; } - else if ( rrealoadCounter != 0) { + if ( realoadCounter != 0) { + this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - rrealoadCounter++; + } + realoadCounter++; } + }); window.onresize = (event) => { @@ -463,8 +465,6 @@ export class AgendaPage implements OnInit { loadRangeEvents(startTime: Date, endTime: Date){ - console.log('==========================================================') - this.eventSelectedDate = new Date(startTime); this.showLoader = true; @@ -835,6 +835,11 @@ export class AgendaPage implements OnInit { this.showLoader = false; } + }).finally(()=>{ + counter++; + if(counter==2) { + this.showLoader = false; + } }) 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) => { @@ -882,6 +887,11 @@ export class AgendaPage implements OnInit { this.showLoader = false; } + }).finally(()=>{ + counter++; + if(counter==2) { + this.showLoader = false; + } }) @@ -955,131 +965,148 @@ export class AgendaPage implements OnInit { startTime: startDate, endTime: event.end }) + + // console.log(event.end.toISOString() == endDate.toISOString()) - const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0') + const day = (((new Date (event.start)).getDate())).toString().padStart(2,'0') event.manyDays = false + + event.todayOnly = new Date(event.start).toLocaleDateString() == new Date(event.end).toLocaleDateString() + + + if(!days.hasOwnProperty(day)) { days[day] = [] } - // difference - const diffTime = Math.abs(endDate - startDate); - const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); + if (new Date(startDate).toLocaleDateString() != new Date(endDate).toLocaleDateString()) { + + console.log(new Date(startDate).toLocaleDateString(),'!=' , new Date(endDate).toLocaleDateString()) + + // difference + const diffTime = Math.abs(endDate - startDate); + const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24)); - if (diffDays <= 150 && !event.event.IsAllDayEvent ) { + if (diffDays <= 150 && !event.event.IsAllDayEvent ) { - if (diffDays >= 1) { - - const StartEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - startMany: true, - endMany: false, - middle: false - }) - - days[day].push(StartEvent) - - let i = 1; - - while (startDate.getFullYear() != endDate.getFullYear() || - startDate.getMonth() != endDate.getMonth() || - startDate.getDate() != endDate.getDate()) { + console.log(event) - const newDate = startDate.setDate(startDate.getDate()+ i) + if (diffDays >= 1) { + + const StartEvent = Object.assign({}, { + title: event.title, + start: event.start, + end: event.end, + color: event.color, + id: event.id, + index: event.index, + profile: event.profile, + CalendarName: event.CalendarName, + event: { + Subject: event.event.Subject, + StartDate: event.event.StartDate, + EndDate: event.event.EndDate, + Location: event.event.Location, + EventId: event.event.EventId, + CalendarName: event.event.CalendarName + }, + startMany: true, + endMany: false, + middle: false + }) + + days[day].push(StartEvent) + + let i = 1; + + while (startDate.getFullYear() != endDate.getFullYear() || + startDate.getMonth() != endDate.getMonth() || + startDate.getDate() != endDate.getDate()) { - let otherDays = (((new Date (newDate)).getDate())).toString().padStart(2,'0') + const newDate = startDate.setDate(startDate.getDate()+ i) + + let otherDays = (((new Date (newDate)).getDate())).toString().padStart(2,'0') + + event.other = true - event.other = true - - event.start = newDate - if(!days.hasOwnProperty(otherDays)) { + event.start = newDate + if(!days.hasOwnProperty(otherDays)) { - days[otherDays] = [] + days[otherDays] = [] + } + + if (!(startDate.getFullYear() != endDate.getFullYear() || + startDate.getMonth() != endDate.getMonth() || + startDate.getDate() != endDate.getDate())) { + // last push + + const EndEvent = Object.assign({}, { + title: event.title, + start: event.start, + end: event.end, + color: event.color, + id: event.id, + index: event.index, + profile: event.profile, + CalendarName: event.CalendarName, + event: { + Subject: event.event.Subject, + StartDate: event.event.StartDate, + EndDate: event.event.EndDate, + Location: event.event.Location, + EventId: event.event.EventId, + CalendarName: event.event.CalendarName + }, + Subject: event.Subject, + startMany: false, + endMany: true, + middle: false + }) + + days[otherDays].push(EndEvent) + + } else { + const EndEvent = Object.assign({}, { + title: event.title, + start: event.start, + end: event.end, + color: event.color, + id: event.id, + index: event.index, + profile: event.profile, + CalendarName: event.CalendarName, + event: { + Subject: event.event.Subject, + StartDate: event.event.StartDate, + EndDate: event.event.EndDate, + Location: event.event.Location, + EventId: event.event.EventId, + CalendarName: event.event.CalendarName + }, + Subject: event.Subject, + startMany: false, + endMany: true, + middle: true + }) + days[otherDays].push(EndEvent) + } + } - - if (!(startDate.getFullYear() != endDate.getFullYear() || - startDate.getMonth() != endDate.getMonth() || - startDate.getDate() != endDate.getDate())) { - // last push - const EndEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - Subject: event.Subject, - startMany: false, - endMany: true, - middle: false - }) + } else { + days[day].push(event) - days[otherDays].push(EndEvent) - - } else { - const EndEvent = Object.assign({}, { - title: event.title, - start: event.start, - end: event.end, - color: event.color, - id: event.id, - index: event.index, - profile: event.profile, - CalendarName: event.CalendarName, - event: { - Subject: event.event.Subject, - StartDate: event.event.StartDate, - EndDate: event.event.EndDate, - Location: event.event.Location, - EventId: event.event.EventId, - CalendarName: event.event.CalendarName - }, - Subject: event.Subject, - startMany: false, - endMany: true, - middle: true - }) - days[otherDays].push(EndEvent) - } - } - } else { days[day].push(event) } - } else { - days[day].push(event) - } + } + + days[day].push(event) }) diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index e3b5ba413..c4cbb7eaf 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -196,7 +196,7 @@
-
+
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 3ca9f20d7..91f16b78c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -213,9 +213,9 @@ export class NewEventPage implements OnInit { IsRecurring: new FormControl(this.postEvent.IsRecurring, [ Validators.required ]), - // participantes: new FormControl(this.taskParticipantsCc.concat(this.taskParticipants), [ - // Validators.required - // ]), + participantes: new FormControl(this.taskParticipants, [ + Validators.required + ]), }) } diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index de4345992..a924d3a42 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -45,7 +45,7 @@ export class ApproveEventModalPage implements OnInit { private toastService: ToastService, ) { - + alert('54321') this.activatedRoute.paramMap.subscribe(paramMap => { if (!paramMap.has("serialNumber")){ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 47573d8e3..9af1adcc3 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -58,6 +58,7 @@ export class ApproveEventPage implements OnInit { this.caller = params["params"].caller; } }); + } ngOnInit() { @@ -187,8 +188,7 @@ export class ApproveEventPage implements OnInit { } } - async getAttachments(instanceId:string){ - const loader = this.toastService.loading() + async getAttachments(instanceId:string) { try { this.loadedAttachments = await this.attachmentsService.getAttachmentsById(instanceId).toPromise(); diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index cd9803bcb..affa010da 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -177,8 +177,7 @@ export class EventsService { return this.http.get(`${geturl}`, options); } - async getAllMdEvents(startdate:string, enddate:string){ - console.log('md once') + async getAllMdEvents(startdate:string, enddate:string) { let prO = await this.getAllMdOficialEvents(startdate, enddate).toPromise(); let prP = await this.getAllMdPessoalEvents(startdate, enddate).toPromise(); const resFinal = prO.concat(prP); @@ -189,7 +188,6 @@ export class EventsService { } async getAllSharedEvents(startdate:string, enddate:string) { - console.log('pr once') let prO = await this.getAllSharedOficialEvents(startdate, enddate).toPromise(); let prP = await this.getAllSharedPessoalEvents(startdate, enddate).toPromise(); const resFinal = prO.concat(prP); diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index 50bbba080..09b638634 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -48,6 +48,7 @@ export class ApproveEventPage implements OnInit { private toastService: ToastService ) { // Event to approve list + alert('123') }