diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index a541aa08c..e11318398 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; - +import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { IonicModule } from '@ionic/angular'; import { HomePageRoutingModule } from './home-routing.module'; @@ -15,7 +15,8 @@ import { HomePage } from './home.page'; FormsModule, IonicModule, HomePageRoutingModule, - LazyLoadImageModule + LazyLoadImageModule, + HeaderPageModule ], declarations: [HomePage], }) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 3b16e2708..c668783ba 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -1,6 +1,12 @@ + + + + + + diff --git a/src/app/index/index.module.ts b/src/app/index/index.module.ts index 5b832f0c8..8099e939b 100644 --- a/src/app/index/index.module.ts +++ b/src/app/index/index.module.ts @@ -1,7 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; - import { IonicModule } from '@ionic/angular'; import { IndexPageRoutingModule } from './index-routing.module'; @@ -13,7 +12,7 @@ import { IndexPage } from './index.page'; CommonModule, FormsModule, IonicModule, - IndexPageRoutingModule + IndexPageRoutingModule, ], declarations: [IndexPage] }) diff --git a/src/app/index/index.page.html b/src/app/index/index.page.html index 825a30748..c8ea4389a 100644 --- a/src/app/index/index.page.html +++ b/src/app/index/index.page.html @@ -1,3 +1,4 @@ + diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 2fae69b2f..40dced8ff 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -18,7 +18,6 @@ import { CalendarModule, DateAdapter } from 'angular-calendar'; import { adapterFactory } from 'angular-calendar/date-adapters/date-fns'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.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'; @@ -43,7 +42,6 @@ import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-t AgendaPageRoutingModule, NgCalendarModule, // entryComponents - HeaderPageModule, ViewEventPageModule, AttendeeModalPageModule, EventsToApprovePageModule, diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 4a299e49f..6f43254c6 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -1,7 +1,3 @@ - - - - diff --git a/src/app/pages/agenda/view-event/view-event.module.ts b/src/app/pages/agenda/view-event/view-event.module.ts index 29247adab..4371235ec 100644 --- a/src/app/pages/agenda/view-event/view-event.module.ts +++ b/src/app/pages/agenda/view-event/view-event.module.ts @@ -9,7 +9,6 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module'; import { ViewEventPage } from './view-event.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +18,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, ViewEventPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [ViewEventPage] diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/pages/agenda/view-event/view-event.page.html index 5a40b5cb3..b5c64d9a0 100644 --- a/src/app/pages/agenda/view-event/view-event.page.html +++ b/src/app/pages/agenda/view-event/view-event.page.html @@ -1,7 +1,3 @@ - - - - diff --git a/src/app/pages/chat/chat.module.ts b/src/app/pages/chat/chat.module.ts index 4ffcc20c5..bbd84cba1 100644 --- a/src/app/pages/chat/chat.module.ts +++ b/src/app/pages/chat/chat.module.ts @@ -17,7 +17,6 @@ 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'; import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module'; import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; @@ -32,7 +31,6 @@ import { ImageCropperModule } from 'ngx-image-cropper'; PipesModule, ChatPageRoutingModule, RouterModule, - HeaderPageModule, MessagesPageModule, ContactsPageModule, GroupMessagesPageModule, diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 6ee4c5414..5adf41b91 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -1,7 +1,3 @@ - - - - diff --git a/src/app/pages/events/events.module.ts b/src/app/pages/events/events.module.ts index 6bd3e5096..3cbcc5b38 100644 --- a/src/app/pages/events/events.module.ts +++ b/src/app/pages/events/events.module.ts @@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -12,7 +11,6 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; FormsModule, IonicModule, EventsPageRoutingModule, - HeaderPageModule, // ], declarations: [EventsPage], diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 2153db98c..c39efd361 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,7 +1,3 @@ - - - - diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss index 0a534d223..1ab148482 100644 --- a/src/app/pages/events/events.page.scss +++ b/src/app/pages/events/events.page.scss @@ -1,5 +1,21 @@ @import '~src/function.scss'; +:host { + // mobile + background: var(--background-mobile); +} + + +// desktop +@media only screen and (min-width: 1365px) { + // set color to body + :host { + // mobile + background: var(--background-desktop) !important ; + + } +} + /* HEADER */ .bg-blue{ --background:#0782c9; 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 5246c81ef..adf77df83 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 @@ -8,9 +8,6 @@ import { DespachoPrPageRoutingModule } from './despacho-pr-routing.module'; import { DespachoPrPage } from './despacho-pr.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; - @NgModule({ imports: [ CommonModule, @@ -18,7 +15,6 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, DespachoPrPageRoutingModule, - HeaderPageModule, ], declarations: [DespachoPrPage] }) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html index 6b98b8450..87348484e 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html @@ -1,6 +1,3 @@ - - -
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 276e09b20..f90db8908 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 @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { DespachosPrPageRoutingModule } from './despachos-pr-routing.module'; import { DespachosPrPage } from './despachos-pr.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, DespachosPrPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], 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 79eadf1bc..fa4bc9505 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts @@ -8,8 +8,6 @@ import { DespachoPageRoutingModule } from './despacho-routing.module'; import { DespachoPage } from './despacho.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/task-details/task-details.module' @NgModule({ @@ -19,8 +17,6 @@ import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/t IonicModule, DespachoPageRoutingModule, - HeaderPageModule, - // entries TaskDetailsPageModule ], declarations: [ diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html index 86b1659be..2861e2530 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html @@ -1,7 +1,3 @@ - - - -
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.module.ts b/src/app/pages/gabinete-digital/despachos/despachos.module.ts index e130dc791..0c2c4b18b 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.module.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.module.ts @@ -8,8 +8,6 @@ import { DespachosPageRoutingModule } from './despachos-routing.module'; import { DespachosPage } from './despachos.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +17,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, DespachosPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [ 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 b5063c3de..02ebaf9aa 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 @@ -8,8 +8,6 @@ import { DiplomaAssinarPageRoutingModule } from './diploma-assinar-routing.modul import { DiplomaAssinarPage } from './diploma-assinar.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +17,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, 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 a1ccfc2a2..ef778c32e 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 @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { DiplomasAssinarPageRoutingModule } from './diplomas-assinar-routing.module'; import { DiplomasAssinarPage } from './diplomas-assinar.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -18,7 +15,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- FormsModule, IonicModule, DiplomasAssinarPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts index 8468ae276..b59ee4a82 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module'; import { DiplomasGerarPage } from './diplomas-gerar.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -16,7 +15,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- FormsModule, IonicModule, DiplomasGerarPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule ], declarations: [DiplomasGerarPage] diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts index 33f015d4d..377536dbb 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts @@ -7,15 +7,12 @@ import { IonicModule } from '@ionic/angular'; import { DiplomasGerarPageRoutingModule } from './diplomas-gerar-routing.module'; import { DiplomasGerarPage } from './diplomas-gerar.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; - @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, DiplomasGerarPageRoutingModule, - HeaderPageModule ], declarations: [DiplomasGerarPage] }) 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 c10678733..131d10c5c 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { DiplomaPageRoutingModule } from './diploma-routing.module'; import { DiplomaPage } from './diploma.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, DiplomaPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [DiplomaPage] diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html index 59b5d0667..c43a18525 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html @@ -1,7 +1,3 @@ - - - -
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index 6ff7c8144..1997aa119 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts @@ -17,8 +17,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- FormsModule, IonicModule, DiplomasPageRoutingModule, - HeaderPageModule, - BtnModalDismissPageModule, ], declarations: [DiplomasPage] diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html index 4b5d29bc3..08ae87c0d 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html @@ -1,8 +1,3 @@ - - - - -
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 a7715a73d..b5315cc60 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,7 +7,6 @@ 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'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -16,7 +15,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- FormsModule, IonicModule, ApproveEventModalPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], 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 b44da5b51..5f977d580 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 @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { ApproveEventPageRoutingModule } from './approve-event-routing.module'; import { ApproveEventPage } from './approve-event.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, ApproveEventPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [ApproveEventPage] diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html index 4c0b85228..4ec6be7d2 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html @@ -1,6 +1,3 @@ - - -
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 7f7765bb3..bff51dc67 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,7 +9,6 @@ import { EventListPageRoutingModule } from './event-list-routing.module'; import { EventListPage } from './event-list.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +18,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, EventListPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [EventListPage], diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index 8baba1ccd..30e7d15b9 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -1,7 +1,3 @@ - - - -
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 0fe73f6b1..5f45d135e 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 @@ -8,8 +8,6 @@ import { ExpedienteDetailPageRoutingModule } from './expediente-detail-routing.m import { ExpedienteDetailPage } from './expediente-detail.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +17,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, ExpedienteDetailPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [ExpedienteDetailPage] 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 19516b2be..77ae9f1e4 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 @@ -1,7 +1,3 @@ - - - -
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.module.ts b/src/app/pages/gabinete-digital/expediente/expediente.module.ts index b25bc6c30..10580baa1 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.module.ts @@ -9,7 +9,6 @@ import { ExpedientePageRoutingModule } from './expediente-routing.module'; import { ExpedientePage } from './expediente.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; @NgModule({ imports: [ @@ -18,7 +17,6 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; IonicModule, ExpedientePageRoutingModule, - HeaderPageModule, ], declarations: [ExpedientePage], schemas: [CUSTOM_ELEMENTS_SCHEMA] diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index a583eb11f..3aded9e45 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -1,8 +1,3 @@ - - - - -
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 bd71cffc0..fb3609674 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 @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { ExpedientePrPageRoutingModule } from './expediente-pr-routing.module'; import { ExpedientePrPage } from './expediente-pr.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, 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 b93e898cc..883eea753 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 @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { ExpedientesPrPageRoutingModule } from './expedientes-pr-routing.module'; import { ExpedientesPrPage } from './expedientes-pr.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -18,8 +15,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- FormsModule, IonicModule, ExpedientesPrPageRoutingModule, - HeaderPageModule, - 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 279e05eb6..6cbfbf51f 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 { DiplomasGerarPageModule } from 'src/app/shared/gabinete-digital/diploma 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'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { AllProcessesPageModule } from 'src/app/shared/gabinete-digital/all-processes/all-processes.module'; @@ -32,8 +31,6 @@ import { AllProcessesPageModule } from 'src/app/shared/gabinete-digital/all-proc IonicModule, FontAwesomeModule, GabineteDigitalPageRoutingModule, - // - HeaderPageModule, EmptyContainerPageModule, AllProcessesPageModule, EventsToApprovePageModule, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 660d05984..61fe35092 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -1,6 +1,3 @@ - - - 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 aa8656d3d..55a64897a 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { PedidoPageRoutingModule } from './pedido-routing.module'; import { PedidoPage } from './pedido.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, PedidoPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, ], declarations: [PedidoPage] 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 f2fb679b9..5b0e8213e 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -1,7 +1,3 @@ - - - -
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts index d8bcece1e..c85bcc9a0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.module.ts @@ -7,9 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { PedidosPageRoutingModule } from './pedidos-routing.module'; import { PedidosPage } from './pedidos.page'; -import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ @@ -19,7 +16,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn- IonicModule, 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 3d2776aa3..e191ca165 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.module.ts @@ -8,8 +8,6 @@ import { PendentesPageRoutingModule } from './pendentes-routing.module'; import { PendentesPage } from './pendentes.page'; import { SharedModule } from 'src/app/shared/shared.module'; - -import { HeaderPageModule } from 'src/app/shared/header/header.module'; import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task-list/task-list.module'; @@ -18,9 +16,7 @@ import { TaskListPageModule } from 'src/app/shared/gabinete-digital/generic/task CommonModule, FormsModule, IonicModule, - PendentesPageRoutingModule, - HeaderPageModule, BtnModalDismissPageModule, // entryComponents TaskListPageModule diff --git a/src/app/pages/publications/publications.module.ts b/src/app/pages/publications/publications.module.ts index 5f121647f..c82187dcf 100644 --- a/src/app/pages/publications/publications.module.ts +++ b/src/app/pages/publications/publications.module.ts @@ -12,7 +12,6 @@ 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'; import { EditActionPageModule } from 'src/app/shared/publication/edit-action/edit-action.module'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it @@ -24,7 +23,6 @@ import { LazyLoadImageModule } from 'ng-lazyload-image'; // <-- import it IonicModule, FontAwesomeModule, PublicationsPageRoutingModule, - HeaderPageModule, ViewPublicationsPageModule, NewPublicationPageModule, PublicationDetailPageModule, diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index ed4d18038..1c49e6754 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -1,7 +1,3 @@ - - - -
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 4ddc67b37..260a10994 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -148,9 +148,8 @@ export class PublicationsPage implements OnInit { this.showLoader = false; const folders: PublicationFolder[] = this.getPublicationFolderMap(res) - let publications = await ActionModel.create(folders) - - console.log('publications', publications) + // let publications = await ActionModel.create(folders) + // console.log('publications', publications) this.publicationsEventFolderList = folders.filter((e)=>e.ActionType == 'Evento') this.publicationsTravelFolderList = folders.filter((e)=>e.ActionType != 'Evento') 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 7cf296ada..8fa065a3d 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 @@ -7,15 +7,12 @@ import { IonicModule } from '@ionic/angular'; import { PublicationDetailPageRoutingModule } from './publication-detail-routing.module'; import { PublicationDetailPage } from './publication-detail.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; - @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, PublicationDetailPageRoutingModule, - HeaderPageModule, ], declarations: [PublicationDetailPage] }) 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 0e7a3047c..36027cf08 100644 --- a/src/app/pages/publications/view-publications/view-publications.module.ts +++ b/src/app/pages/publications/view-publications/view-publications.module.ts @@ -8,8 +8,6 @@ import { ViewPublicationsPageRoutingModule } from './view-publications-routing.m import { ViewPublicationsPage } from './view-publications.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; - import { Attributes, IntersectionObserverHooks, LazyLoadImageModule, LAZYLOAD_IMAGE_HOOKS } from 'ng-lazyload-image'; export class LazyLoadImageHooks extends IntersectionObserverHooks { @@ -28,7 +26,6 @@ setup(attributes: Attributes) { IonicModule, ViewPublicationsPageRoutingModule, - HeaderPageModule, LazyLoadImageModule ], exports: [ViewPublicationsPage], diff --git a/src/app/services/events/events.module.ts b/src/app/services/events/events.module.ts index 6bd3e5096..79a44a790 100644 --- a/src/app/services/events/events.module.ts +++ b/src/app/services/events/events.module.ts @@ -4,15 +4,12 @@ import { FormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { EventsPageRoutingModule } from './events-routing.module'; import { EventsPage } from './events.page'; -import { HeaderPageModule } from 'src/app/shared/header/header.module'; - @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, EventsPageRoutingModule, - HeaderPageModule, // ], declarations: [EventsPage], diff --git a/src/app/services/events/events.page.html b/src/app/services/events/events.page.html index 463004977..342bcbcee 100644 --- a/src/app/services/events/events.page.html +++ b/src/app/services/events/events.page.html @@ -1,7 +1,3 @@ - - - -

{{customDate}}

diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 64b5a90ee..c216fdad0 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -52,6 +52,7 @@ export class HeaderPage implements OnInit { ) { this.loggeduser = SessionStore.user; router.events.subscribe((val) => { + this.hideSearch(); this.showSearch = false; this.canOpenSearch = true; this.showProfileModal = false @@ -94,8 +95,10 @@ export class HeaderPage implements OnInit { } hideSearch() { - if (this.router.url == '/home/events' || this.router.url == '/home/chat') { + if (this.router.url.startsWith('/home/events') || this.router.url.startsWith('/home/chat')) { this.hideSearchBtn = true; + } else { + this.hideSearchBtn = false; } } diff --git a/version/git-version.ts b/version/git-version.ts index 69e096ce4..d7f01d283 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "7e5039b4f", - "SHA": "7e5039b4fac3a44e5a039acd69dcba79b2a984b0", + "shortSHA": "5fe1abcff", + "SHA": "5fe1abcffa2c8d725bcc977072028e2b4b59779a", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 27 21:24:34 2023 +0100'", - "lastCommitMessage": "fix slow publication", - "lastCommitNumber": "4845", + "lastCommitTime": "'Sat Mar 4 07:21:33 2023 +0100'", + "lastCommitMessage": "add models", + "lastCommitNumber": "4846", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/models/publication.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.module.ts\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/index/index.module.ts\n\tmodified: src/app/index/index.page.html\n\tmodified: src/app/pages/agenda/agenda.module.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/view-event/view-event.module.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.html\n\tmodified: src/app/pages/chat/chat.module.ts\n\tmodified: src/app/pages/chat/chat.page.html\n\tmodified: src/app/pages/events/events.module.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.module.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.html\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.module.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.module.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.module.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.module.ts\n\tmodified: src/app/pages/publications/publications.module.ts\n\tmodified: src/app/pages/publications/publications.page.html\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/pages/publications/view-publications/publication-detail/publication-detail.module.ts\n\tmodified: src/app/pages/publications/view-publications/view-publications.module.ts\n\tmodified: src/app/services/events/events.module.ts\n\tmodified: src/app/services/events/events.page.html\n\tmodified: src/app/shared/header/header.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file