From 495e845240ca9e1ffa1e5a5d2dcde275f4c5b291 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 2 Jun 2021 16:36:50 +0100 Subject: [PATCH 01/39] save --- src/app/app-routing.module.ts | 1 + src/app/components/components.module.ts | 50 ++++++++++++++++- src/app/pages/agenda/agenda.module.ts | 10 +--- src/app/pages/events/events.module.ts | 2 +- .../pages/publications/publications.module.ts | 4 -- .../btn-seguinte/btn-seguinte.module.ts | 2 +- src/app/shared/header/header.module.ts | 2 +- .../header-no-search.module.ts | 2 +- .../new-publication/new-publication.module.ts | 2 +- .../publication-detail.module.ts | 2 +- .../view-publications.module.ts | 2 +- src/app/shared/shared.module.ts | 53 ++++++++++--------- 12 files changed, 85 insertions(+), 47 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8c082f7db..bfc00f08f 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -121,6 +121,7 @@ const routes: Routes = [ loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) }, + /* { path: 'chat', component: ChatPage diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 090dc2d19..1334da52f 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -7,11 +7,45 @@ import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; +import { NewPublicationPage } from '../shared/publication/new-publication/new-publication.page'; +import { ViewPublicationsPage } from '../shared/publication/view-publications/view-publications.page'; +import { PublicationDetailPage } from '../shared/publication/view-publications/publication-detail/publication-detail.page'; +import { NewActionPage } from '../shared/publication/new-action/new-action.page'; +import { NewEventPage } from '../shared/agenda/new-event/new-event.component'; +import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; +import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; +import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; +import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-event.component'; +import { AttendeesPage } from '../shared/event/attendees/attendees.page'; +import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page'; +import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page'; @NgModule({ - declarations: [], + declarations: [ + HeaderPage, + HeaderNoSearchPage, + BtnSeguintePage, + BtnModalDismissPage, + EmptyChatPage, + BtnCriarPage, + BtnAdicionarPage, + + ViewPublicationsPage, + NewPublicationPage, + PublicationDetailPage, + NewActionPage, + + NewEventPage, + EditEventComponent, + ViewEventPage, + EventListComponent, + ApproveEventComponent, + AttendeesPage, + AttendeeModalPage, + EventsToApprovePage, + ], exports: [ HeaderPage, HeaderNoSearchPage, @@ -20,6 +54,20 @@ import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no EmptyChatPage, BtnCriarPage, BtnAdicionarPage, + + ViewPublicationsPage, + NewPublicationPage, + PublicationDetailPage, + NewActionPage, + + NewEventPage, + EditEventComponent, + ViewEventPage, + EventListComponent, + ApproveEventComponent, + AttendeesPage, + AttendeeModalPage, + EventsToApprovePage, ], imports: [ CommonModule diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 58553b839..5ae511e80 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -44,15 +44,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; CalModalPageModule, ], declarations: [ - AgendaPage, - NewEventPage, - EditEventComponent, - ViewEventPage, - EventListComponent, - ApproveEventComponent, - AttendeesPage, - AttendeeModalPage, - EventsToApprovePage, + AgendaPage ], entryComponents: [ EventsToApprovePage, diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index 34b04023e..2b5c1f6d7 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -7,7 +7,7 @@ import { IonicModule } from '@ionic/angular'; import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; -import { SharedModule } from 'src/app/shared/shared.module'; +// import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts index d2a2b0b42..3f13f16c6 100644 --- a/src/app/pages/publications/publications.module.ts +++ b/src/app/pages/publications/publications.module.ts @@ -25,10 +25,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ], declarations: [ PublicationsPage, - ViewPublicationsPage, - NewPublicationPage, - PublicationDetailPage, - NewActionPage ] }) export class PublicationsPageModule {} diff --git a/src/app/shared/btn-seguinte/btn-seguinte.module.ts b/src/app/shared/btn-seguinte/btn-seguinte.module.ts index bb07c7363..05ced1168 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.module.ts +++ b/src/app/shared/btn-seguinte/btn-seguinte.module.ts @@ -15,6 +15,6 @@ import { BtnSeguintePage } from './btn-seguinte.page'; IonicModule, BtnSeguintePageRoutingModule ], - declarations: [BtnSeguintePage] + declarations: [] }) export class BtnSeguintePageModule {} diff --git a/src/app/shared/header/header.module.ts b/src/app/shared/header/header.module.ts index faf79baac..95ec4c0aa 100644 --- a/src/app/shared/header/header.module.ts +++ b/src/app/shared/header/header.module.ts @@ -15,6 +15,6 @@ import { HeaderPage } from './header.page'; IonicModule, HeaderPageRoutingModule ], - declarations: [HeaderPage] + declarations: [] }) export class HeaderPageModule {} diff --git a/src/app/shared/headers/header-no-search/header-no-search.module.ts b/src/app/shared/headers/header-no-search/header-no-search.module.ts index bd3418660..00ede4ffc 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.module.ts +++ b/src/app/shared/headers/header-no-search/header-no-search.module.ts @@ -15,6 +15,6 @@ import { HeaderNoSearchPage } from './header-no-search.page'; IonicModule, HeaderNoSearchPageRoutingModule ], - declarations: [HeaderNoSearchPage] + declarations: [] }) export class HeaderNoSearchPageModule {} diff --git a/src/app/shared/publication/new-publication/new-publication.module.ts b/src/app/shared/publication/new-publication/new-publication.module.ts index c91c34b29..915b65ed7 100644 --- a/src/app/shared/publication/new-publication/new-publication.module.ts +++ b/src/app/shared/publication/new-publication/new-publication.module.ts @@ -15,6 +15,6 @@ import { NewPublicationPage } from './new-publication.page'; IonicModule, NewPublicationPageRoutingModule ], - declarations: [NewPublicationPage] + declarations: [] }) export class NewPublicationPageModule {} diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts index 116453af2..94af5480d 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts @@ -15,6 +15,6 @@ import { PublicationDetailPage } from './publication-detail.page'; IonicModule, PublicationDetailPageRoutingModule ], - declarations: [PublicationDetailPage] + declarations: [] }) export class PublicationDetailPageModule {} diff --git a/src/app/shared/publication/view-publications/view-publications.module.ts b/src/app/shared/publication/view-publications/view-publications.module.ts index 7792f5dea..a254b3253 100644 --- a/src/app/shared/publication/view-publications/view-publications.module.ts +++ b/src/app/shared/publication/view-publications/view-publications.module.ts @@ -15,6 +15,6 @@ import { ViewPublicationsPage } from 'src/app/pages/publications/view-publicatio IonicModule, ViewPublicationsPageRoutingModule ], - declarations: [ViewPublicationsPage] + declarations: [] }) export class ViewPublicationsPageModule {} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 3b01186fc..42f4c4c87 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -2,42 +2,43 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; -import { HeaderPage } from './header/header.page'; -import { HeaderPrPage } from './header-pr/header-pr.page'; -import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; -import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'; -import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page'; -import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page'; -import { EmptyChatPage } from './chat/empty-chat/empty-chat.page'; -import { BtnCriarPage } from './buttons/btn-criar/btn-criar.page'; -import { BtnAdicionarPage } from './buttons/btn-adicionar/btn-adicionar.page'; +// import { HeaderPage } from './header/header.page'; +// import { HeaderPrPage } from './header-pr/header-pr.page'; +// import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page'; +// import { BtnModalDismissPage } from './btn-modal-dismiss/btn-modal-dismiss.page'; +// import { ChatPopoverPage } from './popover/chat-popover/chat-popover.page'; +// import { HeaderNoSearchPage } from './headers/header-no-search/header-no-search.page'; +// import { EmptyChatPage } from './chat/empty-chat/empty-chat.page'; +// import { BtnCriarPage } from './buttons/btn-criar/btn-criar.page'; +// import { BtnAdicionarPage } from './buttons/btn-adicionar/btn-adicionar.page'; + @NgModule({ imports: [ CommonModule, FormsModule, - IonicModule, + IonicModule ], exports: [ - HeaderPage, - HeaderPrPage, - HeaderNoSearchPage, - BtnSeguintePage, - BtnModalDismissPage, - EmptyChatPage, - BtnCriarPage, - BtnAdicionarPage, + // HeaderPage, + // HeaderPrPage, + // BtnSeguintePage, + // BtnModalDismissPage, + // HeaderNoSearchPage, + // EmptyChatPage, + // BtnCriarPage, + // BtnAdicionarPage, ], entryComponents:[], declarations: [ - HeaderPage, - HeaderPrPage, - HeaderNoSearchPage, - BtnSeguintePage, - BtnModalDismissPage, - EmptyChatPage, - BtnCriarPage, - BtnAdicionarPage, + // HeaderPage, + // HeaderPrPage, + // BtnSeguintePage, + // BtnModalDismissPage, + // HeaderNoSearchPage, + // EmptyChatPage, + // BtnCriarPage, + // BtnAdicionarPage, ] }) export class SharedModule {} \ No newline at end of file From 55f758f2da4890e641382addfa9467ef3160da4e Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 2 Jun 2021 16:43:39 +0100 Subject: [PATCH 02/39] commit publications --- src/app/shared/publication/new-action/new-action.module.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/publication/new-action/new-action.module.ts b/src/app/shared/publication/new-action/new-action.module.ts index 466fe5a3a..bc92b14d6 100644 --- a/src/app/shared/publication/new-action/new-action.module.ts +++ b/src/app/shared/publication/new-action/new-action.module.ts @@ -15,6 +15,6 @@ import { NewActionPage } from './new-action.page'; IonicModule, NewActionPageRoutingModule ], - declarations: [NewActionPage] + declarations: [] }) export class NewActionPageModule {} From 462a68fce463bb120cc96b6b1ce774103c940d0d Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 2 Jun 2021 21:22:26 +0100 Subject: [PATCH 03/39] save --- src/app/components/components.module.ts | 65 ++++++++++++++++++- .../create-process/create-process.module.ts | 4 +- src/app/modals/delegar/delegar.module.ts | 3 +- .../agenda/edit-event/edit-event.module.ts | 3 +- src/app/pages/chat/chat.module.ts | 19 +----- .../diplomas/diplomas.module.ts | 2 +- .../book-meeting-modal.module.ts | 3 +- .../expedient-task-modal.module.ts | 4 +- .../gabinete-digital.module.ts | 31 +-------- .../agenda/view-event/view-event.module.ts | 5 +- .../btn-modal-dismiss.module.ts | 2 +- .../btn-adicionar/btn-adicionar.module.ts | 2 +- .../buttons/btn-criar/btn-criar.module.ts | 2 +- .../chat/edit-group/edit-group.module.ts | 2 +- .../chat/empty-chat/empty-chat.module.ts | 2 +- .../group-contacts/group-contacts.module.ts | 2 +- .../group-messages/group-messages.module.ts | 2 +- .../chat/messages/contacts/contacts.module.ts | 2 +- .../shared/chat/messages/messages.module.ts | 3 +- .../shared/chat/new-group/new-group.module.ts | 2 +- .../empty-container/empty-container.module.ts | 2 +- .../attendee-modal/attendee-modal.module.ts | 2 +- .../event/attendees/attendees.module.ts | 2 +- .../despachos-pr/despachos-pr.module.ts | 2 +- .../despachos/despachos.module.ts | 2 +- .../diplomas-assinar.module.ts | 2 +- .../diplomas/diplomas.page.html | 4 +- .../edit-event.module.ts | 3 +- .../events-to-approve.module.ts | 2 +- .../expediente/expediente.module.ts | 2 +- .../expedientes-pr/expedientes-pr.module.ts | 2 +- .../expedients/expedients.module.ts | 2 +- .../pedidos/pedidos.module.ts | 2 +- .../pendentes/pendentes.module.ts | 2 +- .../chat-popover/chat-popover.module.ts | 2 +- .../popover/chat-popover/popover.modules.ts | 4 +- .../opts-expediente/opts-expediente.page.ts | 2 +- 37 files changed, 101 insertions(+), 98 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 1334da52f..228511b45 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -19,6 +19,24 @@ import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-ev import { AttendeesPage } from '../shared/event/attendees/attendees.page'; import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page'; import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page'; +import { MessagesPage } from '../shared/chat/messages/messages.page'; +import { ContactsPage } from '../shared/chat/messages/contacts/contacts.page'; +import { GroupMessagesPage } from '../shared/chat/group-messages/group-messages.page'; +import { NewGroupPage } from '../shared/chat/new-group/new-group.page'; +import { EditGroupPage } from '../shared/chat/edit-group/edit-group.page'; +import { GroupContactsPage } from '../shared/chat/group-messages/group-contacts/group-contacts.page'; +import { ChatPopoverPage } from '../shared/popover/chat-popover/chat-popover.page'; +import { EmptyContainerPage } from '../shared/empty-container/empty-container.page'; +import { ExpedientePage } from '../shared/gabinete-digital/expediente/expediente.page'; +import { ExpedientsPage } from '../shared/gabinete-digital/expedients/expedients.page'; +import { PedidosPage } from '../shared/gabinete-digital/pedidos/pedidos.page'; +import { DespachosPage } from '../shared/gabinete-digital/despachos/despachos.page'; +import { PendentesPage } from '../shared/gabinete-digital/pendentes/pendentes.page'; +import { DespachosPrPage } from '../shared/gabinete-digital/despachos-pr/despachos-pr.page'; +import { DiplomasPage } from '../pages/gabinete-digital/diplomas/diplomas.page'; +import { ExpedientesPrPage } from '../shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; +import { SignedDiplomaComponent } from '../shared/gabinete-digital/signed-diploma/signed-diploma.component'; +import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; @@ -28,7 +46,6 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, - EmptyChatPage, BtnCriarPage, BtnAdicionarPage, @@ -40,18 +57,37 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv NewEventPage, EditEventComponent, ViewEventPage, - EventListComponent, ApproveEventComponent, AttendeesPage, AttendeeModalPage, + + MessagesPage, + ContactsPage, + GroupMessagesPage, + NewGroupPage, + EditGroupPage, + GroupContactsPage, + EmptyChatPage, + + EventListComponent, + EmptyContainerPage, EventsToApprovePage, + ExpedientePage, + ExpedientsPage, + PedidosPage, + DespachosPage, + PendentesPage, + DespachosPrPage, + DiplomasPage, + ExpedientesPrPage, + SignedDiplomaComponent, + DiplomasAssinarPage ], exports: [ HeaderPage, HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, - EmptyChatPage, BtnCriarPage, BtnAdicionarPage, @@ -68,6 +104,29 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv AttendeesPage, AttendeeModalPage, EventsToApprovePage, + + MessagesPage, + ContactsPage, + GroupMessagesPage, + NewGroupPage, + EditGroupPage, + GroupContactsPage, + EmptyChatPage, + ChatPopoverPage, + + EventListComponent, + EmptyContainerPage, + EventsToApprovePage, + ExpedientePage, + ExpedientsPage, + PedidosPage, + DespachosPage, + PendentesPage, + DespachosPrPage, + DiplomasPage, + ExpedientesPrPage, + SignedDiplomaComponent, + DiplomasAssinarPage ], imports: [ CommonModule diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index bde6665cf..966b47509 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -18,9 +18,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain CreateProcessPageRoutingModule ], declarations: [ - CreateProcessPage, - AttendeeModalPage, - EmptyContainerPage, + CreateProcessPage ] }) export class CreateProcessPageModule {} diff --git a/src/app/modals/delegar/delegar.module.ts b/src/app/modals/delegar/delegar.module.ts index 895a4348f..3af6ec991 100644 --- a/src/app/modals/delegar/delegar.module.ts +++ b/src/app/modals/delegar/delegar.module.ts @@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee- DelegarPageRoutingModule ], declarations: [ - DelegarPage, - AttendeeModalPage, + DelegarPage ] }) export class DelegarPageModule {} 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 643ac8978..4c289d14b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.module.ts +++ b/src/app/pages/agenda/edit-event/edit-event.module.ts @@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee- EditEventPageRoutingModule ], declarations: [ - EditEventPage, - AttendeeModalPage + EditEventPage ] }) export class EditEventPageModule {} diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index a185b7cfe..29ac75e72 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -30,24 +30,9 @@ import { ComponentsModule } from 'src/app/components/components.module'; RouterModule, ], declarations: [ - ChatPage, - MessagesPage, - ContactsPage, - GroupMessagesPage, - NewGroupPage, - EditGroupPage, - GroupContactsPage, - EmptyChatPage, + ChatPage ], schemas: [CUSTOM_ELEMENTS_SCHEMA], - entryComponents: [ - MessagesPage, - ContactsPage, - GroupMessagesPage, - NewGroupPage, - EditGroupPage, - GroupContactsPage, - EmptyChatPage, - ] + entryComponents: [] }) export class ChatPageModule {} diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index c73e0b0b6..9e3d91ccb 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; DiplomasPageRoutingModule, ComponentsModule ], - declarations: [DiplomasPage] + declarations: [] }) export class DiplomasPageModule {} 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 aa4ed1f1b..4575e1668 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 @@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee- BookMeetingModalPageRoutingModule ], declarations: [ - BookMeetingModalPage, - AttendeeModalPage + BookMeetingModalPage ] }) export class BookMeetingModalPageModule {} 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 89e72ae19..a3bde25aa 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 @@ -18,9 +18,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain ExpedientTaskModalPageRoutingModule ], declarations: [ - ExpedientTaskModalPage, - AttendeeModalPage, - EmptyContainerPage, + ExpedientTaskModalPage ], entryComponents: [ EmptyContainerPage,] diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 9df8b5136..1edf1c4e8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -23,7 +23,6 @@ import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-p import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ComponentsModule } from 'src/app/components/components.module'; -/* import { ComponentsModule } from 'src/app/components/components.module'; */ @NgModule({ imports: [ @@ -34,35 +33,9 @@ import { ComponentsModule } from 'src/app/components/components.module'; GabineteDigitalPageRoutingModule ], declarations: [ - GabineteDigitalPage, - EventListComponent, - EmptyContainerPage, - EventsToApprovePage, - ExpedientePage, - ExpedientsPage, - PedidosPage, - DespachosPage, - PendentesPage, - DespachosPrPage, - DiplomasPage, - ExpedientesPrPage, - SignedDiplomaComponent, - DiplomasAssinarPage - ], - entryComponents: [ - EmptyContainerPage, - EventsToApprovePage, - ExpedientePage, - ExpedientsPage, - PedidosPage, - DespachosPage, - PendentesPage, - DespachosPrPage, - DiplomasPage, - ExpedientesPrPage, - SignedDiplomaComponent, - DiplomasAssinarPage + GabineteDigitalPage ], + entryComponents: [], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class GabineteDigitalPageModule {} diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index e7bc2b222..b8302075e 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -19,9 +19,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ViewEventPageRoutingModule ], - declarations: [ - ViewEventPage, - ChatPopoverPage - ] + declarations: [] }) export class ViewEventPageModule {} diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts index de1bb2d5b..edfeb3d44 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts @@ -15,6 +15,6 @@ import { BtnModalDismissPage } from './btn-modal-dismiss.page'; IonicModule, BtnModalDismissPageRoutingModule ], - declarations: [BtnModalDismissPage] + declarations: [] }) export class BtnModalDismissPageModule {} diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts index 42e7d2a67..70ea0e341 100644 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts +++ b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts @@ -15,6 +15,6 @@ import { BtnAdicionarPage } from './btn-adicionar.page'; IonicModule, BtnAdicionarPageRoutingModule ], - declarations: [BtnAdicionarPage] + declarations: [] }) export class BtnAdicionarPageModule {} diff --git a/src/app/shared/buttons/btn-criar/btn-criar.module.ts b/src/app/shared/buttons/btn-criar/btn-criar.module.ts index 311f914d5..b6a7b77d7 100644 --- a/src/app/shared/buttons/btn-criar/btn-criar.module.ts +++ b/src/app/shared/buttons/btn-criar/btn-criar.module.ts @@ -15,6 +15,6 @@ import { BtnCriarPage } from './btn-criar.page'; IonicModule, BtnCriarPageRoutingModule ], - declarations: [BtnCriarPage] + declarations: [] }) export class BtnCriarPageModule {} diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts index fc72f8542..0378543f2 100644 --- a/src/app/shared/chat/edit-group/edit-group.module.ts +++ b/src/app/shared/chat/edit-group/edit-group.module.ts @@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, EditGroupPageRoutingModule ], - declarations: [EditGroupPage] + declarations: [] }) export class EditGroupPageModule {} diff --git a/src/app/shared/chat/empty-chat/empty-chat.module.ts b/src/app/shared/chat/empty-chat/empty-chat.module.ts index bf6038f1c..f999113de 100644 --- a/src/app/shared/chat/empty-chat/empty-chat.module.ts +++ b/src/app/shared/chat/empty-chat/empty-chat.module.ts @@ -15,6 +15,6 @@ import { EmptyChatPage } from './empty-chat.page'; IonicModule, EmptyChatPageRoutingModule ], - declarations: [EmptyChatPage] + declarations: [] }) export class EmptyChatPageModule {} diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts index 589bc4509..8b0914376 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts @@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; PipesModule, GroupContactsPageRoutingModule ], - declarations: [GroupContactsPage] + declarations: [] }) export class GroupContactsPageModule {} diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts index 49e439273..f5b118c13 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/shared/chat/group-messages/group-messages.module.ts @@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; PopoverModule, GroupMessagesPageRoutingModule ], - declarations: [GroupMessagesPage] + declarations: [] }) export class GroupMessagesPageModule {} diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts index fdd7b48b0..151b67d90 100644 --- a/src/app/shared/chat/messages/contacts/contacts.module.ts +++ b/src/app/shared/chat/messages/contacts/contacts.module.ts @@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ContactsPageRoutingModule ], exports: [FilterPipe], - declarations: [ContactsPage, FilterPipe] + declarations: [] }) export class ContactsPageModule {} diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/shared/chat/messages/messages.module.ts index 9fa17b9c8..3c6cc36d5 100644 --- a/src/app/shared/chat/messages/messages.module.ts +++ b/src/app/shared/chat/messages/messages.module.ts @@ -18,7 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, MessagesPageRoutingModule ], - declarations: [MessagesPage], - exports: [MessagesPage] + declarations: [] }) export class MessagesPageModule {} diff --git a/src/app/shared/chat/new-group/new-group.module.ts b/src/app/shared/chat/new-group/new-group.module.ts index c72df1781..88323d973 100644 --- a/src/app/shared/chat/new-group/new-group.module.ts +++ b/src/app/shared/chat/new-group/new-group.module.ts @@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, NewGroupPageRoutingModule ], - declarations: [NewGroupPage] + declarations: [] }) export class NewGroupPageModule {} diff --git a/src/app/shared/empty-container/empty-container.module.ts b/src/app/shared/empty-container/empty-container.module.ts index ccf4cef7a..d3ee63837 100644 --- a/src/app/shared/empty-container/empty-container.module.ts +++ b/src/app/shared/empty-container/empty-container.module.ts @@ -15,6 +15,6 @@ import { EmptyContainerPage } from './empty-container.page'; IonicModule, EmptyContainerPageRoutingModule ], - declarations: [EmptyContainerPage] + declarations: [] }) export class EmptyContainerPageModule {} 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 e97fd7610..6ff219fcf 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.module.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.module.ts @@ -15,6 +15,6 @@ import { AttendeeModalPage } from './attendee-modal.page'; IonicModule, AttendeeModalPageRoutingModule ], - declarations: [AttendeeModalPage] + declarations: [] }) export class AttendeeModalPageModule {} diff --git a/src/app/shared/event/attendees/attendees.module.ts b/src/app/shared/event/attendees/attendees.module.ts index 63a655038..6bf3dcc62 100644 --- a/src/app/shared/event/attendees/attendees.module.ts +++ b/src/app/shared/event/attendees/attendees.module.ts @@ -15,6 +15,6 @@ import { AttendeesPage } from './attendees.page'; IonicModule, AttendeesPageRoutingModule ], - declarations: [AttendeesPage] + declarations: [] }) export class AttendeesPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts index 4b2b50973..80eea17e6 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts @@ -15,6 +15,6 @@ import { DespachosPrPage } from './despachos-pr.page'; IonicModule, DespachosPrPageRoutingModule ], - declarations: [DespachosPrPage] + declarations: [] }) export class DespachosPrPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos/despachos.module.ts b/src/app/shared/gabinete-digital/despachos/despachos.module.ts index 848f0659a..6bfaee8f8 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.module.ts @@ -15,6 +15,6 @@ import { DespachosPage } from './despachos.page'; IonicModule, DespachosPageRoutingModule ], - declarations: [DespachosPage] + declarations: [] }) export class DespachosPageModule {} diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts index 4c13c29c3..cb6ab5a67 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -15,6 +15,6 @@ import { DiplomasAssinarPage } from './diplomas-assinar.page'; IonicModule, DiplomasAssinarPageRoutingModule ], - declarations: [DiplomasAssinarPage] + declarations: [] }) export class DiplomasAssinarPageModule {} diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html index 032837cfd..b6bc41fa7 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html @@ -2,7 +2,7 @@
Diplomas
-
@@ -19,7 +19,7 @@ - + Date: Thu, 3 Jun 2021 10:41:25 +0100 Subject: [PATCH 04/39] save --- src/app/components/components.module.ts | 15 +++++++------- .../group-messages/group-messages.module.ts | 4 ++-- .../pages/publications/publications.module.ts | 10 +++++++++- .../view-publications.module.ts | 2 ++ .../group-messages/group-messages.module.ts | 4 ++-- .../edit-event.module.ts | 8 +++++--- .../chat-popover/chat-popover.module.ts | 7 +++++-- .../popover/chat-popover/chat-popover.page.ts | 15 -------------- .../popover/chat-popover/popover.modules.ts | 20 ------------------- .../opts-expediente/opts-expediente.module.ts | 2 ++ .../new-action/new-action.module.ts | 3 ++- .../new-publication/new-publication.module.ts | 3 ++- .../publication-detail.module.ts | 3 ++- .../view-publications.module.ts | 6 +++--- .../view-publications.page.ts | 2 +- 15 files changed, 45 insertions(+), 59 deletions(-) delete mode 100644 src/app/shared/popover/chat-popover/popover.modules.ts diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 228511b45..255043a72 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -37,6 +37,7 @@ import { DiplomasPage } from '../pages/gabinete-digital/diplomas/diplomas.page'; import { ExpedientesPrPage } from '../shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; import { SignedDiplomaComponent } from '../shared/gabinete-digital/signed-diploma/signed-diploma.component'; import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; +import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popover.module'; @@ -49,10 +50,10 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar BtnCriarPage, BtnAdicionarPage, - ViewPublicationsPage, + /* ViewPublicationsPage, NewPublicationPage, PublicationDetailPage, - NewActionPage, + NewActionPage, */ NewEventPage, EditEventComponent, @@ -91,10 +92,10 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar BtnCriarPage, BtnAdicionarPage, - ViewPublicationsPage, + /* ViewPublicationsPage, NewPublicationPage, - PublicationDetailPage, - NewActionPage, + PublicationDetailPage, */ + //NewActionPage, NewEventPage, EditEventComponent, @@ -112,7 +113,7 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar EditGroupPage, GroupContactsPage, EmptyChatPage, - ChatPopoverPage, + //ChatPopoverPage, EventListComponent, EmptyContainerPage, @@ -129,7 +130,7 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar DiplomasAssinarPage ], imports: [ - CommonModule + CommonModule, ] }) export class ComponentsModule { } diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index f4c0fca1c..777e20e53 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -8,8 +8,8 @@ import { IonicModule } from '@ionic/angular'; import { GroupMessagesPageRoutingModule } from './group-messages-routing.module'; import { GroupMessagesPage } from './group-messages.page'; -import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules'; import { ComponentsModule } from 'src/app/components/components.module'; +import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module'; @NgModule({ imports: [ @@ -18,7 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PopoverModule, + ChatPopoverPageModule, GroupMessagesPageRoutingModule ], declarations: [GroupMessagesPage] diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts index 3f13f16c6..a21c4ffdb 100644 --- a/src/app/pages/publications/publications.module.ts +++ b/src/app/pages/publications/publications.module.ts @@ -13,6 +13,10 @@ import { NewPublicationPage } from 'src/app/shared/publication/new-publication/n import { PublicationDetailPage } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.page'; import { NewActionPage } from 'src/app/shared/publication/new-action/new-action.page'; import { ComponentsModule } from 'src/app/components/components.module'; +import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publications/view-publications.module'; +import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module'; +import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module'; +import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module'; @NgModule({ @@ -21,7 +25,11 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PublicationsPageRoutingModule + PublicationsPageRoutingModule, + ViewPublicationsPageModule, + NewPublicationPageModule, + PublicationDetailPageModule, + NewActionPageModule, ], declarations: [ PublicationsPage, diff --git a/src/app/pages/publications/view-publications/view-publications.module.ts b/src/app/pages/publications/view-publications/view-publications.module.ts index 534dfbe92..a5553f3c5 100644 --- a/src/app/pages/publications/view-publications/view-publications.module.ts +++ b/src/app/pages/publications/view-publications/view-publications.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module'; import { ViewPublicationsPage } from './view-publications.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, ViewPublicationsPageRoutingModule ], declarations: [] diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts index f5b118c13..cea5ed63e 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/shared/chat/group-messages/group-messages.module.ts @@ -8,8 +8,8 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module' import { GroupMessagesPage } from './group-messages.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules'; import { ComponentsModule } from 'src/app/components/components.module'; +import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module'; @NgModule({ imports: [ @@ -17,7 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PopoverModule, + ChatPopoverPageModule, GroupMessagesPageRoutingModule ], declarations: [] diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts index af3b36c0d..4d3a8353c 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; @@ -6,18 +6,20 @@ import { IonicModule } from '@ionic/angular'; import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.module'; import { EditEventToApproveComponent } from './edit-event.page'; -import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, EditEventToApproveComponentRoutingModule ], declarations: [ EditEventToApproveComponent - ] + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class EditEventToApproveComponentModule {} diff --git a/src/app/shared/popover/chat-popover/chat-popover.module.ts b/src/app/shared/popover/chat-popover/chat-popover.module.ts index b1ea8fb9b..582f39d9a 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.module.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.module.ts @@ -1,4 +1,4 @@ -import { NgModule } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -7,14 +7,17 @@ import { IonicModule } from '@ionic/angular'; import { ChatPopoverPageRoutingModule } from './chat-popover-routing.module'; import { ChatPopoverPage } from './chat-popover.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, ChatPopoverPageRoutingModule ], - declarations: [] + declarations: [ChatPopoverPage], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class ChatPopoverPageModule {} diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 4b489dde8..7d39449b9 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -1,6 +1,5 @@ import { Component, OnInit } from '@angular/core'; import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { EditGroupPage } from 'src/app/pages/chat/edit-group/edit-group.page'; import { ChatService } from 'src/app/services/chat.service'; @Component({ @@ -84,20 +83,6 @@ export class ChatPopoverPage implements OnInit { async openChangeGroupName(){ this.modalController.dismiss('edit'); - /* const modal = await this.modalController.create({ - component: EditGroupPage, - componentProps: { - roomId: this.roomId, - }, - cssClass: 'contacts', - backdropDismiss: false - }); - - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log(res.data); - this.modalController.dismiss(res.data); - }); */ } } diff --git a/src/app/shared/popover/chat-popover/popover.modules.ts b/src/app/shared/popover/chat-popover/popover.modules.ts deleted file mode 100644 index 226345b25..000000000 --- a/src/app/shared/popover/chat-popover/popover.modules.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { IonicModule } from '@ionic/angular'; -import { ChatPopoverPage } from './chat-popover.page'; - - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - ], - exports: [ - ChatPopoverPage, - ], - entryComponents:[], - declarations: [] -}) -export class PopoverModule {} \ No newline at end of file diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.module.ts b/src/app/shared/popover/opts-expediente/opts-expediente.module.ts index f2d9a571d..755345c1d 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.module.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.module.ts @@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module'; import { OptsExpedientePage } from './opts-expediente.page'; +import { ComponentsModule } from 'src/app/components/components.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, + ComponentsModule, OptsExpedientePageRoutingModule ], declarations: [OptsExpedientePage] diff --git a/src/app/shared/publication/new-action/new-action.module.ts b/src/app/shared/publication/new-action/new-action.module.ts index bc92b14d6..d5d868f49 100644 --- a/src/app/shared/publication/new-action/new-action.module.ts +++ b/src/app/shared/publication/new-action/new-action.module.ts @@ -15,6 +15,7 @@ import { NewActionPage } from './new-action.page'; IonicModule, NewActionPageRoutingModule ], - declarations: [] + exports: [NewActionPage], + declarations: [NewActionPage] }) export class NewActionPageModule {} diff --git a/src/app/shared/publication/new-publication/new-publication.module.ts b/src/app/shared/publication/new-publication/new-publication.module.ts index 915b65ed7..3580e799a 100644 --- a/src/app/shared/publication/new-publication/new-publication.module.ts +++ b/src/app/shared/publication/new-publication/new-publication.module.ts @@ -15,6 +15,7 @@ import { NewPublicationPage } from './new-publication.page'; IonicModule, NewPublicationPageRoutingModule ], - declarations: [] + exports: [NewPublicationPage], + declarations: [NewPublicationPage] }) export class NewPublicationPageModule {} diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts index 94af5480d..2f02044b4 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.module.ts @@ -15,6 +15,7 @@ import { PublicationDetailPage } from './publication-detail.page'; IonicModule, PublicationDetailPageRoutingModule ], - declarations: [] + exports: [PublicationDetailPage], + declarations: [PublicationDetailPage] }) export class PublicationDetailPageModule {} diff --git a/src/app/shared/publication/view-publications/view-publications.module.ts b/src/app/shared/publication/view-publications/view-publications.module.ts index a254b3253..27e09ec09 100644 --- a/src/app/shared/publication/view-publications/view-publications.module.ts +++ b/src/app/shared/publication/view-publications/view-publications.module.ts @@ -5,8 +5,7 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module'; - -import { ViewPublicationsPage } from 'src/app/pages/publications/view-publications/view-publications.page'; +import { ViewPublicationsPage } from './view-publications.page'; @NgModule({ imports: [ @@ -15,6 +14,7 @@ import { ViewPublicationsPage } from 'src/app/pages/publications/view-publicatio IonicModule, ViewPublicationsPageRoutingModule ], - declarations: [] + exports: [ViewPublicationsPage], + declarations: [ViewPublicationsPage] }) export class ViewPublicationsPageModule {} diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index a723445b8..3a7947c10 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -109,7 +109,7 @@ export class ViewPublicationsPage implements OnInit { } - async AddPublication(publicationType:any, folderId:string) { + async AddPublication(publicationType:any, folderId:any) { if( window.innerWidth <= 1024) { const modal = await this.modalController.create({ From 5c41e528100dbdab41976eeea7d5773e0136bda8 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:00:58 +0100 Subject: [PATCH 05/39] Improve agenda modules --- src/app/pages/agenda/agenda.module.ts | 14 ++++++++++++++ src/app/pages/events/attendees/attendees.module.ts | 3 ++- .../shared/agenda/view-event/view-event.module.ts | 3 ++- .../event/attendee-modal/attendee-modal.module.ts | 3 ++- .../events-to-approve/events-to-approve.module.ts | 3 ++- src/app/shared/header/header.module.ts | 3 ++- 6 files changed, 24 insertions(+), 5 deletions(-) diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 5ae511e80..308264f36 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -28,6 +28,13 @@ import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; 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'; + @NgModule({ imports: [ CommonModule, @@ -42,6 +49,13 @@ import { ComponentsModule } from 'src/app/components/components.module'; AgendaPageRoutingModule, NgCalendarModule, CalModalPageModule, + + // entryComponents + HeaderPageModule, + ViewEventPageModule, + AttendeesPageModule, + AttendeeModalPageModule, + EventsToApprovePageModule ], declarations: [ AgendaPage diff --git a/src/app/pages/events/attendees/attendees.module.ts b/src/app/pages/events/attendees/attendees.module.ts index 63a655038..36e9da0d5 100644 --- a/src/app/pages/events/attendees/attendees.module.ts +++ b/src/app/pages/events/attendees/attendees.module.ts @@ -15,6 +15,7 @@ import { AttendeesPage } from './attendees.page'; IonicModule, AttendeesPageRoutingModule ], - declarations: [AttendeesPage] + declarations: [AttendeesPage], + exports: [AttendeesPage] }) export class AttendeesPageModule {} diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index b8302075e..78c4c090b 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -19,6 +19,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ViewEventPageRoutingModule ], - declarations: [] + declarations: [], + exports: [ViewEventPage] }) export class ViewEventPageModule {} 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 6ff219fcf..0d65b0fac 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.module.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.module.ts @@ -15,6 +15,7 @@ import { AttendeeModalPage } from './attendee-modal.page'; IonicModule, AttendeeModalPageRoutingModule ], - declarations: [] + declarations: [], + exports: [AttendeeModalPage] }) export class AttendeeModalPageModule {} diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts index 17ef0f8eb..7011961ac 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts @@ -15,6 +15,7 @@ import { EventsToApprovePage } from './events-to-approve.page'; IonicModule, EventsToApprovePageRoutingModule ], - declarations: [] + declarations: [], + exports: [EventsToApprovePage] }) export class EventsToApprovePageModule {} diff --git a/src/app/shared/header/header.module.ts b/src/app/shared/header/header.module.ts index 95ec4c0aa..9b3dd4129 100644 --- a/src/app/shared/header/header.module.ts +++ b/src/app/shared/header/header.module.ts @@ -15,6 +15,7 @@ import { HeaderPage } from './header.page'; IonicModule, HeaderPageRoutingModule ], - declarations: [] + declarations: [], + exports: [HeaderPage] }) export class HeaderPageModule {} From b09016a111bb458c354e76c91a62eff8f092f049 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 11:03:26 +0100 Subject: [PATCH 06/39] save chat changes --- src/app/components/components.module.ts | 22 ++++--------------- src/app/pages/chat/chat.module.ts | 14 ++++++++++++ .../chat/edit-group/edit-group.module.ts | 3 ++- .../group-contacts/group-contacts.module.ts | 3 ++- .../group-messages/group-messages.module.ts | 3 ++- .../chat/messages/contacts/contacts.module.ts | 4 ++-- .../shared/chat/messages/messages.module.ts | 3 ++- .../shared/chat/new-group/new-group.module.ts | 3 ++- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 255043a72..51472dfd2 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -7,10 +7,6 @@ import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; -import { NewPublicationPage } from '../shared/publication/new-publication/new-publication.page'; -import { ViewPublicationsPage } from '../shared/publication/view-publications/view-publications.page'; -import { PublicationDetailPage } from '../shared/publication/view-publications/publication-detail/publication-detail.page'; -import { NewActionPage } from '../shared/publication/new-action/new-action.page'; import { NewEventPage } from '../shared/agenda/new-event/new-event.component'; import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; @@ -50,11 +46,6 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov BtnCriarPage, BtnAdicionarPage, - /* ViewPublicationsPage, - NewPublicationPage, - PublicationDetailPage, - NewActionPage, */ - NewEventPage, EditEventComponent, ViewEventPage, @@ -62,13 +53,13 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov AttendeesPage, AttendeeModalPage, - MessagesPage, + /* MessagesPage, ContactsPage, GroupMessagesPage, NewGroupPage, EditGroupPage, GroupContactsPage, - EmptyChatPage, + EmptyChatPage, */ EventListComponent, EmptyContainerPage, @@ -92,11 +83,6 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov BtnCriarPage, BtnAdicionarPage, - /* ViewPublicationsPage, - NewPublicationPage, - PublicationDetailPage, */ - //NewActionPage, - NewEventPage, EditEventComponent, ViewEventPage, @@ -106,13 +92,13 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov AttendeeModalPage, EventsToApprovePage, - MessagesPage, + /* MessagesPage, ContactsPage, GroupMessagesPage, NewGroupPage, EditGroupPage, GroupContactsPage, - EmptyChatPage, + EmptyChatPage, */ //ChatPopoverPage, EventListComponent, diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 29ac75e72..11d3903a9 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -18,6 +18,13 @@ import { GroupContactsPage } from 'src/app/shared/chat/group-messages/group-cont import { PipesModule } from 'src/app/pipes/pipes.module'; import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; import { ComponentsModule } from 'src/app/components/components.module'; +import { ContactsPageModule } from 'src/app/shared/chat/messages/contacts/contacts.module'; +import { GroupMessagesPageModule } from 'src/app/shared/chat/group-messages/group-messages.module'; +import { NewGroupPageModule } from 'src/app/shared/chat/new-group/new-group.module'; +import { EditGroupPageModule } from 'src/app/shared/chat/edit-group/edit-group.module'; +import { GroupContactsPageModule } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.module'; +import { MessagesPageModule } from 'src/app/shared/chat/messages/messages.module'; +import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.module'; @NgModule({ imports: [ @@ -28,6 +35,13 @@ import { ComponentsModule } from 'src/app/components/components.module'; PipesModule, ChatPageRoutingModule, RouterModule, + MessagesPageModule, + ContactsPageModule, + GroupMessagesPageModule, + NewGroupPageModule, + EditGroupPageModule, + GroupContactsPageModule, + EmptyChatPageModule, ], declarations: [ ChatPage diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts index 0378543f2..fcd33821f 100644 --- a/src/app/shared/chat/edit-group/edit-group.module.ts +++ b/src/app/shared/chat/edit-group/edit-group.module.ts @@ -18,6 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, EditGroupPageRoutingModule ], - declarations: [] + exports: [EditGroupPage], + declarations: [EditGroupPage] }) export class EditGroupPageModule {} diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts index 8b0914376..a2f3199a9 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts @@ -20,6 +20,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; PipesModule, GroupContactsPageRoutingModule ], - declarations: [] + exports: [GroupContactsPage], + declarations: [GroupContactsPage] }) export class GroupContactsPageModule {} diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts index cea5ed63e..73a6eda80 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/shared/chat/group-messages/group-messages.module.ts @@ -20,6 +20,7 @@ import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.m ChatPopoverPageModule, GroupMessagesPageRoutingModule ], - declarations: [] + exports: [GroupMessagesPage], + declarations: [GroupMessagesPage] }) export class GroupMessagesPageModule {} diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts index 151b67d90..6301034b4 100644 --- a/src/app/shared/chat/messages/contacts/contacts.module.ts +++ b/src/app/shared/chat/messages/contacts/contacts.module.ts @@ -19,7 +19,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ContactsPageRoutingModule ], - exports: [FilterPipe], - declarations: [] + exports: [ContactsPage, FilterPipe], + declarations: [ContactsPage] }) export class ContactsPageModule {} diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/shared/chat/messages/messages.module.ts index 3c6cc36d5..455729837 100644 --- a/src/app/shared/chat/messages/messages.module.ts +++ b/src/app/shared/chat/messages/messages.module.ts @@ -18,6 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, MessagesPageRoutingModule ], - declarations: [] + exports: [MessagesPage], + declarations: [MessagesPage] }) export class MessagesPageModule {} diff --git a/src/app/shared/chat/new-group/new-group.module.ts b/src/app/shared/chat/new-group/new-group.module.ts index 88323d973..b9ea20a58 100644 --- a/src/app/shared/chat/new-group/new-group.module.ts +++ b/src/app/shared/chat/new-group/new-group.module.ts @@ -18,6 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, NewGroupPageRoutingModule ], - declarations: [] + exports: [NewGroupPage], + declarations: [NewGroupPage] }) export class NewGroupPageModule {} From a5f8e18691db8f7edfa59ae9b550766111a5903d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:13:50 +0100 Subject: [PATCH 07/39] fix --- src/app/components/components.module.ts | 4 ++-- src/app/shared/agenda/view-event/view-event.module.ts | 2 +- src/app/shared/event/attendee-modal/attendee-modal.module.ts | 2 +- .../events-to-approve/events-to-approve.module.ts | 2 +- src/app/shared/header/header.module.ts | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 51472dfd2..1142b4f03 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -48,7 +48,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov NewEventPage, EditEventComponent, - ViewEventPage, + //ViewEventPage, ApproveEventComponent, AttendeesPage, AttendeeModalPage, @@ -85,7 +85,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov NewEventPage, EditEventComponent, - ViewEventPage, + // ViewEventPage, EventListComponent, ApproveEventComponent, AttendeesPage, diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index 78c4c090b..1afb226e0 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -19,7 +19,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ViewEventPageRoutingModule ], - declarations: [], + declarations: [ViewEventPage], exports: [ViewEventPage] }) export class ViewEventPageModule {} 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 0d65b0fac..bc1113349 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.module.ts +++ b/src/app/shared/event/attendee-modal/attendee-modal.module.ts @@ -15,7 +15,7 @@ import { AttendeeModalPage } from './attendee-modal.page'; IonicModule, AttendeeModalPageRoutingModule ], - declarations: [], + declarations: [AttendeeModalPage], exports: [AttendeeModalPage] }) export class AttendeeModalPageModule {} diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts index 7011961ac..cbc598559 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module.ts @@ -15,7 +15,7 @@ import { EventsToApprovePage } from './events-to-approve.page'; IonicModule, EventsToApprovePageRoutingModule ], - declarations: [], + declarations: [EventsToApprovePage], exports: [EventsToApprovePage] }) export class EventsToApprovePageModule {} diff --git a/src/app/shared/header/header.module.ts b/src/app/shared/header/header.module.ts index 9b3dd4129..935554cd0 100644 --- a/src/app/shared/header/header.module.ts +++ b/src/app/shared/header/header.module.ts @@ -15,7 +15,7 @@ import { HeaderPage } from './header.page'; IonicModule, HeaderPageRoutingModule ], - declarations: [], + declarations: [HeaderPage], exports: [HeaderPage] }) export class HeaderPageModule {} From 60a90e11c4f3819bc1ff08d7c3ed51c5a32fdbd1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:30:24 +0100 Subject: [PATCH 08/39] fix HeaderPageModule --- src/app/components/components.module.ts | 5 +++-- .../headers/header-no-search/header-no-search.module.ts | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 1142b4f03..e57d4720b 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -38,8 +38,9 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov @NgModule({ + declarations: [ - HeaderPage, + //HeaderPage, HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, @@ -76,7 +77,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov DiplomasAssinarPage ], exports: [ - HeaderPage, + //HeaderPage, HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, diff --git a/src/app/shared/headers/header-no-search/header-no-search.module.ts b/src/app/shared/headers/header-no-search/header-no-search.module.ts index 00ede4ffc..0d7373a40 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.module.ts +++ b/src/app/shared/headers/header-no-search/header-no-search.module.ts @@ -15,6 +15,5 @@ import { HeaderNoSearchPage } from './header-no-search.page'; IonicModule, HeaderNoSearchPageRoutingModule ], - declarations: [] }) export class HeaderNoSearchPageModule {} From 30f720a3b929ca84db10709c6aef47aa5855574c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 11:31:19 +0100 Subject: [PATCH 09/39] save --- src/app/components/components.module.ts | 21 ++----------------- src/app/pages/events/events.module.ts | 4 +++- .../publication-detail.module.ts | 2 +- .../view-publications.module.ts | 3 ++- .../header-no-search.module.ts | 3 ++- 5 files changed, 10 insertions(+), 23 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 1142b4f03..04615accb 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -40,7 +40,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov @NgModule({ declarations: [ HeaderPage, - HeaderNoSearchPage, + /* HeaderNoSearchPage, */ BtnSeguintePage, BtnModalDismissPage, BtnCriarPage, @@ -53,14 +53,6 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov AttendeesPage, AttendeeModalPage, - /* MessagesPage, - ContactsPage, - GroupMessagesPage, - NewGroupPage, - EditGroupPage, - GroupContactsPage, - EmptyChatPage, */ - EventListComponent, EmptyContainerPage, EventsToApprovePage, @@ -77,7 +69,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov ], exports: [ HeaderPage, - HeaderNoSearchPage, + /* HeaderNoSearchPage, */ BtnSeguintePage, BtnModalDismissPage, BtnCriarPage, @@ -92,15 +84,6 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov AttendeeModalPage, EventsToApprovePage, - /* MessagesPage, - ContactsPage, - GroupMessagesPage, - NewGroupPage, - EditGroupPage, - GroupContactsPage, - EmptyChatPage, */ - //ChatPopoverPage, - EventListComponent, EmptyContainerPage, EventsToApprovePage, diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index 2b5c1f6d7..ffcaef135 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -9,6 +9,7 @@ import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; // import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderNoSearchPageModule } from 'src/app/shared/headers/header-no-search/header-no-search.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - EventsPageRoutingModule + EventsPageRoutingModule, + HeaderNoSearchPageModule, ], declarations: [EventsPage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/publications/publication-detail/publication-detail.module.ts b/src/app/pages/publications/publication-detail/publication-detail.module.ts index 94af5480d..116453af2 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.module.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.module.ts @@ -15,6 +15,6 @@ import { PublicationDetailPage } from './publication-detail.page'; IonicModule, PublicationDetailPageRoutingModule ], - declarations: [] + declarations: [PublicationDetailPage] }) export class PublicationDetailPageModule {} diff --git a/src/app/pages/publications/view-publications/view-publications.module.ts b/src/app/pages/publications/view-publications/view-publications.module.ts index a5553f3c5..ea016b8ed 100644 --- a/src/app/pages/publications/view-publications/view-publications.module.ts +++ b/src/app/pages/publications/view-publications/view-publications.module.ts @@ -17,6 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ViewPublicationsPageRoutingModule ], - declarations: [] + exports: [ViewPublicationsPage], + declarations: [ViewPublicationsPage] }) export class ViewPublicationsPageModule {} diff --git a/src/app/shared/headers/header-no-search/header-no-search.module.ts b/src/app/shared/headers/header-no-search/header-no-search.module.ts index 00ede4ffc..e9ecd8556 100644 --- a/src/app/shared/headers/header-no-search/header-no-search.module.ts +++ b/src/app/shared/headers/header-no-search/header-no-search.module.ts @@ -15,6 +15,7 @@ import { HeaderNoSearchPage } from './header-no-search.page'; IonicModule, HeaderNoSearchPageRoutingModule ], - declarations: [] + exports: [HeaderNoSearchPage], + declarations: [HeaderNoSearchPage] }) export class HeaderNoSearchPageModule {} From 878279bb78da896a81432557e4e11620e9b84c69 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:36:14 +0100 Subject: [PATCH 10/39] Improve --- src/app/pages/gabinete-digital/gabinete-digital.module.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 1edf1c4e8..4e4cac560 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -24,13 +24,18 @@ import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-d import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ComponentsModule } from 'src/app/components/components.module'; + +import { HeaderPageModule } from 'src/app/shared/header/header.module'; + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, ComponentsModule, - GabineteDigitalPageRoutingModule + GabineteDigitalPageRoutingModule, + // entries + HeaderPageModule ], declarations: [ GabineteDigitalPage From 646172eb93aa4f7a2bf87b407d9df4673fe1b925 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:44:32 +0100 Subject: [PATCH 11/39] Recreate modal --- .../new-event/new-event-routing.module.ts | 17 ++ .../agenda/new-event/new-event.component.html | 230 ------------------ .../agenda/new-event/new-event.component.scss | 213 ---------------- .../agenda/new-event/new-event.module.ts | 20 ++ .../agenda/new-event/new-event.page.html | 9 + .../agenda/new-event/new-event.page.scss | 213 ++++++++++++++++ ...mponent.spec.ts => new-event.page.spec.ts} | 6 +- ...w-event.component.ts => new-event.page.ts} | 9 +- 8 files changed, 268 insertions(+), 449 deletions(-) create mode 100644 src/app/shared/agenda/new-event/new-event-routing.module.ts delete mode 100644 src/app/shared/agenda/new-event/new-event.component.html delete mode 100644 src/app/shared/agenda/new-event/new-event.component.scss create mode 100644 src/app/shared/agenda/new-event/new-event.module.ts create mode 100644 src/app/shared/agenda/new-event/new-event.page.html create mode 100644 src/app/shared/agenda/new-event/new-event.page.scss rename src/app/shared/agenda/new-event/{new-event.component.spec.ts => new-event.page.spec.ts} (75%) rename src/app/shared/agenda/new-event/{new-event.component.ts => new-event.page.ts} (99%) diff --git a/src/app/shared/agenda/new-event/new-event-routing.module.ts b/src/app/shared/agenda/new-event/new-event-routing.module.ts new file mode 100644 index 000000000..1b0103232 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { NewEventPage } from './new-event.page'; + +const routes: Routes = [ + { + path: '', + component: NewEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class NewEventPageRoutingModule {} diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html deleted file mode 100644 index 30169bfa0..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ /dev/null @@ -1,230 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- - Oficial - Pessoal - -
-
-
- -
-
-
- -
-
- - Reunião - Viagem - Conferência - Encontro - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - -
-
-
- -
-
-
- -
-
- -
- - - Adicionar intervenientes - {{participant.Name}} - - -
- -
- -
-
-
-
- -
-
-
- -
-
-
- - - - Com conhecimento - {{participant.Name}} - - - -
-
- -
-
-
-
- -
-
-
- -
-
- - - -
-
-
- -
- -
- -
-
- Adicionar documentos -
- -
- -
- - - -

