peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 13:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
Peter Maquiran
2022-12-20 17:14:23 +01:00
parent be617c0fe3
commit 5652043b8a
22 changed files with 285 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/agenda/agenda.page.ts
+55 -24
View File
@@ -398,12 +398,6 @@ export class AgendaPage implements OnInit {
const profile_ = element.profile == 'md' ? 'mdgpr' : 'pr';
const eventtype = element.event.CalendarName;
// if (startTimeSamp < endTimeSamp && endDay == 29 && (endMinutes + endHours) == 0) {
// //
// classs.push(`calendar-event-border`);
// }
classs.push(`calendar-event-border calendar-${profile_}-event-type-${eventtype}`);
});
@@ -497,14 +491,37 @@ export class AgendaPage implements OnInit {
}
loadRequest: any = {}
loadRequestHistory: any = {}
loadRangeEvents(startTime: Date, endTime: Date) {
this.array = [];
this.rangeStartDate = startTime
this.rangeEndDate = endTime
this.showLoader = true;
const index = `${startTime}${endTime}`
if(!this.loadRequest[index]) {
this.loadRequest[index] = {startTime, endTime}
this.loadRequestHistory[index] = {lastTimeUpdate: new Date()}
this.loadRangeEventRun(startTime, endTime)
} else {
// console.log('dont call')
}
}
deleteLoadRangeEvent(startTime: Date, endTime: Date) {
const index = `${startTime}${endTime}`
delete this.loadRequest[index]
}
loadRangeEventRun(startTime: Date, endTime: Date) {
this.array = [];
this.rangeStartDate = startTime
this.rangeEndDate = endTime
this.showLoader = true;
if (window.innerWidth < 800) {
if (this.profile == "mdgpr" && this.loggeduser.Profile == 'MDGPR') {
@@ -534,6 +551,7 @@ export class AgendaPage implements OnInit {
this.getFromDB();
}).finally(() => {
this.showLoader = false;
this.deleteLoadRangeEvent(startTime, endTime)
})
}
@@ -561,6 +579,7 @@ export class AgendaPage implements OnInit {
this.getFromDB()
})
.finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
this.showLoader = false;
})
@@ -592,6 +611,7 @@ export class AgendaPage implements OnInit {
this.getFromDB()
})
.finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
this.showLoader = false;
})
} else if (this.loggeduser.Profile != 'PR' && this.loggeduser.Profile != 'MDGPR'){
@@ -624,6 +644,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB();
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
this.showLoader = false;
})
@@ -648,6 +669,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB()
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
this.showLoader = false;
})
@@ -688,6 +710,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB()
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
counter++;
if (counter == 2) {
this.showLoader = false;
@@ -723,6 +746,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB()
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
counter++;
if (counter == 2) {
this.showLoader = false;
@@ -759,6 +783,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB()
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
this.showLoader = false;
})
} else {
@@ -796,6 +821,7 @@ export class AgendaPage implements OnInit {
}).catch((error) => {
this.getFromDB()
}).finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
counter++;
if (counter == 2) {
this.showLoader = false;
@@ -843,6 +869,7 @@ export class AgendaPage implements OnInit {
this.getFromDB()
})
.finally(() => {
this.deleteLoadRangeEvent(startTime, endTime)
counter++;
if (counter == 2) {
this.showLoader = false;
@@ -962,7 +989,7 @@ export class AgendaPage implements OnInit {
this.showTimeline = true;
})
} else {
this.sqliteservice.getAllEvents().then((events: any[]) => {
this.sqliteservice.getAllEvents().then((events: any[] = []) => {
let eventArray = [];
@@ -984,20 +1011,18 @@ export class AgendaPage implements OnInit {
getEventsFromDB () {
new Promise((resolve, reject)=>{
new Promise((resolve, reject) => {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('agendaResponse').then((events) => {
resolve(events)
})
} else {
this.sqliteservice.getAllEvents().then((events: any[]) => {
this.sqliteservice.getAllEvents().then((events: any[] = []) => {
resolve(events)
})
}
})
}
updateEventListBox() {
@@ -1199,20 +1224,26 @@ export class AgendaPage implements OnInit {
openAddEventDismiss(data) {
let postEvent: Event = data;
if (postEvent.Subject != null) {
// this.eventSource.push({
// title: postEvent.Subject,
// startTime: new Date(postEvent.StartDate),
// endTime: new Date(postEvent.EndDate),
// allDay: false,
// event: postEvent
// });
this.myCal.update();
this.myCal.loadEvents();
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
try {
let postEvent: Event = data;
if (postEvent.Subject != null) {
// this.eventSource.push({
// title: postEvent.Subject,
// startTime: new Date(postEvent.StartDate),
// endTime: new Date(postEvent.EndDate),
// allDay: false,
// event: postEvent
// });
this.myCal.update();
this.myCal.loadEvents();
this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate);
}
} catch (error) {
}
this.cloneAllmobileComponent();
}
src/app/pages/agenda/new-event/new-event.page.ts
+5
View File
@@ -103,6 +103,11 @@ export class NewEventPage implements OnInit {
this.selectedDate = this.navParams.get('eventSelectedDate');
this.taskParticipants = this.navParams.get('attendees');
if(this.eventService.calendarNamesAry['Meu calendario']) {
this.CalendarName = 'Meu calendario'
}
}
ngOnInit() {
src/app/pages/agenda/view-event/view-event.page.ts
+1 -1
View File
@@ -143,7 +143,7 @@ export class ViewEventPage implements OnInit {
resolve(events)
})
} else {
this.sqliteservice.getAllEvents().then((events: any[]) => {
this.sqliteservice.getAllEvents().then((events: any[] = []) => {
resolve(events)
})