mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
fix agenda
This commit is contained in:
@@ -271,16 +271,19 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
if (realoadCounter != 0) {
|
||||
|
||||
if(this.currentMoth.rangeStartDate != null) {
|
||||
|
||||
this.loadRangeEvents(this.currentMoth.rangeStartDate, this.currentMoth.rangeEndDate)
|
||||
} else {
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
}
|
||||
|
||||
|
||||
this.updateEventListBox()
|
||||
}
|
||||
|
||||
|
||||
this.calendar.currentDate = new Date();
|
||||
|
||||
try {
|
||||
this.myCal.update();
|
||||
this.myCal.loadEvents();
|
||||
this.onDropDownScrollWeal()
|
||||
} catch (e) { }
|
||||
|
||||
this.updateEventListBox()
|
||||
|
||||
realoadCounter++;
|
||||
this.weekToShow()
|
||||
}
|
||||
@@ -735,7 +738,10 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt');
|
||||
if(this.TimelineMDList[selectedDay]) {
|
||||
this.hasEventToday = true
|
||||
if(momentG(new Date(this.TimelineMDList[selectedDay][0].start), 'MMMM', 'pt') == momentG(this.eventSelectedDate, 'MMMM', 'pt')) {
|
||||
this.hasEventToday = true
|
||||
}
|
||||
|
||||
} else {
|
||||
this.hasEventToday = false
|
||||
}
|
||||
@@ -763,10 +769,7 @@ export class AgendaPage implements OnInit {
|
||||
} catch (e) { }
|
||||
|
||||
this.updateEventListBox()
|
||||
} else {
|
||||
|
||||
}
|
||||
|
||||
} else {}
|
||||
|
||||
}
|
||||
|
||||
@@ -1150,10 +1153,8 @@ export class AgendaPage implements OnInit {
|
||||
// THIS LINE
|
||||
this.updateEventListBox();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
shoeEventDay(events: any[]) {
|
||||
|
||||
if (this.segment == 'Combinado') {
|
||||
@@ -1171,3 +1172,18 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function endOfMonth(myDate){
|
||||
let date = new Date(myDate);
|
||||
date.setDate(1); // Avoids edge cases on the 31st day of some months
|
||||
date.setMonth(date.getMonth() +1);
|
||||
date.setDate(0);
|
||||
date.setHours(23);
|
||||
date.setMinutes(59);
|
||||
date.setSeconds(59);
|
||||
return date;
|
||||
}
|
||||
|
||||
const addDays = 5;
|
||||
const endDateRange = endOfMonth(new Date(5))
|
||||
endDateRange.setDate(endDateRange.getDate() + addDays)
|
||||
|
||||
Reference in New Issue
Block a user