- {{document.Assunto}} - {{document.appName}} - - - -

-

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

- - - -
- -
- - - - - - Cancelar - - - - - - Gravar - - - - \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.scss b/src/app/shared/agenda/new-event/new-event.component.scss deleted file mode 100644 index 1497762a9..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.scss +++ /dev/null @@ -1,213 +0,0 @@ -ion-content{ - --background:transparent; -} -.header-toolbar{ - --background:transparent; - --opacity: 1; -} -.main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .title-content{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - width: 221px; - margin: 2.5px 0 0 5px; - } - } - - .title{ - font-size: 25px; - } - -} -.main-content{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - margin: 0 auto; - background-color: #fff; - overflow:auto; - padding: 15px 20px 0 20px; - - .ion-item-container{ - margin: 15px auto; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 10px; - } - .ion-item-container-no-border{ - width: 100%; - margin: 0px auto; - padding: 0 !important; - overflow: auto; - } - .container-div{ - margin-bottom: 15px; - } - .ion-item-class-2{ - margin: 0px auto; - } - .ion-icon-class{ - width: 45px; - height: 45px; - float: left; - padding: 10px; - font-size: 25px; - } - ion-select{ - padding-left: 5px; - margin-left: 0; - } - .ion-input-class{ - height: 45px; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; - padding-right: 10px; - float: left; - } - .ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; - } - .list-people{ - width: 256px; - float: left; - - } - .add-people{ - width: 45px; - float: right; - overflow: auto; - font-size: 25px; - padding: 10px; - } - .list-people-title{ - /* font-size: 13px; */ - color: #797979; - } - .attach-document{ - font-size: 15px; - color: #0d89d1; - margin: 5px 5px 5px 10px; - padding: 5px; - float: left; - } - .attach-icon{ - width: 37px; - font-size: 35px; - float: left; - } - .attach-title-item{ - width: 100%; - font-size: 15px; - color:#0d89d1; - } - /* SPAN */ - .span-left{ - float: left; - font-size: 15x; - } - .span-right{ - text-align: right; - float: right; - font-size: 13px; - } - .container-footer{ - margin:0 auto; - overflow: auto; - } - .button-cancel { - width: 170px; - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color: #061b52; - margin:10px; - } - .button-save { - width: 170px; - height: 44px; - border-radius: 22.5px; - --background: #42b9fe; - --color:#ffffff; - margin:10px; - } - - .text-input{ - width: 100%; - border: 1px solid #ebebeb; - margin: 0px 15px 15px 0px; - padding: 0 !important; - border-radius: 5px; - } - - /* Error Messages */ - .error{ - color:red; - font-size: 12px; - font-weight: bold; - padding-bottom: 20px; - } - .span-color{ - color:red; - } - -} - - -.container-div{ - ion-textarea{ - height: 81px; - } -} - - -.app-name{ - background: #42b9f2; - border-radius: 18px; - text-align: center; - display: flex; - align-items: center; - padding: 0px 5px; - color: white; - font-size: 9pt; - font-weight: 500; - height: 19px; - -webkit-border-radius: 18px; - -moz-border-radius: 18px; - -ms-border-radius: 18px; - -o-border-radius: 18px; -} - - -.close-button { - display: none; -} - -.list:hover { - - .app-name { - display: none; - } - - .close-button { - display: block !important; - } -} \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts new file mode 100644 index 000000000..f5d90c691 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { NewEventPageRoutingModule } from './new-event-routing.module'; + +import { NewEventPage } from './new-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + NewEventPageRoutingModule + ], + declarations: [NewEventPage] +}) +export class NewEventPageModule {} diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html new file mode 100644 index 000000000..626888e59 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -0,0 +1,9 @@ + + + NewEvent + + + + + + diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss new file mode 100644 index 000000000..29ce5055c --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -0,0 +1,213 @@ +ion-content{ + --background:transparent; + } + .header-toolbar{ + --background:transparent; + --opacity: 1; + } + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 221px; + margin: 2.5px 0 0 5px; + } + } + + .title{ + font-size: 25px; + } + + } + .main-content{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + margin: 0 auto; + background-color: #fff; + overflow:auto; + padding: 15px 20px 0 20px; + + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + + } + + + .container-div{ + ion-textarea{ + height: 81px; + } + } + + + .app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; + } + + + .close-button { + display: none; + } + + .list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.spec.ts b/src/app/shared/agenda/new-event/new-event.page.spec.ts similarity index 75% rename from src/app/shared/agenda/new-event/new-event.component.spec.ts rename to src/app/shared/agenda/new-event/new-event.page.spec.ts index 2930af086..ca95e3857 100644 --- a/src/app/shared/agenda/new-event/new-event.component.spec.ts +++ b/src/app/shared/agenda/new-event/new-event.page.spec.ts @@ -1,13 +1,13 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { NewEventPage } from './new-event.component'; +import { NewEventPage } from './new-event.page'; describe('NewEventPage', () => { let component: NewEventPage; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ NewEventPage ], imports: [IonicModule.forRoot()] diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.page.ts similarity index 99% rename from src/app/shared/agenda/new-event/new-event.component.ts rename to src/app/shared/agenda/new-event/new-event.page.ts index 20d667c51..74acd2072 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -11,14 +11,16 @@ import { SearchDocument } from "src/app/models/search-document"; import { EventAttachment } from 'src/app/models/attachment.model'; import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; + + @Component({ selector: 'app-new-event', - templateUrl: './new-event.component.html', - styleUrls: ['./new-event.component.scss'], + templateUrl: './new-event.page.html', + styleUrls: ['./new-event.page.scss'], }) - export class NewEventPage implements OnInit { + eventBody: EventBody; segment:string = "true"; @@ -345,4 +347,5 @@ export class NewEventPage implements OnInit { },3000) } + } From 766946454f477d0a92de9355829f659f0be2fbce Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:52:33 +0100 Subject: [PATCH 12/39] fixe Attendess modal --- .../agenda/new-event/new-event.page.html | 227 +++++++++++++++++- 1 file changed, 224 insertions(+), 3 deletions(-) diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 626888e59..30169bfa0 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -1,9 +1,230 @@ - - - NewEvent + + +
+
+
+ Novo Evento +
+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+
+
+
+ +
+
+ + Reunião + Viagem + Conferência + Encontro + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+
+
+ +
+
+ +
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+ +
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + + Com conhecimento + {{participant.Name}} + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+ +
+ +
+
+ Adicionar documentos +
+ +
+ +
+ + + +

+ {{document.Assunto}} + {{document.appName}} + + + +

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

+ + + +
+ +
+ + + + + Cancelar + + + + + + Gravar + + + + \ No newline at end of file From a56b3a5944773ecc2932286f008cc03472472ef3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:56:01 +0100 Subject: [PATCH 13/39] Improve view event to approve --- src/app/app-routing.module.ts | 273 +++++++++--------- src/app/components/components.module.ts | 12 +- src/app/pages/agenda/agenda.module.ts | 5 +- .../gabinete-digital.module.ts | 4 +- 4 files changed, 148 insertions(+), 146 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bfc00f08f..8d0ace252 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,137 +1,140 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'btn-criar', - loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule) - }, - { - path: 'btn-adicionar', - loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'btn-criar', + loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule) + }, + { + path: 'btn-adicionar', + loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) + }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, { + path: 'new-event', + loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) }, - - /* { - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index e57d4720b..1ff04be4b 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -7,7 +7,7 @@ import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; -import { NewEventPage } from '../shared/agenda/new-event/new-event.component'; +import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; @@ -52,7 +52,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov //ViewEventPage, ApproveEventComponent, AttendeesPage, - AttendeeModalPage, + //AttendeeModalPage, /* MessagesPage, ContactsPage, @@ -64,7 +64,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, EmptyContainerPage, - EventsToApprovePage, + //EventsToApprovePage, ExpedientePage, ExpedientsPage, PedidosPage, @@ -90,8 +90,8 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, ApproveEventComponent, AttendeesPage, - AttendeeModalPage, - EventsToApprovePage, + //AttendeeModalPage, + //EventsToApprovePage, /* MessagesPage, ContactsPage, @@ -104,7 +104,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, EmptyContainerPage, - EventsToApprovePage, + //EventsToApprovePage, ExpedientePage, ExpedientsPage, PedidosPage, diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 308264f36..a08c4f9e8 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -13,7 +13,7 @@ import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; import { SharedModule } from 'src/app/shared/shared.module'; -import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.component" +import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page" import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component"; @@ -60,9 +60,6 @@ import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event declarations: [ AgendaPage ], - entryComponents: [ - EventsToApprovePage, - ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ { provide: LOCALE_ID, useValue: 'pt-PT'} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 4e4cac560..5eca65132 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -26,6 +26,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; @NgModule({ imports: [ @@ -35,7 +36,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, GabineteDigitalPageRoutingModule, // entries - HeaderPageModule + HeaderPageModule, + EventsToApprovePageModule ], declarations: [ GabineteDigitalPage From b9ae9bce3d5c84fcea2fbdda6dd6f98e280cd2da Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 12:08:49 +0100 Subject: [PATCH 14/39] save chenges in gabinete-digital --- src/app/components/components.module.ts | 17 +++++++----- src/app/pages/chat/chat.module.ts | 2 ++ .../despacho-pr/despacho-pr.module.ts | 4 ++- .../despachos-pr/despachos-pr.module.ts | 4 ++- .../despachos/despacho/despacho.module.ts | 4 ++- .../despachos/despachos.module.ts | 2 ++ .../diploma-assinar/diploma-assinar.module.ts | 4 ++- .../diplomas-assinar.module.ts | 2 ++ .../diplomas/diploma/diploma.module.ts | 4 ++- .../diplomas/diplomas.module.ts | 2 ++ .../approve-event-modal.module.ts | 4 ++- .../approve-event/approve-event.module.ts | 4 ++- .../event-list/event-list.module.ts | 4 ++- .../expediente/expediente.module.ts | 4 ++- .../expediente-pr/expediente-pr.module.ts | 4 ++- .../expedientes-pr/expedientes-pr.module.ts | 2 ++ .../gabinete-digital.module.ts | 27 ++++++++++++++++++- .../pedidos/pedido/pedido.module.ts | 4 ++- .../pedidos/pedidos.module.ts | 4 ++- .../pendentes/pendentes.module.ts | 4 ++- .../new-action/new-action.module.ts | 3 ++- .../new-publication/new-publication.module.ts | 3 ++- .../pages/publications/publications.module.ts | 2 ++ .../empty-container/empty-container.module.ts | 3 ++- .../despachos-pr/despachos-pr.module.ts | 3 ++- .../despachos/despachos.module.ts | 3 ++- .../diplomas-assinar.module.ts | 3 ++- .../diplomas/diplomas.module.ts | 1 + .../expediente/expediente.module.ts | 3 ++- .../expedientes-pr/expedientes-pr.module.ts | 3 ++- .../expedients/expedients.module.ts | 3 ++- .../pedidos/pedidos.module.ts | 3 ++- .../pendentes/pendentes.module.ts | 3 ++- 33 files changed, 110 insertions(+), 32 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index c7717e7e2..e136e25a4 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -54,8 +54,11 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov AttendeesPage, AttendeeModalPage, + EventListComponent, - EmptyContainerPage, + SignedDiplomaComponent, + + /* EmptyContainerPage, EventsToApprovePage, ExpedientePage, ExpedientsPage, @@ -64,8 +67,8 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov PendentesPage, DespachosPrPage, DiplomasPage, - ExpedientesPrPage, - SignedDiplomaComponent, + ExpedientesPrPage, */ + DiplomasAssinarPage ], exports: [ @@ -86,7 +89,9 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventsToApprovePage, EventListComponent, - EmptyContainerPage, + SignedDiplomaComponent, + + /* EmptyContainerPage, EventsToApprovePage, ExpedientePage, ExpedientsPage, @@ -95,9 +100,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov PendentesPage, DespachosPrPage, DiplomasPage, - ExpedientesPrPage, - SignedDiplomaComponent, - DiplomasAssinarPage + ExpedientesPrPage, */ ], imports: [ CommonModule, diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 11d3903a9..85c8c34bb 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -25,6 +25,7 @@ import { EditGroupPageModule } from 'src/app/shared/chat/edit-group/edit-group.m import { GroupContactsPageModule } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.module'; import { MessagesPageModule } from 'src/app/shared/chat/messages/messages.module'; import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -35,6 +36,7 @@ import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.m PipesModule, ChatPageRoutingModule, RouterModule, + HeaderPageModule, MessagesPageModule, ContactsPageModule, GroupMessagesPageModule, diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts index 744e0a11f..5f7334e9a 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts @@ -9,6 +9,7 @@ import { DespachoPrPageRoutingModule } from './despacho-pr-routing.module'; import { DespachoPrPage } from './despacho-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DespachoPrPageRoutingModule + DespachoPrPageRoutingModule, + HeaderPageModule, ], declarations: [DespachoPrPage] }) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts index c6de146aa..963a77e6f 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts @@ -9,6 +9,7 @@ import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module'; import { DespachosPrPage } from './despachos-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DespachosPrPageRoutingModule + DespachosPrPageRoutingModule, + HeaderPageModule, ], declarations: [DespachosPrPage] }) diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts index 3c556a3c6..0579462ea 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts @@ -9,6 +9,7 @@ import { DespachoPageRoutingModule } from './despacho-routing.module'; import { DespachoPage } from './despacho.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DespachoPageRoutingModule + DespachoPageRoutingModule, + HeaderPageModule, ], declarations: [ DespachoPage, diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts index ed4885ec8..3f4b2debe 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts @@ -9,6 +9,7 @@ import { DespachosPageRoutingModule } from './despachos-routing.module'; import { DespachosPage } from './despachos.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -17,6 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; IonicModule, ComponentsModule, DespachosPageRoutingModule, + HeaderPageModule, ], declarations: [ DespachosPage, diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts index 87d64d885..64cf9c9a0 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts @@ -9,6 +9,7 @@ import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.modul import { DiplomaAssinarPage } from './diploma-assinar.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DiplomaAssinarPageRoutingModule + DiplomaAssinarPageRoutingModule, + HeaderPageModule, ], declarations: [DiplomaAssinarPage] }) diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts index 70f73a6fa..49abc64e8 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -9,6 +9,7 @@ import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.mod import { DiplomasAssinarPage } from './diplomas-assinar.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,6 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, DiplomasAssinarPageRoutingModule, + HeaderPageModule, ComponentsModule ], declarations: [DiplomasAssinarPage] diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts index 0b0c30349..8b7158f67 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -9,6 +9,7 @@ import { DiplomaPageRoutingModule } from './diploma-routing.module'; import { DiplomaPage } from './diploma.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DiplomaPageRoutingModule + DiplomaPageRoutingModule, + HeaderPageModule, ], declarations: [DiplomaPage] }) diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index 9e3d91ccb..d7f707a9d 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -9,6 +9,7 @@ import { DiplomasPageRoutingModule } from './diplomas-routing.module'; import { DiplomasPage } from './diplomas.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,6 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, DiplomasPageRoutingModule, + HeaderPageModule, ComponentsModule ], declarations: [] diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts index 339f09346..020f9435d 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts @@ -7,13 +7,15 @@ import { IonicModule } from '@ionic/angular'; import { ApproveEventModalPageRoutingModule } from './approve-event-modal-routing.module'; import { ApproveEventModalPage } from './approve-event-modal.page'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ApproveEventModalPageRoutingModule + ApproveEventModalPageRoutingModule, + HeaderPageModule, ], declarations: [ApproveEventModalPage] }) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts index b2941e26d..2aac9a5c1 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts @@ -9,6 +9,7 @@ import { ApproveEventPageRoutingModule } from './approve-event-routing.module'; import { ApproveEventPage } from './approve-event.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ApproveEventPageRoutingModule + ApproveEventPageRoutingModule, + HeaderPageModule, ], declarations: [ApproveEventPage] }) 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 a1ac22c1d..907d95802 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 @@ -9,6 +9,7 @@ import { EventListPageRoutingModule } from './event-list-routing.module'; import { EventListPage } from './event-list.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - EventListPageRoutingModule + EventListPageRoutingModule, + HeaderPageModule, ], declarations: [EventListPage] }) diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index 55b5631fa..7d0427077 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -9,6 +9,7 @@ import { ExpedientePageRoutingModule } from './expediente-routing.module'; import { ExpedientePage } from './expediente.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ExpedientePageRoutingModule + ExpedientePageRoutingModule, + HeaderPageModule, ], declarations: [ExpedientePage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts index 405983adf..8b086e074 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts @@ -9,6 +9,7 @@ import { ExpedientePrPageRoutingModule } from './expediente-pr-routing.module'; import { ExpedientePrPage } from './expediente-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ExpedientePrPageRoutingModule + ExpedientePrPageRoutingModule, + HeaderPageModule, ], declarations: [ExpedientePrPage] }) diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts index db0ca9550..e036efe77 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts @@ -9,6 +9,7 @@ import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module' import { ExpedientesPrPage } from './expedientes-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,6 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ExpedientesPrPageRoutingModule, + HeaderPageModule, ComponentsModule ], declarations: [ExpedientesPrPage] diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 1edf1c4e8..c977945fb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -23,6 +23,18 @@ import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-p import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ComponentsModule } from 'src/app/components/components.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; +import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; +import { ExpedientePageModule } from 'src/app/shared/gabinete-digital/expediente/expediente.module'; +import { ExpedientsPageModule } from 'src/app/shared/gabinete-digital/expedients/expedients.module'; +import { PedidosPageModule } from 'src/app/shared/gabinete-digital/pedidos/pedidos.module'; +import { DespachosPageModule } from 'src/app/shared/gabinete-digital/despachos/despachos.module'; +import { PendentesPageModule } from 'src/app/shared/gabinete-digital/pendentes/pendentes.module'; +import { DespachosPrPageModule } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module'; +import { DiplomasPageModule } from 'src/app/shared/gabinete-digital/diplomas/diplomas.module'; +import { ExpedientesPrPageModule } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module'; +import { DiplomasAssinarPageModule } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -30,7 +42,20 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - GabineteDigitalPageRoutingModule + GabineteDigitalPageRoutingModule, + HeaderPageModule, + EmptyContainerPageModule, + EventsToApprovePageModule, + ExpedientePageModule, + ExpedientsPageModule, + PedidosPageModule, + DespachosPageModule, + PendentesPageModule, + DespachosPrPageModule, + DiplomasPageModule, + ExpedientesPrPageModule, + DiplomasAssinarPageModule + ], declarations: [ GabineteDigitalPage diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts index 3f4d3915f..05d31ab10 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts @@ -9,6 +9,7 @@ import { PedidoPageRoutingModule } from './pedido-routing.module'; import { PedidoPage } from './pedido.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PedidoPageRoutingModule + PedidoPageRoutingModule, + HeaderPageModule, ], declarations: [PedidoPage] }) diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts index f98f74ff2..2569728d3 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts @@ -9,6 +9,7 @@ import { PedidosPageRoutingModule } from './pedidos-routing.module'; import { PedidosPage } from './pedidos.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PedidosPageRoutingModule + PedidosPageRoutingModule, + HeaderPageModule, ], declarations: [PedidosPage] }) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts index 30d707de7..11828a9e9 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts @@ -9,6 +9,7 @@ import { PendentesPageRoutingModule } from './pendentes-routing.module'; import { PendentesPage } from './pendentes.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PendentesPageRoutingModule + PendentesPageRoutingModule, + HeaderPageModule, ], declarations: [PendentesPage] }) diff --git a/src/app/pages/publications/new-action/new-action.module.ts b/src/app/pages/publications/new-action/new-action.module.ts index bc92b14d6..d5d868f49 100644 --- a/src/app/pages/publications/new-action/new-action.module.ts +++ b/src/app/pages/publications/new-action/new-action.module.ts @@ -15,6 +15,7 @@ import { NewActionPage } from './new-action.page'; IonicModule, NewActionPageRoutingModule ], - declarations: [] + exports: [NewActionPage], + declarations: [NewActionPage] }) export class NewActionPageModule {} diff --git a/src/app/pages/publications/new-publication/new-publication.module.ts b/src/app/pages/publications/new-publication/new-publication.module.ts index 915b65ed7..3580e799a 100644 --- a/src/app/pages/publications/new-publication/new-publication.module.ts +++ b/src/app/pages/publications/new-publication/new-publication.module.ts @@ -15,6 +15,7 @@ import { NewPublicationPage } from './new-publication.page'; IonicModule, NewPublicationPageRoutingModule ], - declarations: [] + exports: [NewPublicationPage], + declarations: [NewPublicationPage] }) export class NewPublicationPageModule {} diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts index a21c4ffdb..6439f05ae 100644 --- a/src/app/pages/publications/publications.module.ts +++ b/src/app/pages/publications/publications.module.ts @@ -17,6 +17,7 @@ import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publ import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module'; import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module'; import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ @@ -26,6 +27,7 @@ import { PublicationDetailPageModule } from 'src/app/shared/publication/view-pub IonicModule, ComponentsModule, PublicationsPageRoutingModule, + HeaderPageModule, ViewPublicationsPageModule, NewPublicationPageModule, PublicationDetailPageModule, diff --git a/src/app/shared/empty-container/empty-container.module.ts b/src/app/shared/empty-container/empty-container.module.ts index d3ee63837..57d8c5379 100644 --- a/src/app/shared/empty-container/empty-container.module.ts +++ b/src/app/shared/empty-container/empty-container.module.ts @@ -15,6 +15,7 @@ import { EmptyContainerPage } from './empty-container.page'; IonicModule, EmptyContainerPageRoutingModule ], - declarations: [] + exports: [EmptyContainerPage], + declarations: [EmptyContainerPage] }) export class EmptyContainerPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts index 80eea17e6..c82c092c2 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.module.ts @@ -15,6 +15,7 @@ import { DespachosPrPage } from './despachos-pr.page'; IonicModule, DespachosPrPageRoutingModule ], - declarations: [] + exports: [DespachosPrPage], + declarations: [DespachosPrPage] }) export class DespachosPrPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos/despachos.module.ts b/src/app/shared/gabinete-digital/despachos/despachos.module.ts index 6bfaee8f8..4fff76935 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.module.ts @@ -15,6 +15,7 @@ import { DespachosPage } from './despachos.page'; IonicModule, DespachosPageRoutingModule ], - declarations: [] + exports: [DespachosPage], + declarations: [DespachosPage] }) export class DespachosPageModule {} diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts index cb6ab5a67..77a1cc2c1 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -15,6 +15,7 @@ import { DiplomasAssinarPage } from './diplomas-assinar.page'; IonicModule, DiplomasAssinarPageRoutingModule ], - declarations: [] + exports: [DiplomasAssinarPage], + declarations: [DiplomasAssinarPage] }) export class DiplomasAssinarPageModule {} diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts index d056e0b92..0f1c09416 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.module.ts @@ -15,6 +15,7 @@ import { DiplomasPage } from './diplomas.page'; IonicModule, DiplomasPageRoutingModule ], + exports: [DiplomasPage], declarations: [DiplomasPage] }) export class DiplomasPageModule {} diff --git a/src/app/shared/gabinete-digital/expediente/expediente.module.ts b/src/app/shared/gabinete-digital/expediente/expediente.module.ts index 6e72bb240..95944464c 100644 --- a/src/app/shared/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/shared/gabinete-digital/expediente/expediente.module.ts @@ -18,7 +18,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ExpedientePageRoutingModule ], - declarations: [], + exports: [ExpedientePage], + declarations: [ExpedientePage], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class ExpedientePageModule {} diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts index b7e846cdf..06ef3e600 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module.ts @@ -15,6 +15,7 @@ import { ExpedientesPrPage } from './expedientes-pr.page'; IonicModule, ExpedientesPrPageRoutingModule ], - declarations: [] + exports: [ ExpedientesPrPage], + declarations: [ ExpedientesPrPage] }) export class ExpedientesPrPageModule {} diff --git a/src/app/shared/gabinete-digital/expedients/expedients.module.ts b/src/app/shared/gabinete-digital/expedients/expedients.module.ts index 7561ef1a1..12474c13f 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.module.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.module.ts @@ -15,6 +15,7 @@ import { ExpedientsPage } from './expedients.page'; IonicModule, ExpedientsPageRoutingModule ], - declarations: [] + exports: [ExpedientsPage], + declarations: [ExpedientsPage] }) export class ExpedientsPageModule {} diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts index 5a91e16d4..649886dcf 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.module.ts @@ -15,6 +15,7 @@ import { PedidosPage } from './pedidos.page'; IonicModule, PedidosPageRoutingModule ], - declarations: [] + exports: [PedidosPage], + declarations: [PedidosPage] }) export class PedidosPageModule {} diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.module.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.module.ts index 1442f35b8..3abd2fa40 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.module.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.module.ts @@ -15,6 +15,7 @@ import { PendentesPage } from './pendentes.page'; IonicModule, PendentesPageRoutingModule ], - declarations: [] + exports: [PendentesPage], + declarations: [PendentesPage] }) export class PendentesPageModule {} From 2c8240fcd3104c482934cdbc8db4f83a8dd40bd4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 12:14:52 +0100 Subject: [PATCH 15/39] save --- .../expediente/expediente-detail/expediente-detail.module.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts index 83b9c9632..1c9d13a74 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts @@ -9,6 +9,7 @@ import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.m import { ExpedienteDetailPage } from './expediente-detail.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ExpedienteDetailPageRoutingModule + ExpedienteDetailPageRoutingModule, + HeaderPageModule, ], declarations: [ExpedienteDetailPage] }) From a1eaf54bf0ef7d6d33ec5928d4ba63d91cb35ae4 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 12:29:45 +0100 Subject: [PATCH 16/39] save --- src/app/components/components.module.ts | 1 - .../gabinete-digital.module.ts | 1 - .../gabinete-digital/gabinete-digital.page.ts | 14 -- .../request-to-appear.component.html | 226 ------------------ .../request-to-appear.component.scss | 0 .../request-to-appear.component.spec.ts | 24 -- .../request-to-appear.component.ts | 14 -- .../publication-detail.module.ts | 2 +- .../despachos/despachos.page.html | 4 +- .../diplomas-assinar.page.html | 4 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../expedients/expedients.page.html | 2 +- .../signed-diploma.component.html | 119 --------- .../signed-diploma.component.scss | 177 -------------- .../signed-diploma.component.spec.ts | 24 -- .../signed-diploma.component.ts | 185 -------------- 16 files changed, 7 insertions(+), 792 deletions(-) delete mode 100644 src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html delete mode 100644 src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.scss delete mode 100644 src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts delete mode 100644 src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts delete mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.html delete mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss delete mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts delete mode 100644 src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 8bd72425f..19e809102 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -31,7 +31,6 @@ import { PendentesPage } from '../shared/gabinete-digital/pendentes/pendentes.pa import { DespachosPrPage } from '../shared/gabinete-digital/despachos-pr/despachos-pr.page'; import { DiplomasPage } from '../pages/gabinete-digital/diplomas/diplomas.page'; import { ExpedientesPrPage } from '../shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; -import { SignedDiplomaComponent } from '../shared/gabinete-digital/signed-diploma/signed-diploma.component'; import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popover.module'; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index c977945fb..899796807 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -20,7 +20,6 @@ import { DespachosPage } from 'src/app/shared/gabinete-digital/despachos/despach import { DespachosPrPage } from 'src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page'; import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; -import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ComponentsModule } from 'src/app/components/components.module'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index beccdd061..f0e76c939 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,7 +12,6 @@ import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; -import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -486,19 +485,6 @@ export class GabineteDigitalPage implements OnInit { } } - async openSignedDiplom(){ - const modal = await this.modalController.create({ - component: SignedDiplomaComponent, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - //backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - async openDeploma() { const modal = await this.modalController.create({ component: DiplomasPage, diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html deleted file mode 100644 index 90e793e08..000000000 --- a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.html +++ /dev/null @@ -1,226 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- - Oficial - Pessoal - -
-
-
- -
-
-
- -
-
- - Reunião - Viagem - Conferência - Encontro - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - -
-
-
- - - - - - - -
- - - - - - Cancelar - - - - - - Gravar - - - - \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.scss b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts deleted file mode 100644 index 2120b0b0f..000000000 --- a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { RequestToAppearComponent } from './request-to-appear.component'; - -describe('RequestToAppearComponent', () => { - let component: RequestToAppearComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ RequestToAppearComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(RequestToAppearComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts b/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts deleted file mode 100644 index 2ed6012c0..000000000 --- a/src/app/pages/gabinete-digital/request-to-appear/request-to-appear.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-request-to-appear', - templateUrl: './request-to-appear.component.html', - styleUrls: ['./request-to-appear.component.scss'], -}) -export class RequestToAppearComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts index 94af5480d..116453af2 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts @@ -15,6 +15,6 @@ import { PublicationDetailPage } from './publication-detail.page'; IonicModule, PublicationDetailPageRoutingModule ], - declarations: [] + declarations: [PublicationDetailPage] }) export class PublicationDetailPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 5fa393a55..c0ca45367 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -2,14 +2,14 @@
Despachos
-
- +
Diplomas
-
@@ -10,7 +10,7 @@
- + - + diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html index 67ea75a48..711c368a7 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.html +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html @@ -9,7 +9,7 @@ - + -
-
Diploma assinados
-
- -
-
- - - - - - - - -
-
- - - - - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Remetente}} -
-
- - -
-
-
- {{ task.Folio }} -
-
- - - -
-
- - -
-
-
- {{ task.CreateDate | date: 'dd-MM-yy' }} -
-
- {{task.Remetente}} -
-
- - - -
-
-
- {{ task.Folio }} -
-
- - -
-
-
- - - - - - - -

-

-

- - - - - - - -

-

-

- - - -
- - diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss deleted file mode 100644 index e624d0744..000000000 --- a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.scss +++ /dev/null @@ -1,177 +0,0 @@ -@import '~src/function.scss'; -/* CONTENT */ -:host{ - padding: 30px 20px 0 20px !important; - margin: 0; -} -.title{ - font-family: Roboto; - font-size: 25px; - color:#000; - overflow: auto; - - .thetitle{ - width: fit-content; - float: left; - } - .theicon{ - width: fit-content; - float: right; - } - } -.item-list-small{ - font-size: 11px; - overflow: hidden; - } - .ion-item-class{ - padding: 0; - - } - .label-text{ - width: 100%; - padding: 0; - margin: 0; - } -//DIV -ion-item{ - --background: none; -} -.item { - //border-radius: 15px; - //box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); - //Sborder: solid 1px #e9e9e9; - background-color: var(--white); - margin: 0 auto; - //padding: 10px; - margin-bottom: 10px; - overflow: hidden; - } -.div-content-expediente{ - width: 100%; - float: left; - border-left: 3px solid #dae3f3; - padding:5px 5px 15px 5px; - margin: 10px 0 10px 0; - background: #dae3f3; - border-radius: 20px; -} -.div-content-pendentes{ - width: 100%; - float: left; - border-left: 3px solid #d9d9d9; - padding: 5px; -} - .div-content-expediente h3, .div-content-pendentes h3{ - margin: 0; - padding: 0; - font-size: 14pt; - width: 100%; - } - .div-icon{ - width: 10%; - font-size: 20px; - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } - .div-content-expediente p, .div-content-pendentes p{ - font-size: 14pt; - color: rgb(94, 92, 92); - padding: 0; - margin: 0; - } - .span-left{ - /* border: 1px solid red; */ - float: left; - font-size: 12px; - padding-left: 18px; - } - .span-right{ - /* border: 1px solid blue; */ - text-align: right; - float: right; - font-size: 12px; - padding-right: 18px; -} - -/* New CSS */ -.expediente{ - padding-top: 10px; -} -.exp-list-item{ - //width: 368px; - overflow: auto; - /* border-bottom: 1px solid gray; */ - margin: 10px auto; -} -.exp-top-detail{ - width: 100%; - overflow: auto; -} -.exp-date{ - width: auto; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #797979; - float: left; -} -.exp-remetente{ - //width: 200px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - color: #000000; - float: left; - margin-left: 16px; - -} -.exp-icon{ - width: 45px; - float: right; - font-size: 13px; -} -.exp-icon ion-icon{ - font-size: 25px; - color: #42b9fe; -} -.exp-bottom-detail{ - float: left; - font-family: Roboto; - font-size: 16px; - font-weight: 700; - color: #0d89d1; -} -.div-top-header{ - width: 400px; - margin: 6px auto; - background-color: #0782c9; - overflow: auto; -} -.div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px -} -.div-logo{ - background: transparent; - width: 150px; - margin: 2.5px 0 2.5px 71px; - float: left; -} -.div-logo img{ - width: 100%; -} -.div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; -} \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts deleted file mode 100644 index 125b8ddcd..000000000 --- a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { SignedDiplomaComponent } from './signed-diploma.component'; - -describe('SignedDiplomaComponent', () => { - let component: SignedDiplomaComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ SignedDiplomaComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(SignedDiplomaComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts deleted file mode 100644 index 611f2768b..000000000 --- a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts +++ /dev/null @@ -1,185 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; -import { Router } from '@angular/router'; -import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { formatDate } from '@angular/common'; -import { ModalController, NavParams } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; -import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page'; - -@Component({ - selector: 'app-signed-diploma', - templateUrl: './signed-diploma.component.html', - styleUrls: ['./signed-diploma.component.scss'], -}) -export class SignedDiplomaComponent implements OnInit { - -//profile:string; -diplomasList:DailyWorkTask[] = []; -showLoader: boolean; -totalDocs:any; -serialNumber:string; - -@Input() profile:string; -@Input() segment:string; - -constructor( - private processes:ProcessesService, - private modalController: ModalController, - private alertService: AlertService, - ) { - this.profile = 'mdgpr'; - this.segment = 'validar' - } - - ngOnInit() { - //Inicializar segment - this.segment = 'assinados'; - this.LoadList(); - } - segmentChanged(ev: any) { - this.LoadList(); - } - - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - - async LoadList(){ - - - let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - this.diplomasList = new Array(); - - console.log(diplomas); - switch (this.segment) { - case 'validar': - let diplomasValidar = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Revising"); - console.log(diplomasValidar); - diplomasValidar.forEach(element => { - let DocId = element.workflowInstanceDataFields.FolderID; - let ApplicationId = element.workflowInstanceDataFields.ApplicationId; - this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ - this.totalDocs = res.DocumentsTotal; - console.log(res.DocumentsTotal); - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }, - (error)=>{ - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }); - }); - this.showLoader = false; - break; - case 'assinados': - let diplomasassinado = diplomas.reverse().filter(data => data.workflowInstanceDataFields.Status == "Signed"); - console.log('Assinados'); - - diplomasassinado.forEach(element => { - let DocId = element.workflowInstanceDataFields.FolderID; - let ApplicationId = element.workflowInstanceDataFields.ApplicationId; - this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{ - this.totalDocs = res.DocumentsTotal; - console.log(res.DocumentsTotal); - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }, - (error)=>{ - let date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); - - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.workflowInstanceDataFields.Sender, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.diplomasList.push(task); - }); - }); - this.showLoader = false; - - break; - } - } - - doRefresh(event) { - this.LoadList(); - setTimeout(() => { - //event.target.complete(); - }, 2000); - } - - async viewPedidoDetail(serialNumber:any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: DiplomaPage, - componentProps:{ - enterAnimation: "", - serialNumber: serialNumber, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - console.log('refresh list'); - this.LoadList(); - }); - } - -} From b4dc683482838191921cbfdfa4dd47373a8fdae4 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 13:23:45 +0100 Subject: [PATCH 17/39] useless import --- src/app/shared/agenda/view-event/view-event.module.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index 1afb226e0..ec2133b67 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -16,7 +16,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; CommonModule, FormsModule, IonicModule, - ComponentsModule, ViewEventPageRoutingModule ], declarations: [ViewEventPage], From f2f45b3d98691443fca18303e0713912375620b0 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 13:33:39 +0100 Subject: [PATCH 18/39] Improve --- .../expedient-task-modal/expedient-task-modal.page.html | 2 +- src/app/pages/search/organic-entity/organic-entity.page.html | 2 +- .../gabinete-digital/despachos-pr/despachos-pr.page.html | 4 ++-- .../shared/gabinete-digital/expedients/expedients.page.html | 4 ++-- src/app/shared/header/header.page.html | 2 +- src/global.scss | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index a8d166ee7..23b414d2c 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -146,7 +146,7 @@ (closeComponent)="closeComponent()" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" - (setContact)="setContact($event)" + (setContact)="setContact(event)" > diff --git a/src/app/pages/search/organic-entity/organic-entity.page.html b/src/app/pages/search/organic-entity/organic-entity.page.html index e683c99ce..efde8e18c 100644 --- a/src/app/pages/search/organic-entity/organic-entity.page.html +++ b/src/app/pages/search/organic-entity/organic-entity.page.html @@ -21,7 +21,7 @@
- +
  • diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index db0e2b989..610f85ecb 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -5,7 +5,7 @@ Despachos
-
@@ -13,7 +13,7 @@

Presidente da República

- +
Expediente
-
- +
- +
diff --git a/src/global.scss b/src/global.scss index efd39c49d..4b81d8140 100644 --- a/src/global.scss +++ b/src/global.scss @@ -542,7 +542,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } .timeline-box{ - left: -13%; + // left: -13%; position: relative; width: 113%; } From f6ce29ee66cb5dc00174a59b263901c8b5e1ccfc Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 13:34:19 +0100 Subject: [PATCH 19/39] save --- src/app/pages/gabinete-digital/diplomas/diplomas.module.ts | 2 +- .../gabinete-digital/despachos-pr/despachos-pr.page.html | 4 ++-- src/app/shared/header/header.page.html | 2 +- src/app/shared/popover/chat-popover/chat-popover.module.ts | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index d7f707a9d..4caddc6f6 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -20,6 +20,6 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; HeaderPageModule, ComponentsModule ], - declarations: [] + declarations: [DiplomasPage] }) export class DiplomasPageModule {} diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html index db0e2b989..610f85ecb 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -5,7 +5,7 @@ Despachos
-
@@ -13,7 +13,7 @@

Presidente da República

- +
- +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.module.ts b/src/app/shared/popover/chat-popover/chat-popover.module.ts index 582f39d9a..4ff1cd980 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.module.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.module.ts @@ -17,6 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, ChatPopoverPageRoutingModule ], + exports: [ChatPopoverPage], declarations: [ChatPopoverPage], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) From 014d85b16ef00709d521f409ecee7c8643a72a64 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 14:10:16 +0100 Subject: [PATCH 20/39] Regenerate components --- .../approve-event-routing.module.ts | 17 ++++ .../approve-event.component.spec.ts | 24 ----- .../approve-event/approve-event.module.ts | 21 ++++ ...component.html => approve-event.page.html} | 0 ...component.scss => approve-event.page.scss} | 2 +- .../approve-event/approve-event.page.spec.ts | 24 +++++ ...ent.component.ts => approve-event.page.ts} | 7 +- .../edit-event/edit-event-routing.module.ts | 17 ++++ .../edit-event/edit-event.component.spec.ts | 24 ----- .../agenda/edit-event/edit-event.module.ts | 21 ++++ ...nt.component.html => edit-event.page.html} | 0 ...nt.component.scss => edit-event.page.scss} | 0 .../edit-event.page.spec.ts} | 12 +-- ...-event.component.ts => edit-event.page.ts} | 7 +- .../event-list/event-list-routing.module.ts | 17 ++++ .../event-list/event-list.component.scss | 96 ------------------- .../event-list/event-list.component.spec.ts | 24 ----- .../agenda/event-list/event-list.module.ts | 20 ++++ ...st.component.html => event-list.page.html} | 0 .../agenda/event-list/event-list.page.scss | 96 +++++++++++++++++++ .../agenda/event-list/event-list.page.spec.ts | 24 +++++ ...t-list.component.ts => event-list.page.ts} | 12 +-- .../view-event/options/options.component.html | 14 --- .../view-event/options/options.component.scss | 54 ----------- .../view-event/options/options.component.ts | 14 --- 25 files changed, 278 insertions(+), 269 deletions(-) create mode 100644 src/app/shared/agenda/approve-event/approve-event-routing.module.ts delete mode 100644 src/app/shared/agenda/approve-event/approve-event.component.spec.ts create mode 100644 src/app/shared/agenda/approve-event/approve-event.module.ts rename src/app/shared/agenda/approve-event/{approve-event.component.html => approve-event.page.html} (100%) rename src/app/shared/agenda/approve-event/{approve-event.component.scss => approve-event.page.scss} (99%) create mode 100644 src/app/shared/agenda/approve-event/approve-event.page.spec.ts rename src/app/shared/agenda/approve-event/{approve-event.component.ts => approve-event.page.ts} (97%) create mode 100644 src/app/shared/agenda/edit-event/edit-event-routing.module.ts delete mode 100644 src/app/shared/agenda/edit-event/edit-event.component.spec.ts create mode 100644 src/app/shared/agenda/edit-event/edit-event.module.ts rename src/app/shared/agenda/edit-event/{edit-event.component.html => edit-event.page.html} (100%) rename src/app/shared/agenda/edit-event/{edit-event.component.scss => edit-event.page.scss} (100%) rename src/app/shared/agenda/{view-event/options/options.component.spec.ts => edit-event/edit-event.page.spec.ts} (60%) rename src/app/shared/agenda/edit-event/{edit-event.component.ts => edit-event.page.ts} (97%) create mode 100644 src/app/shared/agenda/event-list/event-list-routing.module.ts delete mode 100644 src/app/shared/agenda/event-list/event-list.component.scss delete mode 100644 src/app/shared/agenda/event-list/event-list.component.spec.ts create mode 100644 src/app/shared/agenda/event-list/event-list.module.ts rename src/app/shared/agenda/event-list/{event-list.component.html => event-list.page.html} (100%) create mode 100644 src/app/shared/agenda/event-list/event-list.page.scss create mode 100644 src/app/shared/agenda/event-list/event-list.page.spec.ts rename src/app/shared/agenda/event-list/{event-list.component.ts => event-list.page.ts} (90%) delete mode 100644 src/app/shared/agenda/view-event/options/options.component.html delete mode 100644 src/app/shared/agenda/view-event/options/options.component.scss delete mode 100644 src/app/shared/agenda/view-event/options/options.component.ts diff --git a/src/app/shared/agenda/approve-event/approve-event-routing.module.ts b/src/app/shared/agenda/approve-event/approve-event-routing.module.ts new file mode 100644 index 000000000..db3724c21 --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ApproveEventPage } from './approve-event.page'; + +const routes: Routes = [ + { + path: '', + component: ApproveEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ApproveEventPageRoutingModule {} diff --git a/src/app/shared/agenda/approve-event/approve-event.component.spec.ts b/src/app/shared/agenda/approve-event/approve-event.component.spec.ts deleted file mode 100644 index 961d67648..000000000 --- a/src/app/shared/agenda/approve-event/approve-event.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ApproveEventComponent } from './approve-event.component'; - -describe('ApproveEventComponent', () => { - let component: ApproveEventComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ApproveEventComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ApproveEventComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/approve-event/approve-event.module.ts b/src/app/shared/agenda/approve-event/approve-event.module.ts new file mode 100644 index 000000000..ce95c4925 --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ApproveEventPageRoutingModule } from './approve-event-routing.module'; + +import { ApproveEventPage } from './approve-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ApproveEventPageRoutingModule + ], + declarations: [ApproveEventPage], + exports: [ApproveEventPage] +}) +export class ApproveEventPageModule {} diff --git a/src/app/shared/agenda/approve-event/approve-event.component.html b/src/app/shared/agenda/approve-event/approve-event.page.html similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.component.html rename to src/app/shared/agenda/approve-event/approve-event.page.html diff --git a/src/app/shared/agenda/approve-event/approve-event.component.scss b/src/app/shared/agenda/approve-event/approve-event.page.scss similarity index 99% rename from src/app/shared/agenda/approve-event/approve-event.component.scss rename to src/app/shared/agenda/approve-event/approve-event.page.scss index 22ed80b8d..699b4287a 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.scss +++ b/src/app/shared/agenda/approve-event/approve-event.page.scss @@ -1,4 +1,4 @@ - ion-menu{ +ion-menu{ --height: 225px; } .display-none-true{ diff --git a/src/app/shared/agenda/approve-event/approve-event.page.spec.ts b/src/app/shared/agenda/approve-event/approve-event.page.spec.ts new file mode 100644 index 000000000..6f853d63a --- /dev/null +++ b/src/app/shared/agenda/approve-event/approve-event.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ApproveEventPage } from './approve-event.page'; + +describe('ApproveEventPage', () => { + let component: ApproveEventPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ApproveEventPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ApproveEventPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/approve-event/approve-event.component.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts similarity index 97% rename from src/app/shared/agenda/approve-event/approve-event.component.ts rename to src/app/shared/agenda/approve-event/approve-event.page.ts index 62476bc00..57f76257d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.component.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -15,10 +15,10 @@ import { SuccessMessageComponent } from '../../popover/success-message/success-m @Component({ selector: 'app-approve-event', - templateUrl: './approve-event.component.html', - styleUrls: ['./approve-event.component.scss'], + templateUrl: './approve-event.page.html', + styleUrls: ['./approve-event.page.scss'], }) -export class ApproveEventComponent implements OnInit { +export class ApproveEventPage implements OnInit { event: Event; loadedEvent:any; @@ -267,4 +267,5 @@ export class ApproveEventComponent implements OnInit { modal.dismiss() },3000) } + } diff --git a/src/app/shared/agenda/edit-event/edit-event-routing.module.ts b/src/app/shared/agenda/edit-event/edit-event-routing.module.ts new file mode 100644 index 000000000..3616b2106 --- /dev/null +++ b/src/app/shared/agenda/edit-event/edit-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EditEventPage } from './edit-event.page'; + +const routes: Routes = [ + { + path: '', + component: EditEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EditEventPageRoutingModule {} diff --git a/src/app/shared/agenda/edit-event/edit-event.component.spec.ts b/src/app/shared/agenda/edit-event/edit-event.component.spec.ts deleted file mode 100644 index f0db40f8a..000000000 --- a/src/app/shared/agenda/edit-event/edit-event.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { EditEventComponent } from './edit-event.component'; - -describe('EditEventComponent', () => { - let component: EditEventComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EditEventComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(EditEventComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/edit-event/edit-event.module.ts b/src/app/shared/agenda/edit-event/edit-event.module.ts new file mode 100644 index 000000000..bcd1dc3e4 --- /dev/null +++ b/src/app/shared/agenda/edit-event/edit-event.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EditEventPageRoutingModule } from './edit-event-routing.module'; + +import { EditEventPage } from './edit-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EditEventPageRoutingModule + ], + declarations: [EditEventPage], + exports: [EditEventPage] +}) +export class EditEventPageModule {} diff --git a/src/app/shared/agenda/edit-event/edit-event.component.html b/src/app/shared/agenda/edit-event/edit-event.page.html similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.component.html rename to src/app/shared/agenda/edit-event/edit-event.page.html diff --git a/src/app/shared/agenda/edit-event/edit-event.component.scss b/src/app/shared/agenda/edit-event/edit-event.page.scss similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.component.scss rename to src/app/shared/agenda/edit-event/edit-event.page.scss diff --git a/src/app/shared/agenda/view-event/options/options.component.spec.ts b/src/app/shared/agenda/edit-event/edit-event.page.spec.ts similarity index 60% rename from src/app/shared/agenda/view-event/options/options.component.spec.ts rename to src/app/shared/agenda/edit-event/edit-event.page.spec.ts index 370263b60..4a219c892 100644 --- a/src/app/shared/agenda/view-event/options/options.component.spec.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.spec.ts @@ -1,19 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { OptionsComponent } from './options.component'; +import { EditEventPage } from './edit-event.page'; -describe('OptionsComponent', () => { - let component: OptionsComponent; - let fixture: ComponentFixture; +describe('EditEventPage', () => { + let component: EditEventPage; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ OptionsComponent ], + declarations: [ EditEventPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(OptionsComponent); + fixture = TestBed.createComponent(EditEventPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts similarity index 97% rename from src/app/shared/agenda/edit-event/edit-event.component.ts rename to src/app/shared/agenda/edit-event/edit-event.page.ts index 0e9fbd9e6..61d2b9c57 100644 --- a/src/app/shared/agenda/edit-event/edit-event.component.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -11,10 +11,11 @@ import { AttachmentsService } from 'src/app/services/attachments.service'; import { Attachment } from 'src/app/models/attachment.model'; @Component({ selector: 'app-edit-event', - templateUrl: './edit-event.component.html', - styleUrls: ['./edit-event.component.scss'], + templateUrl: './edit-event.page.html', + styleUrls: ['./edit-event.page.scss'], }) -export class EditEventComponent implements OnInit { +export class EditEventPage implements OnInit { + stEvent: Event; isRecurring:string; diff --git a/src/app/shared/agenda/event-list/event-list-routing.module.ts b/src/app/shared/agenda/event-list/event-list-routing.module.ts new file mode 100644 index 000000000..ee54ce56a --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EventListPage } from './event-list.page'; + +const routes: Routes = [ + { + path: '', + component: EventListPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EventListPageRoutingModule {} diff --git a/src/app/shared/agenda/event-list/event-list.component.scss b/src/app/shared/agenda/event-list/event-list.component.scss deleted file mode 100644 index 90dbde141..000000000 --- a/src/app/shared/agenda/event-list/event-list.component.scss +++ /dev/null @@ -1,96 +0,0 @@ -:host{ - padding: 30px 20px 0 20px !important; - margin: 0; -} -.header-content{ - overflow: auto; - margin: 0 auto; - } - .header-icon-left{ - font-size: 33px; - color: #42b9fe; - float: left; - } - .header-title{ - font-family: Roboto; - font-size: 25px; - padding: 0; - color:#000; - float: left; - } - .main-content{ - margin-top: 20px; - .item{ - --inner-padding-end: 0 !important; - --inner-padding-top: 10px; - --inner-padding-bottom:10px; - } - .event-pr-Oficial{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #99e47b; - overflow: auto; - } - .event-pr-Pessoal{ - background-color: var(--white); - border-radius: 5px; - border-right: 5px solid #958bfc; - overflow: auto; - } - .event-mdgpr-Oficial{ - border-radius: 5px; - border-right: 5px solid #ffb703; - overflow: auto; - } - .event-mdgpr-Pessoal{ - border-radius: 5px; - border-right: 5px solid #f05d5e; - overflow: auto; - } - .approve-event-time{ - float: left; - } - .approve-event-time p{ - width: 33px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--Antartic-grey); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail{ - float: left; - margin-left: 10px; - } - .approve-event-detail p{ - //width: 250px; - font-family: Roboto; - font-size: 13px; - font-weight: normal; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: var(--black); - margin: 0; - padding-bottom: 10px; - } - .approve-event-detail h3{ - width: 250px; - font-family: Roboto; - font-size: 15px; - font-weight: bold; - font-stretch: normal; - font-style: normal; - line-height: normal; - letter-spacing: normal; - color: #0d89d1; - margin: 0; - padding: 0; - } -} \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.component.spec.ts b/src/app/shared/agenda/event-list/event-list.component.spec.ts deleted file mode 100644 index e054b909d..000000000 --- a/src/app/shared/agenda/event-list/event-list.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { EventListComponent } from './event-list.component'; - -describe('EventListComponent', () => { - let component: EventListComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ EventListComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(EventListComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/shared/agenda/event-list/event-list.module.ts new file mode 100644 index 000000000..bc23c444f --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EventListPageRoutingModule } from './event-list-routing.module'; + +import { EventListPage } from './event-list.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EventListPageRoutingModule + ], + declarations: [EventListPage] +}) +export class EventListPageModule {} diff --git a/src/app/shared/agenda/event-list/event-list.component.html b/src/app/shared/agenda/event-list/event-list.page.html similarity index 100% rename from src/app/shared/agenda/event-list/event-list.component.html rename to src/app/shared/agenda/event-list/event-list.page.html diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/shared/agenda/event-list/event-list.page.scss new file mode 100644 index 000000000..58df3afb0 --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.page.scss @@ -0,0 +1,96 @@ +:host{ + padding: 30px 20px 0 20px !important; + margin: 0; + } + .header-content{ + overflow: auto; + margin: 0 auto; + } + .header-icon-left{ + font-size: 33px; + color: #42b9fe; + float: left; + } + .header-title{ + font-family: Roboto; + font-size: 25px; + padding: 0; + color:#000; + float: left; + } + .main-content{ + margin-top: 20px; + .item{ + --inner-padding-end: 0 !important; + --inner-padding-top: 10px; + --inner-padding-bottom:10px; + } + .event-pr-Oficial{ + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #99e47b; + overflow: auto; + } + .event-pr-Pessoal{ + background-color: var(--white); + border-radius: 5px; + border-right: 5px solid #958bfc; + overflow: auto; + } + .event-mdgpr-Oficial{ + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; + } + .event-mdgpr-Pessoal{ + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; + } + .approve-event-time{ + float: left; + } + .approve-event-time p{ + width: 33px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--Antartic-grey); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail{ + float: left; + margin-left: 10px; + } + .approve-event-detail p{ + //width: 250px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding-bottom: 10px; + } + .approve-event-detail h3{ + width: 250px; + font-family: Roboto; + font-size: 15px; + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #0d89d1; + margin: 0; + padding: 0; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/event-list/event-list.page.spec.ts b/src/app/shared/agenda/event-list/event-list.page.spec.ts new file mode 100644 index 000000000..3f1ddf69a --- /dev/null +++ b/src/app/shared/agenda/event-list/event-list.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { EventListPage } from './event-list.page'; + +describe('EventListPage', () => { + let component: EventListPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ EventListPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(EventListPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/event-list/event-list.component.ts b/src/app/shared/agenda/event-list/event-list.page.ts similarity index 90% rename from src/app/shared/agenda/event-list/event-list.component.ts rename to src/app/shared/agenda/event-list/event-list.page.ts index ba845ab01..9096aa845 100644 --- a/src/app/shared/agenda/event-list/event-list.component.ts +++ b/src/app/shared/agenda/event-list/event-list.page.ts @@ -4,15 +4,15 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController, NavParams } from '@ionic/angular'; -import { ApproveEventModalPage } from 'src/app/pages/agenda/approve-event-modal/approve-event-modal.page'; import { NavigationEnd, Router } from '@angular/router'; @Component({ selector: 'app-event-list', - templateUrl: './event-list.component.html', - styleUrls: ['./event-list.component.scss'], + templateUrl: './event-list.page.html', + styleUrls: ['./event-list.page.scss'], }) -export class EventListComponent implements OnInit { +export class EventListPage implements OnInit { + showLoader: boolean; eventsPRList: any; @@ -93,5 +93,5 @@ export class EventListComponent implements OnInit { this.cloneAllmobileComponent.emit(); } - } - \ No newline at end of file + +} diff --git a/src/app/shared/agenda/view-event/options/options.component.html b/src/app/shared/agenda/view-event/options/options.component.html deleted file mode 100644 index c3e4ba0b5..000000000 --- a/src/app/shared/agenda/view-event/options/options.component.html +++ /dev/null @@ -1,14 +0,0 @@ - -
- -
-
- - -
- - -
- diff --git a/src/app/shared/agenda/view-event/options/options.component.scss b/src/app/shared/agenda/view-event/options/options.component.scss deleted file mode 100644 index 308751df6..000000000 --- a/src/app/shared/agenda/view-event/options/options.component.scss +++ /dev/null @@ -1,54 +0,0 @@ -.container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; - } - .arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: 35px; - overflow: hidden; - } - } - .buttons{ - display: flex; - flex-wrap: wrap; - justify-content: space-around; - } - .solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - @media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - //display: none; - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - .solid{ - display: block; - } - .mobile-only{ - display: none !important; - } - } - \ No newline at end of file diff --git a/src/app/shared/agenda/view-event/options/options.component.ts b/src/app/shared/agenda/view-event/options/options.component.ts deleted file mode 100644 index b4280a4ec..000000000 --- a/src/app/shared/agenda/view-event/options/options.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-options', - templateUrl: './options.component.html', - styleUrls: ['./options.component.scss'], -}) -export class OptionsComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} From bf90d2765f7349b3b8d6cbfe1b3797ff7eb375d8 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 14:11:34 +0100 Subject: [PATCH 21/39] save --- src/app/components/components.module.ts | 30 --- src/app/pages/chat/chat-routing.module.ts | 13 - src/app/pages/chat/chat.page.ts | 15 -- .../conversation-routing.module.ts | 17 -- .../chat/conversation/conversation.module.ts | 20 -- .../chat/conversation/conversation.page.html | 49 ---- .../chat/conversation/conversation.page.scss | 55 ----- .../conversation/conversation.page.spec.ts | 24 -- .../chat/conversation/conversation.page.ts | 73 ------ .../group-messages/group-messages.module.ts | 2 +- .../chat/messages/contacts/contacts.module.ts | 5 +- .../chat/newchat/newchat-routing.module.ts | 17 -- src/app/pages/chat/newchat/newchat.module.ts | 21 -- src/app/pages/chat/newchat/newchat.page.html | 51 ---- src/app/pages/chat/newchat/newchat.page.scss | 66 ------ .../pages/chat/newchat/newchat.page.spec.ts | 24 -- src/app/pages/chat/newchat/newchat.page.ts | 98 -------- .../pages/chat/test/test-routing.module.ts | 17 -- src/app/pages/chat/test/test.module.ts | 21 -- src/app/pages/chat/test/test.page.html | 32 --- src/app/pages/chat/test/test.page.scss | 0 src/app/pages/chat/test/test.page.spec.ts | 24 -- src/app/pages/chat/test/test.page.ts | 200 ---------------- .../gabinete-digital.module.ts | 6 +- .../chat/empty-chat/empty-chat.module.ts | 3 +- .../chat/messages/contacts/contacts.module.ts | 8 +- .../expediente/expediente-routing.module.ts | 12 - .../expediente/expediente.module.ts | 25 -- .../expediente/expediente.page.html | 202 ---------------- .../expediente/expediente.page.scss | 224 ------------------ .../expediente/expediente.page.spec.ts | 24 -- .../expediente/expediente.page.ts | 158 ------------ src/app/shared/header/header.page.html | 2 +- .../chat-popover/chat-popover.module.ts | 5 +- 34 files changed, 16 insertions(+), 1527 deletions(-) delete mode 100644 src/app/pages/chat/conversation/conversation-routing.module.ts delete mode 100644 src/app/pages/chat/conversation/conversation.module.ts delete mode 100644 src/app/pages/chat/conversation/conversation.page.html delete mode 100644 src/app/pages/chat/conversation/conversation.page.scss delete mode 100644 src/app/pages/chat/conversation/conversation.page.spec.ts delete mode 100644 src/app/pages/chat/conversation/conversation.page.ts delete mode 100644 src/app/pages/chat/newchat/newchat-routing.module.ts delete mode 100644 src/app/pages/chat/newchat/newchat.module.ts delete mode 100644 src/app/pages/chat/newchat/newchat.page.html delete mode 100644 src/app/pages/chat/newchat/newchat.page.scss delete mode 100644 src/app/pages/chat/newchat/newchat.page.spec.ts delete mode 100644 src/app/pages/chat/newchat/newchat.page.ts delete mode 100644 src/app/pages/chat/test/test-routing.module.ts delete mode 100644 src/app/pages/chat/test/test.module.ts delete mode 100644 src/app/pages/chat/test/test.page.html delete mode 100644 src/app/pages/chat/test/test.page.scss delete mode 100644 src/app/pages/chat/test/test.page.spec.ts delete mode 100644 src/app/pages/chat/test/test.page.ts delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente-routing.module.ts delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente.module.ts delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente.page.html delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente.page.scss delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente.page.spec.ts delete mode 100644 src/app/shared/gabinete-digital/expediente/expediente.page.ts diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 19e809102..38f956b8e 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -1,46 +1,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { HeaderPage } from '../shared/header/header.page'; import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page'; import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page'; import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; -import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-event.component'; import { AttendeesPage } from '../shared/event/attendees/attendees.page'; -import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page'; -import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page'; -import { MessagesPage } from '../shared/chat/messages/messages.page'; -import { ContactsPage } from '../shared/chat/messages/contacts/contacts.page'; -import { GroupMessagesPage } from '../shared/chat/group-messages/group-messages.page'; -import { NewGroupPage } from '../shared/chat/new-group/new-group.page'; -import { EditGroupPage } from '../shared/chat/edit-group/edit-group.page'; -import { GroupContactsPage } from '../shared/chat/group-messages/group-contacts/group-contacts.page'; -import { ChatPopoverPage } from '../shared/popover/chat-popover/chat-popover.page'; -import { EmptyContainerPage } from '../shared/empty-container/empty-container.page'; -import { ExpedientePage } from '../shared/gabinete-digital/expediente/expediente.page'; -import { ExpedientsPage } from '../shared/gabinete-digital/expedients/expedients.page'; -import { PedidosPage } from '../shared/gabinete-digital/pedidos/pedidos.page'; -import { DespachosPage } from '../shared/gabinete-digital/despachos/despachos.page'; -import { PendentesPage } from '../shared/gabinete-digital/pendentes/pendentes.page'; -import { DespachosPrPage } from '../shared/gabinete-digital/despachos-pr/despachos-pr.page'; -import { DiplomasPage } from '../pages/gabinete-digital/diplomas/diplomas.page'; -import { ExpedientesPrPage } from '../shared/gabinete-digital/expedientes-pr/expedientes-pr.page'; -import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; -import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popover.module'; - - @NgModule({ declarations: [ - //HeaderPage, - //HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, BtnCriarPage, @@ -55,13 +29,10 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, - EmptyContainerPage, //EventsToApprovePage, ], exports: [ - //HeaderPage, - //HeaderNoSearchPage, BtnSeguintePage, BtnModalDismissPage, BtnCriarPage, @@ -77,7 +48,6 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov //EventsToApprovePage, EventListComponent, - EmptyContainerPage, ], imports: [ diff --git a/src/app/pages/chat/chat-routing.module.ts b/src/app/pages/chat/chat-routing.module.ts index 5a2dc637f..4d1596c1b 100644 --- a/src/app/pages/chat/chat-routing.module.ts +++ b/src/app/pages/chat/chat-routing.module.ts @@ -10,14 +10,6 @@ const routes: Routes = [ path: '', component: ChatPage, }, - { - path: 'conversation', - loadChildren: () => import('./conversation/conversation.module').then( m => m.ConversationPageModule) - }, - { - path: 'newchat', - loadChildren: () => import('./newchat/newchat.module').then( m => m.NewchatPageModule) - }, { path: 'new-group', loadChildren: () => import('./new-group/new-group.module').then( m => m.NewGroupPageModule) @@ -34,11 +26,6 @@ const routes: Routes = [ { path: 'edit-group', loadChildren: () => import('./edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'test', - outlet:'test', - loadChildren: () => import('./test/test.module').then( m => m.TestPageModule) } ]; diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 2a9b58dd0..0e09bac21 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -12,12 +12,10 @@ import { import { ModalController } from '@ionic/angular'; import { AuthService } from 'src/app/services/auth.service'; import { ChatService } from 'src/app/services/chat.service'; -import { ConversationPage } from './conversation/conversation.page'; import { GroupMessagesPage } from './group-messages/group-messages.page'; import { ContactsPage } from './messages/contacts/contacts.page'; import { MessagesPage } from './messages/messages.page'; import { NewGroupPage } from './new-group/new-group.page'; -import { NewchatPage } from './newchat/newchat.page'; import { Storage } from '@ionic/storage'; import { AlertService } from 'src/app/services/alert.service'; import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; @@ -277,19 +275,6 @@ sendMsg() { }); }); } - - async startConversation(selectedUser) { - const modal = await this.modalController.create({ - component: ConversationPage, - cssClass: 'conversation', - backdropDismiss: false, - componentProps: { - user: selectedUser, - } - }); - await modal.present(); - modal.onDidDismiss(); - } async selectContact(){ const modal = await this.modalController.create({ diff --git a/src/app/pages/chat/conversation/conversation-routing.module.ts b/src/app/pages/chat/conversation/conversation-routing.module.ts deleted file mode 100644 index 07d2654ce..000000000 --- a/src/app/pages/chat/conversation/conversation-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ConversationPage } from './conversation.page'; - -const routes: Routes = [ - { - path: '', - component: ConversationPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ConversationPageRoutingModule {} diff --git a/src/app/pages/chat/conversation/conversation.module.ts b/src/app/pages/chat/conversation/conversation.module.ts deleted file mode 100644 index 22dca4438..000000000 --- a/src/app/pages/chat/conversation/conversation.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { ConversationPageRoutingModule } from './conversation-routing.module'; - -import { ConversationPage } from './conversation.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - ConversationPageRoutingModule - ], - declarations: [ConversationPage] -}) -export class ConversationPageModule {} diff --git a/src/app/pages/chat/conversation/conversation.page.html b/src/app/pages/chat/conversation/conversation.page.html deleted file mode 100644 index 7ef609bfc..000000000 --- a/src/app/pages/chat/conversation/conversation.page.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - {{chatUser.name}} - - - - - - -

