From ef05948e6c842b8a4ee4426b5ea6fa62530253bf Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 14 Jul 2021 16:49:56 +0100 Subject: [PATCH] save --- src/app/models/event.model.ts | 2 +- .../agenda/edit-event/edit-event.page.html | 68 ++++++------ .../agenda/edit-event/edit-event.page.ts | 2 +- .../agenda/new-event/new-event.page.html | 74 ++++++------- .../pages/agenda/new-event/new-event.page.ts | 6 +- .../approve-event/approve-event.page.ts | 1 - .../book-meeting-modal.page.html | 100 +++++++++--------- .../book-meeting-modal.page.ts | 44 ++++---- .../expedient-task-modal.page.ts | 58 +++++----- .../edit-event-to-approve.page.ts | 19 ++-- .../agenda/edit-event/edit-event.page.html | 2 +- .../agenda/edit-event/edit-event.page.ts | 6 +- .../agenda/new-event/new-event.page.html | 2 +- .../shared/agenda/new-event/new-event.page.ts | 10 +- .../edit-event.page.html | 12 +-- .../edit-event-to-approve/edit-event.page.ts | 49 +++++---- 16 files changed, 231 insertions(+), 224 deletions(-) diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 3565594eb..2415eeb8f 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -19,7 +19,7 @@ export class Event{ AppointmentState: number; TimeZone: string; Organizer: string; - Categories: string[]; + Categories: string; HasAttachments: boolean; EventRecurrence?: EventRecurrence; 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 66820d31f..1622a79a1 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -3,7 +3,7 @@
- +
@@ -14,13 +14,13 @@
- +
- +
@@ -53,7 +53,7 @@
- +
@@ -61,9 +61,9 @@
Oficial Pessoal @@ -74,23 +74,23 @@
- {{ postEvent.Categories[0] }} + {{ postEvent.Categories }}
Campo obrigatório.
- +
- Reunião Viagem @@ -103,27 +103,27 @@
- {{ postEvent.Categories[0] }} + {{ postEvent.Categories}}
Campo obrigatório.
- +
- @@ -137,14 +137,14 @@
- @@ -161,28 +161,28 @@ {{recurring.Description}}
- +
- @@ -252,16 +252,16 @@
Adicionar documentos -
+
- -
+ +
-

- {{document.SourceName}} +

+ {{document.SourceName}} @@ -277,11 +277,11 @@ -

+
- + @@ -298,7 +298,7 @@ (dynamicSetIntervenient)="dynamicSetIntervenient($event)" > -
+
@@ -306,4 +306,4 @@
- \ No newline at end of file + 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 a5585de15..1ea220083 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -162,7 +162,7 @@ export class EditEventPage implements OnInit { CalendarName: new FormControl(this.postEvent.CalendarName, [ Validators.required ]), - Categories: new FormControl(this.postEvent.Categories[0], [ + Categories: new FormControl(this.postEvent.Categories, [ Validators.required ]), IsRecurring: new FormControl(this.postEvent.IsRecurring, [ diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index c4cbb7eaf..c7197f152 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -13,7 +13,7 @@
- +
@@ -43,7 +43,7 @@ - +
- +
@@ -64,9 +64,9 @@
Oficial Pessoal @@ -89,9 +89,9 @@
- Reunião Viagem @@ -104,26 +104,26 @@ - +
- @@ -131,14 +131,14 @@
- +
-
- +
- {{recurring.Description}}
- +
-
- +
@@ -217,7 +217,7 @@
- +
@@ -245,20 +245,20 @@
- +
- + - +
- +
@@ -266,27 +266,27 @@
Adicionar documentos -
+
- -
+ +
-

- {{document.Assunto}} - {{document.appName}} +

+ {{document.Assunto}} + {{document.appName}} -

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

-
+
@@ -302,4 +302,4 @@ - \ No newline at end of file + 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 3658c257d..79a86ffc0 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -114,7 +114,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: ['Reunião'], + Categories: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -136,7 +136,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: ['Reunião'], + Categories: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -207,7 +207,7 @@ export class NewEventPage implements OnInit { Date: new FormControl(this.dateValid, [ Validators.required ]), - Categories: new FormControl(this.postEvent.Categories[0], [ + Categories: new FormControl(this.postEvent.Categories, [ Validators.required ]), participantes: new FormControl(this.taskParticipants, [ diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 055a89fc5..3420657e9 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -293,7 +293,6 @@ export class ApproveEventPage implements OnInit { modal.onDidDismiss().then(res => { this.getTask(); - this.goBack(); }); } 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 be0d84f1c..551b901e2 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 @@ -8,7 +8,7 @@
- +
@@ -52,11 +52,11 @@
- Oficial Pessoal @@ -85,11 +85,11 @@
- - Reunião Viagem @@ -100,7 +100,7 @@ - + Reunião @@ -116,7 +116,7 @@ - +
@@ -127,10 +127,10 @@
- - + - - @@ -166,30 +166,30 @@
- - + - - @@ -204,15 +204,15 @@
- Não se repete Repete @@ -224,9 +224,9 @@ @@ -307,21 +307,21 @@
Anexar Documentos -
+
-
+
-

- {{document.Assunto}} - {{document.appName}} +

+ {{document.Assunto}} + {{document.appName}} -

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

@@ -331,12 +331,12 @@
- - { - + if(data) { data = data['data']; @@ -336,14 +336,14 @@ export class BookMeetingModalPage implements OnInit { this.setIntervenientCC(newAttendeesCC); } }); - + } else { this.showAttendees = true; } } async addParticipantsCc() { - + this.adding = "CC"; if(window.innerWidth <= 800) { @@ -361,7 +361,7 @@ export class BookMeetingModalPage implements OnInit { await modal.present(); modal.onDidDismiss().then((data) => { - + if(data){ data = data['data']; @@ -414,7 +414,7 @@ export class BookMeetingModalPage implements OnInit { removeAttachment(index: number){ this.documents = this.documents.filter( (e, i) => index != i); } - + validateFormInputs(){ let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ @@ -434,10 +434,10 @@ export class BookMeetingModalPage implements OnInit { setIntervenient(data){ this.taskParticipants = data; } - + setIntervenientCC(data){ this.taskParticipantsCc = data; } -} \ No newline at end of file +} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 15a84edc6..b0cab8f2e 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -56,7 +56,7 @@ export class ExpedientTaskModalPage implements OnInit { taskDate: Date; taskDescription: string; - + loadedAttachments:any; documents:SearchDocument[] = []; @@ -104,7 +104,7 @@ export class ExpedientTaskModalPage implements OnInit { this.loggeduser = userAuth.ValidatedUser; this.task = this.navParams.get('task'); - + this.taskType = this.navParams.get('taskAction'); this.selectedTypes = ['99999850']; @@ -123,7 +123,7 @@ export class ExpedientTaskModalPage implements OnInit { NumberPDPP: this.task.workflowInstanceDataFields.DispatchNumber, }; - + this.postData.DispatchFolder = this.dispatchFolder; this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ @@ -139,7 +139,7 @@ export class ExpedientTaskModalPage implements OnInit { ngOnInit() { console.log(this.postData); - + this.taskDate = new Date(this.task.taskStartDate); if(!this.task.hasOwnProperty('isEvent')) { this.getAttachments(); @@ -162,7 +162,7 @@ export class ExpedientTaskModalPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } - + getSubjectType() { this.processes.GetSubjectType().subscribe(res=>{ console.log(res); @@ -197,7 +197,7 @@ export class ExpedientTaskModalPage implements OnInit { // CalendarName: new FormControl(this.postEvent.CalendarName, [ // Validators.required // ]), - // Categories: new FormControl(this.postEvent.Categories[0], [ + // Categories: new FormControl(this.postEvent.Categories, [ // Validators.required // ]), // IsRecurring: new FormControl(this.postEvent.IsRecurring, [ @@ -209,7 +209,7 @@ export class ExpedientTaskModalPage implements OnInit { }) } - // + // async saveTask(){ if(this.loggeduser.Profile == 'MDGPR') { @@ -239,7 +239,7 @@ export class ExpedientTaskModalPage implements OnInit { UserType: val.IsRequired?"I": "CC" }; }) - + let docs = { ProcessInstanceID: "", Attachments: [] @@ -271,7 +271,7 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, AttachmentList: docs, } - + console.log(this.postData); try { @@ -279,7 +279,7 @@ export class ExpedientTaskModalPage implements OnInit { this.taskResult = await this.processes.postDespatcho(this.postData).toPromise(); await this.toastService.successMessage('Processo efetuado'); this.modalController.dismiss(); - + } catch (error) { await this.toastService.badRequest('Processo não efetuado') } finally { @@ -288,7 +288,7 @@ export class ExpedientTaskModalPage implements OnInit { console.log('this.taskResult', this.taskResult); break; - + case '1': this.postData = { DistributionType: "Paralelo", @@ -299,7 +299,7 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, AttachmentList: docs } - + let action_parecer = { "serialNumber": this.task.serialNumber, "action": "Tratado", @@ -313,7 +313,7 @@ export class ExpedientTaskModalPage implements OnInit { this.taskResult = await this.processes.postParecer(this.postData).toPromise(); await this.toastService.successMessage('Pedido enviado'); this.modalController.dismiss(action_parecer); - + } catch (error) { await this.toastService.badRequest('Processo não efetuado') } finally { @@ -324,7 +324,7 @@ export class ExpedientTaskModalPage implements OnInit { this.postData = { DistributionType: "Paralelo", CountryCode: 'AO', - Priority: this.postData.Priority, + Priority: this.postData.Priority, UserEmail: this.loggeduser.Email, UsersSelected: attendees, DispatchFolder: this.dispatchFolder, @@ -372,7 +372,7 @@ export class ExpedientTaskModalPage implements OnInit { AttachmentList: docs, } console.log(this.postData); - + let action_despacho_pr = { "serialNumber": this.task.serialNumber, "action": "Tratado", @@ -394,7 +394,7 @@ export class ExpedientTaskModalPage implements OnInit { console.log('this.taskResult', this.taskResult); break; - + case '1': this.postData = { DistributionType: "Paralelo", @@ -405,7 +405,7 @@ export class ExpedientTaskModalPage implements OnInit { DispatchFolder: this.dispatchFolder, AttachmentList: docs } - + let action_parecer_pr = { "serialNumber": this.task.serialNumber, "action": "Tratado", @@ -453,11 +453,11 @@ export class ExpedientTaskModalPage implements OnInit { cssClass: 'attendee modal modal-desktop', backdropDismiss: false }); - + await modal.present(); - + modal.onDidDismiss().then((data) => { - + if(data){ data = data['data']; @@ -472,11 +472,11 @@ export class ExpedientTaskModalPage implements OnInit { this.showAttendees = true } } - + async setIntervenient(data) { this.taskParticipants = data; } - + async setIntervenientCC(data) { this.taskParticipantsCc = data; } @@ -485,7 +485,7 @@ export class ExpedientTaskModalPage implements OnInit { this.adding = 'intervenient' this.openAttendees(); } - + async addParticipantsCc() { this.adding = "CC"; this.openAttendees(); @@ -507,14 +507,14 @@ export class ExpedientTaskModalPage implements OnInit { cssClass: 'discart-expedient-modal', backdropDismiss: false }); - + await modal.present(); modal.onDidDismiss().then(res=>{ if(res['data']=='close'){ console.log('Expedient Discard closed'); this.modalController.dismiss(res['data']) } - + }); } @@ -523,13 +523,13 @@ export class ExpedientTaskModalPage implements OnInit { if(this.adding == "intervenient"){ this.taskParticipants = data; } else if (this.adding == "CC") { - + this.taskParticipantsCc = data; } - + } - + async closeComponent() { this.showAttendees = false; @@ -586,4 +586,4 @@ export class ExpedientTaskModalPage implements OnInit { } -} \ No newline at end of file +} 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 d4b0fd0c3..2be4cbc91 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 @@ -210,7 +210,7 @@ export class EditEventToApprovePage implements OnInit { Validators.required, ]), //CalendarName: new FormControl(this.postEvent.CalendarName), - // Categories: new FormControl(this.postEvent.Categories[0], [ + // Categories: new FormControl(this.postEvent.Categories, [ // Validators.required // ]), dateStart: new FormControl(this.dateStart, [ @@ -253,26 +253,25 @@ export class EditEventToApprovePage implements OnInit { }) const event: any = { - Agenda: this.eventProcess.workflowInstanceDataFields.Agenda, + SerialNumber: this.eventProcess.serialNumber, Body: this.eventProcess.workflowInstanceDataFields.Body, - EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, - EventType: this.eventProcess.workflowInstanceDataFields.EventType, - IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent, - IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring, Location: this.eventProcess.workflowInstanceDataFields.Location, Subject: this.eventProcess.workflowInstanceDataFields.Subject, - serialNumber: this.eventProcess.serialNumber, StartDate: this.eventProcess.workflowInstanceDataFields.StartDate, - MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail, + EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, + ReviewUserComment: '', MDName: this.eventProcess.workflowInstanceDataFields.MDName, + MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail, + IsAllDayEvent: this.eventProcess.workflowInstanceDataFields.IsAllDayEvent, + Status: null, + EventType: this.eventProcess.workflowInstanceDataFields.EventType, + IsRecurring: this.eventProcess.workflowInstanceDataFields.IsRecurring, Message: this.eventProcess.workflowInstanceDataFields.Message, EventRecurrence: { Type: this.eventProcess.workflowInstanceDataFields.OccurrenceType, LastOccurrence: this.eventProcess.workflowInstanceDataFields.LastOccurrence, }, ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, - Private: false, - ReviewUserComment: '' } 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 d74e2f0a0..9829685c8 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.html +++ b/src/app/shared/agenda/edit-event/edit-event.page.html @@ -87,7 +87,7 @@ - + Reunião 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 2b73bdb85..b4d7149c9 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -204,7 +204,7 @@ export class EditEventPage implements OnInit { Validators.required, ]), CalendarName: new FormControl(this.postEvent.CalendarName), - Categories: new FormControl(this.postEvent.Categories[0], [ + Categories: new FormControl(this.postEvent.Categories, [ Validators.required ]), dateStart: new FormControl(this.dateStart, [ @@ -268,13 +268,13 @@ export class EditEventPage implements OnInit { "EventId": this.postEvent.EventId, "CalendarDestinationName": this.postEvent.CalendarName, } - + console.log(body); try { await this.eventsService.changeAgenda(body).toPromise(); } catch (e) {} - + } this.showLoader = false; this.toastService.successMessage() diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 2f1add160..0102cd331 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -74,7 +74,7 @@ - + Reunião 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 a19dbb451..7506764cd 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -140,7 +140,7 @@ export class NewEventPage implements OnInit { if(!this.restoreTemporaryData()){ // clear - + this.eventBody = { BodyType : "1", Text : ""}; this.postEvent.Body = this.eventBody; @@ -169,7 +169,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: ['Reunião'], + Categories: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -191,7 +191,7 @@ export class NewEventPage implements OnInit { AppointmentState: 0, TimeZone: '', Organizer: '', - Categories: ['Reunião'], + Categories: 'Reunião', HasAttachments: false, EventRecurrence: {Type:'-1'}, }; @@ -238,7 +238,7 @@ export class NewEventPage implements OnInit { Validators.required, ]), CalendarName: new FormControl(this.postEvent.CalendarName), - Categories: new FormControl(this.postEvent.Categories[0], [ + Categories: new FormControl(this.postEvent.Categories, [ Validators.required ]), dateStart: new FormControl(this.postEvent.StartDate, [ @@ -423,7 +423,7 @@ export class NewEventPage implements OnInit { loader.remove() this.showLoader = false this.toastService.badRequest('Evento não criado') - + }); } 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 41dd1d694..0650cfbdf 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 @@ -77,7 +77,7 @@ @@ -116,7 +116,7 @@ @@ -232,7 +232,7 @@
-
+
@@ -241,7 +241,7 @@
-
+
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 2ce9df981..f0392f42d 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 @@ -13,6 +13,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../models/event.model'; import { NgxMatDateFormats, NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { NavigationExtras, Router } from '@angular/router'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -94,7 +95,8 @@ export class EditEventToApproveComponent implements OnInit { segment:string = "true"; profile:string; eventAttendees: EventPerson[]; - + startDate: Date; + endDate: Date; loadedEventAttachments: Attachment[]; taskParticipants: any = []; taskParticipantsCc: any = []; @@ -115,31 +117,18 @@ export class EditEventToApproveComponent implements OnInit { private processes:ProcessesService, private animationController: AnimationController, private toastService: ToastService, + private router:Router, ) { // Edit event to approve this.serialNumber = this.navParams.get('serialNumber'); - this.isEventEdited = false; - - - } ngOnInit() { this.getTask() - console.log('HERE'); this.getRecurrenceTypes(); - - this.selectedRecurringType = this.eventProcess.workflowInstanceDataFields.OccurrenceType; - - setTimeout(() => { - this.selectedRecurringType = this.eventProcess.workflowInstanceDataFields.OccurrenceType; - console.log(this.selectedRecurringType); - }, 1000); - - } async getTask() { @@ -149,6 +138,9 @@ export class EditEventToApproveComponent implements OnInit { this.eventProcess = result + this.startDate = new Date(this.eventProcess.workflowInstanceDataFields.StartDate); + this.endDate = new Date(this.eventProcess.workflowInstanceDataFields.EndDate); + // description let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') this.eventProcess.workflowInstanceDataFields.Body = body @@ -205,10 +197,26 @@ export class EditEventToApproveComponent implements OnInit { } } + goBack() { + let navigationExtras: NavigationExtras = { + queryParams: { + "eventos": true, + } + }; + if( window.innerWidth < 801) { + this.router.navigate(['/home/gabinete-digital/event-list']); + } else { + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + + } + close() { this.modalController.dismiss(); + console.log('CLOSE'); + } save() { @@ -232,8 +240,8 @@ export class EditEventToApproveComponent implements OnInit { Body: this.eventProcess.workflowInstanceDataFields.Body, Location: this.eventProcess.workflowInstanceDataFields.Location, Subject: this.eventProcess.workflowInstanceDataFields.Subject, - StartDate: this.eventProcess.workflowInstanceDataFields.StartDate, - EndDate: this.eventProcess.workflowInstanceDataFields.EndDate, + StartDate: this.startDate, + EndDate: this.endDate, ReviewUserComment: '', MDName: this.eventProcess.workflowInstanceDataFields.MDName, MDEmail: this.eventProcess.workflowInstanceDataFields.MDEmail, @@ -277,8 +285,8 @@ export class EditEventToApproveComponent implements OnInit { }) - - //this.modalController.dismiss(); + this.modalController.dismiss(); + this.goBack(); } @@ -326,8 +334,9 @@ export class EditEventToApproveComponent implements OnInit { addParticipants(){ this.adding = 'intervenient' - this.openAttendees(); + console.log('LOGS'); + } addParticipantsCC(){