diff --git a/src/app/models/entiry/agenda/eventToApproveDetails.ts b/src/app/models/entiry/agenda/eventToApproveDetails.ts index f4bf3c15f..0925a47a9 100644 --- a/src/app/models/entiry/agenda/eventToApproveDetails.ts +++ b/src/app/models/entiry/agenda/eventToApproveDetails.ts @@ -177,7 +177,11 @@ const EventToApproveDetails = z.object({ totalDocuments: z.number().nullable(), Documents: z.array(z.unknown()).nullable(), PrivateMessage: z.string().nullable(), - Attachments: z.array(Attachments) + Attachments: z.array(Attachments), + eventRecurrence: z.object({ + frequency: z.number(), + until: z.string() + }) }); diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index 43b6ef9a4..d75d2401e 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -9,7 +9,7 @@
- +
diff --git a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts index d6decb1c9..c4065bcde 100644 --- a/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts +++ b/src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts @@ -60,6 +60,8 @@ export class AgendaDataRepositoryService { try { const result = await this.agendaDataService.getEvent(id).pipe( map((response) => { + console.log('response',response) + console.log('ToDomain',EventToApproveDetailsMapper.toDomain(response.data)) return EventToApproveDetailsMapper.toDomain(response.data) }) ).toPromise() @@ -140,6 +142,7 @@ export class AgendaDataRepositoryService { } updateEvent(eventId, eventData, editAllEvent) { + console.log('Update event', eventData) let eventInput = { subject: eventData.Subject, body: eventData.Body.Text || eventData.Body, @@ -149,12 +152,13 @@ export class AgendaDataRepositoryService { isAllDayEvent: eventData.IsAllDayEvent, updateAllEvents: editAllEvent, type: this.utils.calendarTypeSeleted(eventData.Category), - category: this.utils.calendarCategorySeleted(eventData.CalendarName), + category: this.utils.calendarCategorySeleted(eventData.CalendarName || eventData.Agenda), recurrence: { frequency: this.utils.eventRecurence(eventData.EventRecurrence.frequency), until: ((eventData.EventRecurrence.until === "") ? this.utils.addOneHourToIsoString(eventData.EndDate.toISOString()) : eventData.EventRecurrence.until), } } + console.log('Update event post', eventInput) return this.agendaDataService.updateEvent(eventId, eventInput) } diff --git a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts index 91a7eb2f0..e96243112 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts +++ b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts @@ -113,7 +113,7 @@ export class EventToApproveDetailsMapper { "Status": "Active", "TimeZone": getTextInsideParentheses(new Date(dto.startDate)+ ''), "Agenda": category , - "EventType": "Reunião", + "EventType": dto.type, //"EventID": "", //"HasAttachments": true, "ParticipantsList": [ @@ -159,7 +159,11 @@ export class EventToApproveDetailsMapper { Stakeholders: '', CreateDate: '', ApplicationId: e.applicationId, - })) + })), + eventRecurrence: { + frequency: dto.eventRecurrence.frequency, + until: dto.eventRecurrence.until + } } } diff --git a/src/app/services/Repositorys/Agenda/model/enums.ts b/src/app/services/Repositorys/Agenda/model/enums.ts index 07ef3cd70..ad702044f 100644 --- a/src/app/services/Repositorys/Agenda/model/enums.ts +++ b/src/app/services/Repositorys/Agenda/model/enums.ts @@ -44,7 +44,7 @@ export enum EEventType export enum EAttendeeType { - Required, + Required = 1, Acknowledgment, Optional } diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/services/Repositorys/Agenda/utils.ts index 8c566e36e..d065821a1 100644 --- a/src/app/services/Repositorys/Agenda/utils.ts +++ b/src/app/services/Repositorys/Agenda/utils.ts @@ -78,10 +78,10 @@ export class Utils { let listupdate = [] documents.forEach(element => { let object = { - docId: element.docId, - sourceName: element.subject || element.sourceNames, + docId: element.docId || element.DocId, + sourceName: element.subject || element.sourceNames || element.Description, description: "", - applicationId: element.applicationId + applicationId: element.applicationId || element.ApplicationId } listupdate.push(object) diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html index 69dd0bee6..f594c3423 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html @@ -111,13 +111,13 @@ - + Reunião - + Viagem - + Conferência diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts index 61fa30bc9..3daccc65a 100644 --- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts @@ -168,7 +168,7 @@ export class EditEventToApprovePage implements OnInit { // description let body: any = this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') this.eventProcess.workflowInstanceDataFields.Body = body - this.eventProcess.workflowInstanceDataFields.Category = this.eventProcess.workflowInstanceDataFields.EventType + this.eventProcess.workflowInstanceDataFields.Category = this.setEventType(this.eventProcess.workflowInstanceDataFields.EventType) this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId this.loadedAttachments = res.value.Attachments; @@ -240,6 +240,7 @@ export class EditEventToApprovePage implements OnInit { setOtherData() { if (this.eventProcess.workflowInstanceDataFields.ParticipantsList) { this.eventProcess.workflowInstanceDataFields.ParticipantsList.forEach(e => { + console.log('intervenientes ', e) if (e.IsRequired) { this.taskParticipants.push(e); } else { @@ -260,7 +261,7 @@ export class EditEventToApprovePage implements OnInit { this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId - /* this.getAttachments() */ + /* this.getAttachments() */ } close() { @@ -371,7 +372,7 @@ export class EditEventToApprovePage implements OnInit { try { /* await this.eventsService.postEventToApproveEdit(event).toPromise() */ - this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event,false).subscribe((value) => { + this.agendaDataRepository.updateEvent(this.eventProcess.serialNumber, event, false).subscribe((value) => { console.log(value) }, ((error) => { console.log('edit event error: ', error) @@ -550,7 +551,7 @@ export class EditEventToApprovePage implements OnInit { if (JSON.stringify(restoredData) != "{}" && undefined != restoredData) { this.eventProcess = restoredData.eventProcess, - this.loadedAttachments = restoredData.attachment + this.loadedAttachments = restoredData.attachment // restore dater for date and hours picker this.restoreDatepickerData() @@ -580,11 +581,11 @@ export class EditEventToApprovePage implements OnInit { } deleteAttachment(attachment: Attachment, index) { - const id: any = this.loadedAttachments[index].id - console.log(this.loadedAttachments) - let update = this.removeItemById(this.loadedAttachments,id) - this.loadedAttachments = update; - this.deletedAttachmentsList.push(id) + const id: any = this.loadedAttachments[index].id + console.log(this.loadedAttachments) + let update = this.removeItemById(this.loadedAttachments, id) + this.loadedAttachments = update; + this.deletedAttachmentsList.push(id) } removeItemById(array, id) { @@ -650,4 +651,14 @@ export class EditEventToApprovePage implements OnInit { } + setEventType(eventType) { + var selectedEventType = { + 1: 'Meeting', + 2: 'Travel', + 3: 'Conference', + 4: 'Encontro' + } + return selectedEventType[eventType]; + } + } diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html index 38af057b0..3ca31acec 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html @@ -80,13 +80,13 @@ - + Reunião - + Viagem - + Conferência diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index d5538ec34..be1f95cf3 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -159,7 +159,6 @@ export class EditEventToApproveComponent implements OnInit { console.log('Loaded Event', res.value) this.eventProcess = res.value as any - this.eventProcess.workflowInstanceDataFields.Category = res.value.workflowInstanceDataFields.EventType this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate); @@ -171,6 +170,7 @@ export class EditEventToApproveComponent implements OnInit { this.Location = this.eventProcess.workflowInstanceDataFields.Location this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId + this.eventProcess.workflowInstanceDataFields.Category = this.setEventType(this.eventProcess.workflowInstanceDataFields.EventType) this.loadedAttachments = res.value.Attachments /* this.getAttachments() @@ -529,7 +529,14 @@ export class EditEventToApproveComponent implements OnInit { await modal.present(); } - - + setEventType(eventType) { + var selectedEventType = { + 1: 'Meeting', + 2: 'Travel', + 3: 'Conference', + 4: 'Encontro' + } + return selectedEventType[eventType]; + } }