{{message.user}}

- {{message.msg}} -
{{message.createdAt | date: 'HH:mm'}}
- - - -

{{message.user}}

- {{message.msg}} -
{{message.createdAt | date: 'HH:mm'}}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/pages/chat/conversation/conversation.page.scss b/src/app/pages/chat/conversation/conversation.page.scss deleted file mode 100644 index 67e5a83e2..000000000 --- a/src/app/pages/chat/conversation/conversation.page.scss +++ /dev/null @@ -1,55 +0,0 @@ -ion-content{ - background-color:#fefefe; -} -.chat-container{ - margin: 10px 10px 0 10px; -} -.message { - padding: 5px 5px 5px 10px; - border-radius: 10px; - margin-bottom: 10px; - white-space: pre-wrap; - } - - .my-message { - background: var(--ion-color-primary); - color: #fff; - } - .my-message p{ - margin: 0; - padding: 0; - color: #9ab8e9; - } - .message-date{ - font-size: 10px; - text-align: right; - margin-right: 5px; - } - - .other-message { - background: #f2f3f7; - color: #333; - } - .other-message p{ - margin: 0; - padding: 0; - color:#959ba7; -} - - .message-input { - margin-top: 0px; - - background: #fff; - padding: 0; - margin: 0; - } - - - .div-message{ - border: 1px solid var(--ion-color-medium); - border-radius: 20px; - } - - - - diff --git a/src/app/pages/chat/conversation/conversation.page.spec.ts b/src/app/pages/chat/conversation/conversation.page.spec.ts deleted file mode 100644 index 9e1cc5cee..000000000 --- a/src/app/pages/chat/conversation/conversation.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ConversationPage } from './conversation.page'; - -describe('ConversationPage', () => { - let component: ConversationPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ConversationPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ConversationPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/chat/conversation/conversation.page.ts b/src/app/pages/chat/conversation/conversation.page.ts deleted file mode 100644 index be26471fb..000000000 --- a/src/app/pages/chat/conversation/conversation.page.ts +++ /dev/null @@ -1,73 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { ModalController, NavParams } from '@ionic/angular'; -import { AuthService } from 'src/app/services/auth.service'; - -@Component({ - selector: 'app-conversation', - templateUrl: './conversation.page.html', - styleUrls: ['./conversation.page.scss'], -}) -export class ConversationPage implements OnInit { - - message = ''; - messages = []; - currentUser = ''; - - constructor( - private authService: AuthService, - private router:Router, - private modalController: ModalController, - private navParams: NavParams) { } - - loggedUser: any; - chatUser: any; - - ngOnInit() { - this.authService.userData$.subscribe((res:any)=>{ - this.loggedUser=res; - }) - this.chatUser = this.navParams.get('user'); - console.log(this.navParams.get('user')); - - console.log(this.chatUser.name); - - - /* console.log("ON"); - this.socket.connect(); - - //Set current user - let name = `User-${new Date().getTime()}`; - this.currentUser=name; - - this.socket.emit('set-name', name); - - //Reat from event calling "fromEvent" - this.socket.fromEvent('users-changed').subscribe(data =>{ - console.log('gOT data:', data); - }); - - //Add message to the array of messages - this.socket.fromEvent('message').subscribe(message =>{ - console.log('New:', message); - this.messages.push(message); - }); */ - - } - close(){ - this.router.navigate(['/home/chat']); - this.modalController.dismiss(null); - } - sendMessage(){ - - } - /* sendMessage(){ - this.socket.emit('send-message', {text: this.message}); - this.message=""; - } - - ionViewWillLeave(){ - this.socket.disconnect(); - } */ - -} diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index 777e20e53..00aba5875 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -18,8 +18,8 @@ import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat- FormsModule, IonicModule, ComponentsModule, + GroupMessagesPageRoutingModule, ChatPopoverPageModule, - GroupMessagesPageRoutingModule ], declarations: [GroupMessagesPage] }) diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/pages/chat/messages/contacts/contacts.module.ts index 887da2a94..4da67c6e9 100644 --- a/src/app/pages/chat/messages/contacts/contacts.module.ts +++ b/src/app/pages/chat/messages/contacts/contacts.module.ts @@ -10,6 +10,7 @@ import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { PipesModule } from 'src/app/pipes/pipes.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { FilterPipe } from 'src/app/pipes/filter.pipe'; @NgModule({ imports: [ @@ -17,9 +18,9 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, + ContactsPageRoutingModule, PipesModule, - ContactsPageRoutingModule ], - declarations: [ContactsPage] + declarations: [ContactsPage, FilterPipe] }) export class ContactsPageModule {} diff --git a/src/app/pages/chat/newchat/newchat-routing.module.ts b/src/app/pages/chat/newchat/newchat-routing.module.ts deleted file mode 100644 index 98eb05c20..000000000 --- a/src/app/pages/chat/newchat/newchat-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { NewchatPage } from './newchat.page'; - -const routes: Routes = [ - { - path: '', - component: NewchatPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class NewchatPageRoutingModule {} diff --git a/src/app/pages/chat/newchat/newchat.module.ts b/src/app/pages/chat/newchat/newchat.module.ts deleted file mode 100644 index 26265c661..000000000 --- a/src/app/pages/chat/newchat/newchat.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { NewchatPageRoutingModule } from './newchat-routing.module'; - -import { NewchatPage } from './newchat.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - NewchatPageRoutingModule - ], - declarations: [NewchatPage], - schemas: [CUSTOM_ELEMENTS_SCHEMA] -}) -export class NewchatPageModule {} diff --git a/src/app/pages/chat/newchat/newchat.page.html b/src/app/pages/chat/newchat/newchat.page.html deleted file mode 100644 index 21194affc..000000000 --- a/src/app/pages/chat/newchat/newchat.page.html +++ /dev/null @@ -1,51 +0,0 @@ - - -
-
-
- -
-
- Nova Conversa -
-
-
- - - - - - - - - -
- - - - - - {{user.name}} - - - Tiago Kayaya - - - Gilson Manuel - - - - - - {{item.$t}} - - - -
- - diff --git a/src/app/pages/chat/newchat/newchat.page.scss b/src/app/pages/chat/newchat/newchat.page.scss deleted file mode 100644 index 87a747b8a..000000000 --- a/src/app/pages/chat/newchat/newchat.page.scss +++ /dev/null @@ -1,66 +0,0 @@ -ion-content{ - --background:transparent; -} -.header-toolbar{ - --background:transparent; - --opacity: 1; - - .main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; - padding: 1px; - } - .div-icon ion-icon{ - float: right; - padding-left: 20px; - } - .title-content{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - } - - .back-icon{ - width: 37px; - float: left; - font-size: 35px; - overflow: auto; - - } - .div-title{ - width: 221px; - padding: 0!important; - float: left; - margin: 2.5px 0 0 5px; - } - .title{ - font-size: 25px; - } - } -} - .main-content{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - margin: 0 auto; - background-color: #fff; - overflow:auto; - padding: 15px 20px 0 20px; - } -ion-searchbar{ - --border-radius: 20px; -} diff --git a/src/app/pages/chat/newchat/newchat.page.spec.ts b/src/app/pages/chat/newchat/newchat.page.spec.ts deleted file mode 100644 index 70ff90072..000000000 --- a/src/app/pages/chat/newchat/newchat.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { NewchatPage } from './newchat.page'; - -describe('NewchatPage', () => { - let component: NewchatPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ NewchatPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(NewchatPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/chat/newchat/newchat.page.ts b/src/app/pages/chat/newchat/newchat.page.ts deleted file mode 100644 index 153a298ca..000000000 --- a/src/app/pages/chat/newchat/newchat.page.ts +++ /dev/null @@ -1,98 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { ModalController } from '@ionic/angular'; -import { Observable } from 'rxjs'; -import { ChatService } from 'src/app/services/chat.service'; -import { ConversationPage } from '../conversation/conversation.page'; - -@Component({ - selector: 'app-newchat', - templateUrl: './newchat.page.html', - styleUrls: ['./newchat.page.scss'], -}) -export class NewchatPage implements OnInit { - showLoader: boolean; - userList: any[]; - - contacts:any; - currentPageClass = this; - triggerAlphaScrollChange: number = 0; - - constructor( - private chatService: ChatService, - private modalController: ModalController, - private router:Router) { - this.contacts = [ - { - 'name': 'Affenpinscher' - }, - { - 'name': 'Afghan Hound' - }, - // ... - ]; - } - - result:any; - searchCountryString:any; - searchedItem:any; - - ngOnInit() { - this.getUsers(); - } - close(){ - this.modalController.dismiss(); - } - doRefresh(event) { - this.getUsers(); - - setTimeout(() => { - event.target.complete(); - }, 2000); - } - - getUsers(){ - this.result = this.chatService.getAllUsers().subscribe((res:any)=>{ - this.userList = res.users; - this.searchedItem = this.userList; - }); - } - - userSelected(id){ - console.log(id); - this.router.navigate(['/home/chat/conversation']); - - } - onChange(event){ - const val = event.detail.value; - this.searchedItem = this.userList; - if(val && val.trim() != ''){ - this.searchedItem = this.searchedItem.filter((item:any) =>{ - return (item.name.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); - } - } - - async starConversation(selectedUser) { - const modal = await this.modalController.create({ - component: ConversationPage, - cssClass: 'conversation', - backdropDismiss: false, - componentProps: { - user: selectedUser, - } - }); - await modal.present(); - modal.onDidDismiss(); - } - - - onItemClick(item) { - // This is an example of how you could manually trigger ngOnChange - // for the component. If you modify "listData" it won't perform - // an ngOnChange, you will have to trigger manually to refresh the component. - this.triggerAlphaScrollChange++; - } - - -} diff --git a/src/app/pages/chat/test/test-routing.module.ts b/src/app/pages/chat/test/test-routing.module.ts deleted file mode 100644 index 7f8abfd58..000000000 --- a/src/app/pages/chat/test/test-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { TestPage } from './test.page'; - -const routes: Routes = [ - { - path: '', - component: TestPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class TestPageRoutingModule {} diff --git a/src/app/pages/chat/test/test.module.ts b/src/app/pages/chat/test/test.module.ts deleted file mode 100644 index c094c137f..000000000 --- a/src/app/pages/chat/test/test.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { TestPageRoutingModule } from './test-routing.module'; - -import { TestPage } from './test.page'; -import { BrowserModule } from '@angular/platform-browser'; -import { CommonModule } from '@angular/common'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - TestPageRoutingModule - ], - declarations: [TestPage] -}) -export class TestPageModule {} diff --git a/src/app/pages/chat/test/test.page.html b/src/app/pages/chat/test/test.page.html deleted file mode 100644 index 3475567a4..000000000 --- a/src/app/pages/chat/test/test.page.html +++ /dev/null @@ -1,32 +0,0 @@ - - - test - - - -
{{member}}
- - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/pages/chat/test/test.page.scss b/src/app/pages/chat/test/test.page.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/chat/test/test.page.spec.ts b/src/app/pages/chat/test/test.page.spec.ts deleted file mode 100644 index d721f93a1..000000000 --- a/src/app/pages/chat/test/test.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { TestPage } from './test.page'; - -describe('TestPage', () => { - let component: TestPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TestPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(TestPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/chat/test/test.page.ts b/src/app/pages/chat/test/test.page.ts deleted file mode 100644 index 51293585d..000000000 --- a/src/app/pages/chat/test/test.page.ts +++ /dev/null @@ -1,200 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { AuthService } from 'src/app/services/auth.service'; -import { ChatService } from 'src/app/services/chat.service'; -import { ChatOptionsPopoverPage } from 'src/app/shared/popover/chat-options-popover/chat-options-popover.page'; -import { ChatPopoverPage } from 'src/app/shared/popover/chat-popover/chat-popover.page'; -import { GroupContactsPage } from '../group-messages/group-contacts/group-contacts.page'; - -@Component({ - selector: 'app-test', - templateUrl: './test.page.html', - styleUrls: ['./test.page.scss'], -}) -export class TestPage implements OnInit { - - showLoader: boolean; - isGroupCreated:boolean; - loggedUser: any; - message:any; - messages:any; - - - room:any; - roomName:any; - members:any; - contacts: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"]; - - constructor( - private menu: MenuController, - private modalController: ModalController, - private actionSheetController: ActionSheetController, - public popoverController: PopoverController, - private chatService: ChatService, - private navParams: NavParams, - private authService: AuthService, - ) { - this.isGroupCreated = true; - this.room = this.navParams.get('room'); - this.roomName = this.room.name.split('-').join(' '); - } - - ngOnInit() { - this.authService.userData$.subscribe((res:any)=>{ - this.loggedUser=res; - console.log(this.loggedUser); - }); - this.load(); - } - load(){ - this.getGroupContacts(); - this.loadGroupMessages(); - } - - close(){ - this.modalController.dismiss(); - } - - doRefresh(ev:any){ - this.load(); - ev.target.complete(); - } - - getGroupContacts(){ - this.showLoader = true; - //If group is private call getGroupMembers - if(this.room.t === 'p'){ - this.chatService.getGroupMembers(this.room._id).subscribe(res=>{ - console.log(res); - this.members = res['members']; - this.showLoader = false; - }); - } - //Otherwise call getChannelMembers for públic groups - else{ - this.chatService.getChannelMembers(this.room._id).subscribe(res=>{ - console.log(res); - this.members = res['members']; - this.showLoader = false; - }); - } - } - loadGroupMessages(){ - this.showLoader = true; - //If group is private call getGroupMembers - if(this.room.t === 'p'){ - this.chatService.getPrivateGroupMessages(this.room._id).subscribe(res=>{ - console.log(res); - let msgOnly = res['messages'].filter(data => data.t != 'au'); - this.messages = msgOnly.reverse(); - this.showLoader = false; - }); - } - //Otherwise call getChannelMembers for públic groups - else{ - this.chatService.getPublicGroupMessages(this.room._id).subscribe(res=>{ - console.log(res); - this.messages = res['messages'].reverse(); - }); - } - } - sendMessage(){ - - let body = { - "message": - { - "rid": this.room._id, "msg": this.message - } - } - - this.chatService.sendMessage(body).subscribe(res=> { - this.loadGroupMessages(); - }); - this.message = ""; - } - - async openOptions(ev: any) { - const popover = await this.popoverController.create({ - component: ChatPopoverPage, - cssClass: 'chat-popover', - event: ev, - componentProps: { - room: this.room, - }, - translucent: true - }); - await popover.present(); - popover.onDidDismiss().then(res=>{ - console.log(res); - if(res.data){ - this.roomName = res.data.name.split('-').join(' '); - console.log(this.roomName); - - this.load(); - /* this.modalController.dismiss(); */ - }; - - }); - } - async openChatOptions(ev: any) { - const popover = await this.popoverController.create({ - component: ChatOptionsPopoverPage, - cssClass: 'chat-options-popover', - event: ev, - componentProps: { - room: this.room, - }, - translucent: true - }); - return await popover.present(); - } - async addContacts(){ - console.log(this.members); - - const modal = await this.modalController.create({ - component: GroupContactsPage, - componentProps: { - isCreated: this.isGroupCreated, - room: this.room, - members: this.members, - name: this.room.name, - }, - cssClass: 'contacts', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then(()=>{ - this.load(); - }); - } - - /* async actionSheet() { - const actionSheet = await this.actionSheetController.create({ - cssClass: 'my-custom-class', - buttons: [{ - text: 'Sair do grupo', - handler: () => { - console.log('Delete clicked'); - } - }, { - text: 'Alterar nome do grupo1', - handler: () => { - console.log('Alterar nome do grupo'); - this.openChangeGroupName() - } - }, { - text: 'Apagar o grupo', - handler: () => { - console.log('Play clicked'); - } - }, - ] - }); - await actionSheet.present(); - } - */ - -} - diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 899796807..e125f3f05 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -12,7 +12,6 @@ import { SharedModule } from 'src/app/shared/shared.module'; import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; -import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'; import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page'; import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page'; import { PedidosPage } from 'src/app/shared/gabinete-digital/pedidos/pedidos.page'; @@ -24,7 +23,6 @@ import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-as import { ComponentsModule } from 'src/app/components/components.module'; import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; -import { ExpedientePageModule } from 'src/app/shared/gabinete-digital/expediente/expediente.module'; import { ExpedientsPageModule } from 'src/app/shared/gabinete-digital/expedients/expedients.module'; import { PedidosPageModule } from 'src/app/shared/gabinete-digital/pedidos/pedidos.module'; import { DespachosPageModule } from 'src/app/shared/gabinete-digital/despachos/despachos.module'; @@ -45,7 +43,6 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; HeaderPageModule, EmptyContainerPageModule, EventsToApprovePageModule, - ExpedientePageModule, ExpedientsPageModule, PedidosPageModule, DespachosPageModule, @@ -53,7 +50,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; DespachosPrPageModule, DiplomasPageModule, ExpedientesPrPageModule, - DiplomasAssinarPageModule + DiplomasAssinarPageModule, + EmptyContainerPageModule, ], declarations: [ diff --git a/src/app/shared/chat/empty-chat/empty-chat.module.ts b/src/app/shared/chat/empty-chat/empty-chat.module.ts index f999113de..0c41f0249 100644 --- a/src/app/shared/chat/empty-chat/empty-chat.module.ts +++ b/src/app/shared/chat/empty-chat/empty-chat.module.ts @@ -15,6 +15,7 @@ import { EmptyChatPage } from './empty-chat.page'; IonicModule, EmptyChatPageRoutingModule ], - declarations: [] + exports: [EmptyChatPage], + declarations: [EmptyChatPage] }) export class EmptyChatPageModule {} diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts index 6301034b4..98d3374bb 100644 --- a/src/app/shared/chat/messages/contacts/contacts.module.ts +++ b/src/app/shared/chat/messages/contacts/contacts.module.ts @@ -10,6 +10,7 @@ import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { ComponentsModule } from 'src/app/components/components.module'; +import { PipesModule } from 'src/app/pipes/pipes.module'; @NgModule({ imports: [ @@ -17,9 +18,10 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ContactsPageRoutingModule + ContactsPageRoutingModule, + PipesModule, ], - exports: [ContactsPage, FilterPipe], - declarations: [ContactsPage] + exports: [ContactsPage], + declarations: [ContactsPage, FilterPipe] }) export class ContactsPageModule {} diff --git a/src/app/shared/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/shared/gabinete-digital/expediente/expediente-routing.module.ts deleted file mode 100644 index 1305f8f4f..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente-routing.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -const routes: Routes = [ - -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ExpedientePageRoutingModule {} diff --git a/src/app/shared/gabinete-digital/expediente/expediente.module.ts b/src/app/shared/gabinete-digital/expediente/expediente.module.ts deleted file mode 100644 index 95944464c..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { ExpedientePageRoutingModule } from './expediente-routing.module'; - -import { ExpedientePage } from './expediente.page'; -import { SharedModule } from 'src/app/shared/shared.module'; -import { ComponentsModule } from 'src/app/components/components.module'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - ComponentsModule, - ExpedientePageRoutingModule - ], - exports: [ExpedientePage], - declarations: [ExpedientePage], - schemas: [CUSTOM_ELEMENTS_SCHEMA] -}) -export class ExpedientePageModule {} diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.html b/src/app/shared/gabinete-digital/expediente/expediente.page.html deleted file mode 100644 index ae82fd0ed..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.html +++ /dev/null @@ -1,202 +0,0 @@ - - - - -
-
- -
- Detalhes do Expediente -
-
- - - -
-
-
- - - - - -
-

Detalhes do Expediente

- - - Assunto - {{ task.Folio }} - - - Remetentes - {{task.Remetente}} - - - Data - {{ task.CreateDate | date: 'dd-MM-yy | hh:mm'}} - - - - Ver documento - - -
-

Eventos Associados

- - - -
- - - -
-
-

{{event.StartDate | date: 'hh:mm'}}

-

{{event.EndDate | date: 'hh:mm'}}

-
-
-

{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}

-

{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}

-

{{event.Subject}}

-
-
- - -
- - - -
- - - -
-
- - - - - - - - -

- -

-

- -

- - - - -

- -

-

- - - - -

- -

-

- -

- - - - - - - -
- - diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.scss b/src/app/shared/gabinete-digital/expediente/expediente.page.scss deleted file mode 100644 index b14a6c4e2..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.scss +++ /dev/null @@ -1,224 +0,0 @@ -@import '~src/function.scss'; -.header-toolbar{ - --background:transparent; - --opacity: 1; - - .main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .header-top{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - width: 280px; - margin: 2.5px 0 0 5px; - display: flex; - align-items: center; - - } - .right{ - padding: 0!important; - float: right; - font-size: 25px; - color: #0782c9; - margin: 5px 0 0 0; - } - } - .header-bottom{ - width: 310px; - overflow: auto; - margin: 0 auto; - - .header-bottom-icon{ - width: 30px; - font-size: 25px; - float: left; - padding: 2px; - - } - .header-bottom-contacts{ - width: 275px; - font-size: 15px; - color: #797979; - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - float: left; - padding: 5px; - margin: 1px; - } - } - - .title{ - font-size: 25px; - overflow: auto; - float: left; - } - .div-icon{ - width: 40px; - float: right; - font-size: 35px; - overflow: auto; - padding: 1px; - } - } - } -ion-item-group{ - margin: 15px; -} -ion-button{ - display: block; - width: 80%; - margin: 20px auto; -} -.h3-event-title{ - padding: 15px 0 0px 25px; - font-weight: bold; -} - -//DIV -.div-item-Oficial{ - width: 100%; - overflow: auto; - border-bottom: 1px solid #ccc; - margin: 10px 0 5px 0; - /* background: #cab0dc; */ - /* border-radius: 20px; */ - /* padding: 10px; */ - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ - } - .div-item-Pessoal{ - width: 100%; - overflow: auto; - border-bottom: 1px solid #ccc; - margin: 10px 0 5px 0; - /* background: #cbeecb; */ - /* border-radius: 20px; */ - /* padding: 10px; */ - /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ - } - .div-up{ - width: 100%; - overflow: auto; - } - .div-up h3{ - margin: 0; - padding: 0; - font-size: 17px; - width: 100%; - } - .div-icon{ - width: 10%; - font-size: 22px; - float: left; - color: #808080; - } - .div-icon ion-icon{ - display: block; - margin: 0 auto; - - } - .div-content-Oficial{ - width: 85%; - float: left; - border-left: 4px solid #cab0dc; - padding: 0 0 0 12px; - } - .div-content-Pessoal{ - width: 85%; - float: left; - border-left: 4px solid #cbeecb; - padding: 0 0 0 12px; - } - .div-content-Oficial h3, .div-content-Pessoal h3{ - font-size: 14pt; - /* border: 1px solid red; */ - } - .div-content-Oficial p, .div-content-Pessoal p{ - font-size: 12pt; - color: rgb(94, 92, 92); - padding: 0 !important; - margin: 0 !important; - } - .div-botton{ - width: 100%; - overflow: auto; - margin: 10px 0 5px 0; - } - .div-botton-left{ - width: 10%; - float: left; - } - .ion-icon-location{ - text-align: center; - display: block; - color: #000; - font-size: 16px; - margin: 0 auto; - } - .div-botton-middle{ - width: 75%; - float: left; - margin-top: 0.5px; - } - .div-botton-middle p{ - padding: 0; - margin: 0; - } - .div-botton-right{ - width: 10%; - float: left; - margin: 0; - padding: 0; - } - .ion-icon-attach{ - color: #666666; - font-size: 20px; - } -/* TOGGLE BUTTON */ - .switch { - position: relative; - display: inline-block; - width: 90px; - height: 34px; - float: right; - margin:20px 20px 0 0; - } - .div-top-header{ - width: 400px; - margin: 6px auto; - background-color: #0782c9; - overflow: auto; - } - .div-search{ - font-size: 45px; - float: left; - margin: 0 0 0 10px - } - .div-logo{ - background: transparent; - width: 150px; - margin: 2.5px 0 2.5px 71px; - float: left; - } - .div-logo img{ - width: 100%; - } - .div-profile{ - font-size: 45px; - float: right; - margin-right: 10px; - } \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.spec.ts b/src/app/shared/gabinete-digital/expediente/expediente.page.spec.ts deleted file mode 100644 index 760d8b73a..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ExpedientePage } from './expediente.page'; - -describe('ExpedientePage', () => { - let component: ExpedientePage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ ExpedientePage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ExpedientePage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/gabinete-digital/expediente/expediente.page.ts b/src/app/shared/gabinete-digital/expediente/expediente.page.ts deleted file mode 100644 index c0f9a1ac1..000000000 --- a/src/app/shared/gabinete-digital/expediente/expediente.page.ts +++ /dev/null @@ -1,158 +0,0 @@ -import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { EventsService } from 'src/app/services/events.service'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from 'src/app/models/dailyworktask.model'; -import { ActivatedRoute, Router } from '@angular/router'; -import { formatDate } from '@angular/common'; - -import { MenuController, ModalController, NavParams } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; -import { Event } from 'src/app/models/event.model'; -import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; -import { momentG } from 'src/plugin/momentG'; -import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; -import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; - -@Component({ - selector: 'app-expediente', - templateUrl: './expediente.page.html', - styleUrls: ['./expediente.page.scss'], -}) -export class ExpedientePage implements OnInit { - - task: any; - fulltask: any; - eventsList: Event[]; - //serialnumber: string; - //profile: string; - - @Input() profile:string; - @Input() serialNumber:string; - @Output() openExpedientList:EventEmitter = new EventEmitter(); - - constructor(private activateRoute: ActivatedRoute, - private processes: ProcessesService, - private iab: InAppBrowser, - private attachments: AttachmentsService, - private events: EventsService, - private menu: MenuController, - private router: Router, - private modalController: ModalController, - //private navParams: NavParams, - private alertService: AlertService) { - //this.serialnumber = this.navParams.get('serialNumber'); - //this.profile = this.navParams.get('profile'); - } - - ngOnInit() { - this.profile = "mdgpr"; - // console.log(this.serialNumber); - - this.activateRoute.paramMap.subscribe(paramMap => { - if (!paramMap.has('SerialNumber')) { - return; - } - /* this.serialnumber = paramMap.get('SerialNumber'); */ - this.LoadTaskDetail(this.serialNumber); - this.LoadRelatedEvents(this.serialNumber); - }); - this.LoadTaskDetail(this.serialNumber); - this.LoadRelatedEvents(this.serialNumber); - } - - openExpedientListPage(){ - this.openExpedientList.emit(); - } - - async LoadTaskDetail(serial: string) { - this.processes.GetTask(serial).subscribe(res => { - this.task = { - "SerialNumber": res.serialNumber, - "Folio": res.workflowInstanceFolio, - "Senders": res.originator.email, - "CreateDate": momentG(new Date(res.taskStartDate),'yyyy-MM-dd HH:mm:ss'), - "DocumentURL": res.workflowInstanceDataFields.ViewerRequest, - "Remetente": res.workflowInstanceDataFields.Sender, - } - this.fulltask = res; - console.log(res); - - }); - } - - async LoadRelatedEvents(serial: string) { - if (this.eventsList == null) { - this.attachments.getAttachmentsBySerial(serial).subscribe(res => { - console.log(res); - res.forEach(att => { - if (this.eventsList == null) { - this.eventsList = new Array(); - } - this.events.getEvent(att.ParentId).subscribe(event => { - this.eventsList.push(event); - console.log(this.eventsList); - }); - }); - }); - } - } - - viewDocument() { - const url: string = this.task.DocumentURL.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1"); - const browser = this.iab.create(url,"_blank"); - browser.show(); - } - - openMenu() { - this.menu.open(); - } - - async openExpedientActionsModal(taskAction: any, task: any) { - const modal = await this.modalController.create({ - component: ExpedientTaskModalPage, - componentProps: { - taskAction: taskAction, - task: task, - }, - cssClass: 'expedient-task-modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - - async openBookMeetingModal(task: any) { - const modal = await this.modalController.create({ - component: BookMeetingModalPage, - componentProps: { - task: task, - }, - cssClass: 'book-meeting-modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - - async viewEventDetail(eventId: any) { - console.log(this.profile); - - const modal = await this.modalController.create({ - component: ViewEventPage, - componentProps: { - eventId: eventId, - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss().then((res) => { - if (res) { - } - }); - } - -} diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 200337791..547c56c25 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -65,7 +65,7 @@ - +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.module.ts b/src/app/shared/popover/chat-popover/chat-popover.module.ts index 4ff1cd980..4c2489a0e 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.module.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.module.ts @@ -1,4 +1,4 @@ -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; +import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; @@ -18,7 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module'; ChatPopoverPageRoutingModule ], exports: [ChatPopoverPage], - declarations: [ChatPopoverPage], - schemas: [CUSTOM_ELEMENTS_SCHEMA] + declarations: [ChatPopoverPage] }) export class ChatPopoverPageModule {} From 24e37ae48f9b6db44710464beefbf3943305458a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 14:18:30 +0100 Subject: [PATCH 22/39] Add components --- src/app/app-routing.module.ts | 284 +++++++++--------- src/app/components/components.module.ts | 24 +- src/app/pages/agenda/agenda.module.ts | 11 +- .../approve-event-modal.page.html | 105 ------- .../approve-event-modal.page.ts | 210 ------------- .../expedient-task-modal.page.html | 2 - .../gabinete-digital.module.ts | 2 +- .../agenda/event-list/event-list.module.ts | 3 +- .../agenda/new-event/new-event.module.ts | 3 +- .../events-to-approve.page.ts | 4 +- src/global.scss | 2 +- 11 files changed, 174 insertions(+), 476 deletions(-) delete mode 100644 src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html delete mode 100644 src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 8d0ace252..3a0c83fff 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,140 +1,152 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'btn-criar', - loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule) - }, - { - path: 'btn-adicionar', - loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'btn-criar', + loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule) + }, + { + path: 'btn-adicionar', + loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) + }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, + { path: 'new-event', loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) }, + { + path: 'edit-event', + loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) + }, + { + path: 'approve-event', + loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) + }, - - /* { - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 19e809102..ec6cd538b 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -8,10 +8,10 @@ import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page'; import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; -import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; +import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; -import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; -import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-event.component'; +import { EventListPage } from '../shared/agenda/event-list/event-list.page'; +import { ApproveEventPage } from '../shared/agenda/approve-event/approve-event.page'; import { AttendeesPage } from '../shared/event/attendees/attendees.page'; import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page'; import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page'; @@ -46,15 +46,15 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov BtnCriarPage, BtnAdicionarPage, - NewEventPage, - EditEventComponent, + //NewEventPage, + //EditEventPage, //ViewEventPage, - ApproveEventComponent, + //ApproveEventPage, AttendeesPage, //AttendeeModalPage, - EventListComponent, + //EventListPage, EmptyContainerPage, //EventsToApprovePage, @@ -67,16 +67,14 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov BtnCriarPage, BtnAdicionarPage, - NewEventPage, - EditEventComponent, + //NewEventPage, + //EditEventPage, // ViewEventPage, - EventListComponent, - ApproveEventComponent, + //EventListPage, + //ApproveEventPage, AttendeesPage, //AttendeeModalPage, //EventsToApprovePage, - - EventListComponent, EmptyContainerPage, ], diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index a08c4f9e8..7978c413a 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -14,10 +14,9 @@ import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; import { SharedModule } from 'src/app/shared/shared.module'; import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page" -import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component'; +import { EditEventPage } from 'src/app/shared/agenda/edit-event/edit-event.page'; import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; -import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component"; -import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component"; +import { EventListPage } from "src/app/shared/agenda/event-list/event-list.page"; import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; @@ -34,6 +33,8 @@ import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/att 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'; @NgModule({ imports: [ @@ -55,7 +56,9 @@ import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event ViewEventPageModule, AttendeesPageModule, AttendeeModalPageModule, - EventsToApprovePageModule + EventsToApprovePageModule, + ApproveEventPageModule, + NewEventPageModule, ], declarations: [ AgendaPage diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html deleted file mode 100644 index b96e33cae..000000000 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html +++ /dev/null @@ -1,105 +0,0 @@ - -
-
- -
-
- -
-
- -
-
- - - - - Acções - - - - - - - Aprovar - - - - Adicionar Nota - - - - Rejeitar - - - - - - -
-
-
- 11{{loadedEvent.workflowInstanceDataFields.Location}} -
-
- {{loadedEvent.workflowInstanceDataFields.Agenda}} -
-
-
- -

{{customDate}}

-

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

-

(Não se repete)

-

Repete

- -
-
-
-
Intervenientes
- - -

{{loadedEvent.workflowInstanceDataFields.Participants}}

- - -
Detalhes
- -

{{loadedEvent.workflowInstanceDataFields.Body}}

- -
- -
- -
Documentos Anexados
- - -

Receita por Natureza

-

{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}

- - - -
- - - -
- -

- Emendar -

-

- - - -

-

- Aprovar -

- - -
- - diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts deleted file mode 100644 index e46534965..000000000 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ /dev/null @@ -1,210 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; -import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { Event } from 'src/app/models/event.model'; -import { AlertService } from 'src/app/services/alert.service'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { BadRequestComponent } from 'src/app/shared/popover/bad-request/bad-request.component'; -import { SuccessMessageComponent } from 'src/app/shared/popover/success-message/success-message.component'; -import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page'; -import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page'; - -@Component({ - selector: 'app-approve-event-modal', - templateUrl: './approve-event-modal.page.html', - /* styleUrls: ['./approve-event-modal.page.scss'], */ -}) -export class ApproveEventModalPage implements OnInit { - event: Event; - loadedEvent:any; - loadedAttachments:any; - serialNumber:string; - customDate:any; - today:any; - - months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; - days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; - - - constructor( - private router:Router, - private modalController: ModalController, - private navParams: NavParams, - private processes:ProcessesService, - private attachmentsService: AttachmentsService, - private popoverController: PopoverController, - private menu: MenuController, - private alertService: AlertService, - ) { - this.serialNumber = this.navParams.get('serialNumber'); - } - - ngOnInit() { - this.getTask(); - this.getAttachments(); - - window.onresize = (event) => { - // if not mobile remove all component - if( window.innerWidth >= 800){ - this.modalController.dismiss(null); - } - }; - } - - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - - close(){ - /* this.router.navigate(['/home/gabinete-digital/event-list']); */ - this.modalController.dismiss(null); - } - - getTask(){ - this.processes.GetTask(this.serialNumber).subscribe(res => { - console.log(res); - this.loadedEvent = res; - this.today = new Date(res.workflowInstanceDataFields.StartDate); - console.log(new Date(this.today)); - this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); - - }) - } - async approveTask(serialNumber:string){ - let body = { - "serialNumber": serialNumber, - "action": "Aprovar" - } - - try { - await this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); - this.successMessage() - } catch (error) { - this.badRequest() - } - - } - - async emendTask(serialNumber:string){ - - try { - await this.openEmendMessageModal(serialNumber); - this.modalController.dismiss(null); - this.menu.close(); - } catch (error) { - - } - - - } - - async rejectTask(serialNumber:string){ - - let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - - try { - await this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); - this.successMessage() - } catch (error) { - this.badRequest() - } - - } - - getAttachments(){ - this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{ - this.loadedAttachments = res; - console.log(res); - }); - } - - async openOptions(ev:any) { - const popover = await this.popoverController.create({ - component: EventActionsPopoverPage, - cssClass: 'event-actions-popover', - event: ev, - translucent: true - }); - return await popover.present(); - } - - openMenu() { - this.menu.open(); - } - - async openEmendMessageModal(serialNumber:string) { - const modal = await this.modalController.create({ - component: EmendMessageModalPage, - componentProps:{ - - }, - cssClass: 'emend-message-modal', - backdropDismiss: false - }); - - await modal.present(); - - modal.onDidDismiss().then(res => { - if(res.data !== '') { - let body = { "serialNumber": serialNumber, - "action": "Emendar", - "dataFields": { - "ReviewerUseComment": res.data, - } - } - - try { - this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.successMessage() - } catch (error) { - this.badRequest() - } - - } - else{ - //this.alertService.presentAlert('Operação cancelada!'); - } - }); - } - - - async successMessage(message?: string) { - - const modal = await this.modalController.create({ - component: SuccessMessageComponent, - componentProps: { - message: message || 'Processo efetuado' , - }, - cssClass: 'modal modal-desktop' - }); - - modal.present() - - setTimeout(()=>{ - modal.dismiss() - },3000) - - } - - async badRequest(message?: string) { - const modal = await this.modalController.create({ - component: BadRequestComponent, - componentProps: { - message: message || 'Processo não efetuado' , - }, - cssClass: 'modal modal-desktop' - }); - - modal.present() - - setTimeout(()=>{ - modal.dismiss() - },3000) - } -} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index 23b414d2c..b05c37464 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -124,8 +124,6 @@
- -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 899796807..1922084ce 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -9,7 +9,7 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod import { GabineteDigitalPage } from './gabinete-digital.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component'; +import { EventListPage } from 'src/app/shared/agenda/event-list/event-list.page'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; import { ExpedientePage } from 'src/app/shared/gabinete-digital/expediente/expediente.page'; diff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/shared/agenda/event-list/event-list.module.ts index bc23c444f..c6e334490 100644 --- a/src/app/shared/agenda/event-list/event-list.module.ts +++ b/src/app/shared/agenda/event-list/event-list.module.ts @@ -15,6 +15,7 @@ import { EventListPage } from './event-list.page'; IonicModule, EventListPageRoutingModule ], - declarations: [EventListPage] + declarations: [EventListPage], + exports: [EventListPage] }) export class EventListPageModule {} diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts index f5d90c691..4bcea0ab2 100644 --- a/src/app/shared/agenda/new-event/new-event.module.ts +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -15,6 +15,7 @@ import { NewEventPage } from './new-event.page'; IonicModule, NewEventPageRoutingModule ], - declarations: [NewEventPage] + declarations: [NewEventPage], + exports: [NewEventPage] }) export class NewEventPageModule {} diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index 5acf9d097..23ebdb775 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController, NavParams } from '@ionic/angular'; import { NavigationEnd, NavigationExtras, Router } from '@angular/router'; -import { ApproveEventComponent } from '../../agenda/approve-event/approve-event.component'; +import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page'; @Component({ selector: 'app-events-to-approve', @@ -104,7 +104,7 @@ export class EventsToApprovePage implements OnInit { } const modal = await this.modalController.create({ - component: ApproveEventComponent, + component: ApproveEventPage, componentProps:{ serialNumber: eventToAprove.serialNumber, InstanceId: InstanceId , diff --git a/src/global.scss b/src/global.scss index 4b81d8140..efd39c49d 100644 --- a/src/global.scss +++ b/src/global.scss @@ -542,7 +542,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- } .timeline-box{ - // left: -13%; + left: -13%; position: relative; width: 113%; } From c76dc98a1411069200a44493eac936d0bea76592 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 14:19:16 +0100 Subject: [PATCH 23/39] save --- src/app/components/components.module.ts | 13 ------------- src/app/pages/agenda/agenda.module.ts | 3 --- .../gabinete-digital/gabinete-digital.module.ts | 1 - 3 files changed, 17 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 38f956b8e..b6537abc7 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -6,10 +6,7 @@ import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; -import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; -import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; -import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-event.component'; import { AttendeesPage } from '../shared/event/attendees/attendees.page'; @NgModule({ @@ -21,14 +18,10 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; BtnAdicionarPage, NewEventPage, - EditEventComponent, //ViewEventPage, - ApproveEventComponent, - AttendeesPage, //AttendeeModalPage, - EventListComponent, //EventsToApprovePage, ], @@ -39,16 +32,10 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; BtnAdicionarPage, NewEventPage, - EditEventComponent, // ViewEventPage, - EventListComponent, - ApproveEventComponent, AttendeesPage, //AttendeeModalPage, //EventsToApprovePage, - - EventListComponent, - ], imports: [ CommonModule, diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index a08c4f9e8..c60bc622b 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -14,10 +14,7 @@ import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; import { SharedModule } from 'src/app/shared/shared.module'; import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page" -import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; -import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component"; -import { ApproveEventComponent } from "src/app/shared/agenda/approve-event/approve-event.component"; import { AttendeesPage } from 'src/app/shared/event/attendees/attendees.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index e125f3f05..21ae44038 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -9,7 +9,6 @@ import { GabineteDigitalPageRoutingModule } from './gabinete-digital-routing.mod import { GabineteDigitalPage } from './gabinete-digital.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { EventListComponent } from 'src/app/shared/agenda/event-list/event-list.component'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page'; import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page'; From 5d8600324a770550f42e5699a2d2d6d82e2ef84f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 14:48:35 +0100 Subject: [PATCH 24/39] Improve Attendees --- src/app/components/components.module.ts | 4 ++-- src/app/pages/agenda/agenda.module.ts | 6 +++++- .../events/attendee-modal/attendee-modal.module.ts | 4 +++- .../gabinete-digital/event-list/event-list.module.ts | 3 ++- .../book-meeting-modal/book-meeting-modal.module.ts | 9 ++++++++- .../expedient-task-modal.module.ts | 10 +++++++++- .../expedientes-pr/expediente-pr/expediente-pr.page.ts | 2 +- .../pages/gabinete-digital/gabinete-digital.module.ts | 1 + src/app/shared/event/attendees/attendees.module.ts | 3 ++- src/app/shared/header/header.page.html | 4 ++-- 10 files changed, 35 insertions(+), 11 deletions(-) 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 @@
- +
From 7dfa6d6b6f553a0fb7a88f91b3f39a59a7043f5a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 14:52:49 +0100 Subject: [PATCH 25/39] save --- src/app/app-routing.module.ts | 8 ------- src/app/components/components.module.ts | 10 ++------ .../chat/edit-group/edit-group.module.ts | 4 +++- .../group-contacts/group-contacts.module.ts | 4 +++- .../new-group/contacts/contacts.module.ts | 4 +++- .../new-group/group-chat/group-chat.module.ts | 4 +++- .../pages/chat/new-group/new-group.module.ts | 4 +++- .../btn-seguinte/btn-seguinte.module.ts | 3 ++- .../btn-adicionar-routing.module.ts | 17 ------------- .../btn-adicionar/btn-adicionar.module.ts | 20 ---------------- .../btn-adicionar/btn-adicionar.page.html | 3 --- .../btn-adicionar/btn-adicionar.page.scss | 7 ------ .../btn-adicionar/btn-adicionar.page.spec.ts | 24 ------------------- .../btn-adicionar/btn-adicionar.page.ts | 15 ------------ .../btn-criar/btn-criar-routing.module.ts | 17 ------------- .../buttons/btn-criar/btn-criar.module.ts | 20 ---------------- .../buttons/btn-criar/btn-criar.page.html | 3 --- .../buttons/btn-criar/btn-criar.page.scss | 7 ------ .../buttons/btn-criar/btn-criar.page.spec.ts | 24 ------------------- .../buttons/btn-criar/btn-criar.page.ts | 15 ------------ .../chat/edit-group/edit-group.module.ts | 4 +++- .../group-contacts/group-contacts.page.html | 6 ++++- .../group-contacts/group-contacts.page.scss | 7 ++++++ .../new-group/contacts/contacts.module.ts | 4 +++- .../new-group/group-chat/group-chat.module.ts | 4 +++- .../shared/chat/new-group/new-group.page.html | 6 ++++- .../shared/chat/new-group/new-group.page.scss | 7 ++++++ .../event/attendees/attendees.module.ts | 3 ++- 28 files changed, 54 insertions(+), 200 deletions(-) delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts delete mode 100644 src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar.module.ts delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.html delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.scss delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts delete mode 100644 src/app/shared/buttons/btn-criar/btn-criar.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 3a0c83fff..564618489 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -16,14 +16,6 @@ const routes: Routes = [ path: 'empty-chat', loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) }, - { - path: 'btn-criar', - loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule) - }, - { - path: 'btn-adicionar', - loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule) - }, { path: 'empty-container', loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 35ad22a3d..742903dc0 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common'; import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page'; import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page'; import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; -import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page'; -import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page'; import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; @@ -15,10 +13,8 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; @NgModule({ declarations: [ - BtnSeguintePage, + /* BtnSeguintePage, */ BtnModalDismissPage, - BtnCriarPage, - BtnAdicionarPage, //NewEventPage, //EditEventPage, @@ -34,10 +30,8 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; ], exports: [ - BtnSeguintePage, + /* BtnSeguintePage, */ BtnModalDismissPage, - BtnCriarPage, - BtnAdicionarPage, //NewEventPage, //EditEventPage, diff --git a/src/app/pages/chat/edit-group/edit-group.module.ts b/src/app/pages/chat/edit-group/edit-group.module.ts index ba9c5fb3a..76bd8d362 100644 --- a/src/app/pages/chat/edit-group/edit-group.module.ts +++ b/src/app/pages/chat/edit-group/edit-group.module.ts @@ -9,6 +9,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module'; import { EditGroupPage } from './edit-group.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - EditGroupPageRoutingModule + EditGroupPageRoutingModule, + BtnSeguintePageModule, ], declarations: [EditGroupPage] }) diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts index 589bc4509..e993e9da3 100644 --- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts +++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.module.ts @@ -10,6 +10,7 @@ import { GroupContactsPage } from './group-contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { PipesModule } from 'src/app/pipes/pipes.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -18,7 +19,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; IonicModule, ComponentsModule, PipesModule, - GroupContactsPageRoutingModule + GroupContactsPageRoutingModule, + BtnSeguintePageModule, ], declarations: [GroupContactsPage] }) diff --git a/src/app/pages/chat/new-group/contacts/contacts.module.ts b/src/app/pages/chat/new-group/contacts/contacts.module.ts index 92557bb61..942581b58 100644 --- a/src/app/pages/chat/new-group/contacts/contacts.module.ts +++ b/src/app/pages/chat/new-group/contacts/contacts.module.ts @@ -9,6 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module'; import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ContactsPageRoutingModule + ContactsPageRoutingModule, + BtnSeguintePageModule, ], declarations: [ContactsPage] }) diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts index e976a36ec..898b546d6 100644 --- a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts @@ -9,6 +9,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module'; import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - GroupChatPageRoutingModule + GroupChatPageRoutingModule, + BtnSeguintePageModule, ], declarations: [GroupChatPage] }) diff --git a/src/app/pages/chat/new-group/new-group.module.ts b/src/app/pages/chat/new-group/new-group.module.ts index c72df1781..f96c28444 100644 --- a/src/app/pages/chat/new-group/new-group.module.ts +++ b/src/app/pages/chat/new-group/new-group.module.ts @@ -9,6 +9,7 @@ import { NewGroupPageRoutingModule } from './new-group-routing.module'; import { NewGroupPage } from './new-group.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - NewGroupPageRoutingModule + NewGroupPageRoutingModule, + BtnSeguintePageModule, ], declarations: [NewGroupPage] }) diff --git a/src/app/shared/btn-seguinte/btn-seguinte.module.ts b/src/app/shared/btn-seguinte/btn-seguinte.module.ts index 05ced1168..8bcb566c7 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.module.ts +++ b/src/app/shared/btn-seguinte/btn-seguinte.module.ts @@ -15,6 +15,7 @@ import { BtnSeguintePage } from './btn-seguinte.page'; IonicModule, BtnSeguintePageRoutingModule ], - declarations: [] + exports: [BtnSeguintePage], + declarations: [BtnSeguintePage] }) export class BtnSeguintePageModule {} diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts deleted file mode 100644 index b6f074394..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { BtnAdicionarPage } from './btn-adicionar.page'; - -const routes: Routes = [ - { - path: '', - component: BtnAdicionarPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class BtnAdicionarPageRoutingModule {} diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts deleted file mode 100644 index 70ea0e341..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { BtnAdicionarPageRoutingModule } from './btn-adicionar-routing.module'; - -import { BtnAdicionarPage } from './btn-adicionar.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - BtnAdicionarPageRoutingModule - ], - declarations: [] -}) -export class BtnAdicionarPageModule {} diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html deleted file mode 100644 index e53e30f5d..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Adicionar -
diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss deleted file mode 100644 index b7b93819b..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.scss +++ /dev/null @@ -1,7 +0,0 @@ -.right{ - padding: 0!important; - float: right; - font-size: 15px; - color: #0782c9; - margin: 8px 5px 0 5px; - } \ No newline at end of file diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts deleted file mode 100644 index 43026a2ac..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { BtnAdicionarPage } from './btn-adicionar.page'; - -describe('BtnAdicionarPage', () => { - let component: BtnAdicionarPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ BtnAdicionarPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(BtnAdicionarPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts b/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts deleted file mode 100644 index 55d0d768f..000000000 --- a/src/app/shared/buttons/btn-adicionar/btn-adicionar.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-btn-adicionar', - templateUrl: './btn-adicionar.page.html', - styleUrls: ['./btn-adicionar.page.scss'], -}) -export class BtnAdicionarPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts b/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts deleted file mode 100644 index 83df1196f..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { BtnCriarPage } from './btn-criar.page'; - -const routes: Routes = [ - { - path: '', - component: BtnCriarPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class BtnCriarPageRoutingModule {} diff --git a/src/app/shared/buttons/btn-criar/btn-criar.module.ts b/src/app/shared/buttons/btn-criar/btn-criar.module.ts deleted file mode 100644 index b6a7b77d7..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { BtnCriarPageRoutingModule } from './btn-criar-routing.module'; - -import { BtnCriarPage } from './btn-criar.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - BtnCriarPageRoutingModule - ], - declarations: [] -}) -export class BtnCriarPageModule {} diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.html b/src/app/shared/buttons/btn-criar/btn-criar.page.html deleted file mode 100644 index cf6ccee57..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar.page.html +++ /dev/null @@ -1,3 +0,0 @@ -
- Criar grupo -
diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.scss b/src/app/shared/buttons/btn-criar/btn-criar.page.scss deleted file mode 100644 index b7b93819b..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar.page.scss +++ /dev/null @@ -1,7 +0,0 @@ -.right{ - padding: 0!important; - float: right; - font-size: 15px; - color: #0782c9; - margin: 8px 5px 0 5px; - } \ No newline at end of file diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts deleted file mode 100644 index ce36f9653..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { BtnCriarPage } from './btn-criar.page'; - -describe('BtnCriarPage', () => { - let component: BtnCriarPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ BtnCriarPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(BtnCriarPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/shared/buttons/btn-criar/btn-criar.page.ts b/src/app/shared/buttons/btn-criar/btn-criar.page.ts deleted file mode 100644 index 6afea0c23..000000000 --- a/src/app/shared/buttons/btn-criar/btn-criar.page.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-btn-criar', - templateUrl: './btn-criar.page.html', - styleUrls: ['./btn-criar.page.scss'], -}) -export class BtnCriarPage implements OnInit { - - constructor() { } - - ngOnInit() { - } - -} diff --git a/src/app/shared/chat/edit-group/edit-group.module.ts b/src/app/shared/chat/edit-group/edit-group.module.ts index fcd33821f..62da945f7 100644 --- a/src/app/shared/chat/edit-group/edit-group.module.ts +++ b/src/app/shared/chat/edit-group/edit-group.module.ts @@ -9,6 +9,7 @@ import { EditGroupPageRoutingModule } from './edit-group-routing.module'; import { EditGroupPage } from './edit-group.page'; import { SharedModule } from '../../shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from '../../btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - EditGroupPageRoutingModule + EditGroupPageRoutingModule, + BtnSeguintePageModule, ], exports: [EditGroupPage], declarations: [EditGroupPage] diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html index ae052752e..4cc223766 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html @@ -10,7 +10,11 @@
Contactos
- +
+ +
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss index a2f88e2f3..b28c08b5b 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss @@ -41,6 +41,13 @@ float: left; margin: 2.5px 0 0 5px; } + .adicionar{ + padding: 0!important; + float: right; + font-size: 15px; + color: #0782c9; + margin: 8px 5px 0 5px; + } .title{ font-size: 25px; } diff --git a/src/app/shared/chat/new-group/contacts/contacts.module.ts b/src/app/shared/chat/new-group/contacts/contacts.module.ts index 92557bb61..942581b58 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.module.ts +++ b/src/app/shared/chat/new-group/contacts/contacts.module.ts @@ -9,6 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module'; import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ContactsPageRoutingModule + ContactsPageRoutingModule, + BtnSeguintePageModule, ], declarations: [ContactsPage] }) diff --git a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts index e976a36ec..898b546d6 100644 --- a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts @@ -9,6 +9,7 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module'; import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - GroupChatPageRoutingModule + GroupChatPageRoutingModule, + BtnSeguintePageModule, ], declarations: [GroupChatPage] }) diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html index 02dc25311..a8f9ccd2a 100644 --- a/src/app/shared/chat/new-group/new-group.page.html +++ b/src/app/shared/chat/new-group/new-group.page.html @@ -5,7 +5,11 @@
Novo Grupo
- +
+ +
diff --git a/src/app/shared/chat/new-group/new-group.page.scss b/src/app/shared/chat/new-group/new-group.page.scss index 025d3aedd..f7486d5fc 100644 --- a/src/app/shared/chat/new-group/new-group.page.scss +++ b/src/app/shared/chat/new-group/new-group.page.scss @@ -65,6 +65,13 @@ ion-content{ width: 221px; //margin: 2.5px 0 0 5px; } + .btn-criar{ + padding: 0!important; + float: right; + font-size: 15px; + color: #0782c9; + margin: 8px 5px 0 5px; + } .right{ padding: 0!important; float: right; diff --git a/src/app/shared/event/attendees/attendees.module.ts b/src/app/shared/event/attendees/attendees.module.ts index 6bf3dcc62..35f3b4a2a 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: [] + exports: [AttendeesPage], + declarations: [AttendeesPage] }) export class AttendeesPageModule {} From 8e8e1cd15296445b44ecd94993dd36bd13a9b0da Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 14:56:53 +0100 Subject: [PATCH 26/39] Fixe --- .../diplomas-assinar/diplomas-assinar.page.html | 2 +- .../expedientes-pr/expedientes-pr.page.html | 2 +- .../gabinete-digital/gabinete-digital.page.html | 4 ++-- .../gabinete-digital/gabinete-digital.page.ts | 6 +++--- src/app/pages/publications/publications.page.html | 14 +++++++------- src/app/pages/publications/publications.page.ts | 2 +- .../btn-modal-dismiss/btn-modal-dismiss.module.ts | 2 +- src/app/shared/btn-seguinte/btn-seguinte.module.ts | 2 +- .../buttons/btn-adicionar/btn-adicionar.module.ts | 2 +- .../shared/buttons/btn-criar/btn-criar.module.ts | 2 +- .../chat/group-messages/group-messages.page.ts | 2 +- src/app/shared/chat/messages/messages.page.ts | 2 +- .../opts-expediente/opts-expediente.page.html | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index e6f497c23..776e45e90 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -7,7 +7,7 @@
Diplomas
-
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html index d3523389f..86a9349d7 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html @@ -19,7 +19,7 @@
- + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 22f287ab4..dda2a113a 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -3,7 +3,7 @@ - + @@ -14,7 +14,7 @@
Gabinete Digital -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index f0e76c939..bfcf556ca 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -387,7 +387,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPrPage(segment:string) { + openDespachosPrPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDespachoListPr(); @@ -400,7 +400,7 @@ export class GabineteDigitalPage implements OnInit { } } - openPendentesPage(segment:string){ + openPendentesPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openPendenteList(); @@ -413,7 +413,7 @@ export class GabineteDigitalPage implements OnInit { } } - openExpedientesPrPage(segment:string){ + openExpedientesPrPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { //this.openExpedientList(); diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index e453b1a92..d3478afc8 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -24,7 +24,7 @@ -
@@ -80,8 +80,8 @@ class="height-100 d-flex flex-column overflow-hidden flex-grow-1" (addNewPublication)="addNewPublication($event)" (openPublicationDetails)="openPublicationDetails($event)" - (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" - (goBackToViewPublications)="goBackToViewPublications($event)" + (goBacktoPublicationDetails)="goBacktoPublicationDetails()" + (goBackToViewPublications)="goBackToViewPublications()" (closeDesktopComponent)="closeDesktopComponent($event)" > @@ -94,8 +94,8 @@ [publicationId]="publicationId" (closeDesktopComponent)="closeDesktopComponent($event)" - (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" - (goBackToViewPublications)="goBackToViewPublications($event)" + (goBacktoPublicationDetails)="goBacktoPublicationDetails()" + (goBackToViewPublications)="goBackToViewPublications()" > @@ -106,8 +106,8 @@ [folderId]="folderId" (addNewPublication)="addNewPublication($event)" (closeDesktopComponent)="closeDesktopComponent($event)" - (goBacktoPublicationDetails)="goBacktoPublicationDetails($event)" - (goBackToViewPublications)="goBackToViewPublications($event)" + (goBacktoPublicationDetails)="goBacktoPublicationDetails()" + (goBackToViewPublications)="goBackToViewPublications()" > Pedido de Parecer - +
From 3e64e6358ef552e78fbe983aec86b1d53376860c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 15:03:23 +0100 Subject: [PATCH 27/39] Fixe --- .../edit-event/edit-event-routing.module.ts | 17 +++++ .../events/edit-event/edit-event.module.ts | 21 +++++ ...nt-home.page.html => edit-event.page.html} | 0 ...nt-home.page.scss => edit-event.page.scss} | 0 ...ponent.spec.ts => edit-event.page.spec.ts} | 12 +-- ...-event.component.ts => edit-event.page.ts} | 9 +-- src/app/pages/events/events-routing.module.ts | 76 ++++++++++--------- src/app/pages/events/events.page.ts | 3 +- 8 files changed, 89 insertions(+), 49 deletions(-) create mode 100644 src/app/pages/events/edit-event/edit-event-routing.module.ts create mode 100644 src/app/pages/events/edit-event/edit-event.module.ts rename src/app/pages/events/edit-event/{app-edit-event-home.page.html => edit-event.page.html} (100%) rename src/app/pages/events/edit-event/{app-edit-event-home.page.scss => edit-event.page.scss} (100%) rename src/app/pages/events/edit-event/{edit-event.component.spec.ts => edit-event.page.spec.ts} (59%) rename src/app/pages/events/edit-event/{edit-event.component.ts => edit-event.page.ts} (97%) diff --git a/src/app/pages/events/edit-event/edit-event-routing.module.ts b/src/app/pages/events/edit-event/edit-event-routing.module.ts new file mode 100644 index 000000000..3616b2106 --- /dev/null +++ b/src/app/pages/events/edit-event/edit-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { EditEventPage } from './edit-event.page'; + +const routes: Routes = [ + { + path: '', + component: EditEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class EditEventPageRoutingModule {} diff --git a/src/app/pages/events/edit-event/edit-event.module.ts b/src/app/pages/events/edit-event/edit-event.module.ts new file mode 100644 index 000000000..bcd1dc3e4 --- /dev/null +++ b/src/app/pages/events/edit-event/edit-event.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { EditEventPageRoutingModule } from './edit-event-routing.module'; + +import { EditEventPage } from './edit-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + EditEventPageRoutingModule + ], + declarations: [EditEventPage], + exports: [EditEventPage] +}) +export class EditEventPageModule {} diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.html b/src/app/pages/events/edit-event/edit-event.page.html similarity index 100% rename from src/app/pages/events/edit-event/app-edit-event-home.page.html rename to src/app/pages/events/edit-event/edit-event.page.html diff --git a/src/app/pages/events/edit-event/app-edit-event-home.page.scss b/src/app/pages/events/edit-event/edit-event.page.scss similarity index 100% rename from src/app/pages/events/edit-event/app-edit-event-home.page.scss rename to src/app/pages/events/edit-event/edit-event.page.scss diff --git a/src/app/pages/events/edit-event/edit-event.component.spec.ts b/src/app/pages/events/edit-event/edit-event.page.spec.ts similarity index 59% rename from src/app/pages/events/edit-event/edit-event.component.spec.ts rename to src/app/pages/events/edit-event/edit-event.page.spec.ts index 018a13b51..4a219c892 100644 --- a/src/app/pages/events/edit-event/edit-event.component.spec.ts +++ b/src/app/pages/events/edit-event/edit-event.page.spec.ts @@ -1,19 +1,19 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { EditEventComponent } from './edit-event.component'; +import { EditEventPage } from './edit-event.page'; -describe('EditEventComponent', () => { - let component: EditEventComponent; - let fixture: ComponentFixture; +describe('EditEventPage', () => { + let component: EditEventPage; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ EditEventComponent ], + declarations: [ EditEventPage ], imports: [IonicModule.forRoot()] }).compileComponents(); - fixture = TestBed.createComponent(EditEventComponent); + fixture = TestBed.createComponent(EditEventPage); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/pages/events/edit-event/edit-event.component.ts b/src/app/pages/events/edit-event/edit-event.page.ts similarity index 97% rename from src/app/pages/events/edit-event/edit-event.component.ts rename to src/app/pages/events/edit-event/edit-event.page.ts index c55f493cb..c3ea2c912 100644 --- a/src/app/pages/events/edit-event/edit-event.component.ts +++ b/src/app/pages/events/edit-event/edit-event.page.ts @@ -16,12 +16,12 @@ import { AttachmentsPage } from '../attachments/attachments.page'; @Component({ - selector: 'app-edit-event-home', - templateUrl: './app-edit-event-home.page.html', - styleUrls: ['./app-edit-event-home.page.scss'], + selector: 'app-edit-event', + templateUrl: './edit-event.page.html', + styleUrls: ['./edit-event.page.scss'], }) +export class EditEventPage implements OnInit { -export class EventEditPage implements OnInit { loadedEvent: Event; loadedEventAttachments: Attachment[]; @@ -242,5 +242,4 @@ export class EventEditPage implements OnInit { }); } - } diff --git a/src/app/pages/events/events-routing.module.ts b/src/app/pages/events/events-routing.module.ts index 0839cc0ea..0d6a85ab4 100644 --- a/src/app/pages/events/events-routing.module.ts +++ b/src/app/pages/events/events-routing.module.ts @@ -1,38 +1,42 @@ -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: '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) + }, { + 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/events/events.page.ts b/src/app/pages/events/events.page.ts index eda18087c..845b4642b 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -15,9 +15,8 @@ import { DailyWorkTask } from '../../models/dailyworktask.model'; import { ViewEventPage } from '../agenda/view-event/view-event.page'; import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; -import { EventEditPage } from './edit-event/edit-event.component'; +import { EditEventPage as EventEditPage } from './edit-event/edit-event.page'; import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; -import { EditEventPage } from '../agenda/edit-event/edit-event.page'; import { User } from 'src/app/models/user.model'; @Component({ From 522276d7a468f60f45ae53073ae40c776a9b8057 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 15:05:09 +0100 Subject: [PATCH 28/39] save --- .../create-task/create-task.component.html | 237 ------------------ .../create-task/create-task.component.scss | 0 .../create-task/create-task.component.spec.ts | 24 -- .../create-task/create-task.component.ts | 14 -- .../diplomas-assinar.page.html | 4 +- .../add-participants-cc-modal.page.html | 2 +- 6 files changed, 3 insertions(+), 278 deletions(-) delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.html delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.scss delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.ts diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.html b/src/app/pages/gabinete-digital/create-task/create-task.component.html deleted file mode 100644 index cb43c5d46..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.html +++ /dev/null @@ -1,237 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- - - - - -
-
-
- -
-
- - - -
-
-
- - - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.scss b/src/app/pages/gabinete-digital/create-task/create-task.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts deleted file mode 100644 index 22f9769b0..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { CreateTaskComponent } from './create-task.component'; - -describe('CreateTaskComponent', () => { - let component: CreateTaskComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ CreateTaskComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(CreateTaskComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.ts deleted file mode 100644 index 19dbd3db8..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-create-task', - templateUrl: './create-task.component.html', - styleUrls: ['./create-task.component.scss'], -}) -export class CreateTaskComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index e6f497c23..737d24541 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -7,7 +7,7 @@
Diplomas
-
@@ -18,7 +18,7 @@
- + - +

{{ attendee.Name }}

{{ attendee.EmailAddress }}

From a44e8fa7c3f330856603499a235ef67772539af9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 15:28:07 +0100 Subject: [PATCH 29/39] save --- .../event-list/approve-event/approve-event.module.ts | 2 ++ src/app/pages/gabinete-digital/event-list/event-list.module.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts index 2aac9a5c1..b5ebe2d40 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts @@ -10,6 +10,7 @@ import { ApproveEventPage } from './approve-event.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, ApproveEventPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [ApproveEventPage] }) 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 eeab575ef..c3419a8fb 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 @@ -10,6 +10,7 @@ import { EventListPage } from './event-list.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, EventListPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [EventListPage], exports: [EventListPage] From 99b1bde310806574f6b844bbbc741709fc924a69 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 15:28:22 +0100 Subject: [PATCH 30/39] save --- src/app/components/components.module.ts | 4 ++-- src/app/modals/document-detail/document-detail.module.ts | 4 +++- src/app/pages/chat/group-messages/group-messages.module.ts | 2 ++ src/app/pages/chat/new-group/group-chat/group-chat.module.ts | 2 ++ .../gabinete-digital/despachos-pr/despachos-pr.module.ts | 2 ++ src/app/pages/gabinete-digital/despachos/despachos.module.ts | 2 ++ .../diploma-assinar/diploma-assinar.module.ts | 2 ++ .../diplomas-assinar/diplomas-assinar.module.ts | 4 +++- .../pages/gabinete-digital/diplomas/diploma/diploma.module.ts | 2 ++ src/app/pages/gabinete-digital/diplomas/diplomas.module.ts | 4 +++- .../approve-event-modal/approve-event-modal.module.ts | 2 ++ .../book-meeting-modal/book-meeting-modal.module.ts | 4 +++- .../expedient-task-modal/expedient-task-modal.module.ts | 4 +++- .../expediente/expediente-detail/expediente-detail.module.ts | 2 ++ .../expedientes-pr/expediente-pr/expediente-pr.module.ts | 2 ++ .../gabinete-digital/expedientes-pr/expedientes-pr.module.ts | 4 +++- src/app/pages/gabinete-digital/gabinete-digital.module.ts | 2 ++ .../pages/gabinete-digital/pedidos/pedido/pedido.module.ts | 2 ++ src/app/pages/gabinete-digital/pedidos/pedidos.module.ts | 2 ++ src/app/pages/gabinete-digital/pendentes/pendentes.module.ts | 2 ++ src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts | 1 + src/app/shared/chat/new-group/group-chat/group-chat.module.ts | 2 ++ 22 files changed, 49 insertions(+), 8 deletions(-) diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 1186b18b4..4c7831bdb 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -14,7 +14,7 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; declarations: [ /* BtnSeguintePage, */ - BtnModalDismissPage, + //BtnModalDismissPage, //NewEventPage, //EditEventPage, @@ -31,7 +31,7 @@ import { AttendeesPage } from '../shared/event/attendees/attendees.page'; ], exports: [ /* BtnSeguintePage, */ - BtnModalDismissPage, + //BtnModalDismissPage, //NewEventPage, //EditEventPage, diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts index 2a8cd73f5..3ade9b0a4 100644 --- a/src/app/modals/document-detail/document-detail.module.ts +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -9,6 +9,7 @@ import { DocumentDetailPageRoutingModule } from './document-detail-routing.modul import { DocumentDetailPage } from './document-detail.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - DocumentDetailPageRoutingModule + DocumentDetailPageRoutingModule, + BtnModalDismissPageModule, ], declarations: [ DocumentDetailPage, diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts index 00aba5875..4157e85c1 100644 --- a/src/app/pages/chat/group-messages/group-messages.module.ts +++ b/src/app/pages/chat/group-messages/group-messages.module.ts @@ -10,6 +10,7 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module' import { GroupMessagesPage } from './group-messages.page'; import { ComponentsModule } from 'src/app/components/components.module'; import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -20,6 +21,7 @@ import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat- ComponentsModule, GroupMessagesPageRoutingModule, ChatPopoverPageModule, + BtnModalDismissPageModule, ], declarations: [GroupMessagesPage] }) diff --git a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts index 898b546d6..2db5ec117 100644 --- a/src/app/pages/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/pages/chat/new-group/group-chat/group-chat.module.ts @@ -10,6 +10,7 @@ import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte. ComponentsModule, GroupChatPageRoutingModule, BtnSeguintePageModule, + BtnModalDismissPageModule, ], declarations: [GroupChatPage] }) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts index 963a77e6f..d72c2557b 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts @@ -10,6 +10,7 @@ import { DespachosPrPage } from './despachos-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, DespachosPrPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [DespachosPrPage] }) diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts index 3f4b2debe..202bb6d84 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts @@ -10,6 +10,7 @@ import { DespachosPage } from './despachos.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, DespachosPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [ DespachosPage, diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts index 64cf9c9a0..a9790731b 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts @@ -10,6 +10,7 @@ import { DiplomaAssinarPage } from './diploma-assinar.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, DiplomaAssinarPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [DiplomaAssinarPage] }) diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts index 49abc64e8..1edfe392b 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts @@ -10,6 +10,7 @@ import { DiplomasAssinarPage } from './diplomas-assinar.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -18,7 +19,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, DiplomasAssinarPageRoutingModule, HeaderPageModule, - ComponentsModule + ComponentsModule, + BtnModalDismissPageModule, ], declarations: [DiplomasAssinarPage] }) diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts index 8b7158f67..1a2611227 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -10,6 +10,7 @@ import { DiplomaPage } from './diploma.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, DiplomaPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [DiplomaPage] }) diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index 4caddc6f6..f693b215a 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -10,6 +10,7 @@ import { DiplomasPage } from './diplomas.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -18,7 +19,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, DiplomasPageRoutingModule, HeaderPageModule, - ComponentsModule + ComponentsModule, + BtnModalDismissPageModule, ], declarations: [DiplomasPage] }) diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts index 020f9435d..a7715a73d 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts @@ -8,6 +8,7 @@ import { ApproveEventModalPageRoutingModule } from './approve-event-modal-routin import { ApproveEventModalPage } from './approve-event-modal.page'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -16,6 +17,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, ApproveEventModalPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [ApproveEventModalPage] }) 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 970062cd1..13fc31cc9 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 @@ -11,6 +11,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee- 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'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -21,7 +22,8 @@ import { AttendeeModalPageModule } from 'src/app/pages/events/attendee-modal/att // AttendeesPageModule, AttendeeModalPageModule, - EmptyContainerPageModule + EmptyContainerPageModule, + BtnModalDismissPageModule, ], 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 27ad835ce..10d4ca393 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 @@ -12,6 +12,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain 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'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -22,7 +23,8 @@ import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-c // AttendeesPageModule, AttendeeModalPageModule, - EmptyContainerPageModule + EmptyContainerPageModule, + BtnModalDismissPageModule, ], declarations: [ diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts index 1c9d13a74..62f2040d8 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts @@ -10,6 +10,7 @@ import { ExpedienteDetailPage } from './expediente-detail.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, ExpedienteDetailPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [ExpedienteDetailPage] }) diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts index 8b086e074..2902a511a 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts @@ -10,6 +10,7 @@ import { ExpedientePrPage } from './expediente-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, ExpedientePrPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [ExpedientePrPage] }) diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts index e036efe77..b5a5deeea 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts @@ -10,6 +10,7 @@ import { ExpedientesPrPage } from './expedientes-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -18,7 +19,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, ExpedientesPrPageRoutingModule, HeaderPageModule, - ComponentsModule + ComponentsModule, + BtnModalDismissPageModule, ], declarations: [ExpedientesPrPage] }) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 2cad6f2b5..6cb489df0 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -32,6 +32,7 @@ import { DiplomasPageModule } from 'src/app/shared/gabinete-digital/diplomas/dip import { ExpedientesPrPageModule } from 'src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.module'; import { DiplomasAssinarPageModule } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -53,6 +54,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ExpedientesPrPageModule, DiplomasAssinarPageModule, EmptyContainerPageModule, + BtnModalDismissPageModule, ], declarations: [ diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts index 05d31ab10..c6b78fdf1 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts @@ -10,6 +10,7 @@ import { PedidoPage } from './pedido.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, PedidoPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [PedidoPage] }) diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts index 2569728d3..2d25777e3 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts @@ -10,6 +10,7 @@ import { PedidosPage } from './pedidos.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, PedidosPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [PedidosPage] }) diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts index 11828a9e9..483c1523d 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts @@ -10,6 +10,7 @@ import { PendentesPage } from './pendentes.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, PendentesPageRoutingModule, HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [PendentesPage] }) diff --git a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts index de1bb2d5b..bd6fadcfd 100644 --- a/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts +++ b/src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module.ts @@ -15,6 +15,7 @@ import { BtnModalDismissPage } from './btn-modal-dismiss.page'; IonicModule, BtnModalDismissPageRoutingModule ], + exports: [BtnModalDismissPage], declarations: [BtnModalDismissPage] }) export class BtnModalDismissPageModule {} diff --git a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts index 898b546d6..2db5ec117 100644 --- a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts @@ -10,6 +10,7 @@ import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -19,6 +20,7 @@ import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte. ComponentsModule, GroupChatPageRoutingModule, BtnSeguintePageModule, + BtnModalDismissPageModule, ], declarations: [GroupChatPage] }) From e370c7c645cd89b403091271a8e8694ebf9aee5c Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 15:35:09 +0100 Subject: [PATCH 31/39] save --- src/app/modals/create-process/create-process.module.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index 966b47509..5574afdd6 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -9,13 +9,17 @@ 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'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - CreateProcessPageRoutingModule + CreateProcessPageRoutingModule, + EmptyContainerPageModule, + AttendeeModalPageModule ], declarations: [ CreateProcessPage From 3d30a9e622f1d74f58a98fa51de79c7940486332 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 15:36:15 +0100 Subject: [PATCH 32/39] Improve --- .../create-process/create-process.module.ts | 8 +- src/app/pages/agenda/agenda.module.ts | 4 +- .../event-actions-popover.page.ts | 8 +- .../create-task/create-task.component.html | 237 ------------------ .../create-task/create-task.component.scss | 0 .../create-task/create-task.component.spec.ts | 24 -- .../create-task/create-task.component.ts | 14 -- .../diplomas-assinar.page.html | 2 +- .../book-meeting-modal.module.ts | 4 +- .../pages/publications/publications.page.html | 2 +- .../btn-seguinte/btn-seguinte.module.ts | 1 - 11 files changed, 18 insertions(+), 286 deletions(-) delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.html delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.scss delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts delete mode 100644 src/app/pages/gabinete-digital/create-task/create-task.component.ts diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index 966b47509..0283d48a0 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -9,13 +9,19 @@ 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 { 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, - CreateProcessPageRoutingModule + CreateProcessPageRoutingModule, + + // + AttendeeModalPageModule, + EmptyContainerPageModule ], declarations: [ CreateProcessPage diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 3c5cc9657..06d3a91a7 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -38,6 +38,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo 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'; +import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module'; @NgModule({ imports: [ @@ -62,7 +63,8 @@ import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list EventsToApprovePageModule, ApproveEventPageModule, NewEventPageModule, - EventListPageModule + EventListPageModule, + EditEventPageModule, ], declarations: [ AgendaPage diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 70e16386e..85c8e0df0 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -35,8 +35,8 @@ export class EventActionsPopoverPage implements OnInit { closePopover(){ this.popoverController.dismiss(); } - approveTask(serialNumber:string){ - let body = { "serialNumber": serialNumber, "action": "Aprovar" } + approveTask() { + let body = { "serialNumber": this.serialNumber, "action": "Aprovar" } console.log(body); @@ -50,9 +50,9 @@ export class EventActionsPopoverPage implements OnInit { } } - emendarTask(serialNumber:string){ + emendarTask(){ - let body = { "serialNumber": serialNumber, "action": "Rejeitar" } + let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } console.log(body); diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.html b/src/app/pages/gabinete-digital/create-task/create-task.component.html deleted file mode 100644 index cb43c5d46..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.html +++ /dev/null @@ -1,237 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- - - - - -
-
-
- -
-
- - - -
-
-
- - - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.scss b/src/app/pages/gabinete-digital/create-task/create-task.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts deleted file mode 100644 index 22f9769b0..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { CreateTaskComponent } from './create-task.component'; - -describe('CreateTaskComponent', () => { - let component: CreateTaskComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ CreateTaskComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(CreateTaskComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.ts deleted file mode 100644 index 19dbd3db8..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-create-task', - templateUrl: './create-task.component.html', - styleUrls: ['./create-task.component.scss'], -}) -export class CreateTaskComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 776e45e90..737d24541 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -18,7 +18,7 @@
- + - + diff --git a/src/app/shared/btn-seguinte/btn-seguinte.module.ts b/src/app/shared/btn-seguinte/btn-seguinte.module.ts index 8bcb566c7..6b635eaac 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.module.ts +++ b/src/app/shared/btn-seguinte/btn-seguinte.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { BtnSeguintePageRoutingModule } from './btn-seguinte-routing.module'; import { BtnSeguintePage } from './btn-seguinte.page'; - @NgModule({ imports: [ CommonModule, From 1bf8a920408b71565b3e9da30ce45d12e62b89ea Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 15:50:12 +0100 Subject: [PATCH 33/39] Fixe --- src/app/pages/chat/group-messages/group-messages.page.ts | 2 +- .../expedient-task-modal/expedient-task-modal.page.html | 2 +- .../expediente/expediente-detail/expediente-detail.page.ts | 2 +- src/app/pages/gabinete-digital/gabinete-digital.page.ts | 2 +- src/app/pages/gabinete-digital/pedidos/pedidos.page.html | 2 +- .../publications/view-publications/view-publications.page.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 220b8a71a..e5132050a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -158,7 +158,7 @@ export class GroupMessagesPage implements OnInit { }); } - async openChatOptions(ev: any) { + async openChatOptions(ev?: any) { const popover = await this.popoverController.create({ component: ChatOptionsPopoverPage, cssClass: 'chat-options-popover', diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index b05c37464..b6091247d 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -144,7 +144,7 @@ (closeComponent)="closeComponent()" (setIntervenient)="setIntervenient($event)" (setIntervenientCC)="setIntervenientCC($event)" - (setContact)="setContact(event)" + (setContact)="setContact($event)" >
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index a1f8537c9..cba216bda 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -318,7 +318,7 @@ export class ExpedienteDetailPage implements OnInit { } - async openOptions(taskAction: any) { + async openOptions(taskAction?: any) { const popover = await this.popoverController.create({ component: OptsExpedientePage, cssClass: 'exp-options', diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index bfcf556ca..4d9fbe02d 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -374,7 +374,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPage(segment:string) { + openDespachosPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDespachoList(); diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index 86c1e8cdd..b689c3329 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -27,7 +27,7 @@
- + Date: Thu, 3 Jun 2021 16:04:03 +0100 Subject: [PATCH 34/39] save --- .../task-options/task-options.component.html | 17 ------- .../task-options/task-options.component.scss | 51 ------------------- .../task-options.component.spec.ts | 24 --------- .../task-options/task-options.component.ts | 14 ----- .../agenda/view-event/view-event.page.ts | 1 - .../gabinete-digital.page.html | 2 +- .../group-contacts/group-contacts.module.ts | 2 +- 7 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 src/app/pages/agenda/view-event/task-options/task-options.component.html delete mode 100644 src/app/pages/agenda/view-event/task-options/task-options.component.scss delete mode 100644 src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts delete mode 100644 src/app/pages/agenda/view-event/task-options/task-options.component.ts diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.html b/src/app/pages/agenda/view-event/task-options/task-options.component.html deleted file mode 100644 index 78d6d3599..000000000 --- a/src/app/pages/agenda/view-event/task-options/task-options.component.html +++ /dev/null @@ -1,17 +0,0 @@ - -
- -
-
- - - - - - -
- -
- diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.scss b/src/app/pages/agenda/view-event/task-options/task-options.component.scss deleted file mode 100644 index 2c7a0cc7f..000000000 --- a/src/app/pages/agenda/view-event/task-options/task-options.component.scss +++ /dev/null @@ -1,51 +0,0 @@ -.container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; -} -.arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: 35px; - overflow: hidden; - } -} -.buttons{ - display: flex; - flex-wrap: wrap; - justify-content: space-around; -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - } - .btn-ok, .btn-cancel{ - //width: 50% !important; - margin-bottom: 5px !important; - margin-top: 5px !important; -} -@media only screen and (min-width: 1024px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - display: none; - width: 100% !important; - margin-bottom: 10px !important; - } - .btn-delete, .btn-ok{ - width: 100% !important; - margin-bottom: 10px !important; - margin-top: 10px !important; - } - /* .solid{ - display: block; - } */ -} \ No newline at end of file diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts b/src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts deleted file mode 100644 index 7aa133d7e..000000000 --- a/src/app/pages/agenda/view-event/task-options/task-options.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { TaskOptionsComponent } from './task-options.component'; - -describe('TaskOptionsComponent', () => { - let component: TaskOptionsComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TaskOptionsComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(TaskOptionsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/agenda/view-event/task-options/task-options.component.ts b/src/app/pages/agenda/view-event/task-options/task-options.component.ts deleted file mode 100644 index 4680abe44..000000000 --- a/src/app/pages/agenda/view-event/task-options/task-options.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-task-options', - templateUrl: './task-options.component.html', - styleUrls: ['./task-options.component.scss'], -}) -export class TaskOptionsComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index c92f115bc..ac5f3c6ea 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -12,7 +12,6 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; -import { TaskOptionsComponent } from './task-options/task-options.component'; @Component({ selector: 'app-view-event', diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index dda2a113a..1ae0d674f 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -127,7 +127,7 @@
-

Diplomas assinados PR

+

Diplomas assinados PR

Diplomas

{{ count_dip_as_pr }} Documentos

diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts index a2f3199a9..98a13031c 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.module.ts @@ -17,8 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, + GroupContactsPageRoutingModule, PipesModule, - GroupContactsPageRoutingModule ], exports: [GroupContactsPage], declarations: [GroupContactsPage] From 33cd1eb299bff2d13b7da4cb4997b8163690a276 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 16:09:27 +0100 Subject: [PATCH 35/39] Save --- src/app/modals/delegar/delegar.module.ts | 5 ++++- src/app/pages/agenda/edit-event/edit-event.module.ts | 6 +++++- .../book-meeting-modal/book-meeting-modal.module.ts | 3 +-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/app/modals/delegar/delegar.module.ts b/src/app/modals/delegar/delegar.module.ts index 3af6ec991..a7df223e4 100644 --- a/src/app/modals/delegar/delegar.module.ts +++ b/src/app/modals/delegar/delegar.module.ts @@ -8,13 +8,16 @@ 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({ imports: [ CommonModule, FormsModule, IonicModule, - DelegarPageRoutingModule + DelegarPageRoutingModule, + // + AttendeeModalPageModule ], declarations: [ DelegarPage 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 4c289d14b..303186c06 100644 --- a/src/app/pages/agenda/edit-event/edit-event.module.ts +++ b/src/app/pages/agenda/edit-event/edit-event.module.ts @@ -8,13 +8,17 @@ 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({ imports: [ CommonModule, FormsModule, IonicModule, - EditEventPageRoutingModule + EditEventPageRoutingModule, + + // + AttendeeModalPageModule ], declarations: [ EditEventPage 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 51385faac..2223c9033 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 @@ -10,8 +10,8 @@ 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'; 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'; @NgModule({ imports: [ @@ -21,7 +21,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- BookMeetingModalPageRoutingModule, // // AttendeesPageModule, - AttendeesPageModule, EmptyContainerPageModule, From a5895adeba7610bb080e5887bfc7414a41b72b2a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 16:23:18 +0100 Subject: [PATCH 36/39] Improve --- src/app/pages/chat/chat.page.html | 4 ++-- src/app/pages/chat/messages/contacts/contacts.module.ts | 2 +- src/app/shared/chat/messages/contacts/contacts.module.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index e68af0924..2cfdd3cb6 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -3,7 +3,7 @@ - + @@ -23,7 +23,7 @@ -
diff --git a/src/app/pages/chat/messages/contacts/contacts.module.ts b/src/app/pages/chat/messages/contacts/contacts.module.ts index 4da67c6e9..ca2f6bc11 100644 --- a/src/app/pages/chat/messages/contacts/contacts.module.ts +++ b/src/app/pages/chat/messages/contacts/contacts.module.ts @@ -21,6 +21,6 @@ import { FilterPipe } from 'src/app/pipes/filter.pipe'; ContactsPageRoutingModule, PipesModule, ], - declarations: [ContactsPage, FilterPipe] + declarations: [ContactsPage] }) export class ContactsPageModule {} diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts index 98d3374bb..56e3bca48 100644 --- a/src/app/shared/chat/messages/contacts/contacts.module.ts +++ b/src/app/shared/chat/messages/contacts/contacts.module.ts @@ -22,6 +22,6 @@ import { PipesModule } from 'src/app/pipes/pipes.module'; PipesModule, ], exports: [ContactsPage], - declarations: [ContactsPage, FilterPipe] + declarations: [ContactsPage] }) export class ContactsPageModule {} From 716562e3570338ba5127288221b810f8ca25fb1b Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 3 Jun 2021 17:07:29 +0100 Subject: [PATCH 37/39] fixed all production issues --- src/app/app.module.ts | 4 +- src/app/components/components.module.ts | 43 +------------------ .../document-detail/document-detail.module.ts | 4 +- src/app/models/user.model.ts | 2 +- src/app/pages/chat/chat.page.ts | 2 +- src/app/pages/chat/messages/messages.page.ts | 4 +- .../events/edit-event/edit-event.page.html | 15 +------ .../expediente/expediente.page.html | 2 +- .../expediente/expediente.page.ts | 3 +- .../gabinete-digital.page.html | 4 +- .../gabinete-digital/gabinete-digital.page.ts | 2 + 11 files changed, 16 insertions(+), 69 deletions(-) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 29a6ee156..642a4a317 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,8 +35,8 @@ import { ChatService } from './services/chat.service' @NgModule({ - declarations: [AppComponent,MessagesPage,], - entryComponents: [MessagesPage], + declarations: [AppComponent], + entryComponents: [], imports: [BrowserModule, CommonModule, FormsModule, diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index 4c7831bdb..3cdff95ee 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -1,49 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page'; -import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page'; -import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page'; -import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; -import { EditEventPage } from '../shared/agenda/edit-event/edit-event.page'; -import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; -import { EventListPage } from '../shared/agenda/event-list/event-list.page'; -import { ApproveEventPage } from '../shared/agenda/approve-event/approve-event.page'; -import { AttendeesPage } from '../shared/event/attendees/attendees.page'; @NgModule({ - declarations: [ - /* BtnSeguintePage, */ - //BtnModalDismissPage, - - //NewEventPage, - //EditEventPage, - //ViewEventPage, - //ApproveEventPage, - //AttendeesPage, - //AttendeeModalPage, - - - //EventListPage, - //EmptyContainerPage, - //EventsToApprovePage, - - ], - exports: [ - /* BtnSeguintePage, */ - //BtnModalDismissPage, - - //NewEventPage, - //EditEventPage, - // ViewEventPage, - //EventListPage, - //ApproveEventPage, - //AttendeesPage, - //AttendeeModalPage, - //EventsToApprovePage, - //EmptyContainerPage, - - ], + declarations: [], + exports: [], imports: [ CommonModule, ] diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts index 3ade9b0a4..809d618a0 100644 --- a/src/app/modals/document-detail/document-detail.module.ts +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -20,8 +20,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- DocumentDetailPageRoutingModule, BtnModalDismissPageModule, ], - declarations: [ - DocumentDetailPage, - SharedModule,] + declarations: [DocumentDetailPage] }) export class DocumentDetailPageModule {} diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 997b9ddea..c8a464b2c 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -25,5 +25,5 @@ export class User { Id: 1 }[] UserName: string - Profile: "PR" | "MDGPR" + Profile: any; } \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 0e09bac21..f4b9c3df0 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -37,7 +37,7 @@ export class ChatPage implements OnInit { X_User_Id:any; X_Auth_Token:any; - private loggedUser: any; + loggedUser: any; /* Set segment variable */ segment:string; allGroups: any[]; diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index a52e0bc3a..9dc8603b0 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -113,7 +113,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { }); } - async openMessagesOptions(ev: any) { + async openMessagesOptions(ev?: any) { const popover = await this.popoverController.create({ component: MessagesOptionsPage, componentProps: { @@ -139,7 +139,7 @@ export class MessagesPage implements OnInit, AfterViewChecked { modal.onDidDismiss(); } - async openChatOptions(ev: any) { +async openChatOptions(ev?: any) { const popover = await this.popoverController.create({ component: ChatOptionsPopoverPage, cssClass: 'chat-options-popover', diff --git a/src/app/pages/events/edit-event/edit-event.page.html b/src/app/pages/events/edit-event/edit-event.page.html index 860adfe23..f789aaf58 100644 --- a/src/app/pages/events/edit-event/edit-event.page.html +++ b/src/app/pages/events/edit-event/edit-event.page.html @@ -16,16 +16,14 @@
-
Assunto - + Campo obrigatório -
Descrição @@ -117,17 +115,6 @@
- - - diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index d3241ec79..c56ae6304 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -2,7 +2,7 @@ - + diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 5a37081d6..7625f3fef 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -84,11 +84,10 @@ export class ExpedientePage implements OnInit { }); } - doRefresh(event) { + doRefresh() { this.LoadList(); setTimeout(() => { - event.target.complete(); }, 2000); } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 1ae0d674f..48d560d71 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -95,8 +95,8 @@
-

Expediente Presidente

-

Expediente

+

Expediente Presidente

+

Expediente

{{count_exp_pr}} Documentos

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 4d9fbe02d..72577ea63 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -68,6 +68,8 @@ export class GabineteDigitalPage implements OnInit { serialNumber:string; loggeduser: User; + mdgpr = "MDGPR"; + pr = "PR" constructor( private processesbackend:ProcessesService, From 19f270f425e89e6bc5900d2fcf1d0ffa08345983 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 4 Jun 2021 11:37:56 +0100 Subject: [PATCH 38/39] changes on Rocket Chat authentication --- src/app/config/auth-constants.ts | 1 + src/app/pages/chat/chat.page.html | 2 +- src/app/pages/chat/chat.page.ts | 7 ++++- src/app/pages/login/login.page.ts | 9 +++---- src/app/services/auth.service.ts | 44 +++++++++++++++++++++++++++---- src/app/services/chat.service.ts | 29 +++----------------- 6 files changed, 55 insertions(+), 37 deletions(-) diff --git a/src/app/config/auth-constants.ts b/src/app/config/auth-constants.ts index e6769cfd5..677d091cc 100644 --- a/src/app/config/auth-constants.ts +++ b/src/app/config/auth-constants.ts @@ -4,4 +4,5 @@ export class AuthConnstants{ public static readonly AUTH = 'userDataKey'; public static readonly PROFILE = 'profile'; public static readonly USER = 'userId'; + public static readonly USERCHAT = 'userChat'; } \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 2cfdd3cb6..62fa07099 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -51,7 +51,7 @@
- + {{user}} diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index f4b9c3df0..32a7371b3 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -90,6 +90,8 @@ export class ChatPage implements OnInit { /* Fim websockets variables*/ + loggedUserChat:any; + constructor( private http:HttpClient, private chatService: ChatService, @@ -98,11 +100,14 @@ export class ChatPage implements OnInit { private storage:Storage, private resolver: ComponentFactoryResolver, ){ + this.loggedUserChat = authService.ValidatedUserChat['data']; this.headers = new HttpHeaders(); this.loadMessage(); } ngOnInit() { + console.log(this.loggedUserChat); + this.segment = "Contactos"; this.authService.userData$.subscribe((res:any)=>{ @@ -255,7 +260,7 @@ sendMsg() { } getChatMembers(){ this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> { - this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username) + this.dmUsers = res['members'].filter(data => data.username != this.loggedUserChat.me.username) }); } getGroups(){ diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index dec8ade5e..3280944bf 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -59,7 +59,6 @@ export class LoginPage implements OnInit { } else { this.userLoginPreference = '' } - } ngOnInit() {} @@ -72,7 +71,6 @@ export class LoginPage implements OnInit { ); } - async presentAlert(message: string) { const alert = await this.alertController.create({ cssClass: 'my-custom-class', @@ -84,7 +82,7 @@ export class LoginPage implements OnInit { await alert.present(); } - loginRocketChat() { + /* loginRocketChat() { let postData = { "user": this.username, @@ -99,7 +97,7 @@ export class LoginPage implements OnInit { console.log('Network error'); this.presentAlert('Network error ' + error); }); - } + } */ getToken() { // this.notificatinsservice.getAndpostToken(this.username); @@ -115,7 +113,8 @@ export class LoginPage implements OnInit { BasicAuthKey: "" } if (await this.authService.login(this.userattempt)) { - this.loginRocketChat(); + //this.loginRocketChat(); + this.authService.loginChat(this.userattempt); //this.getToken(); if(!this.pin) { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index fd1ba8331..1585007f6 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -7,6 +7,7 @@ import { environment } from 'src/environments/environment'; import { HttpService } from './http.service'; import { BehaviorSubject, Observable } from 'rxjs'; import { AuthConnstants } from '../config/auth-constants'; +import { AlertController } from '@ionic/angular'; @Injectable({ providedIn: 'root' @@ -16,13 +17,15 @@ export class AuthService { userId$ = new BehaviorSubject(''); headers: HttpHeaders; public ValidatedUser:User; + public ValidatedUserChat:any; opts:any; constructor( private http: HttpClient, private httpService: HttpService, private storageService:StorageService, - private router:Router + private router:Router, + public alertController: AlertController, ) { this.headers = new HttpHeaders(); @@ -30,6 +33,9 @@ export class AuthService { if (localStorage.getItem("user") != null) { this.ValidatedUser = JSON.parse(localStorage.getItem('user')); } + if (localStorage.getItem("userChat") != null) { + this.ValidatedUserChat = JSON.parse(localStorage.getItem('userChat')); + } } @@ -75,12 +81,30 @@ export class AuthService { } //Login to rocketChat server - loginChat(postData: any):Observable { - console.log(postData); - - return this.httpService.post('login', postData); + async loginChat(user: UserForm): Promise { + let postData = { + "user": user.username, + "password": user.password, + } + + let responseChat = await this.httpService.post('login', postData).toPromise(); + if(responseChat){ + console.log('Login to Rocket chat OK'); + this.ValidatedUserChat = responseChat; + localStorage.setItem('userChat', JSON.stringify(responseChat)); + this.storageService.store(AuthConnstants.AUTH, responseChat); + return true; + } + else{ + console.log('Network error'); + this.presentAlert('Network error'); + return false; + } } + + + //Get user data from RocketChat | global object getUserData(){ this.storageService.get(AuthConnstants.AUTH).then(res=>{ @@ -108,4 +132,14 @@ export class AuthService { }) */ } + async presentAlert(message: string) { + const alert = await this.alertController.create({ + cssClass: 'my-custom-class', + header: 'Mensagem do sistema', + message: message, + buttons: ['OK'] + }); + + await alert.present(); + } } diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index c73767b2a..838225d47 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -22,7 +22,7 @@ export class ChatService { SERVER_URL = 'wss://www.tabularium.pt/websocket'; public messages: Subject; - + loggedUserChat:any; constructor( private http:HttpClient, @@ -33,11 +33,10 @@ export class ChatService { private wsService: WebsocketService, ) { + this.loggedUserChat = authService.ValidatedUserChat; this.headers = new HttpHeaders(); - this.authService.userData$.subscribe((res:any)=>{ - this.headers = this.headers.set('X-User-Id', res.userId); - this.headers = this.headers.set('X-Auth-Token', res.authToken); - }); + this.headers = this.headers.set('X-User-Id', this.loggedUserChat['data'].userId); + this.headers = this.headers.set('X-Auth-Token', this.loggedUserChat['data'].authToken); this.options = { headers: this.headers, }; @@ -48,25 +47,6 @@ export class ChatService { return (JSON.stringify(data)); }); } - - /* getUser(){ - this.storage.get('user').then((val) => { - let user = JSON.parse(unescape(atob(val))).data; - - this.headers = this.headers.set('X-User-Id', user.userId); - this.headers = this.headers.set('X-Auth-Token', user.authToken); - - this.options1 = { - headers: this.headers, - }; - console.log(this.options1); - - this.http.get(environment.apiChatUrl+'users.presence', this.options1).subscribe(res => { - console.log(res); - }); - - }); - } */ getAllChannels(){ return this.http.get(environment.apiChatUrl+'channels.list', this.options); @@ -108,7 +88,6 @@ export class ChatService { //Load messages from roomId getAllDirectMessages(){ - console.log(this.options); return this.http.get(environment.apiChatUrl+'im.list', this.options); } //Load messages from roomId From d37b6c58dc6fb5a1ae5101f57973f8554533fd13 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 4 Jun 2021 15:59:36 +0100 Subject: [PATCH 39/39] some changes --- .../create-process/create-process.page.html | 2 +- .../modals/dar-parecer/dar-parecer.page.ts | 2 +- src/app/modals/delegar/delegar.page.ts | 5 ++- .../despachos/despacho/despacho.page.ts | 15 -------- .../expediente-detail.page.html | 35 ------------------- .../expediente-detail.page.ts | 7 ++-- .../expediente-pr/expediente-pr.page.ts | 9 +++-- .../pedidos/pedido/pedido.page.html | 1 - .../pedidos/pedido/pedido.page.ts | 9 +---- .../gabinete-digital/pedidos/pedidos.page.ts | 19 ---------- 10 files changed, 14 insertions(+), 90 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index dde835def..aa3272b4f 100644 --- a/src/app/modals/create-process/create-process.page.html +++ b/src/app/modals/create-process/create-process.page.html @@ -5,7 +5,7 @@ {{modalTitle[taskType]}}
- +
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index dbb72b4b1..e724f7e13 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -62,7 +62,7 @@ export class DarParecerPage implements OnInit { console.log(body); try { - await this.processes.CompleteTask(body).toPromise() + await this.processes.CompleteTask(body).toPromise(); this.modalController.dismiss(); this.successMessage() } catch (error) { diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index dba6a266a..83ab31cef 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -75,6 +75,9 @@ export class DelegarPage implements OnInit { this.router.navigate(['/home/gabinete-digital/expediente']); this.modalController.dismiss(null); } + goBack() { + window.history.back() + } cancelTask(){ this.modalController.dismiss(null); } @@ -100,7 +103,7 @@ export class DelegarPage implements OnInit { (error)=>{ this.badRequest() }); - this.close(); + this.goBack(); } } 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 c3023a98e..594bd2bb8 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -84,22 +84,7 @@ export class DespachoPage implements OnInit { } goBack() { - - // this.activatedRoute.queryParams.subscribe(params => { - // if(params["from"] == 'pendentes') { - // this.router.navigate(['/home/gabinete-digital/pendentes']); - // } else { - // let navigationExtras: NavigationExtras = { - // queryParams: { - // "despachos": true, - // } - // }; - // this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras); - // } - // }); - window.history.back() - } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 440d392ae..ff8c63d82 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -2,41 +2,6 @@ -
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index cba216bda..bd37a2a32 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -227,20 +227,19 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - console.log(body); if(body == 'descartar'){ if(res['data']== 'Yes'){ let otherbody = { "serialNumber": this.task.SerialNumber, "action": "Passivo", - "ActionTypeId": 94, + "ActionTypeId": 99999877, "dataFields": { "Note": "", } } - try { + try { await this.processes.CompleteTask(otherbody).toPromise() this.successMessage() } catch (error) { @@ -255,7 +254,7 @@ export class ExpedienteDetailPage implements OnInit { else{ if(res['data']== 'Yes'){ try { - await this.processes.CompleteTask(body).toPromise() + //await this.processes.CompleteTask(body).toPromise() this.successMessage() } catch (error) { this.badRequest() 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 83cf79df5..bed0e421d 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 @@ -313,21 +313,20 @@ export class ExpedientePrPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async (res)=>{ console.log(res['data']); - console.log(body); if(body == 'descartar'){ if(res['data']== 'Yes'){ let otherbody = { - "serialNumber": body.serialNumber, + "serialNumber": this.task.SerialNumber, "action": "Passivo", - "ActionTypeId": 94, + "ActionTypeId": 99999877, "dataFields": { "Note": "", } } try { - await this.processes.CompleteTask(otherbody).toPromise() + await this.processes.CompleteTask(otherbody).toPromise(); this.successMessage() } catch (error) { this.badRequest() @@ -343,7 +342,7 @@ export class ExpedientePrPage implements OnInit { if(res['data']== 'Yes'){ try { - await this.processes.CompleteTask(body).toPromise() + //await this.processes.CompleteTask(body).toPromise() this.successMessage() this.goBack(); } catch (error) { diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index d2de06148..4802585c9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -107,7 +107,6 @@
-
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 6734a2cad..31376a64a 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -41,7 +41,6 @@ export class PedidoPage implements OnInit { fulltask: any; eventsList: Event[]; serialnumber: string; - profile: string; intervenientes: any; cc: any; loggeduser: User; @@ -61,15 +60,11 @@ export class PedidoPage implements OnInit { this.activatedRoute.queryParams.subscribe(params => { if(params["serialNumber"]) { this.serialnumber = params["serialNumber"]; - // console.log(params["serialNumber"]); } }); } ngOnInit() { - this.profile = "mdgpr"; - // console.log(this.serialnumber); - this.LoadTaskDetail(this.serialnumber); } @@ -255,7 +250,6 @@ export class PedidoPage implements OnInit { componentProps: { taskAction: taskAction, task: this.fulltask, - profile: this.profile, }, cssClass: classs, }); @@ -286,13 +280,11 @@ export class PedidoPage implements OnInit { } async viewEventDetail(eventId: any) { - console.log(this.profile); const modal = await this.modalController.create({ component: ViewEventPage, componentProps: { eventId: eventId, - profile: this.profile, }, cssClass: 'modal modal-desktop', backdropDismiss: false @@ -370,6 +362,7 @@ export class PedidoPage implements OnInit { await modal.present(); modal.onDidDismiss(); } + async openAddNoteModal(actionName:string) { let classs; if( window.innerWidth <= 800){ diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index abe625250..b313655e8 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -32,7 +32,6 @@ export class PedidosPage implements OnInit { taskType: string; serialNumber:string; - @Input() profile:string; @Input() segment:string; @Output() openExpedientDetail:EventEmitter = new EventEmitter(); @@ -43,7 +42,6 @@ export class PedidosPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, ) { - this.profile = 'mdgpr'; } ngOnInit() { @@ -176,28 +174,11 @@ export class PedidosPage implements OnInit { } async viewPedidoDetail(serialNumber:any) { - console.log(this.profile); - - // const modal = await this.modalController.create({ - // component: PedidoPage, - // componentProps:{ - // enterAnimation: "", - // serialNumber: serialNumber, - // profile: this.profile, - // }, - // cssClass: 'modal modal-desktop', - // }); - // await modal.present(); - // modal.onDidDismiss().then((res)=>{ - // console.log('refresh list'); - // this.LoadList(); - // }); let navigationExtras: NavigationExtras = { queryParams: { enterAnimation: "", serialNumber: serialNumber, - profile: this.profile, } }; this.router.navigate(['/home/gabinete-digital/pedidos/pedido'], navigationExtras);