diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index 5574afdd6..7a83ca089 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { CreateProcessPageRoutingModule } from './create-process-routing.module'; import { CreateProcessPage } from './create-process.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 4ab5dd4d7..bc2011682 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -19,7 +19,7 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { User } from 'src/app/models/user.model'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -393,7 +393,7 @@ export class CreateProcessPage implements OnInit { this.showAttendees=false; const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, @@ -433,7 +433,7 @@ export class CreateProcessPage implements OnInit { this.showAttendees=false; const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, diff --git a/src/app/modals/delegar/delegar.module.ts b/src/app/modals/delegar/delegar.module.ts index a7df223e4..debc9fbb9 100644 --- a/src/app/modals/delegar/delegar.module.ts +++ b/src/app/modals/delegar/delegar.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { DelegarPageRoutingModule } from './delegar-routing.module'; import { DelegarPage } from './delegar.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; @NgModule({ diff --git a/src/app/pages/agenda/edit-event/edit-event.module.ts b/src/app/pages/agenda/edit-event/edit-event.module.ts index 303186c06..c1162fa5a 100644 --- a/src/app/pages/agenda/edit-event/edit-event.module.ts +++ b/src/app/pages/agenda/edit-event/edit-event.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { EditEventPageRoutingModule } from './edit-event-routing.module'; import { EditEventPage } from './edit-event.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; @NgModule({ 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 76f04df4b..74bcbc503 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -10,7 +10,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { Event } from '../../../models/event.model'; -import { AttendeesPage } from '../../events/attendees/attendees.page'; +import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; @Component({ @@ -138,7 +138,7 @@ export class EditEventPage implements OnInit { } else{ const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, 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 0750b12b3..57f0520d5 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -10,7 +10,7 @@ import { ToastService } from 'src/app/services/toast.service'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { Event } from '../../../models/event.model'; -import { AttendeesPage } from '../../events/attendees/attendees.page'; +import { AttendeesPageModal } from '../../events/attendees/attendees.page'; import { SearchPage } from '../../search/search.page'; @Component({ @@ -241,7 +241,7 @@ export class NewEventPage implements OnInit { async openAttendees() { const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { eventAttendees: this.postEvent.Attendees, adding: this.adding, diff --git a/src/app/pages/events/attendees/attendees-routing.module.ts b/src/app/pages/events/attendees/attendees-routing.module.ts index 7c59381bf..00f6f262b 100644 --- a/src/app/pages/events/attendees/attendees-routing.module.ts +++ b/src/app/pages/events/attendees/attendees-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { AttendeesPage } from './attendees.page'; +import { AttendeesPageModal } from './attendees.page'; const routes: Routes = [ { path: '', - component: AttendeesPage + component: AttendeesPageModal } ]; diff --git a/src/app/pages/events/attendees/attendees.module.ts b/src/app/pages/events/attendees/attendees.module.ts index 36e9da0d5..f21feadb2 100644 --- a/src/app/pages/events/attendees/attendees.module.ts +++ b/src/app/pages/events/attendees/attendees.module.ts @@ -6,7 +6,7 @@ import { IonicModule } from '@ionic/angular'; import { AttendeesPageRoutingModule } from './attendees-routing.module'; -import { AttendeesPage } from './attendees.page'; +import { AttendeesPageModal } from './attendees.page'; @NgModule({ imports: [ @@ -15,7 +15,7 @@ import { AttendeesPage } from './attendees.page'; IonicModule, AttendeesPageRoutingModule ], - declarations: [AttendeesPage], - exports: [AttendeesPage] + declarations: [AttendeesPageModal], + exports: [AttendeesPageModal] }) export class AttendeesPageModule {} diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index 66ec466da..d79630879 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/src/app/pages/events/attendees/attendees.page.ts @@ -8,7 +8,7 @@ import { ContactsService } from 'src/app/services/contacts.service'; templateUrl: './attendees.page.html', styleUrls: ['./attendees.page.scss'], }) -export class AttendeesPage implements OnInit { +export class AttendeesPageModal implements OnInit { // Defined by the API contacts: EventPerson[]; diff --git a/src/app/pages/events/edit-event/edit-event.page.ts b/src/app/pages/events/edit-event/edit-event.page.ts index c3ea2c912..787ae3e99 100644 --- a/src/app/pages/events/edit-event/edit-event.page.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -6,7 +6,7 @@ import { Event } from '../../../models/event.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController, ModalController } from '@ionic/angular'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { AlertService } from 'src/app/services/alert.service'; import { Attachment } from 'src/app/models/attachment.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; @@ -87,7 +87,7 @@ export class EditEventPage implements OnInit { async openAttendees(){ const modal = await this.modalCtrl.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { eventAttendees: this.loadedEvent.Attendees }, diff --git a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts index 76304f437..461c74cde 100644 --- a/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/pages/events/event-detail-modal/event-detail-modal.page.ts @@ -10,7 +10,7 @@ import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { AttachmentsPage } from '../attachments/attachments.page'; -import { AttendeesPage } from '../attendees/attendees.page'; +import { AttendeesPageModal } from '../attendees/attendees.page'; @Component({ selector: 'app-event-detail-modal', @@ -81,7 +81,7 @@ export class EventDetailModalPage implements OnInit { async openAttendees(){ const modal = await this.modalCtrl.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { eventAttendees: this.loadedEvent.Attendees }, diff --git a/src/app/pages/events/event-detail/event-detail.page.ts b/src/app/pages/events/event-detail/event-detail.page.ts index e52d331a7..bc5a58008 100644 --- a/src/app/pages/events/event-detail/event-detail.page.ts +++ b/src/app/pages/events/event-detail/event-detail.page.ts @@ -6,7 +6,7 @@ import { Event } from '../../../models/event.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController, ModalController } from '@ionic/angular'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { AlertService } from 'src/app/services/alert.service'; import { Attachment } from 'src/app/models/attachment.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; @@ -87,7 +87,7 @@ export class EventDetailPage implements OnInit { async openAttendees(){ const modal = await this.modalCtrl.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { eventAttendees: this.loadedEvent.Attendees }, diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts index 004bdb6a2..743fe38aa 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing.module'; import { BookMeetingModalPage } from './book-meeting-modal.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; 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 aa2eb4575..ce18428f8 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,7 +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'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; @Component({ @@ -178,7 +178,7 @@ export class BookMeetingModalPage implements OnInit { if(window.innerWidth <= 800){ const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, @@ -214,7 +214,7 @@ export class BookMeetingModalPage implements OnInit { if(window.innerWidth <= 800) { const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts index b1122467f..08212fb16 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-routing.module'; import { ExpedientTaskModalPage } from './expedient-task-modal.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index 2fec50acb..9a0e38226 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -19,7 +19,7 @@ import { User } from 'src/app/models/user.model'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page'; import { ToastService } from 'src/app/services/toast.service'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-expedient-task-modal', @@ -378,7 +378,7 @@ export class ExpedientTaskModalPage implements OnInit { if(window.innerWidth <= 1024) { const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants, diff --git a/src/app/shared/event/attendee-modal/attendee-modal-routing.module.ts b/src/app/shared/event/attendee-modal/attendee-modal-routing.module.ts index 384a9efd2..b1c0e4fea 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal-routing.module.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal-routing.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { AttendeeModalPage } from './attendee-modal.page'; +import { AttendeePage } from './attendee-modal.page'; const routes: Routes = [ { path: '', - component: AttendeeModalPage + component: AttendeePage } ]; diff --git a/src/app/shared/event/attendee-modal/attendee-modal.module.ts b/src/app/shared/event/attendee-modal/attendee-modal.module.ts index bc1113349..f8fc059de 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.module.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.module.ts @@ -6,7 +6,7 @@ import { IonicModule } from '@ionic/angular'; import { AttendeeModalPageRoutingModule } from './attendee-modal-routing.module'; -import { AttendeeModalPage } from './attendee-modal.page'; +import { AttendeePage } from './attendee-modal.page'; @NgModule({ imports: [ @@ -15,7 +15,7 @@ import { AttendeeModalPage } from './attendee-modal.page'; IonicModule, AttendeeModalPageRoutingModule ], - declarations: [AttendeeModalPage], - exports: [AttendeeModalPage] + declarations: [AttendeePage], + exports: [AttendeePage] }) export class AttendeeModalPageModule {} diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.spec.ts b/src/app/shared/event/attendee-modal/attendee-modal.page.spec.ts index f247abe63..47eefcadd 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.spec.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { AttendeeModalPage } from './attendee-modal.page'; +import { AttendeePage } from './attendee-modal.page'; -describe('AttendeeModalPage', () => { - let component: AttendeeModalPage; - let fixture: ComponentFixture; +describe('AttendeePage', () => { + let component: AttendeePage; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [ AttendeeModalPage ], + declarations: [ AttendeePage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(AttendeeModalPage); + fixture = TestBed.createComponent(AttendeePage); component = fixture.componentInstance; fixture.detectChanges(); })); 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 418700419..0ad3d1275 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.ts @@ -8,7 +8,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js' templateUrl: './attendee-modal.page.html', styleUrls: ['./attendee-modal.page.scss'], }) -export class AttendeeModalPage implements OnInit { +export class AttendeePage implements OnInit { // Defined by the API contacts: EventPerson[]; 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 1e58b380d..dd027d5b5 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 @@ -3,7 +3,7 @@ import { AlertController, AnimationController, ModalController, NavParams } from import { Attachment } from 'src/app/models/attachment.model'; import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchDocument } from 'src/app/models/search-document'; -import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; @@ -289,7 +289,7 @@ export class EditEventToApproveComponent implements OnInit { if(window.innerWidth <= 1024) { const modal = await this.modalController.create({ - component: AttendeesPage, + component: AttendeesPageModal, componentProps: { adding: this.adding, taskParticipants: this.taskParticipants,