mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 04:57:52 +00:00
Peter Maquiran
12 lines
28 KiB
TypeScript
12 lines
28 KiB
TypeScript
export let versionData = {
|
|
"shortSHA": "190e98fab",
|
|
"SHA": "190e98fab7d727ce5a8dcda6333bbc04126ca9bc",
|
|
"branch": "no_bug_movemente",
|
|
"lastCommitAuthor": "'Peter Maquiran'",
|
|
"lastCommitTime": "'Thu Feb 16 11:58:22 2023 +0100'",
|
|
"lastCommitMessage": "fix",
|
|
"lastCommitNumber": "4785",
|
|
"change": "diff --git a/.husky/pre-commit b/.husky/pre-commit\nindex 2a367c7cc..fe58ea54a 100644\n--- a/.husky/pre-commit\n+++ b/.husky/pre-commit\n@@ -1,4 +1,4 @@\n #!/usr/bin/env sh\n . \"$(dirname -- \"$0\")/_/husky.sh\"\n \n-npm run build:version && git add .\n+npm run build:version && git add version/git-version.ts\ndiff --git a/src/app/modals/view-document/view-document.page.ts b/src/app/modals/view-document/view-document.page.ts\nindex 1e9910e26..5eaf5bec2 100644\n--- a/src/app/modals/view-document/view-document.page.ts\n+++ b/src/app/modals/view-document/view-document.page.ts\n@@ -6,7 +6,6 @@ import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expedient\n import { ProcessesService } from 'src/app/services/processes.service';\n import { EventDetailsDocumentsOptionsPage } from 'src/app/shared/popover/event-details-documents-options/event-details-documents-options.page';\n import { DocumentSetUpMeetingPage } from '../document-set-up-meeting/document-set-up-meeting.page';\n-import { AlertService } from 'src/app/services/alert.service';\n import { AlertController, ModalController } from '@ionic/angular';\n @Component({\n selector: 'app-view-document',\ndiff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html\nindex 4a299e49f..4f07fc949 100644\n--- a/src/app/pages/agenda/agenda.page.html\n+++ b/src/app/pages/agenda/agenda.page.html\n@@ -110,15 +110,14 @@\n <div class=\"text\" *ngIf=\"profile == 'pr'\">\n CP \n </div>\n-\n </div>\n \n- <button *ngIf=\"profile == 'mdgpr' && ( SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR') && eventService.hasSharedCalendar \" (click)=\"changeProfile()\" class=\"d-md-none btn-no-color resize\">\n+ <button *ngIf=\"profile == 'mdgpr' && ( SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR') && eventService.hasSharedCalendar \" (click)=\"changeProfile()\" class=\"btn-no-color resize\">\n <ion-icon class=\"right-icons\" src=\"assets/images/icons-profile-calendar-md.svg\"></ion-icon>\n </button>\n \n <button title=\"Mudar de Agenda\" *ngIf=\"profile == 'pr'&& ( SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR') && eventService.hasSharedCalendar\" (click)=\"changeProfile()\" class=\"btn-no-color resize\">\n- <ion-icon class=\"right-icons d-md-none\" src=\"assets/images/icons-profile-calendar-pr.svg\"></ion-icon>\n+ <ion-icon class=\"right-icons\" src=\"assets/images/icons-profile-calendar-pr.svg\"></ion-icon>\n </button>\n \n <button title=\"Visualizar a lista de Eventos para aprovação\" class=\"btn-no-color cursor-pointer resize\" (click)=\"viewEventsToApprove()\" *ngIf=\"p.userPermission([p.permissionList.Gabinete.aprove_event])\">\n@@ -226,21 +225,49 @@\n </ion-row>\n \n <div class=\"calendar-title-container px-20 d-none d-md-flex\">\n- <div class=\"calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center\" *ngIf=\"eventService.hasOwnCalendar\">\n+\n+\n+ <div class=\"calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center\" *ngIf=\"SessionStore.user.Profile != 'PR' && SessionStore.user.Profile != 'MDGPR' && eventService.hasSharedCalendar && eventService.hasOwnCalendar && profile == 'mdgpr'\">\n <!-- <div >Agenda de {{SessionStore.user.FullName}}</div> -->\n <div >Minha agenda</div>\n </div>\n- <div class=\"calendar-title-description text-black align-center\" *ngIf=\"eventService.hasSharedCalendar\">\n+\n+ <div class=\"calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center\" *ngIf=\"SessionStore.user.Profile != 'PR' && SessionStore.user.Profile != 'MDGPR' && eventService.hasSharedCalendar && eventService.hasOwnCalendar && profile == 'pr'\">\n+ <!-- <div >Agenda de {{SessionStore.user.FullName}}</div> -->\n+ <div >Agenda Partilhada</div>\n+ \n+ <mat-option *ngFor=\"let calendars of eventService.calendarNamesAry\" value=\"{{calendars.Fullname || calendars}}\">\n+ <div *ngIf=\"calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'\"> Agenda do {{calendars.Fullname}} </div>\n+ </mat-option>\n+ </div>\n+\n+\n+ <div class=\"calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center\" *ngIf=\"SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR' && eventService.hasSharedCalendar && eventService.hasOwnCalendar && profile == 'mdgpr'\">\n+ <!-- <div >Agenda de {{SessionStore.user.FullName}}</div> -->\n+ <div *ngIf=\"SessionStore.user.Profile == 'PR' && profile == 'pr' \">Minha agenda</div>\n+ <div *ngIf=\"SessionStore.user.Profile == 'MDGPR' && profile == 'pr' \">Minha agenda</div>\n+ </div>\n+\n+ <div class=\"calendar-title-description flex-grow-1 text-grey d-flex justify-center align-center\" *ngIf=\"SessionStore.user.Profile != 'PR' && SessionStore.user.Profile != 'MDGPR' && eventService.hasSharedCalendar && eventService.hasOwnCalendar && profile == 'pr'\">\n+ <!-- <div >Agenda de {{SessionStore.user.FullName}}</div> -->\n+ <div >Agenda Partilhada</div>\n+ \n+ <mat-option *ngFor=\"let calendars of eventService.calendarNamesAry\" value=\"{{calendars.Fullname || calendars}}\">\n+ <div *ngIf=\"calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'\"> Agenda do {{calendars.Fullname}} </div>\n+ </mat-option>\n+ </div>\n+\n+ <div class=\"calendar-title-description text-black align-center\" *ngIf=\"eventService.hasSharedCalendar && (SessionStore.user.Profile == 'PR' || SessionStore.user.Profile == 'MDGPR')\">\n <div class=\"flex-grow-1 text-grey d-flex justify-center align-center\">\n \n <mat-option *ngFor=\"let calendars of eventService.calendarNamesAry\" value=\"{{calendars.Fullname || calendars}}\">\n <div *ngIf=\"calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'\"> Agenda do PR </div>\n <div *ngIf=\"calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'\"> Agenda do MD </div>\n <div *ngIf=\"calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'\"> Agenda do {{calendars.Fullname}} </div>\n- \n </mat-option>\n </div>\n </div>\n+\n </div>\n \n </div>\n@@ -252,7 +279,7 @@\n <div class=\"height-100\">\n <div class=\"timeline-container height-100 d-flex pt-20 pl-20 pl-20 filter-{{segment}}\" >\n \n- <div class=\"ss-timeline timeline-mobile flex-grow-1 d-md-none text-black height-100 width-100 overflow-y-auto\" >\n+ <div class=\"ss-timeline timeline-mobile flex-grow-1 text-black height-100 width-100 overflow-y-auto\" >\n <div *ngFor=\"let events of TimelineMDList | keyvalue;\" >\n \n <div class=\"EventListBox-container\" >\n@@ -296,7 +323,7 @@\n </div>\n </div>\n \n- <div class=\"fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20 width-100 height-100 overflow-y-auto\" *ngIf=\"SessionStore.user.OwnerCalendars.length && SessionStore.user.Profile != 'PR' \">\n+ <!-- <div class=\"fs-timeline flex-grow-1 d-none d-md-block d-md-block text-black pr-20 width-100 height-100 overflow-y-auto\" *ngIf=\"SessionStore.user.OwnerCalendars.length && SessionStore.user.Profile != 'PR' \">\n <div *ngFor=\"let events of TimelineMDList | keyvalue;\" >\n \n <div class=\"EventListBox-container\" >\n@@ -338,8 +365,8 @@\n </div>\n </div>\n \n- <!-- shared desktop -->\n- <div class=\"sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto\" *ngIf=\"SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' \" >\n+ shared desktop -->\n+ <!-- <div class=\"sd-timeline flex-grow-1 d-none d-md-block timeline-md text-black pl-20 pr-20 width-100 height-100 overflow-y-auto\" *ngIf=\"SessionStore.user.SharedCalendars.length != 0 || SessionStore.user.Profile == 'PR' \" >\n <div *ngFor=\"let events of TimelinePRList | keyvalue;\">\n \n <div class=\"EventListBox-container\" >\n@@ -382,7 +409,7 @@\n </div>\n \n </div>\n- </div>\n+ </div> -->\n \n </div>\n </div>\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 <file>...\" to unstage)\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: .husky/pre-commit\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 <file>...\" to include in what will be committed)\n\tsrc/assets/www/pdfjs/web/nice.pdf",
|
|
"changeAuthor": "peter.maquiran"
|
|
} |