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 d088bb30b..7e3974aae 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -179,8 +179,8 @@ -
-
+
+
@@ -225,6 +225,7 @@ [taskParticipants]="taskParticipants" [taskParticipantsCc]="taskParticipantsCc" [adding]="adding" + (dynamicSetIntervenient)="dynamicSetIntervenient($event)" >
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 5d0dbe1ca..5d5245903 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -118,6 +118,11 @@ export class EditEventPage implements OnInit { } + async dynamicSetIntervenient(data){ + this.taskParticipants = data['taskParticipants']; + this.taskParticipantsCc = data['taskParticipantsCc']; + } + async setIntervenient(data){ this.taskParticipants = data; diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index f42f80adc..e5c8ab51b 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -34,53 +34,57 @@
-
-
-

{{loadedEvent.Location}}{{loadedEvent.CalendarName}}

+ +
+
+
+

{{loadedEvent.Location}}{{loadedEvent.CalendarName}}

+
+
+ +

{{customDate}}

+

das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}

+

(Não se repete)

+

Repete

+
+
-
- -

{{customDate}}

-

das {{loadedEvent.StartDate | date: 'HH:mm'}} às {{loadedEvent.EndDate | date: 'HH:mm'}}

-

(Não se repete)

-

Repete

-
-
-
-
-
-
-
Intervenientes
- - -
-

{{attendee.Name}}

-
-
-
-
-
-
Detalhes
- - - -
-
- -
- -
Documentos Anexados
+
+
+
+
Intervenientes
- -

{{attach.SourceName}}

-

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

-
-
- + +
+

{{attendee.Name}}

+
+
+ +
+
+
Detalhes
+ + + +
+
+ +
+ +
Documentos Anexados
+ + +

{{attach.SourceName}}

+

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

+
+
+
+
+
-
+
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.ts index 36a6c6c13..9a2bb9208 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -2,7 +2,6 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { ModalController } from '@ionic/angular'; import { ContactsService } from 'src/app/services/contacts.service'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { el } from 'date-fns/locale'; @Component({ selector: 'app-attendee-modal', @@ -26,6 +25,7 @@ export class AttendeeModalPage implements OnInit { @Output() setIntervenient = new EventEmitter(); @Output() setIntervenientCC = new EventEmitter(); + @Output() dynamicSetIntervenient = new EventEmitter(); currentPath = window.location.pathname; @Input() adding: "intervenient" | "CC"; @@ -39,7 +39,6 @@ export class AttendeeModalPage implements OnInit { if(this.taskParticipantsCc == null || this.taskParticipantsCc == undefined){ this.taskParticipantsCc = []; - } } @@ -126,6 +125,11 @@ export class AttendeeModalPage implements OnInit { } + this.dynamicSetIntervenient.emit({ + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc + }) + this.setContactWithClose(); }