diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 9133595b8..f1cf61d76 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -335,6 +335,7 @@ [profile]="profile" [selectedSegment]=segment [taskParticipants]="taskParticipants" + [taskParticipantsCc]="taskParticipantsCc" [selectedDate]="eventSelectedDate" (onAddEvent)="openAddEventDismiss($event)" (openAttendeesComponent)="openAttendeesComponent($event)" @@ -342,7 +343,9 @@ [eventAttendees]="contacts" (clearContact)="clearContact()" (setContact)="setContact($event)" - + + (setIntervenient)="setIntervenient($event)" + (setIntervenientCC)="setIntervenientCC($event)" > diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index b66a79c7d..b32ffdcfd 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -992,7 +992,7 @@ export class AgendaPage implements OnInit { } // open component - async openAttendeesComponent(data){ + async openAttendeesComponent(data) { if(Array.isArray(data)){ if(data.length >= 1){ @@ -1003,7 +1003,6 @@ export class AgendaPage implements OnInit { this.cloneAllmobileComponent(); this.mobileComponent.showAttendees = true; - } async clearContact(){ @@ -1046,14 +1045,19 @@ export class AgendaPage implements OnInit { } - async setIntervenient(data){ + async setIntervenient(data) { this.taskParticipants = data; - this.postEvent } - async setIntervenientCC(data){ + async setIntervenientCC(data) { this.taskParticipantsCc = data; } + // Emitters + // adding + async setAdding(adding: "intervenient" | "CC" = "intervenient") { + this.adding = adding; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts index 0da22289c..080323b92 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.component.ts @@ -30,6 +30,10 @@ export class EditEventComponent implements OnInit { @Output() openAttendeesComponent = new EventEmitter(); @Output() closeComponent = new EventEmitter(); + + @Output() setIntervenient = new EventEmitter(); + @Output() setIntervenientCC = new EventEmitter(); + constructor( private modalController: ModalController, @@ -73,14 +77,16 @@ export class EditEventComponent implements OnInit { this.closeComponent.emit(); this.clearContact.emit(); + + this.setIntervenient.emit([]); + this.setIntervenientCC.emit([]); } - async openAttendees() - { + async openAttendees() { this.openAttendeesComponent.emit(); this.clearContact.emit(); -} + } } diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html index 54fc0b65d..4aba5c53e 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -147,17 +147,16 @@ - + - + Com conhecimento - Text diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts index 1e0375581..f2012825f 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -21,6 +21,11 @@ export class NewEventPage implements OnInit { @Input() selectedSegment: string; @Input() selectedDate: Date; @Input() taskParticipants: EventPerson[]; + @Input() taskParticipantsCc: any = []; + + + @Output() setIntervenient = new EventEmitter(); + @Output() setIntervenientCC = new EventEmitter(); @Output() onAddEvent = new EventEmitter(); @Output() openAttendeesComponent = new EventEmitter(); @@ -122,6 +127,9 @@ export class NewEventPage implements OnInit { this.onAddEvent.emit(this.postEvent); this.GoBackEditOrAdd.emit(); + + this.setIntervenient.emit([]); + this.setIntervenientCC.emit([]); } async openAttendees(){