diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 2f445093c..089f41bd4 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -8,7 +8,6 @@ import { AgendaPageRoutingModule } from './agenda-routing.module'; import { AgendaPage } from './agenda.page'; import { NgCalendarModule } from 'ionic2-calendar'; -import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; @@ -45,8 +44,6 @@ import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event ComponentsModule, AgendaPageRoutingModule, NgCalendarModule, - CalModalPageModule, - // entryComponents HeaderPageModule, ViewEventPageModule, diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 7458cf873..14cf2df7c 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -2,7 +2,6 @@ import { Component, OnInit, ViewChild, Inject, LOCALE_ID, Input } from '@angular import { CalendarComponent } from 'ionic2-calendar'; import { AlertController, ModalController } from '@ionic/angular'; import { formatDate } from '@angular/common'; -import { CalModalPage } from '../cal-modal/cal-modal.page'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd } from '@angular/router'; @@ -289,39 +288,6 @@ export class AgendaPage implements OnInit { this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); } - async openCalModal() { - const modal = await this.modalCtrl.create({ - component: CalModalPage, - componentProps:{ - segment: this.segment, - profile: this.profile, - eventSelectedDate: this.eventSelectedDate, - }, - cssClass: 'cal-modal modal-desktop', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then((data) => { - let postEvent: Event = data['data']; - if (postEvent.Subject != null) - { - this.eventSource.push({ - title: postEvent.Subject, - startTime: new Date(postEvent.StartDate), - endTime: new Date(postEvent.EndDate), - allDay: false, - event: postEvent - }); - - this.myCal.update(); - this.myCal.loadEvents(); - this.loadRangeEvents(this.rangeStartDate, this.rangeEndDate); - } - }); - } - // for calendar currentDayEventDisplayBorder(day: any, id: any){ diff --git a/src/app/pages/cal-modal/cal-modal-routing.module.ts b/src/app/pages/cal-modal/cal-modal-routing.module.ts deleted file mode 100644 index e3cb6d5d6..000000000 --- a/src/app/pages/cal-modal/cal-modal-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { CalModalPage } from './cal-modal.page'; - -const routes: Routes = [ - { - path: '', - component: CalModalPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class CalModalPageRoutingModule {} diff --git a/src/app/pages/cal-modal/cal-modal.module.ts b/src/app/pages/cal-modal/cal-modal.module.ts deleted file mode 100644 index fb8f9ea1e..000000000 --- a/src/app/pages/cal-modal/cal-modal.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { CalModalPageRoutingModule } from './cal-modal-routing.module'; - -import { CalModalPage } from './cal-modal.page'; -import { NgCalendarModule } from 'ionic2-calendar'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - CalModalPageRoutingModule, - ReactiveFormsModule, - NgCalendarModule - ], - declarations: [CalModalPage] -}) -export class CalModalPageModule {} diff --git a/src/app/pages/cal-modal/cal-modal.page.html b/src/app/pages/cal-modal/cal-modal.page.html deleted file mode 100644 index 33a8a12a7..000000000 --- a/src/app/pages/cal-modal/cal-modal.page.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - Novo Evento - - - - -
-
- - Assunto * - - - - - Campo obrigatório - - - Descrição * - - - - - Campo obrigatório - - - Localização * - - - - - Campo obrigatório - - - - Selecione a Agenda * - - Pessoal - Oficial - - - - - Campo obrigatório - - - - Tipo de evento * - - Reunião - Viagem - Conferência - Encontro - - - - - Campo obrigatório - - - - Data Início * - - - - - - - Data Fim * - - - - -
-
- - - Participantes - -
-
-
- - - Anexos - -
-
-
- - - - - - Cancelar - - - - {{ viewTitle }} - - - Enviar - - - - - diff --git a/src/app/pages/cal-modal/cal-modal.page.scss b/src/app/pages/cal-modal/cal-modal.page.scss deleted file mode 100644 index e7a445d83..000000000 --- a/src/app/pages/cal-modal/cal-modal.page.scss +++ /dev/null @@ -1,34 +0,0 @@ -.div-ion-content{ - margin: 15px; -} -:host ::ng-deep{ - .monthview-container { - height: auto !important; - } - .event-detail-container{ - display: none; - } -} -.div-attach{ - border: 1px solid #ccc; - margin: 15px 0 0 0; - padding: 15px; -} -.error{ - color:red; - font-size: 12px; - font-weight: bold; - padding-bottom: 20px; - } -/* ion-item{ - display: block; - border: 1px solid red; - width: 100%; - float: left; -} */ -.span-color{ - color:red; -} -/* .ion-badge{ - -} */ \ No newline at end of file diff --git a/src/app/pages/cal-modal/cal-modal.page.spec.ts b/src/app/pages/cal-modal/cal-modal.page.spec.ts deleted file mode 100644 index 31a780adc..000000000 --- a/src/app/pages/cal-modal/cal-modal.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { CalModalPage } from './cal-modal.page'; - -describe('CalModalPage', () => { - let component: CalModalPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ CalModalPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(CalModalPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/cal-modal/cal-modal.page.ts b/src/app/pages/cal-modal/cal-modal.page.ts deleted file mode 100644 index f6331ba78..000000000 --- a/src/app/pages/cal-modal/cal-modal.page.ts +++ /dev/null @@ -1,260 +0,0 @@ -import { Component, OnInit, AfterViewInit, Input } from '@angular/core'; -import { ModalController, NavParams } from '@ionic/angular'; - -import { Event } from '../../models/event.model'; -import { EventsService } from 'src/app/services/events.service'; -import { EventBody } from 'src/app/models/eventbody.model'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; - -import { AttendeeModalPage } from '../events/attendee-modal/attendee-modal.page'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { AlertService } from 'src/app/services/alert.service'; -import { FormGroup, FormBuilder, Validators } from "@angular/forms"; -import { identifierModuleUrl } from '@angular/compiler'; - -@Component({ - selector: 'app-cal-modal', - templateUrl: './cal-modal.page.html', - styleUrls: ['./cal-modal.page.scss'], -}) -export class CalModalPage implements OnInit { - - calendar = { - mode: 'month', - currentDate: new Date() - }; - - eventAttendees: EventPerson[]; - segment:string = "true"; - selectedSegment: string; - selectedDate: Date; - - viewTitle: string; - postEvent: Event; - eventBody: EventBody; - modalReady = false; - - minDate: string; - - ionicForm: FormGroup; - isSubmitted = false; - - formSubjectSatus: boolean = false; - formDescriptionSatus: boolean = false; - formLocationSatus: boolean = false; - formEventTypeSatus: boolean = false; - - profile:string; - - constructor( - public formBuilder: FormBuilder, - private modalCtrl: ModalController, - private eventService: EventsService, - private alertController:AlertService, - private navParams: NavParams - ) - { - this.postEvent = new Event(); - this.eventBody = { BodyType : "1", Text : ""}; - this.postEvent.Body = this.eventBody; - this.profile = this.navParams.get('profile'); - } - - ngOnInit() { - - - this.selectedSegment = this.navParams.get('segment'); - this.selectedDate = this.navParams.get('eventSelectedDate'); - - let selectedStartdDate = this.selectedDate; - let selectedEndDate = new Date(this.selectedDate); - /* Set + 30minutes to seleted datetime */ - selectedEndDate.setMinutes(this.selectedDate.getMinutes() + 30) - - this.minDate = this.selectedDate.toString(); - - if(this.selectedSegment != "Combinada"){ - this.postEvent ={ - EventId: '', - Subject: '', - Body: this.eventBody, - Location: '', - CalendarId: '', - CalendarName: this.selectedSegment, - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), - EventType: 'Reunião', - Attendees: null, - IsMeeting: false, - IsRecurring: false, - AppointmentState: 0, - TimeZone: '', - Organizer: '', - Categories: null, - HasAttachments: false, - }; - } - else{ - this.postEvent ={ - EventId: '', - Subject: '', - Body: this.eventBody, - Location: '', - CalendarId: '', - CalendarName: 'Oficial', - StartDate: selectedStartdDate, - EndDate: new Date(selectedEndDate), - EventType: 'Reunião', - Attendees: null, - IsMeeting: false, - IsRecurring: false, - AppointmentState: 0, - TimeZone: '', - Organizer: '', - Categories: null, - HasAttachments: false, - }; - } - - this.ionicForm = this.formBuilder.group({ - subject: ['', [Validators.required]], - agenda: ['', [Validators.required]], - startdate: ['', [Validators.required]], - enddate: ['', [Validators.required]], - description: ['', [Validators.required]], - location: ['', [Validators.required]], - eventtype: ['', [Validators.required]] - }) - } - - get errorControl() { - return this.ionicForm.controls; - } - - ngAfterViewInit(): void { - setTimeout(()=>{ - this.modalReady = true; - }, 0); - } - - save(){ - if (this.ionicForm.valid) { - if(this.profile=='mdgpr'){ - this.eventService.postEventMd(this.postEvent, this.postEvent.CalendarName).subscribe(); - - } - else if(this.profile=='pr'){ - this.eventService.postEventPr(this.postEvent, this.postEvent.CalendarName).subscribe(); - } - this.modalCtrl.dismiss(this.postEvent); - } - else{ - this.validateFormInputs(); - } - } - - validateFormInputs(){ - let formSubject = this.postEvent.Subject.trim(); - let formDescription = this.postEvent.Body.Text.trim(); - let formLocation = this.postEvent.Location.trim(); - - if (!this.postEvent.Subject && formSubject.length <= 0){ - this.formSubjectSatus=true; - } - else{ - this.formSubjectSatus=false; - if(!this.postEvent.Body.Text && formDescription.length <= 0){ - this.formDescriptionSatus=true; - } - else{ - this.formDescriptionSatus=false; - if (!this.postEvent.Location && formLocation.length <= 0){ - this.formLocationSatus=true; - } - else{ - this.formLocationSatus=false; - } - } - } - /* return (this.postEvent.Subject && formSubject.length > 0); */ - } - - onViewTitleChanged(title){ - this.viewTitle = title; - } - - onTimeSelected(ev){ - /* this.postEvent.startTime = new Date(ev.selectedTime); */ - - } - - close(){ - this.modalCtrl.dismiss(); - /* this.modalCtrl.dismiss(this.postEvent); */ - } - - async addAttendees() - { - const modal = await this.modalCtrl.create({ - component: AttendeeModalPage, - componentProps: { - eventPersons: this.postEvent.Attendees - }, - cssClass: 'attendee-modal', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then((data) => { - let newattendees: EventPerson[] = data['data']; - - - if (newattendees != null) - { - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": (this.segment == "true") - }; - if (this.eventAttendees == null) - { - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - - }); - } - this.postEvent.Attendees = this.eventAttendees; - }); - } - - showAlert(){ - this.alertController.presentAlert("Funcionalidade em desenvolvimento"); - } - - async openAttendees() - { - const modal = await this.modalCtrl.create({ - component: AttendeesPage, - componentProps: { - eventAttendees: this.postEvent.Attendees - }, - cssClass: 'attendee', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then((data) => { - if (data['data'] != null) - { - let newattendees: EventPerson[] = data['data']; - this.postEvent.Attendees = newattendees; - } - }); -} - - -} diff --git a/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts b/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts deleted file mode 100644 index 384a9efd2..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AttendeeModalPage } from './attendee-modal.page'; - -const routes: Routes = [ - { - path: '', - component: AttendeeModalPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class AttendeeModalPageRoutingModule {} diff --git a/src/app/pages/events/attendee-modal/attendee-modal.module.ts b/src/app/pages/events/attendee-modal/attendee-modal.module.ts deleted file mode 100644 index 9d90be080..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { AttendeeModalPageRoutingModule } from './attendee-modal-routing.module'; - -import { AttendeeModalPage } from './attendee-modal.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - AttendeeModalPageRoutingModule - ], - declarations: [AttendeeModalPage], - exports: [AttendeeModalPage] - -}) -export class AttendeeModalPageModule {} diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.html b/src/app/pages/events/attendee-modal/attendee-modal.page.html deleted file mode 100644 index 20e71cf0b..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.html +++ /dev/null @@ -1,39 +0,0 @@ - - - Adicionar intervenientes - - - - - - - - - - - - -

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

- - - - - - - - - - - Cancelar - - - - - - Adicionar - - - - - \ No newline at end of file diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.scss b/src/app/pages/events/attendee-modal/attendee-modal.page.scss deleted file mode 100644 index 9cee55e1d..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.scss +++ /dev/null @@ -1,6 +0,0 @@ -ion-item-group{ - margin: 15px; - } -ion-searchbar{ - --border-radius: 20px; -} \ No newline at end of file diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts deleted file mode 100644 index f247abe63..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { AttendeeModalPage } from './attendee-modal.page'; - -describe('AttendeeModalPage', () => { - let component: AttendeeModalPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AttendeeModalPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(AttendeeModalPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/events/attendee-modal/attendee-modal.page.ts b/src/app/pages/events/attendee-modal/attendee-modal.page.ts deleted file mode 100644 index 3f2431d0e..000000000 --- a/src/app/pages/events/attendee-modal/attendee-modal.page.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { Component, OnInit } 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 { ThrowStmt, removeSummaryDuplicates } from '@angular/compiler'; - -@Component({ - selector: 'app-attendee-modal', - templateUrl: './attendee-modal.page.html', - styleUrls: ['./attendee-modal.page.scss'], -}) -export class AttendeeModalPage implements OnInit { - - contacts: EventPerson[]; - showLoader: boolean = false; - eventPersons: EventPerson[]; - - constructor(private modalCtrl: ModalController, private contactsService: ContactsService) { } - - ngOnInit() { - this.fetchContacts(""); - } - - save() { - this.modalCtrl.dismiss( - this.contacts.filter(function(contact) { - return contact.IsRequired == true; - }) - ); - } - - close() { - this.modalCtrl.dismiss(null); - } - - onChange(evt: any) { - this.fetchContacts(evt.detail.value); - } - - selectContact(itm: EventPerson){ - itm.IsRequired = !itm.IsRequired; - } - - async fetchContacts(filter: string) { - this.showLoader = true; - - this.contactsService.getContacts(filter).subscribe(result => - { - if (this.eventPersons != null) - { - this.eventPersons.forEach(attendee => { - const index: number = result.findIndex((cont) => { - return cont.EmailAddress == attendee.EmailAddress - }); - - result.splice(index, 1); - }); - } - - this.contacts = result; - this.showLoader = false; - } - ); - } - -} diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index eaef16cfb..66ec466da 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -26,9 +26,11 @@ export class AttendeesPage implements OnInit { private contactsService: ContactsService, private navParams: NavParams, private modalController: ModalController) { + this.adding = this.navParams.get('adding'); this.taskParticipants = this.navParams.get('taskParticipants'); this.taskParticipantsCc = this.navParams.get('taskParticipantsCc'); + } ngOnInit() { @@ -44,7 +46,7 @@ export class AttendeesPage implements OnInit { } - ngOnChanges(event){} + ngOnChanges(event) {} save(){ @@ -54,7 +56,7 @@ export class AttendeesPage implements OnInit { }); } - close(){ + close() { this.modalController.dismiss(false); } diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts index 0d6a85ab4..5b2cbdb3c 100644 --- a/src/app/pages/events/events-routing.module.ts +++ b/src/app/pages/events/events-routing.module.ts @@ -1,42 +1,39 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { EventsPage } from './events.page'; - -const routes: Routes = [ - { - path: '', - component: EventsPage - }, - { - path: 'event-detail', - loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule) - }, - { - path: 'attachments', - loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule) - }, - { - path: 'attendees', - loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule) - }, - { - path: 'attendee-modal', - loadChildren: () => import('./attendee-modal/attendee-modal.module').then( m => m.AttendeeModalPageModule) - }, - { - path: 'event-detail-modal', - loadChildren: () => import('./event-detail-modal/event-detail-modal.module').then( m => m.EventDetailModalPageModule) - }, { +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EventsPage } from './events.page'; + +const routes: Routes = [ + { + path: '', + component: EventsPage + }, + { + path: 'event-detail', + loadChildren: () => import('./event-detail/event-detail.module').then( m => m.EventDetailPageModule) + }, + { + path: 'attachments', + loadChildren: () => import('./attachments/attachments.module').then( m => m.AttachmentsPageModule) + }, + { + path: 'attendees', + loadChildren: () => import('./attendees/attendees.module').then( m => m.AttendeesPageModule) + }, + { + path: 'event-detail-modal', + loadChildren: () => import('./event-detail-modal/event-detail-modal.module').then( m => m.EventDetailModalPageModule) + }, + { path: 'edit-event', loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule) } - -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class EventsPageRoutingModule {} + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EventsPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 998d67550..137f40b47 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -36,7 +36,7 @@ export class DespachoPage implements OnInit { task: any; attachments:any; fulltask: any; - eventsList: Event[]; + eventsList: Event[] = []; serialnumber: string; profile: string; intervenientes: any; diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index f07882156..9228b6f1e 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -16,6 +16,7 @@ import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.p import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { User } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; +import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-book-meeting-modal', @@ -175,34 +176,31 @@ export class BookMeetingModalPage implements OnInit { if(window.innerWidth <= 800){ const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.eventAttendees + component: AttendeesPage, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'book-meeting-modal', + cssClass: 'attendee', backdropDismiss: false }); - + await modal.present(); - - modal.onDidDismiss().then((res) => { - this.taskParticipants = res.data; - let newattendees: EventPerson[] = res['data']; - if(newattendees != null){ - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": true - }; - if(this.eventAttendees == null){ - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - }); + + 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.postData.Attendees = this.eventAttendees; }); + } else { this.showAttendees = true; } @@ -214,38 +212,29 @@ export class BookMeetingModalPage implements OnInit { if(window.innerWidth <= 800) { const modal = await this.modalController.create({ - component: AddParticipantsCcModalPage, - componentProps: { - eventPersons: this.eventAttendees + component: AttendeesPage, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'add-participants-cc-modal', + cssClass: 'attendee', backdropDismiss: false }); - + await modal.present(); - - modal.onDidDismiss().then((res) => { - this.taskParticipantsCc = res.data; - let newattendees: EventPerson[] = res['data']; + + modal.onDidDismiss().then((data) => { - - if (newattendees != null) - { - newattendees.forEach(newattendee => { - let att = { - "EmailAddress": newattendee.EmailAddress, - "Name": newattendee.Name, - "IsRequired": false - }; - if (this.eventAttendees == null) - { - this.eventAttendees = new Array(); - } - this.eventAttendees.push(att); - - }); + if(data){ + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } - this.postData.Attendees = this.eventAttendees; }); } else { this.showAttendees = true; @@ -403,4 +392,13 @@ export class BookMeetingModalPage implements OnInit { } + setIntervenient(data){ + this.taskParticipants = data; + } + + setIntervenientCC(data){ + this.taskParticipantsCc = data; + } + + } \ No newline at end of file