diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 35ad22a3d..b22b0744a 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -24,7 +24,7 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; //EditEventPage, //ViewEventPage, //ApproveEventPage, - AttendeesPage, + //AttendeesPage, //AttendeeModalPage, @@ -44,7 +44,7 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; // ViewEventPage, //EventListPage, //ApproveEventPage, - AttendeesPage, + //AttendeesPage, //AttendeeModalPage, //EventsToApprovePage, //EmptyContainerPage, diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 7978c413a..3c5cc9657 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -30,12 +30,15 @@ import { ComponentsModule } from 'src/app/components/components.module'; import { AttendeesPageModule } from '../events/attendees/attendees.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; -import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event.module'; import { ApproveEventPageModule } from 'src/app/shared/agenda/approve-event/approve-event.module'; import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module'; + +import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; +import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module'; + @NgModule({ imports: [ CommonModule, @@ -59,6 +62,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo EventsToApprovePageModule, ApproveEventPageModule, NewEventPageModule, + EventListPageModule ], declarations: [ AgendaPage diff --git a/src/app/pages/events/attendee-modal/attendee-modal.module.ts b/src/app/pages/events/attendee-modal/attendee-modal.module.ts index e97fd7610..9d90be080 100644 --- a/src/app/pages/events/attendee-modal/attendee-modal.module.ts +++ b/src/app/pages/events/attendee-modal/attendee-modal.module.ts @@ -15,6 +15,8 @@ import { AttendeeModalPage } from './attendee-modal.page'; IonicModule, AttendeeModalPageRoutingModule ], - declarations: [AttendeeModalPage] + declarations: [AttendeeModalPage], + exports: [AttendeeModalPage] + }) export class AttendeeModalPageModule {} diff --git a/src/app/pages/gabinete-digital/event-list/event-list.module.ts b/src/app/pages/gabinete-digital/event-list/event-list.module.ts index 907d95802..eeab575ef 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.module.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.module.ts @@ -20,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; EventListPageRoutingModule, HeaderPageModule, ], - declarations: [EventListPage] + declarations: [EventListPage], + exports: [EventListPage] }) export class EventListPageModule {} 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 4575e1668..970062cd1 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 @@ -8,13 +8,20 @@ import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing. import { BookMeetingModalPage } from './book-meeting-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; +import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; +import { AttendeeModalPageModule } from 'src/app/pages/events/attendee-modal/attendee-modal.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - BookMeetingModalPageRoutingModule + BookMeetingModalPageRoutingModule, + // + AttendeesPageModule, + AttendeeModalPageModule, + EmptyContainerPageModule ], declarations: [ BookMeetingModalPage 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 a3bde25aa..27ad835ce 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 @@ -9,13 +9,21 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout 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 { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; +import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ExpedientTaskModalPageRoutingModule + ExpedientTaskModalPageRoutingModule, + // + AttendeesPageModule, + AttendeeModalPageModule, + EmptyContainerPageModule + ], declarations: [ ExpedientTaskModalPage diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index acbff7d9e..83cf79df5 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -425,7 +425,7 @@ export class ExpedientePrPage implements OnInit { } - async openOptions(taskAction: any) { + async openOptions(taskAction?: any) { const popover = await this.popoverController.create({ component: OptsExpedientePrPage, cssClass: 'exp-options', diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 4721aecfb..2cad6f2b5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -40,6 +40,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, ComponentsModule, GabineteDigitalPageRoutingModule, + // HeaderPageModule, EmptyContainerPageModule, EventsToApprovePageModule, diff --git a/src/app/shared/event/attendees/attendees.module.ts b/src/app/shared/event/attendees/attendees.module.ts index 6bf3dcc62..36e9da0d5 100644 --- a/src/app/shared/event/attendees/attendees.module.ts +++ b/src/app/shared/event/attendees/attendees.module.ts @@ -15,6 +15,7 @@ import { AttendeesPage } from './attendees.page'; IonicModule, AttendeesPageRoutingModule ], - declarations: [] + declarations: [AttendeesPage], + exports: [AttendeesPage] }) export class AttendeesPageModule {} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 547c56c25..960483e35 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -65,7 +65,7 @@ - +
@@ -77,7 +77,7 @@
- +