\n
\n \n
\n@@ -296,7 +323,7 @@\n
\n
\n \n-
\n+ \n-
\n+ shared desktop -->\n+ \n \n
\n
\ndiff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts\nindex fb12449ee..ca2929c8a 100644\n--- a/src/app/pages/agenda/agenda.page.ts\n+++ b/src/app/pages/agenda/agenda.page.ts\n@@ -536,62 +536,95 @@ export class AgendaPage implements OnInit {\n this.rangeEndDate = endTime\n \n this.showLoader = true;\n- if (window.innerWidth < 800) {\n+ \n+ if (this.profile == \"mdgpr\" && this.loggeduser.Profile == 'MDGPR') {\n+ this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n \n- if (this.profile == \"mdgpr\" && this.loggeduser.Profile == 'MDGPR') {\n- this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n+ (response: any) => {\n \n- (response: any) => {\n+ this.addEventToDB(response, \"md\");\n \n- this.addEventToDB(response, \"md\");\n+ // calendar\n+ this.CalendarStore.removeRange(startTime, endTime, 'md')\n \n- // calendar\n- this.CalendarStore.removeRange(startTime, endTime, 'md')\n+ // loop\n+ this.CalendarStore.pushEvent(response, 'md');\n \n- // loop\n- this.CalendarStore.pushEvent(response, 'md');\n+ this.trasnformData(response, 'md');\n \n- this.trasnformData(response, 'md');\n+ this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n+ this.myCal.update();\n+ this.myCal.loadEvents();\n \n- this.myCal.update();\n- this.myCal.loadEvents();\n+ this.showLoader = false;\n+ this.showTimeline = true;\n \n- this.showLoader = false;\n- this.showTimeline = true;\n+ }).catch((error) => {\n+ console.error(error)\n+ this.getFromDB();\n+ }).finally(() => {\n+ this.showLoader = false;\n+ this.deleteLoadRangeEvent(startTime, endTime)\n+ this.updateEventListBox()\n+ })\n \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB();\n- }).finally(() => {\n- this.showLoader = false;\n- this.deleteLoadRangeEvent(startTime, endTime)\n- this.updateEventListBox()\n- })\n+ }\n+ // view PR calendar with MDGPR profile\n+ else if (this.profile == \"pr\" && this.loggeduser.Profile == 'MDGPR') {\n \n- }\n- // view PR calendar with MDGPR profile\n- else if (this.profile == \"pr\" && this.loggeduser.Profile == 'MDGPR') {\n+ 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) => {\n+ this.addEventToDB(response, \"pr\");\n+\n+ this.CalendarStore.removeRange(startTime, endTime, 'pr')\n+ // calendar\n+ this.CalendarStore.pushEvent(response, 'pr');\n+\n+\n+ this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n+\n+ // \n+ this.myCal.update();\n+ this.myCal.loadEvents();\n+\n+ this.showLoader = false;\n+ this.showTimeline = true;\n \n- 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) => {\n+ }).catch((error) => {\n+ this.getFromDB()\n+ })\n+ .finally(() => {\n+ this.deleteLoadRangeEvent(startTime, endTime)\n+ this.showLoader = false;\n+ this.updateEventListBox()\n+ })\n+\n+ }\n+ else if (this.loggeduser.Profile == 'PR') {\n+ this.eventService.getAllPrEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n+ (response: any) => {\n this.addEventToDB(response, \"pr\");\n \n+ // clear the current month only\n+ // response == september\n+ // startTime = 1, endTime = 31\n this.CalendarStore.removeRange(startTime, endTime, 'pr')\n- // calendar\n this.CalendarStore.pushEvent(response, 'pr');\n \n \n this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n // \n+\n this.myCal.update();\n this.myCal.loadEvents();\n \n this.showLoader = false;\n this.showTimeline = true;\n \n+\n }).catch((error) => {\n+ console.error(error)\n this.getFromDB()\n })\n .finally(() => {\n@@ -599,324 +632,73 @@ export class AgendaPage implements OnInit {\n this.showLoader = false;\n this.updateEventListBox()\n })\n+ } else if (this.loggeduser.Profile != 'PR' && this.loggeduser.Profile != 'MDGPR'){\n+ if(this.profile == \"mdgpr\") {\n \n- }\n- else if (this.loggeduser.Profile == 'PR') {\n- this.eventService.getAllPrEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n- (response: any) => {\n- this.addEventToDB(response, \"pr\");\n+ this.eventService.getAllOwnEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n \n- // clear the current month only\n- // response == september\n- // startTime = 1, endTime = 31\n- this.CalendarStore.removeRange(startTime, endTime, 'pr')\n- this.CalendarStore.pushEvent(response, 'pr');\n-\n-\n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n-\n- // \n-\n- this.myCal.update();\n- this.myCal.loadEvents();\n-\n- this.showLoader = false;\n- this.showTimeline = true;\n+ (response: any) => {\n \n+ this.addEventToDB(response, \"md\");\n \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB()\n- })\n- .finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- this.showLoader = false;\n- this.updateEventListBox()\n- })\n- } else if (this.loggeduser.Profile != 'PR' && this.loggeduser.Profile != 'MDGPR'){\n- if(this.profile == \"mdgpr\") {\n+ // calendar\n+ this.CalendarStore.removeRange(startTime, endTime, 'md')\n \n- this.eventService.getAllOwnEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then(\n+ // loop\n+ this.CalendarStore.pushEvent(response, 'md');\n \n- (response: any) => {\n- \n- this.addEventToDB(response, \"md\");\n- \n- // calendar\n- this.CalendarStore.removeRange(startTime, endTime, 'md')\n- \n- // loop\n- this.CalendarStore.pushEvent(response, 'md');\n- \n- \n- this.trasnformData(response, 'md');\n- \n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n- \n- // \n- this.myCal.update();\n- this.myCal.loadEvents();\n- \n- this.showLoader = false;\n- this.showTimeline = true;\n- \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB();\n- }).finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- this.showLoader = false;\n- this.updateEventListBox()\n- })\n+ \n+ this.trasnformData(response, 'md');\n \n- } else if (this.profile == \"pr\" ) {\n+ this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n- this.eventService.genericGetAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n- this.addEventToDB(response, \"pr\");\n- \n- this.CalendarStore.removeRange(startTime, endTime, 'pr')\n- // calendar\n- this.CalendarStore.pushEvent(response, 'pr');\n- \n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n- \n // \n this.myCal.update();\n this.myCal.loadEvents();\n- \n- this.showLoader = false;\n- this.showTimeline = true;\n- \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB()\n- }).finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- this.showLoader = false;\n- this.updateEventListBox()\n- })\n \n- }\n- }\n-\n- } else {\n- // Desktop only\n-\n- let counter = 0;\n-\n- if (this.loggeduser.Profile == 'MDGPR') {\n-\n- this.eventService.getAllMdEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n-\n- this.addEventToDB(response, \"md\");\n- let eventsList = response;\n-\n- this.CalendarStore.removeRange(startTime, endTime, 'md')\n-\n- // loop\n- this.CalendarStore.pushEvent(eventsList, 'md');\n-\n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n-\n- // \n- this.myCal.update();\n- this.myCal.loadEvents();\n-\n- this.showTimelineMD = true;\n-\n- counter++;\n- if (counter == 2) {\n this.showLoader = false;\n- }\n-\n+ this.showTimeline = true;\n \n }).catch((error) => {\n console.error(error)\n- this.getFromDB()\n+ this.getFromDB();\n }).finally(() => {\n this.deleteLoadRangeEvent(startTime, endTime)\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n+ this.showLoader = false;\n this.updateEventListBox()\n })\n \n- 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) => {\n+ } else if (this.profile == \"pr\" ) {\n \n+ this.eventService.genericGetAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n this.addEventToDB(response, \"pr\");\n- let eventsList = response;\n \n- // clear the current month only\n this.CalendarStore.removeRange(startTime, endTime, 'pr')\n+ // calendar\n+ this.CalendarStore.pushEvent(response, 'pr');\n \n-\n- this.CalendarStore.pushEvent(eventsList, 'pr');\n-\n- this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n+ this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n \n // \n-\n this.myCal.update();\n this.myCal.loadEvents();\n \n- this.showTimelinePR = true;\n-\n- counter++;\n-\n- if (counter == 2 || this.loggeduser.Profile == 'PR') {\n- this.showLoader = false;\n- }\n+ this.showLoader = false;\n+ this.showTimeline = true;\n \n }).catch((error) => {\n+ console.error(error)\n this.getFromDB()\n }).finally(() => {\n this.deleteLoadRangeEvent(startTime, endTime)\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n+ this.showLoader = false;\n this.updateEventListBox()\n })\n \n- } else if(this.loggeduser.Profile == 'PR') {\n-\n- // view PR calendar with PR profile\n- if(this.loggeduser.OwnerCalendars.length != 0 ) {\n-\n- this.eventService.getAllOwnEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n-\n- this.addEventToDB(response, \"pr\");\n- let eventsList = response;\n- \n- this.CalendarStore.removeRange(startTime, endTime, 'pr')\n- \n- // loop\n- this.CalendarStore.pushEvent(eventsList, 'pr');\n- \n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n- \n- // console.log('this.TimelineMDList', this.TimelineMDList);\n-\n- this.myCal.update();\n- this.myCal.loadEvents();\n- \n- this.showTimelineMD = true;\n- \n- this.showLoader = false;\n- \n- \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB()\n- }).finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- this.showLoader = false;\n- this.updateEventListBox()\n- })\n- } else {\n- this.showLoader = false;\n- }\n-\n- } else {\n-\n- if(this.loggeduser.OwnerCalendars.length != 0 ) {\n-\n- this.eventService.getAllOwnEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n-\n- this.addEventToDB(response, \"md\");\n- let eventsList = response;\n- \n- this.CalendarStore.removeRange(startTime, endTime, 'md')\n- \n- // loop\n- this.CalendarStore.pushEvent(eventsList, 'md');\n- \n- \n- this.TimelineMDList = this.listBoxService.list(this.CalendarStore.eventSource, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n-\n- this.myCal.update();\n- this.myCal.loadEvents();\n- \n- this.showTimelineMD = true;\n- \n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n- \n- \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB()\n- }).finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n- this.updateEventListBox()\n- })\n- } else {\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n- }\n-\n- \n-\n- if(this.loggeduser.SharedCalendars.length != 0 ) {\n-\n- this.eventService.genericGetAllSharedEvents(momentG(new Date(startTime), 'yyyy-MM-dd HH:mm:ss'), momentG(new Date(endTime), 'yyyy-MM-dd 23:59:59')).then((response: any) => {\n-\n- this.addEventToDB(response, \"pr\");\n- let eventsList = response;\n- \n- // clear the current month only\n- this.CalendarStore.removeRange(startTime, endTime, 'pr')\n- \n- \n- this.CalendarStore.pushEvent(eventsList, 'pr');\n- this.listToPresent = this.CalendarStore.eventSource\n-\n- this.TimelinePRList = this.listBoxService.list(this.CalendarStore.eventSource, 'pr', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate })\n- // console.log('this.TimelinePRList', this.TimelinePRList)\n- // \n- \n- this.myCal.update();\n- this.myCal.loadEvents();\n- \n- this.showTimelinePR = true;\n- \n- counter++;\n- \n- if (counter == 2 || this.loggeduser.Profile == 'PR') {\n- this.showLoader = false;\n- }\n- \n- }).catch((error) => {\n- console.error(error)\n- this.getFromDB()\n- })\n- .finally(() => {\n- this.deleteLoadRangeEvent(startTime, endTime)\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n- this.updateEventListBox()\n- })\n- } else {\n- counter++;\n- if (counter == 2) {\n- this.showLoader = false;\n- }\n- }\n-\n }\n-\n }\n+\n+ \n }\n \n trasnformData(response, profile) {",
"changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged
...\" to unstage)\n\tmodified: .husky/pre-commit\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\nUntracked files:\n (use \"git add ...\" to include in what will be committed)\n\tsrc/assets/www/pdfjs/web/nice.pdf",
"changeAuthor": "peter.maquiran"
}