mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
fix
This commit is contained in:
@@ -220,7 +220,7 @@ export class AgendaPage implements OnInit {
|
||||
} else if (this.eventService.hasSharedCalendar) {
|
||||
this.profile = "pr";
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
this.calendarHeight = ["height-356"];
|
||||
@@ -253,7 +253,7 @@ export class AgendaPage implements OnInit {
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
ngOnInit() {
|
||||
|
||||
@@ -270,18 +270,26 @@ export class AgendaPage implements OnInit {
|
||||
this.segment = "Combinado";
|
||||
}
|
||||
if (realoadCounter != 0) {
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
|
||||
if(this.currentMoth.rangeStartDate != null) {
|
||||
|
||||
this.loadRangeEvents(this.currentMoth.rangeStartDate, this.currentMoth.rangeEndDate)
|
||||
} else {
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
}
|
||||
|
||||
|
||||
this.updateEventListBox()
|
||||
}
|
||||
realoadCounter++;
|
||||
this.weekToShow()
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
this.backgroundservice.registerBackService('Online', () => {
|
||||
//this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
});
|
||||
|
||||
|
||||
window.onresize = (event) => {
|
||||
// if not table remove all component
|
||||
if (window.innerWidth <= 1024) {
|
||||
@@ -296,7 +304,7 @@ export class AgendaPage implements OnInit {
|
||||
setTimeout(() => {
|
||||
try {
|
||||
let weekNum = 0;
|
||||
|
||||
|
||||
function Week(a) {
|
||||
for(let b of a.querySelectorAll('td')) {
|
||||
if(!b.className.includes('text-muted')) {
|
||||
@@ -305,17 +313,17 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
|
||||
const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
|
||||
|
||||
|
||||
for (let week of weeks as any ){
|
||||
Week(week)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.showCalendar = true
|
||||
this.listBoxService.height = (weekNum * dayBoxHeight) +'px'
|
||||
|
||||
|
||||
if(dayBoxHeight == 0) {
|
||||
this.weekToShow()
|
||||
}
|
||||
@@ -424,10 +432,23 @@ export class AgendaPage implements OnInit {
|
||||
this.eventSelectedDate2 = ev.selectedTime;
|
||||
}
|
||||
|
||||
|
||||
currentMoth = {
|
||||
rangeStartDate: null,
|
||||
rangeEndDate: null
|
||||
}
|
||||
|
||||
onRangeChanged(ev: { startTime: Date, endTime: Date }) {
|
||||
this.rangeStartDate = ev.startTime;
|
||||
this.rangeEndDate = ev.endTime;
|
||||
|
||||
if(this.currentMoth.rangeEndDate == null) {
|
||||
this.currentMoth = {
|
||||
rangeStartDate: ev.startTime,
|
||||
rangeEndDate: ev.endTime
|
||||
}
|
||||
}
|
||||
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
|
||||
|
||||
@@ -554,7 +575,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
loadRangeEvents(startTime: Date, endTime: Date) {
|
||||
this.weekToShow()
|
||||
|
||||
|
||||
if(!this.eventService.hasAnyCalendar) {
|
||||
return false
|
||||
}
|
||||
@@ -602,7 +623,7 @@ export class AgendaPage implements OnInit {
|
||||
} catch (error) {
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
let load = 0;
|
||||
|
||||
@@ -622,7 +643,7 @@ export class AgendaPage implements OnInit {
|
||||
let eventsList = response;
|
||||
this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId)
|
||||
this.CalendarStore.pushEvent(eventsList, label);
|
||||
|
||||
|
||||
this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds)
|
||||
this.updateEventListBox()
|
||||
|
||||
@@ -635,7 +656,7 @@ export class AgendaPage implements OnInit {
|
||||
if(load == selectedCalendarIds.length) {
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
|
||||
this.myCal.update();
|
||||
this.myCal.loadEvents();
|
||||
this.updateEventListBox()
|
||||
@@ -657,19 +678,19 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
return result.concat(join)
|
||||
} else {
|
||||
|
||||
|
||||
const calendar = this.eventService.calendarNamesType[this.CalendarName];
|
||||
let Oficial = calendar?.['OficialId']
|
||||
let Pessoal = calendar?.['PessoalId']
|
||||
|
||||
if(Oficial && Pessoal) {
|
||||
|
||||
|
||||
return [
|
||||
{
|
||||
CalendarId : Oficial,
|
||||
OwnerId: calendar.OwnerId,
|
||||
CalendarName: calendar.CalendarName
|
||||
},
|
||||
},
|
||||
{
|
||||
OwnerId: calendar.OwnerId,
|
||||
CalendarId : Pessoal,
|
||||
@@ -700,7 +721,7 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -743,7 +764,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.updateEventListBox()
|
||||
} else {
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -751,7 +772,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
changeMonth = (month) => {
|
||||
const a = this.calendar.currentDate;
|
||||
|
||||
|
||||
|
||||
const isInvalidDate = (dateString) => JSON.stringify(new Date(dateString)) === 'null';
|
||||
|
||||
@@ -768,7 +789,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.updateEventListBox()
|
||||
} else {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -796,7 +817,7 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
|
||||
changeProfile() {
|
||||
|
||||
|
||||
if (this.profile == "mdgpr") {
|
||||
this.profile = "pr";
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
@@ -839,7 +860,7 @@ export class AgendaPage implements OnInit {
|
||||
cssClass: 'modal modal-desktop',
|
||||
backdropDismiss: false
|
||||
});
|
||||
|
||||
|
||||
modal.onDidDismiss().then((data) => {
|
||||
if (data) {
|
||||
|
||||
@@ -870,7 +891,7 @@ export class AgendaPage implements OnInit {
|
||||
openAddEventDismiss(data) {
|
||||
|
||||
try {
|
||||
|
||||
|
||||
let postEvent: Event = data;
|
||||
if (postEvent.Subject != null) {
|
||||
// this.eventSource.push({
|
||||
@@ -900,7 +921,7 @@ export class AgendaPage implements OnInit {
|
||||
let navigationExtras: NavigationExtras = { queryParams: { CalendarId } }
|
||||
|
||||
this.router.navigate(['/home/agenda/',eventId,'agenda'], navigationExtras);
|
||||
|
||||
|
||||
}
|
||||
|
||||
// open component
|
||||
@@ -923,7 +944,7 @@ export class AgendaPage implements OnInit {
|
||||
setTimeout(()=>{
|
||||
this.onCurrentChanged(this.eventSelectedDate)
|
||||
}, 500)
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1083,7 +1104,7 @@ export class AgendaPage implements OnInit {
|
||||
}
|
||||
|
||||
reloadCalendar() {
|
||||
//
|
||||
//
|
||||
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user