From 6a3fda279e7dbcf36f2844a30fba0d01bd070adf Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 4 May 2021 15:44:48 +0100 Subject: [PATCH] Edit process to approve --- src/app/home/home-routing.module.ts | 9 ++++ src/app/pages/agenda/agenda.page.html | 1 + src/app/pages/agenda/agenda.page.ts | 3 +- .../agenda/edit-event/edit-event.page.ts | 51 +++++++++--------- .../pages/agenda/new-event/new-event.page.ts | 1 + .../approve-event-modal.page.html | 33 +++++++----- .../approve-event-modal.page.scss | 53 +++++++++++++++++++ .../approve-event-modal.page.ts | 42 ++++++++++++--- .../event-list/event-list.page.html | 4 +- .../event-list/event-list.page.ts | 4 +- .../approve-event.component.html | 3 +- .../approve-event/approve-event.component.ts | 6 ++- .../event-list/event-list.component.html | 2 +- .../edit-event.page.html | 45 ++++++++-------- .../edit-event.page.scss | 10 ++-- .../edit-event-to-approve/edit-event.page.ts | 38 +++++++------ 16 files changed, 203 insertions(+), 102 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 8a8e01dc6..2bc75c478 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -136,6 +136,15 @@ const routes: Routes = [ }, ] }, + { + path: 'events-to-approve', + children: [ + { + path: '', + loadChildren: ()=> import('../shared/gabinete-digital/edit-event-to-approve/edit-event.module') + } + ] + } ] }, { diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index a8ec8846c..dda1b4b45 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -469,6 +469,7 @@ { - - if(data){ - data = data['data']; - const newAttendees: EventPerson[] = data['taskParticipants']; - const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + const modal = await this.modalController.create({ + component: AttendeesPage, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc + }, + cssClass: 'attendee', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then((data) => { + + if(data){ + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); + } + }); + - this.setIntervenient(newAttendees); - this.setIntervenientCC(newAttendeesCC); - } - }); - } } setIntervenient(data){ 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 b7e0061a6..9b152a129 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -153,6 +153,7 @@ export class NewEventPage implements OnInit { async openAttendees() { + const modal = await this.modalController.create({ component: AttendeesPage, componentProps: { diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html index a7efa5476..304113ecc 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html @@ -8,8 +8,8 @@
-
- +
+
@@ -72,17 +72,26 @@
-
- -

Documentos Anexados

- - -

Receita por Natureza

-

{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}

- - +
+ + + +

+ {{document.SourceName}} + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect + + + + +

+

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

+ + -
+
+ -
+
@@ -19,7 +19,6 @@
- {{eventProcess.workflowInstanceDataFields.Subject}}
@@ -150,7 +149,7 @@
-
+
@@ -171,7 +170,7 @@
-
+
@@ -189,23 +188,23 @@
-
- - - -

- {{document.SourceName}} - Correspondencia - AccoesPresidenciais - ArquivoDespachoElect - - - - -

-

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

- - +
+ + + +

+ {{document.SourceName}} + Correspondencia + AccoesPresidenciais + ArquivoDespachoElect + + + + +

+

{{document.Stakeholders}} {{document.CreateDate | date: 'dd-MM-yy'}}

+ +
@@ -217,13 +216,13 @@
- + >
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss index de650114b..f52dd4e07 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss @@ -4,11 +4,11 @@ display: none; } -.content{ - margin: 0; - float: left; - border-left: 1px solid #d8d8d8 !important; -} + .content { + margin: 0; + float: left; + border-right: 1px solid #d8d8d8 !important; + } .main-header{ font-family: Roboto; background-color: #fff; 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 784a2cf25..1ec8d744d 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 @@ -29,7 +29,8 @@ export class EditEventToApproveComponent implements OnInit { Agenda: '', EndDate: '', Location: '', - Subject: '' + Subject: '', + InstanceId: '' } } @@ -63,17 +64,12 @@ export class EditEventToApproveComponent implements OnInit { ) { this.serialNumber = this.navParams.get('serialNumber'); - this.postEvent = this.navParams.get('event'); - this.profile = this.navParams.get('profile'); - this.InstanceId = this.navParams.get('InstanceId') + // this.profile = this.navParams.get('profile'); this.isEventEdited = false; - console.log(this.eventProcess.workflowInstanceDataFields.Subject) - this.getTask() - this.getAttachments() } @@ -90,7 +86,11 @@ export class EditEventToApproveComponent implements OnInit { let body : any =this.eventProcess.workflowInstanceDataFields.Body.replace(/<[^>]+>/g, '') this.eventProcess.workflowInstanceDataFields.Body = body this.Location = this.eventProcess.workflowInstanceDataFields.Location - + + this.InstanceId = this.eventProcess.workflowInstanceDataFields.InstanceId + this.getAttachments() + + // attendees //this.eventProcess.workflowInstanceDataFields.ParticipantsList // subject @@ -121,10 +121,6 @@ export class EditEventToApproveComponent implements OnInit { } }) }) - - - - } ngOnInit() { @@ -147,7 +143,6 @@ export class EditEventToApproveComponent implements OnInit { this.eventProcess.workflowInstanceDataFields.ParticipantsList = this.taskParticipants.concat(this.taskParticipantsCc) - } async openAttendees() { @@ -178,6 +173,8 @@ export class EditEventToApproveComponent implements OnInit { this.setIntervenientCC(newAttendeesCC); } }); + } else { + this.showAttendees = true } } @@ -197,6 +194,7 @@ export class EditEventToApproveComponent implements OnInit { } addParticipantsCC(){ + this.adding = 'CC' this.openAttendees(); } @@ -206,12 +204,11 @@ export class EditEventToApproveComponent implements OnInit { this.taskParticipantsCc = taskParticipantsCc; } - - async getAttachments(){ + + async getAttachments() { this.loadedAttachments = await this.attachmentsService.getAttachmentsById(this.InstanceId).toPromise(); console.log(this.loadedAttachments) - } deleteAttachment(attachmentID: string) { @@ -235,18 +232,19 @@ export class EditEventToApproveComponent implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res)=>{ if(res){ - + const data = res.data; + //data.selected const DocumentToSave = { SourceTitle: data.selected.Assunto, - ParentId: this.postEvent.EventId, + ParentId: this.InstanceId, Source: '1', SourceId: data.selected.Id, ApplicationId: data.selected.ApplicationType.toString(), - Id: '0', + Id: '', Link: '', - SerialNumber: '', + SerialNumber: '' }; await this.attachmentsService.setEventAttachmentById(DocumentToSave).subscribe(()=>{