remove duplicated header set background to event pages

This commit is contained in:
Peter Maquiran
2023-03-07 11:48:38 +01:00
parent 5fe1abcffa
commit 8ed49dc200
53 changed files with 39 additions and 166 deletions
+3 -2
View File
@@ -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],
})
+6
View File
@@ -1,6 +1,12 @@
<ion-tabs class="tab" >
<ion-header class="ion-no-border ">
<app-header ></app-header>
</ion-header>
<ion-tab-bar *ngIf="p.userPermissionCount([permissionList.Agenda.access, permissionList.Gabinete.access, permissionList.Actions.access, permissionList.Chat.access]) >= 2 || (p.userPermission([permissionList.Agenda.access]) && SessionStore.user.OwnerCalendars.length != 0) || p.userPermission([permissionList.Gabinete.access])" class="bottoms" slot="bottom">
<ion-tab-button *ngIf="SessionStore.user.OwnerCalendars.length >= 1 || p.userPermission([permissionList.Gabinete.access])" (click)="goto('/home/events')" tab="events" [class.active]="ActiveTabService.pages.home">
+1 -2
View File
@@ -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]
})
+1
View File
@@ -1,3 +1,4 @@
<ion-content>
<router-outlet></router-outlet>
</ion-content>
-2
View File
@@ -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,
-4
View File
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border ">
<app-header ></app-header>
</ion-header>
<!-- Progress bar -->
<ion-content id="timeline-conteiner agenda-container pt-20" class="timeline ">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -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]
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border" [class.d-md-none]="isModal" *ngIf="header">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper main-content-l height-100 white ">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-2
View File
@@ -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,
-4
View File
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="height-100 container-wrapper">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-2
View File
@@ -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],
-4
View File
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<!-- <ion-header class="ion-no-border init-event-header"> -->
<ion-header class="ion-no-border">
<ion-label>
+16
View File
@@ -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;
@@ -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]
})
@@ -1,6 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="main-content d-flex height-100 pl-20 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
@@ -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]
@@ -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: [
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
@@ -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: [
@@ -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]
@@ -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,
],
@@ -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]
@@ -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]
})
@@ -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]
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
@@ -17,8 +17,6 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
FormsModule,
IonicModule,
DiplomasPageRoutingModule,
HeaderPageModule,
BtnModalDismissPageModule,
],
declarations: [DiplomasPage]
@@ -1,8 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="title">
<app-btn-modal-dismiss (click)="goBack()"></app-btn-modal-dismiss>
@@ -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]
@@ -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]
@@ -1,6 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content id="main-content" class="container-wrapper">
<div class="main-content height-100" *ngIf="loadedEvent" >
<div class="d-flex width-100">
@@ -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],
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="header-content">
<div class="header-icon-left">
@@ -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]
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<div class="ion-page d-none" id="main-content">
<ion-menu-button></ion-menu-button>
</div>
@@ -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]
@@ -1,8 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-header class="ion-no-border header-2">
<div class="header-content">
<div class="header-icon-left">
@@ -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]
@@ -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]
@@ -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,
@@ -1,6 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<!-- {{ NotificationsService.active }} -->
<ion-content class="height-100 container-wrapper">
<ion-refresher slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -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]
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="main-content d-flex height-100 overflow-hidden">
<div class="content d-flex flex-column" *ngIf="task">
@@ -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]
@@ -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
@@ -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,
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="container-wrapper">
<div class="d-md-none" *ngIf="hideRefreshBtn">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -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')
@@ -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]
})
@@ -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],
-3
View File
@@ -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],
-4
View File
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border ">
<app-header></app-header>
</ion-header>
<ion-header class="ion-no-border text-white">
<ion-label>
<p class="time ion-text-center">{{customDate}}</p>
+4 -1
View File
@@ -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;
}
}
+6 -6
View File
@@ -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 <file>...\" 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 <file>...\" 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"
}