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 @@
-