diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 374bdb8cf..d352f330d 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -317,13 +317,13 @@
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 11533443e..aca6a0a9b 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -152,7 +152,7 @@ export class AgendaPage implements OnInit { private router: Router, private alertController: AlertService, private sanitizer: DomSanitizer - ) { + ) { this.calendarHeight = "333px"; this.showCalendar = true; @@ -166,8 +166,6 @@ export class AgendaPage implements OnInit { ngOnInit() { this.profile = "mdgpr"; - //Inicializar segment - /* localStorage.setItem('test', this.eventSelectedDate.toString()); */ this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == "/home/agenda") { @@ -180,7 +178,6 @@ export class AgendaPage implements OnInit { } }); - window.onresize = (event) => { // if not table remove all component if( window.innerWidth <= 1024){ @@ -1002,6 +999,7 @@ export class AgendaPage implements OnInit { this.adding = data.type + alert(this.adding) this.cloneAllmobileComponent(); this.mobileComponent.showAttendees = true; } 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 4aba5c53e..d7d90b844 100644 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ b/src/app/shared/agenda/new-event/new-event.component.html @@ -140,7 +140,7 @@
-
+
@@ -154,13 +154,16 @@
+ - Com conhecimento + Com conhecimento + {{participant.Name}} +
-
+
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 c113cef81..d209102ce 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.component.ts @@ -132,10 +132,21 @@ export class NewEventPage implements OnInit { this.setIntervenientCC.emit([]); } - async openAttendees(){ - this.saveTemporaryData(); - this.openAttendeesComponent.emit(); + async addParticipants() { + this.openAttendeesComponent.emit({ + type: "intervenient" + }); + + this.clearContact.emit(); + } + + async addParticipantsCc() { + this.openAttendeesComponent.emit({ + type: "CC" + }); + + this.clearContact.emit(); } saveTemporaryData(){ 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 fa98de30e..efb494c6d 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -34,6 +34,7 @@ export class AttendeeModalPage implements OnInit { @Input() adding: "intervenient" | "CC"; ngOnInit() { + this.fetchContacts(""); if(this.taskParticipants == null || this.taskParticipants == undefined){