diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 51526d5c1..a1f401c00 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -107,13 +107,13 @@ - + Reunião - + Viagem - + Conferência diff --git a/src/app/services/Repositorys/Agenda/utils.ts b/src/app/services/Repositorys/Agenda/utils.ts index 70aa303b5..67024397a 100644 --- a/src/app/services/Repositorys/Agenda/utils.ts +++ b/src/app/services/Repositorys/Agenda/utils.ts @@ -52,9 +52,9 @@ export class Utils { calendarTypeSeleted(calendarName) { var selectedType = { - 'Reunião': 1, - 'Viagem': 2, - 'Conferência': 3, + 'Meeting': 1, + 'Travel': 2, + 'Conference': 3, 'Encontro': 1 } return selectedType[calendarName]; 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 a58c9c342..69dd0bee6 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 @@ -242,7 +242,7 @@ --> -
@@ -270,7 +270,7 @@
-
+ -->
@@ -352,7 +352,7 @@

- {{document.subject}} + {{document.subject || document.Description || document.SourceName || document.sourceName || 'Sem título'}} 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 364d7c572..2034a1c42 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 @@ -72,6 +72,7 @@ export class EditEventToApprovePage implements OnInit { loadedAttachments: any[] = [] eventProcess = { + Attachments: [], serialNumber: "", taskStartDate: "", workflowInstanceDataFields: { @@ -172,7 +173,6 @@ export class EditEventToApprovePage implements OnInit { this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId this.loadedAttachments = res.value.Attachments; console.log(this.loadedAttachments) - this.getAttachments() this.setOtherData() @@ -260,7 +260,7 @@ export class EditEventToApprovePage implements OnInit { this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId - this.getAttachments() + /* this.getAttachments() */ } close() { @@ -538,7 +538,8 @@ export class EditEventToApprovePage implements OnInit { this.getDatepickerData() window['temp.path:/shared/agenda/edit-event-to-approve.ts'] = { - eventProcess: this.eventProcess + eventProcess: this.eventProcess, + attachment: this.loadedAttachments } } @@ -548,7 +549,8 @@ export class EditEventToApprovePage implements OnInit { const restoredData = window['temp.path:/shared/agenda/edit-event-to-approve.ts'] if (JSON.stringify(restoredData) != "{}" && undefined != restoredData) { - this.eventProcess = restoredData.eventProcess + this.eventProcess = restoredData.eventProcess, + this.loadedAttachments = restoredData.attachment // restore dater for date and hours picker this.restoreDatepickerData() @@ -578,12 +580,15 @@ export class EditEventToApprovePage implements OnInit { } deleteAttachment(attachment: Attachment, index) { - if (this.loadedEventAttachments[index].Id) { - const id: any = this.loadedEventAttachments[index].Id - console.log(attachment) - this.loadedAttachments[index]['action'] = 'delete' + 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) { + return array.filter(item => item.id !== id); } async getDoc() { diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html index 165b6878e..50a635cdf 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -104,13 +104,13 @@ - + Reunião - + Viagem - + Conferência 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 e97cd86a2..848e12699 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -114,7 +114,6 @@ export class EditEventPage implements OnInit { } ngOnInit() { - this.postEvent.Category = 'Reunião'; console.log(this.postEvent) this._postEvent = this.postEvent this.allDayCheck = this.postEvent.IsAllDayEvent; @@ -583,21 +582,17 @@ export class EditEventPage implements OnInit { } deleteAttachment(attachmentID: string, index) { - + console.log(JSON.stringify(this.loadedEventAttachments)) const id: any = this.loadedEventAttachments[index].Id - - this.loadedEventAttachments[index]['remove'] = true - console.log(id) + console.log(JSON.stringify(id)) + let update = this.removeItemById(this.loadedEventAttachments, id) + this.loadedEventAttachments = update + console.log( update) this.deletedAttachmentsList.push(id) + } - /* if (id == 'add') { - this.loadedEventAttachments = this.loadedEventAttachments.filter((e, i) => i != index) - } else { - this.loadedEventAttachments[index]['remove'] = true - console.log(id) - this.deletedAttachmentsList.push(id) - } */ - + removeItemById(array, id) { + return array.filter(item => item.Id !== id); } async getDoc() {