From 54fb4f57d7f6d25bdb11cb5fcc3a224ac283c4f6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 22 Oct 2024 14:31:04 +0100 Subject: [PATCH] create weakly event --- src/app/app.module.ts | 17 ---- .../event-set-default-participants.service.ts | 2 + .../room/room-set-last-message.service.ts | 4 +- .../document-set-up-meeting.page.html | 28 ++++-- .../document-set-up-meeting.page.scss | 53 +++++++---- .../document-set-up-meeting.page.ts | 29 +++++- src/app/models/event.model.ts | 2 +- .../module/agenda/data/dto/eventDTOOutput.ts | 4 +- .../agenda-data-repository.service.ts | 2 + .../domain/mapper/EventDetailsMapper.ts | 2 +- .../book-meeting-modal.page.html | 27 ++++-- .../book-meeting-modal.page.scss | 19 +++- .../book-meeting-modal.page.ts | 23 ++++- src/app/services/task.service.ts | 2 +- .../component/edit-event/edit-event.page.html | 14 ++- .../component/edit-event/edit-event.page.scss | 12 +++ .../component/edit-event/edit-event.page.ts | 66 ++++++++++--- .../component/event-list/event-list.page.ts | 1 + .../component/new-event/new-event.page.html | 17 +++- .../component/new-event/new-event.page.scss | 10 ++ .../component/new-event/new-event.page.ts | 87 +++++++---------- .../modal/edit-event/edit-event.page.html | 24 +++-- .../modal/edit-event/edit-event.page.scss | 34 ++++--- .../modal/edit-event/edit-event.page.ts | 57 +++++++++++ .../modal/new-event/new-event.page.html | 16 +++- .../modal/new-event/new-event.page.scss | 12 +++ .../agenda/modal/new-event/new-event.page.ts | 95 ++++++------------- src/main.ts | 1 + version/git-version.ts | 12 +-- 29 files changed, 447 insertions(+), 225 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4b7a59784..d76ac7436 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -153,23 +153,6 @@ registerLocaleData(localePt, 'pt'); } ); -export const increment = createAction('[Counter Component] Increment'); -export const decrement = createAction('[Counter Component] Decrement'); -export const reset = createAction('[Counter Component] Reset'); - -export const initialState = 0; - -const _counterReducer = createReducer( - initialState, - on(increment, (state) => state + 1), - on(decrement, (state) => state - 1), - on(reset, (state) => 0) -); - -export function counterReducer(state, action) { - return _counterReducer(state, action); -} - @NgModule({ declarations: [AppComponent, PopupQuestionPipe, InputFilterDirective], imports: [BrowserModule, diff --git a/src/app/core/agenda/use-case/event-set-default-participants.service.ts b/src/app/core/agenda/use-case/event-set-default-participants.service.ts index eea84d96f..3b7a53ecb 100644 --- a/src/app/core/agenda/use-case/event-set-default-participants.service.ts +++ b/src/app/core/agenda/use-case/event-set-default-participants.service.ts @@ -55,5 +55,7 @@ export class EventSetDefaultParticipantsService { } } + + return ok(null) } } diff --git a/src/app/core/chat/usecase/room/room-set-last-message.service.ts b/src/app/core/chat/usecase/room/room-set-last-message.service.ts index d5983b0bf..dce9c60d2 100644 --- a/src/app/core/chat/usecase/room/room-set-last-message.service.ts +++ b/src/app/core/chat/usecase/room/room-set-last-message.service.ts @@ -102,10 +102,10 @@ export class RoomSetLastMessageService { } else { console.log('set last message') } - } else if (findRoom.isOk() && !findRoom.value && e.payload.receiverId) { + } else if (findRoom.isOk() && !findRoom.value && e.payload?.receiverId) { // console.log('new room', e) const findLocalDirectRoom = await this.roomLocalRepository.findOne({ - receiverId: e.payload.receiverId + receiverId: e.payload?.receiverId }) if(findLocalDirectRoom.isOk() && findLocalDirectRoom.value) { diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html index 314b41b1b..6adbc2ee9 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html @@ -35,28 +35,28 @@
- +
PR
Minha agenda
- + - +
PR
AGENDA DO MDGPR
Agenda {{calendars.wxFullName}}
Minha agenda
- + - + - +
@@ -159,7 +159,7 @@ Diário - Semanalmente + Semanal Mensal @@ -175,6 +175,20 @@ + +
+
+
Seg
+
Terça
+
quarta
+
quinta
+
Sexta
+
Sabado
+
Domingo
+
+
+ +
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss index f63c86c4a..db863a64d 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss @@ -3,7 +3,7 @@ .content{ margin: 0; float: left; - + .header-content{ } .header-title{ @@ -13,13 +13,13 @@ color:#000; float: left; } - + .ion-item-container{ margin: rem(15) auto; border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; - + } .ion-item-container-no-border{ margin: 0px auto; @@ -61,7 +61,7 @@ .list-people{ width: 256px; float: left; - + } .add-people{ width: rem(45); @@ -123,7 +123,7 @@ --color:#ffffff; margin:10px; } - + .text-input{ width: 100%; border: 1px solid #ebebeb; @@ -131,7 +131,7 @@ padding: 0 !important; border-radius: 5px; } - + /* Error Messages */ .error{ color:red; @@ -148,8 +148,8 @@ padding: 20px; overflow: auto; } - - + + .attach-icon{ width: 37px; font-size: rem(35); @@ -170,12 +170,12 @@ float: right; font-size: rem(13); } - - - - - - + + + + + + .app-name{ background: var(--title-text-color); border-radius: 18px; @@ -192,23 +192,34 @@ -ms-border-radius: 18px; -o-border-radius: 18px; } - - + + .close-button { display: none; height: 20px; } - - + + .list:hover { - + .app-name { display: none; } - + .close-button { display: block !important; height: 20px; } } - \ No newline at end of file + + + .segment{ + box-shadow: 0px 0px 10px #b3b3b3; + padding: 3px; + border-radius: 10px; + } + + + .segment-active { + background-color: rgb(212, 212, 212); + } diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index 669b59952..9dbc6ce48 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -115,6 +115,17 @@ export class DocumentSetUpMeetingPage implements OnInit { CalendarNamesOptions = ['Oficial', 'Pessoal'] + daysOfWeek = { + sun: false, + mon: false, + tues: false, + wed: false, + thurs: false, + fri: false, + sat: false, + }; + + constructor( private modalController: ModalController, private router: Router, @@ -209,7 +220,7 @@ export class DocumentSetUpMeetingPage implements OnInit { }; this.agendaDataRepository.getSharedCalendar() - + this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLive().pipe( map(data => data.sort((a, b) => { const priorityA = rolePriorities[a.roleId] || Infinity; @@ -217,7 +228,7 @@ export class DocumentSetUpMeetingPage implements OnInit { return priorityA - priorityB; })) ) - + this.changeAgenda() this.postData.EventRecurrence = { @@ -363,6 +374,20 @@ export class DocumentSetUpMeetingPage implements OnInit { if (this.Form.invalid) return false } + + let i =0; + this.postData.EventRecurrence.daysOfWeek = [] + for(const [key, value] of Object.entries(this.daysOfWeek)) { + if(value) { + if(!this.postData.EventRecurrence.daysOfWeek.includes(i)) { + this.postData.EventRecurrence.daysOfWeek.push(i); + } + } + i++ + } + + + this.postData.Attendees = this.taskParticipants.concat(this.taskParticipantsCc); const laoder = this.toastService.loading(); diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 459f06f4f..31553b04b 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -6,7 +6,7 @@ import { EventPerson } from './eventperson.model'; export interface EventRecurrence { Type?: number | string; Day?: number; - DayOfWeek?: number; + daysOfWeek?: number[]; Month?: number | string; LastOccurrence?: Date | string; frequency?: string, diff --git a/src/app/module/agenda/data/dto/eventDTOOutput.ts b/src/app/module/agenda/data/dto/eventDTOOutput.ts index 74573dda4..dd198ef13 100644 --- a/src/app/module/agenda/data/dto/eventDTOOutput.ts +++ b/src/app/module/agenda/data/dto/eventDTOOutput.ts @@ -41,7 +41,9 @@ const OrganizerSchema = z.object({ const EventRecurrenceSchema = z.object({ Type: z.number().optional(), Day: z.any().optional(), - DayOfWeek: z.any(), + daysOfWeek: z.object({ + day: z.number() + }).array(), Month: z.any(), LastOccurrence: z.any().optional(), frequency: z.number().optional(), diff --git a/src/app/module/agenda/data/repository/agenda-data-repository.service.ts b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts index c919a7313..baa7fbc02 100644 --- a/src/app/module/agenda/data/repository/agenda-data-repository.service.ts +++ b/src/app/module/agenda/data/repository/agenda-data-repository.service.ts @@ -178,6 +178,7 @@ export class AgendaDataRepositoryService { recurrence: { frequency: this.utils.eventRecurence(eventData.EventRecurrence.frequency), until:((eventData.EventRecurrence.until === "") ? this.utils.addOneHourToIsoString(eventData.EndDate.toISOString()) : eventData.EventRecurrence.until), + daysOfWeek: eventData.EventRecurrence.daysOfWeek || [] }, organizerId: SessionStore.user.UserId, isAllDayEvent: eventData.IsAllDayEvent, @@ -211,6 +212,7 @@ export class AgendaDataRepositoryService { recurrence: { frequency: this.utils.eventRecurence(eventData.EventRecurrence.frequency), until: ((eventData.EventRecurrence.until === "") ? this.utils.addOneHourToIsoString(eventData.EndDate.toISOString()) : eventData.EventRecurrence.until), + daysOfWeek: eventData.EventRecurrence.daysOfWeek || [] } } diff --git a/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts b/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts index 257b0ff95..cb0ef5971 100644 --- a/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts +++ b/src/app/module/agenda/domain/mapper/EventDetailsMapper.ts @@ -105,7 +105,7 @@ export class EventMapper { "EventRecurrence": { "Type": -1, "Day": null, - "DayOfWeek": null, + "daysOfWeek": dto.eventRecurrence?.daysOfWeek.map(e => e.day), "Month": null, "LastOccurrence": null, "frequency": dto?.eventRecurrence?.frequency, diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 70808a148..83ad3170f 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -31,28 +31,28 @@
- +
PR
Minha agenda
- + - +
PR
AGENDA DO MDGPR
Agenda {{calendars.wxFullName}}
Minha agenda
- + - + - +
@@ -144,7 +144,7 @@ Diário - Semanalmente + Semanal Mensal @@ -159,6 +159,19 @@ + +
+
+
Seg
+
Terça
+
quarta
+
quinta
+
Sexta
+
Sabado
+
Domingo
+
+
+
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 5895b8e73..bc79244c1 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -19,7 +19,7 @@ border: 1px solid #ebebeb; border-radius: 5px; padding-left: 10px; - + } .ion-item-container-no-border{ margin: 0px auto; @@ -173,7 +173,7 @@ - + .app-name{ background: var(--title-text-color); @@ -191,8 +191,8 @@ -ms-border-radius: 18px; -o-border-radius: 18px; } - - + + .close-button { display: none; height: 20px; @@ -209,3 +209,14 @@ display: block !important; } } + +.segment{ + box-shadow: 0px 0px 10px #b3b3b3; + padding: 3px; + border-radius: 10px; +} + + +.segment-active { + background-color: rgb(212, 212, 212); +} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index f05e1ec82..28029cb98 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -121,7 +121,16 @@ export class BookMeetingModalPage implements OnInit { allDayCheck: boolean = false; CalendarNameShow = true eventRecurence = 'never'; - + + daysOfWeek = { + sun: false, + mon: false, + tues: false, + wed: false, + thurs: false, + fri: false, + sat: false, + }; constructor( private modalController: ModalController, @@ -393,6 +402,18 @@ export class BookMeetingModalPage implements OnInit { } }); + let i =0; + this.postData.EventRecurrence.daysOfWeek = [] + for(const [key, value] of Object.entries(this.daysOfWeek)) { + if(value) { + if(!this.postData.EventRecurrence.daysOfWeek.includes(i)) { + this.postData.EventRecurrence.daysOfWeek.push(i); + } + } + i++ + } + + this.postData.Attachments = DocumentToSave as any; let loader = this.toastService.loading(); diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 2b3d90625..7a2bba8c2 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -314,7 +314,7 @@ export class TaskService { @XTracerAsync({name:'taskService/loadEventToAprove', bugPrint: true}) async loadEventosParaAprovacao(tracing?: TracingType) { this.showLoaderNum++ - console.log('PR') + // console.log('PR') // PR dont have event to approve /* if(this.SessionStore.user.Profile != 'PR') { */ try { diff --git a/src/app/ui/agenda/component/edit-event/edit-event.page.html b/src/app/ui/agenda/component/edit-event/edit-event.page.html index 39f34fbf4..3b5181f20 100644 --- a/src/app/ui/agenda/component/edit-event/edit-event.page.html +++ b/src/app/ui/agenda/component/edit-event/edit-event.page.html @@ -169,7 +169,7 @@ Diário - Semanalmente + Semanal Mensal @@ -183,6 +183,18 @@
+ +
+
+
Seg
+
Terça
+
quarta
+
quinta
+
Sexta
+
Sabado
+
Domingo
+
+
@@ -185,7 +185,7 @@ Diário - Semanalmente + Semanal Mensal @@ -200,8 +200,20 @@ -
-
+
+
+
Seg
+
Terça
+
quarta
+
quinta
+
Sexta
+
Sabado
+
Domingo
+
+
+ +
+
diff --git a/src/app/ui/agenda/modal/edit-event/edit-event.page.scss b/src/app/ui/agenda/modal/edit-event/edit-event.page.scss index fdab03263..2d1fb69c8 100644 --- a/src/app/ui/agenda/modal/edit-event/edit-event.page.scss +++ b/src/app/ui/agenda/modal/edit-event/edit-event.page.scss @@ -13,10 +13,10 @@ .main-header{ font-family: Roboto; background-color: #fff; - + overflow:hidden; transform: translate3d(0, 1px, 0); - + .title-content{ margin: 0px auto; padding: 0 !important; @@ -77,7 +77,7 @@ } .list-people{ float: left; - + } .add-people{ width: rem(45); @@ -107,7 +107,7 @@ width: 100%; font-size: rem(15); color:var(--title-text-color); - + } /* SPAN */ .span-left{ @@ -139,7 +139,7 @@ --color:#ffffff; margin:10px; } - + .text-input{ width: 100%; border: 1px solid #ebebeb; @@ -147,7 +147,7 @@ padding: 0 !important; border-radius: 5px; } - + /* Error Messages */ .error{ color:red; @@ -159,14 +159,14 @@ color:red; } - + .buttons{ display: flex; justify-content: space-between; padding: 20px; overflow: auto; } - + .app-name{ @@ -185,8 +185,8 @@ -ms-border-radius: 18px; -o-border-radius: 18px; } - - + + .close-button { display: none; height: 20px; @@ -203,4 +203,16 @@ display: block !important; height: 20px; } -} \ No newline at end of file +} + + +.segment{ + box-shadow: 0px 0px 10px #b3b3b3; + padding: 3px; + border-radius: 10px; +} + + +.segment-active { + background-color: rgb(212, 212, 212); +} diff --git a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts index 7160bc290..9d399d22a 100644 --- a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts +++ b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts @@ -112,6 +112,16 @@ export class EditEventPage implements OnInit { editAllEvent = false closeModal = false + daysOfWeek = { + sun: false, + mon: false, + tues: false, + wed: false, + thurs: false, + fri: false, + sat: false, + }; + constructor( private modalController: ModalController, private navParams: NavParams, @@ -173,8 +183,41 @@ export class EditEventPage implements OnInit { this.changeAgenda() this.sharedCalendar = this.agendaDataRepository.getShareCalendarItemsLiveWithOrder() + } + + checkForWeekDaysSelect() { + + if(!this.postEvent.EventRecurrence?.daysOfWeek) { + this.postEvent.EventRecurrence.daysOfWeek = [] + } + + if(this.postEvent.EventRecurrence?.daysOfWeek.includes(0)) { + this.daysOfWeek.sun = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(1)) { + this.daysOfWeek.mon = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(2)) { + this.daysOfWeek.tues = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(3)) { + this.daysOfWeek.wed = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(4)) { + this.daysOfWeek.thurs = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(5)) { + this.daysOfWeek.fri = true + } + if (this.postEvent.EventRecurrence?.daysOfWeek.includes(6)) { + this.daysOfWeek.sat = true + } + } + + + hasPrCalendar(data: TableSharedCalendar[]) { for(const e of data) { if(e.roleId == this.RoleIdService.PRES) { @@ -212,6 +255,8 @@ export class EditEventPage implements OnInit { this.selectedRecurringType = this.postEvent.EventRecurrence.Type.toString(); }, 500); + this.checkForWeekDaysSelect() + } ngOnDestroy() { @@ -414,6 +459,18 @@ export class EditEventPage implements OnInit { this.runValidation() + let i =0; + this.postEvent.EventRecurrence.daysOfWeek = [] + for(const [key, value] of Object.entries(this.daysOfWeek)) { + if(value) { + if(!this.postEvent.EventRecurrence.daysOfWeek.includes(i)) { + this.postEvent.EventRecurrence.daysOfWeek.push(i); + } + } + i++ + } + + if (this.Form.invalid) { return false diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.html b/src/app/ui/agenda/modal/new-event/new-event.page.html index 1a311a6d8..6d834e2ce 100644 --- a/src/app/ui/agenda/modal/new-event/new-event.page.html +++ b/src/app/ui/agenda/modal/new-event/new-event.page.html @@ -135,7 +135,7 @@ Diário - Semanalmente + Semanal Mensal @@ -150,6 +150,20 @@
+ +
+
+
Seg
+
Terça
+
quarta
+
quinta
+
Sexta
+
Sabado
+
Domingo
+
+
+ +
diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.scss b/src/app/ui/agenda/modal/new-event/new-event.page.scss index 7f3c222f5..d8e3aa039 100644 --- a/src/app/ui/agenda/modal/new-event/new-event.page.scss +++ b/src/app/ui/agenda/modal/new-event/new-event.page.scss @@ -227,3 +227,15 @@ ion-content{ width: auto; height: 30px; } + + +.segment{ + box-shadow: 0px 0px 10px #b3b3b3; + padding: 3px; + border-radius: 10px; +} + + +.segment-active { + background-color: rgb(212, 212, 212); +} diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.ts b/src/app/ui/agenda/modal/new-event/new-event.page.ts index 3195d0ae3..eea9fa8ba 100644 --- a/src/app/ui/agenda/modal/new-event/new-event.page.ts +++ b/src/app/ui/agenda/modal/new-event/new-event.page.ts @@ -119,6 +119,16 @@ export class NewEventPage implements OnInit { hasChangeCalendar = false + daysOfWeek = { + sun: false, + mon: false, + tues: false, + wed: false, + thurs: false, + fri: false, + sat: false, + }; + constructor( private modalController: ModalController, @@ -219,8 +229,12 @@ export class NewEventPage implements OnInit { Organizer: '', Category: 'Meeting', HasAttachments: false, - EventRecurrence: { frequency: this.eventRecurence, until: "", - Type: '' }, + EventRecurrence: { + frequency: this.eventRecurence, + until: "", + Type: '', + daysOfWeek: [] + }, }; window.onresize = (event) => { @@ -404,34 +418,24 @@ export class NewEventPage implements OnInit { }) } - openInicio() { - let input: any = document.querySelector('#new-inicio') - if (input) { - - input.click() - } - } - - openFim() { - let input: any = document.querySelector('#new-fim') - if (input) { - input.click() - } - } - - openLastOccurrence() { - let input: any = document.querySelector('#last-occurrence') - if (input) { - input.click() - } - } - @XTracerAsync({name:'Mobile/create-event', bugPrint: true}) async save_v2(tracing?: TracingType) { this.injectValidation() this.runValidation() + let i =0; + this.postEvent.EventRecurrence.daysOfWeek = [] + for(const [key, value] of Object.entries(this.daysOfWeek)) { + if(value) { + if(!this.postEvent.EventRecurrence.daysOfWeek.includes(i)) { + this.postEvent.EventRecurrence.daysOfWeek.push(i); + } + } + i++ + } + + console.log(new Date(this.postEvent.StartDate).getTime()) console.log(new Date(this.postEvent.EndDate).getTime()) console.log(new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime() ? 'ok' : null) @@ -472,21 +476,6 @@ export class NewEventPage implements OnInit { } - // //This method return calendar onwner user id - // selectedCalendarUserId() { - - // if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') { - // return this.eventService.calendarNamesType[this.CalendarName]['OwnerId'] - - // } else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') { - - // return this.eventService.calendarNamesType[this.CalendarName]['OwnerId'] - - // } else { - // return '11:11' - // } - // } - async changeAgenda() { const result = await this.agendaDataRepository.geCalendars() @@ -591,34 +580,6 @@ export class NewEventPage implements OnInit { } - - // Deve ser removido posteriormente - eventToaproveBody(event, calendarId, role, userId, attachments) { - let toAproveObject = { - "EventProcess": { - "Body": event.Body, - "Location": event.Location, - "Subject": event.Subject, - "StartDate": event.StartDate, - "EndDate": event.EndDate, - "Status": "Active", - "IsAllDayEvent": event.IsRecurring, - "EventType": event.EventType, - "ParticipantsList": event.Attendees, - "EventRecurrence": event.EventRecurrence, - "HasAttachments": event.HasAttachments, - "CalendarId": calendarId, - "Role": role, - "wxUserID": userId, - "TimeZone": "W. Central Africa Standard Time" - }, - "Attachments": attachments, - "InstanceID": "AGD_" + this.loggeduser.UserName + "_" + this.processeService.generateInstaceFormatDate() - } - - return toAproveObject; - } - async fetchContacts(filter: string) { const result = await this.AgendaService.setDefaultParticipants() diff --git a/src/main.ts b/src/main.ts index 73682e6a0..6425d570c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -185,3 +185,4 @@ defineCustomElements(window); // console.log('Column:', parsedError.columnNumber); // fetchAndHandleSourceMap(matches); + diff --git a/version/git-version.ts b/version/git-version.ts index 11db41437..78dd991a1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "661b449fb", - "SHA": "661b449fb4818c27a829f1ba91b0d73b2eb1e3b5", + "shortSHA": "ac1f01b15", + "SHA": "ac1f01b15b042162bee58c4d23ee56c1070553b6", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Oct 18 16:22:45 2024 +0100'", - "lastCommitMessage": "improve setup meeting from task", - "lastCommitNumber": "6103", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-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\tdeleted: src/app/Rules/aprove-event.service.spec.ts\n\tdeleted: src/app/Rules/aprove-event.service.ts\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/home/home.page.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features-routing.module.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.module.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.html\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.scss\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.spec.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/module/agenda/utils.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/events.service.ts\n\tdeleted: src/app/services/hardware-go-back.service.spec.ts\n\tdeleted: src/app/services/hardware-go-back.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tdeleted: src/app/services/offline-manager.service.spec.ts\n\tdeleted: src/app/services/offline-manager.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/ui/agenda/agenda.page.ts\n\tmodified: src/app/ui/agenda/component/approve-event/approve-event.page.ts\n\tmodified: src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/ui/agenda/component/event-list/event-list.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/component/view-event/view-event.page.ts\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/view-event/view-event.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.ts\n\tmodified: version/git-version.ts", + "lastCommitTime": "'Mon Oct 21 10:15:48 2024 +0100'", + "lastCommitMessage": "remove uunsed", + "lastCommitNumber": "6104", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/app.module.ts\n\tmodified: src/app/core/agenda/use-case/event-set-default-participants.service.ts\n\tmodified: src/app/core/chat/usecase/room/room-set-last-message.service.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.scss\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/models/event.model.ts\n\tmodified: src/app/module/agenda/data/dto/eventDTOOutput.ts\n\tmodified: src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\tmodified: src/app/module/agenda/domain/mapper/EventDetailsMapper.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/ui/agenda/component/edit-event/edit-event.page.html\n\tmodified: src/app/ui/agenda/component/edit-event/edit-event.page.scss\n\tmodified: src/app/ui/agenda/component/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/component/event-list/event-list.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.html\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.scss\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.html\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.scss\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.html\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.scss\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts\n\tmodified: src/main.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file