diff --git a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts index c0e9c231f..2a2369739 100644 --- a/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts +++ b/src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts @@ -74,6 +74,7 @@ export class EventToApproveDetailsMapper { EmailAddress: e.emailAddress, IsRequired: e.attendeeType == '0' ? true : false, UserType: "GD", + wxUserId: e.wxUserId })) ], //"EventOrganizer": "{\"$type\":\"GabineteDigital.k2RESTidentifier_EventPerson, GabineteDigital, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null\",\"EmailAddress\":\"agenda.mdgpr@gabinetedigital.local\",\"Name\":\"Agenda do Ministro e Director do Gabinete do PR\",\"IsRequired\":true}", @@ -103,11 +104,11 @@ export class EventToApproveDetailsMapper { "Documents": null, "PrivateMessage": null, Attachments: dto.attachments.map( e => ({ - DocId: '', - Description: '', + DocId: e.docId, + Description: e.sourceName, Stakeholders: '', CreateDate: '', - ApplicationId: 0, + ApplicationId: e.applicationId, })) } } diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index a68888e6f..f743d9924 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -84,6 +84,7 @@ export class ApproveEventPage implements OnInit { if(res.isOk()) { this.loadedEvent = res.value; + console.log('attachment',res.value) this.loadedAttachments = this.loadedEvent.Attachments this.today = new Date(res.value.workflowInstanceDataFields.StartDate); // 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 252b4559c..fa4668f76 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 @@ -350,9 +350,9 @@
- +

- {{document.SourceName}} + {{document.Description}} Correspondencia AccoesPresidenciais ArquivoDespachoElect 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 24645c2ce..bc6f80262 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 @@ -155,6 +155,7 @@ export class EditEventToApprovePage implements OnInit { async getTask() { const res: any = await this.agendaDataRepository.getEventToApproveById(this.serialNumber) + console.log('evento to apro to edit', res.value) this.eventProcess = res.value; this.eventProcess.workflowInstanceDataFields.LastOccurrence = new Date(this.eventProcess.workflowInstanceDataFields.LastOccurrence) @@ -167,6 +168,8 @@ export class EditEventToApprovePage implements OnInit { this.eventProcess.workflowInstanceDataFields.Category = this.eventProcess.workflowInstanceDataFields.EventType this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId + this.loadedAttachments = res.value.Attachments; + console.log(this.loadedAttachments) this.getAttachments() this.setOtherData() @@ -340,11 +343,6 @@ export class EditEventToApprovePage implements OnInit { } }) - console.log(this.eventProcess.workflowInstanceDataFields.ParticipantsList) - - return - - const event: EventToApproveEdit = { SerialNumber: this.eventProcess.serialNumber, Body: this.eventProcess.workflowInstanceDataFields.Body, @@ -377,6 +375,25 @@ export class EditEventToApprovePage implements OnInit { console.log('edit event error: ', error) })); + this.agendaDataRepository.addEventAttendee(this.eventProcess.serialNumber, { attendees: this.attendeesAdded(this.eventProcess.workflowInstanceDataFields.ParticipantsList) }).subscribe((value) => { + console.log(value) + }, ((error) => { + console.log('add Attendee error: ', error) + })); + + this.agendaDataRepository.addEventAttachment(this.eventProcess.serialNumber, { attachments: this.documentAdded(this.loadedAttachments) }).subscribe((value) => { + console.log(value) + }, ((error) => { + this.showLoader = false + console.log('add attachment error: ', error) + })); + + this.agendaDataRepository.removeEventAttachment(this.eventProcess.serialNumber, { attachments: [] }).subscribe((value) => { + console.log(value) + }, ((error) => { + this.showLoader = false + console.log('remove attachment error: ', error) + })); this.close() @@ -408,6 +425,39 @@ export class EditEventToApprovePage implements OnInit { } + documentAdded(documents: any[]) { + console.log('document added', documents) + return documents.map((element) => { + return { + docId: parseInt(element.SourceId), + sourceName: element.SourceName, + description: "", + applicationId: parseInt(element.ApplicationId) + }; + }); + + } + + atendeesSeletedType(type) { + var selectedType = { + 'true': 1, + 'false': 2, + 'other': 3, + } + return selectedType[type]; + } + + attendeesAdded(taskParticipants: any[]) { + return taskParticipants.map((e) => { + return { + name: e.Name, + emailAddress: e.EmailAddress, + attendeeType: this.atendeesSeletedType(JSON.stringify(e.IsRequired)), + wxUserId: e.wxUserId, + } + }); + } + async gravasAction() { await this.save(); @@ -522,7 +572,7 @@ export class EditEventToApprovePage implements OnInit { } deleteAttachment(attachment: Attachment, index) { - + console.log(attachment) this.loadedAttachments[index]['action'] = 'delete' } @@ -541,7 +591,7 @@ export class EditEventToApprovePage implements OnInit { if(res){ const data: SearchList = res.data.selected; - + console.log(data) const DocumentToSave: any = { SourceTitle: data.Assunto, ParentId: this.InstanceId, 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 0fbecde00..27154aff5 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -631,6 +631,7 @@ export class EditEventPage implements OnInit { this.loadedEventAttachments = this.loadedEventAttachments.filter((e, i) => i != index) } else { this.loadedEventAttachments[index]['remove'] = true + console.log(id) this.deletedAttachmentsList.push(id) } diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 1d6e76404..3a340974d 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -166,11 +166,17 @@ export class ViewEventPage implements OnInit { deleteEvent_v2() { console.log(this.loadedEvent.EventId) + const loader = this.toastService.loading() this.agendaDataRepository.deleteEvent(this.loadedEvent.EventId).subscribe(() => { console.log() - },((error) => { + this.httpErrorHandle.httpsSucessMessagge('delete event') + this.close(); + },(error) => { console.log('delete event error: ',error) - })) + this.httpErrorHandle.httpStatusHandle(error) + },()=>{ + loader.remove(); + }); } async deleteEvent() {