From 76ff62d4287fd56a7bfe5e837cc0d63d8fe3679d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 24 Jun 2024 16:08:20 +0100 Subject: [PATCH] ITOTEAM-594 Implementar o endpoint de listagem do tipo de agenda --- .../agenda/edit-event/edit-event.page.ts | 21 ++--- .../pages/agenda/new-event/new-event.page.ts | 21 ++--- .../notification-holder.service.ts | 85 +++++++++---------- .../agenda/edit-event/edit-event.page.ts | 22 ++--- .../shared/agenda/new-event/new-event.page.ts | 29 +++---- version/git-version.ts | 12 +-- 6 files changed, 80 insertions(+), 110 deletions(-) diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 129ea2d33..f0ee509d0 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -698,26 +698,21 @@ export class EditEventPage implements OnInit { } - changeAgenda() { + async changeAgenda() { - setTimeout(() => { + const result = await this.agendaDataRepository.geCalendars() - if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] && this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { + const selectedCalendar = result.find(e => e.wxUserId == this.selectedUserCalendar) - this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - - } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) { + if(selectedCalendar) { + if(selectedCalendar.shareType == 1) { this.CalendarNamesOptions = ['Oficial'] - this.postEvent.CalendarName = 'Oficial' - - } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { + } else if(selectedCalendar.shareType == 2) { this.CalendarNamesOptions = ['Pessoal'] - this.postEvent.CalendarName = 'Pessoal' - - } else { + } else if (selectedCalendar.shareType == 3) { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] } - }, 50) + } } diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 094ddd32c..f024f5b3e 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -537,26 +537,21 @@ export class NewEventPage implements OnInit { } } - changeAgenda() { + async changeAgenda() { - setTimeout(() => { + const result = await this.agendaDataRepository.geCalendars() - if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { + const selectedCalendar = result.find(e => e.wxUserId == this.selectedUserCalendar) - this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - - } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial']) { + if(selectedCalendar) { + if(selectedCalendar.shareType == 1) { this.CalendarNamesOptions = ['Oficial'] - this.postEvent.CalendarName = 'Oficial' - - } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { + } else if(selectedCalendar.shareType == 2) { this.CalendarNamesOptions = ['Pessoal'] - this.postEvent.CalendarName = 'Pessoal' - - } else { + } else if (selectedCalendar.shareType == 3) { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] } - }, 50) + } } diff --git a/src/app/services/notification/notification-holder.service.ts b/src/app/services/notification/notification-holder.service.ts index ac76b2c48..409e0eadd 100644 --- a/src/app/services/notification/notification-holder.service.ts +++ b/src/app/services/notification/notification-holder.service.ts @@ -40,62 +40,57 @@ export class NotificationHolderService { let notificationObject; if (element.notification) { - notificationObject = { - index: i, - title: element.notification.title, - Service: element.data.Service || element.data.service, - Object: element.data.Object || element.data.object, - IdObject: element.data.IdObject || element.data.idObject, - FolderId: element.data.FolderId || element.data.folderId, - body: element.notification.body, - dateInit: this.getFormatedTime(element.data.dateInit), - dateEnd: this.getFormatedTime(element.data.dateEnd), - Location: element.data.Location || element.data.Location, - TypeAgenda: element.data.TypeAgenda || element.data.typeAgenda, - Role: element.data.Role, - Status: element.data.Status, - read: false, + index: i, + title: element.notification.title, + Service: element.data.Service || element.data.service , + Object: element.data.Object || element.data.object , + IdObject: element.data.IdObject || element.data.idObject , + FolderId: element.data.FolderId || element.data.folderId , + body: element.notification.body, + dateInit: this.getFormatedTime(element.data.dateInit), + dateEnd: this.getFormatedTime(element.data.dateEnd), + Location: element.data.Location || element.data.location , + TypeAgenda: element.data.TypeAgenda || element.data.typeAgenda , + Role: element.data.Role || element.data.role , + Status: element.data.Status || element.data.status , + read: false, } - - } else if (element.data) { + } else if (element.data) { notificationObject = { - index: i, - title: element.title, - Service: element.data.Service || element.data.service, - Object: element.data.Object || element.data.object, - IdObject: element.data.IdObject || element.data.idObject, - FolderId: element.data.FolderId || element.data.folderId, - body: element.body, - dateInit: this.getFormatedTime(element.data.dateInit), - dateEnd: this.getFormatedTime(element.data.dateEnd), - Location: element.data.Location || element.data.folderId, - TypeAgenda: element.data.TypeAgenda || element.data.folderId, - Role: element.data.Role, - Status: element.data.Status, - read: false, + index: i, + title: element.title, + Service: element.data.Service || element.data.service , + Object: element.data.Object || element.data.object , + IdObject: element.data.IdObject || element.data.idObject , + FolderId: element.data.FolderId || element.data.folderId , + body: element.body, + dateInit: this.getFormatedTime(element.data.dateInit), + dateEnd: this.getFormatedTime(element.data.dateEnd), + Location: element.data.Location || element.data.location , + TypeAgenda: element.data.TypeAgenda || element.data.typeAgenda , + Role: element.data.Role || element.data.role , + Status: element.data.Status || element.data.status , + read: false, } - - } else { - { - notificationObject = { - FolderId: element.FolderId || element.data.folderId, - IdObject: element.IdObject || element.data.idObject, - Location: element.Location || element.data.location, - Object: element.Object || element.data.object, - Role: element.Role || element.data.role, - Service: element.Service || element.data.service, - Status: element.Status, - TypeAgenda: element.TypeAgenda, + } else { + notificationObject = { + FolderId: element.FolderId || element.folderId , + IdObject: element.IdObject || element.idObject , + Location: element.Location || element.location , + Object: element.Object || element.object , + Role: element.Role || element.role , + Service: element.Service || element.service , + Status: element.Status || element.status , + TypeAgenda: element.TypeAgenda || element.typeAgenda , body: element.body, dateEnd: element.dateEnd, dateInit: element.dateInit, index: element.index, title: element.title, read: false, - } } - } + } this.notificationList.push(notificationObject) this.save() diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index b60407245..10cb6e355 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -636,27 +636,21 @@ export class EditEventPage implements OnInit { } - changeAgenda() { + async changeAgenda() { - setTimeout(() => { - console.log('selecione agenda', this.eventsService.calendarNamesType) + const result = await this.agendaDataRepository.geCalendars() - if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial'] && this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { + const selectedCalendar = result.find(e => e.wxUserId == this.selectedUserCalendar) - this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - - } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Oficial']) { + if(selectedCalendar) { + if(selectedCalendar.shareType == 1) { this.CalendarNamesOptions = ['Oficial'] - this._postEvent.CalendarName = 'Oficial' - - } else if (this.eventsService.calendarNamesType[this.CalendarNameOwnerName]?.['Pessoal']) { + } else if(selectedCalendar.shareType == 2) { this.CalendarNamesOptions = ['Pessoal'] - this._postEvent.CalendarName = 'Pessoal' - - } else { + } else if (selectedCalendar.shareType == 3) { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] } - }, 50) + } } diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 067766c2e..bd5883944 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -185,6 +185,8 @@ export class NewEventPage implements OnInit { this.selectedUserCalendar = SessionStore.user.UserId } + this.changeAgenda() + } } @@ -408,34 +410,23 @@ export class NewEventPage implements OnInit { this.hasChangeCalendar = true } - changeAgenda() { + async changeAgenda() { this.CalendarNameShow = false - setTimeout(() => { + const result = await this.agendaDataRepository.geCalendars() - this.CalendarNameShow = true + const selectedCalendar = result.find(e => e.wxUserId == this.selectedUserCalendar) - if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { - - this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - console.log(this.postEvent.CalendarName) - - } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial']) { + if(selectedCalendar) { + if(selectedCalendar.shareType == 1) { this.CalendarNamesOptions = ['Oficial'] - this.postEvent.CalendarName = 'Oficial' - console.log(this.postEvent.CalendarName) - - } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal']) { + } else if(selectedCalendar.shareType == 2) { this.CalendarNamesOptions = ['Pessoal'] - this.postEvent.CalendarName = 'Pessoal' - console.log(this.postEvent.CalendarName) - - } else { + } else if (selectedCalendar.shareType == 3) { this.CalendarNamesOptions = ['Oficial', 'Pessoal'] - console.log(this.postEvent.CalendarName) } - }, 50) + } } diff --git a/version/git-version.ts b/version/git-version.ts index ab6ca2b42..fa93694b0 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "ca50ae9da", - "SHA": "ca50ae9dae0ac0d3ed0e5f2a820a780fd6509564", + "shortSHA": "93476dc5c", + "SHA": "93476dc5c494511533d5ae327a3b026399581e9b", "branch": "feature/agenda-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Sun Jun 23 21:47:34 2024 +0100'", - "lastCommitMessage": "ITOTEAM-525 data validation", - "lastCommitNumber": "5839", - "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: angular.json\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts\n\tmodified: src/app/services/Repositorys/Agenda/agenda-data.service.ts\n\tnew file: src/app/services/Repositorys/Agenda/async/change/attendeesLIstChangeDetector.ts\n\tmodified: src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts\n\tmodified: src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts\n\tnew file: src/app/services/Repositorys/Agenda/model/attendeeRemoveInputDTO.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts\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/interceptors/token.interceptors.ts\n\tmodified: src/app/services/notification/notification-holder.service.ts\n\tmodified: src/app/store/notification-holder.service.ts", + "lastCommitTime": "'Mon Jun 24 15:35:16 2024 +0100'", + "lastCommitMessage": "ITOTEAM-597 remove atendess from list", + "lastCommitNumber": "5840", + "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\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/services/notification/notification-holder.service.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file