From 5fe1abcffa2c8d725bcc977072028e2b4b59779a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 4 Mar 2023 07:21:33 +0100
Subject: [PATCH 1/8] add models

---
 src/app/models/beast-orm.ts                   | 38 ++++++++++++++++++-
 src/app/models/publication.ts                 |  2 +-
 src/app/pages/events/events.page.ts           |  8 ++--
 .../publication-detail.page.ts                |  2 +-
 .../pages/publications/publications.page.ts   |  5 +++
 .../publication-detail.page.ts                |  2 +-
 .../view-publications.page.ts                 | 23 ++++++-----
 src/app/services/publications.service.ts      |  4 +-
 .../publication-detail.page.ts                |  2 +-
 .../view-publications.page.html               |  2 +-
 .../view-publications.page.ts                 | 25 +++++++-----
 src/environments/environment.ts               |  2 +-
 version/git-version.ts                        | 12 +++---
 13 files changed, 88 insertions(+), 39 deletions(-)

diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
index 7ed0f9c1c..90923db19 100644
--- a/src/app/models/beast-orm.ts
+++ b/src/app/models/beast-orm.ts
@@ -1,4 +1,5 @@
-import { models } from 'beast-orm'
+// import { models } from 'beast-orm'
+import {  models } from 'src/plugin/src'
 import { environment } from 'src/environments/environment'
 const { ArrayField, JsonField}  = models.indexedDB.fields
 
@@ -47,4 +48,37 @@ models.register({
 })
 
 
-window['MessageModel'] = MessageModel
\ No newline at end of file
+window['MessageModel'] = MessageModel
+
+
+
+
+
+export class ActionModel  extends models.Model{
+	ProcessId = models.IntegerField({unique: true})
+	Description = models.CharField()
+	Detail = models.CharField()
+	DateBegin = models.CharField()
+	DateEnd = models.CharField()
+	ActionType = models.CharField()
+}
+
+export class PublicationModel  extends models.Model{
+	DateIndex = models.CharField()
+    DocumentId = models.IntegerField({unique: true})
+    ProcessId = models.CharField()
+    Title = models.CharField()
+    Message = models.CharField()
+    DatePublication = models.CharField()
+    OriginalFileName = models.CharField()
+    FileBase64 = models.CharField()
+    FileExtension = models.CharField()
+    OrganicEntityId = models.IntegerField()
+}
+
+models.register({
+	databaseName: 'actions'+environment.version.lastCommitNumber + environment.id,
+	type: 'indexedDB',
+	version: 14,
+	models: [PublicationModel, ActionModel]
+})
\ No newline at end of file
diff --git a/src/app/models/publication.ts b/src/app/models/publication.ts
index 6e8e65a88..a042c85f8 100644
--- a/src/app/models/publication.ts
+++ b/src/app/models/publication.ts
@@ -2,7 +2,7 @@
 
 export class Publication{
     DateIndex: Date | string;
-    DocumentId:string;
+    DocumentId: number;
     ProcessId:string;
     Title: string;
     Message: string;
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts
index 58811e9b5..9d64138a6 100644
--- a/src/app/pages/events/events.page.ts
+++ b/src/app/pages/events/events.page.ts
@@ -11,7 +11,7 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { momentG } from 'src/plugin/momentG';
-import { ThemeService } from 'src/app/services/theme.service'
+import { ThemeService } from 'src/app/services/theme.service';
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
@@ -130,8 +130,8 @@ export class EventsPage implements OnInit {
     if (event) {
       setTimeout(() => {
         try {
-  event?.target?.complete();
-} catch(error) {}
+        event?.target?.complete();
+      } catch(error) {}
       }, 2000);
     }
     this.RefreshEvents();
@@ -166,7 +166,7 @@ export class EventsPage implements OnInit {
       }
 
     }
-    
+
     this.showLoader = false;
     this.showAgendaLoader = false;
   }
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts
index 41b700480..12f070c4f 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts
@@ -37,7 +37,7 @@ export class PublicationDetailPage implements OnInit {
       /* this.folderId = this.navParams.get('folderIdId'); */
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 19405fbf5..4ddc67b37 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -16,6 +16,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
+import { ActionModel } from 'src/app/models/beast-orm';
 
 
 @Component({
@@ -146,7 +147,11 @@ export class PublicationsPage implements OnInit {
     this.publications.GetPublicationFolderList().subscribe(async res => {
       this.showLoader = false;
       const folders: PublicationFolder[] = this.getPublicationFolderMap(res)
+      
+      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.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 5564037c1..246b34e26 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -46,7 +46,7 @@ export class PublicationDetailPage implements OnInit {
 
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index bf8915d50..deb5571b5 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -15,6 +15,7 @@ import { ToastService } from 'src/app/services/toast.service';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
 import { Storage } from '@ionic/storage';
+import { PublicationModel } from 'src/app/models/beast-orm';
 
 @Component({
   selector: 'app-view-publications',
@@ -162,20 +163,24 @@ export class ViewPublicationsPage implements OnInit {
     const folderId = this.folderId
 
     try {
-      const res = await this.publications.GetPublicationsImages(folderId).toPromise();
-      let publicationList = []
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
   
-      for (let element of res) {
-        let ress = await this.publications.GetPublicationById(element).toPromise();
-        let item: Publication = this.publicationPipe.itemList(ress)
-        publicationList.push(item);
+      for (let publicationId of publicationIds) {
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
+       
+        const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
+
+        if(!found) {
+          PublicationModel.create(publicationDetails)
+          this.publicationList[folderId].push(publicationDetails)
+        }
       }
   
       this.showLoader = false;
       
-      this.publicationList[folderId] = publicationList
-      this.storage.set(folderId, publicationList);
-      this.getpublication = publicationList;
+      this.storage.set(folderId, this.publicationList[folderId]);
+      this.getpublication = this.publicationList[folderId];
     } catch(error) {
       this.showLoader = false;
     }
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 55e813247..bf9edb752 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -95,7 +95,7 @@ export class PublicationsService  {
     return this.http.delete<any>(`${geturl}`, options);
   }
 
-  GetPublicationsImages(folder:any) {
+  GetPublicationsList(folder:any) {
     const geturl = environment.apiURL + 'presidentialActions/'+ folder +'/posts/ids';
     let params = new HttpParams();
 
@@ -105,7 +105,7 @@ export class PublicationsService  {
       headers: this.headers,
       params: params
     };
-    return this.http.get<Publication[]>(`${geturl}`, options)
+    return this.http.get<number[]>(`${geturl}`, options)
 
   }
 
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index 3a41eb4b6..4f74af317 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -37,7 +37,7 @@ export class PublicationDetailPage implements OnInit {
       /* this.folderId = this.navParams.get('folderIdId'); */
       this.publication = {
         DateIndex: null,
-        DocumentId: '',
+        DocumentId: null,
         ProcessId:'',
         Title:'',
         Message: '',
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 79986c91e..44d05d041 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -20,7 +20,7 @@
           </button >
          </div>
       </div>
-      <div class="div-body width-100">
+      <div class="div-body width-100" *ngIf="publicationItem[folderId].DateBegin">
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
         <p class="item-content-date">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
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 db777e3df..319b1001e 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -12,6 +12,7 @@ import { EditActionPage } from 'src/app/pages/publications/edit-action/edit-acti
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { PublicationModel } from 'src/app/models/beast-orm';
 
 @Component({
   selector: 'app-view-publications',
@@ -116,20 +117,24 @@ export class ViewPublicationsPage implements OnInit {
     const folderId = this.folderId
 
     try {
-      const res = await this.publications.GetPublicationsImages(folderId).toPromise();
-      let publicationList = []
-  
-      for (let element of res) {
-        let ress = await this.publications.GetPublicationById(element).toPromise();
-        let item: Publication = this.publicationPipe.itemList(ress)
-        publicationList.push(item);
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
+
+      for (let publicationId of publicationIds) {
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
+       
+        const found = this.publicationList[folderId].find( e => e.DocumentId == publicationId )
+
+        if(!found) {
+          PublicationModel.create(publicationDetails)
+          this.publicationList[folderId].push(publicationDetails)
+        }
       }
   
       this.showLoader = false;
       
-      this.publicationList[folderId] = publicationList
-      this.storage.set(folderId, publicationList);
-      this.getpublication = publicationList;
+      this.storage.set(folderId, this.publicationList[folderId]);
+      this.getpublication = this.publicationList[folderId];
     } catch(error) {
       this.showLoader = false;
     }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 10909d23b..aaefbfe6d 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -3,4 +3,4 @@ import { oaprDev } from './suport/oapr'
 import { doneITDev } from './suport/doneIt'
 
 
-export const environment: Environment = oaprDev;
\ No newline at end of file
+export const environment: Environment = doneITDev;
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index c47ca6e10..69e096ce4 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "9a1976f54",
-  "SHA": "9a1976f54373e5ed0686998c46bcc00e427d1b88",
+  "shortSHA": "7e5039b4f",
+  "SHA": "7e5039b4fac3a44e5a039acd69dcba79b2a984b0",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 27 20:17:47 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4844",
+  "lastCommitTime": "'Mon Feb 27 21:24:34 2023 +0100'",
+  "lastCommitMessage": "fix slow publication",
+  "lastCommitNumber": "4845",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/pages/publications/view-publications/view-publications.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",
+  "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",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 8ed49dc2006f318a456a2e39bbe2d3291ffcefe8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 7 Mar 2023 11:48:38 +0100
Subject: [PATCH 2/8] remove duplicated header set background to event pages

---
 src/app/home/home.module.ts                      |  5 +++--
 src/app/home/home.page.html                      |  6 ++++++
 src/app/index/index.module.ts                    |  3 +--
 src/app/index/index.page.html                    |  1 +
 src/app/pages/agenda/agenda.module.ts            |  2 --
 src/app/pages/agenda/agenda.page.html            |  4 ----
 .../pages/agenda/view-event/view-event.module.ts |  2 --
 .../pages/agenda/view-event/view-event.page.html |  4 ----
 src/app/pages/chat/chat.module.ts                |  2 --
 src/app/pages/chat/chat.page.html                |  4 ----
 src/app/pages/events/events.module.ts            |  2 --
 src/app/pages/events/events.page.html            |  4 ----
 src/app/pages/events/events.page.scss            | 16 ++++++++++++++++
 .../despacho-pr/despacho-pr.module.ts            |  4 ----
 .../despacho-pr/despacho-pr.page.html            |  3 ---
 .../despachos-pr/despachos-pr.module.ts          |  4 ----
 .../despachos/despacho/despacho.module.ts        |  4 ----
 .../despachos/despacho/despacho.page.html        |  4 ----
 .../despachos/despachos.module.ts                |  3 ---
 .../diploma-assinar/diploma-assinar.module.ts    |  3 ---
 .../diplomas-assinar/diplomas-assinar.module.ts  |  4 ----
 .../diplomas-gerar/diplomas-gerar.module.ts      |  2 --
 .../diplomas-gerar/diplomas-gerar.module.ts      |  3 ---
 .../diplomas/diploma/diploma.module.ts           |  4 ----
 .../diplomas/diploma/diploma.page.html           |  4 ----
 .../gabinete-digital/diplomas/diplomas.module.ts |  2 --
 .../gabinete-digital/diplomas/diplomas.page.html |  5 -----
 .../approve-event-modal.module.ts                |  2 --
 .../approve-event/approve-event.module.ts        |  4 ----
 .../approve-event/approve-event.page.html        |  3 ---
 .../event-list/event-list.module.ts              |  2 --
 .../event-list/event-list.page.html              |  4 ----
 .../expediente-detail.module.ts                  |  3 ---
 .../expediente-detail.page.html                  |  4 ----
 .../expediente/expediente.module.ts              |  2 --
 .../expediente/expediente.page.html              |  5 -----
 .../expediente-pr/expediente-pr.module.ts        |  4 ----
 .../expedientes-pr/expedientes-pr.module.ts      |  5 -----
 .../gabinete-digital/gabinete-digital.module.ts  |  3 ---
 .../gabinete-digital/gabinete-digital.page.html  |  3 ---
 .../pedidos/pedido/pedido.module.ts              |  4 ----
 .../pedidos/pedido/pedido.page.html              |  4 ----
 .../gabinete-digital/pedidos/pedidos.module.ts   |  4 ----
 .../pendentes/pendentes.module.ts                |  4 ----
 .../pages/publications/publications.module.ts    |  2 --
 .../pages/publications/publications.page.html    |  4 ----
 src/app/pages/publications/publications.page.ts  |  5 ++---
 .../publication-detail.module.ts                 |  3 ---
 .../view-publications.module.ts                  |  3 ---
 src/app/services/events/events.module.ts         |  3 ---
 src/app/services/events/events.page.html         |  4 ----
 src/app/shared/header/header.page.ts             |  5 ++++-
 version/git-version.ts                           | 12 ++++++------
 53 files changed, 39 insertions(+), 166 deletions(-)

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 @@
 
+
 <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">
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 @@
+
 <ion-content>
   <router-outlet></router-outlet>
 </ion-content>
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 @@
-<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)">
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 @@
-<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>
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 @@
-<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)">
     
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 @@
-<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>
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 @@
-<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">
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 @@
-<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">
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 @@
-<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">
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 @@
-<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>
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 @@
-<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">
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 @@
-<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">
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 @@
-<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>
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 @@
-<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">
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 @@
-<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)">
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 @@
-<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">
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 @@
-<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)">
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 @@
-<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>
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 <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"
 }
\ No newline at end of file

From 070edbd4faf94338eccc488162df486371263948 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 7 Mar 2023 12:31:43 +0100
Subject: [PATCH 3/8] fix begin date html erro

---
 .../view-publications/view-publications.page.html    |  6 +-----
 .../view-publications/view-publications.page.html    |  2 +-
 version/git-version.ts                               | 12 ++++++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index 5e41c9ca6..eab5ca99e 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -1,7 +1,3 @@
-<ion-header class="ion-no-border">
-  <app-header > </app-header>
-</ion-header>
-
 <ion-header class="ion-no-border">
   <!-- <ion-toolbar class="bg-blue"> -->
   <div class="main-header">
@@ -14,7 +10,7 @@
       <div *ngIf="publicationItem[folderId]" class="div-title flex-grow-1">
         <ion-label class="title">{{publicationItem[folderId].Description}}</ion-label>
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
-        <p class="item-content-date">{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
+        <p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
       <div *ngIf="p.userPermission([p.permissionList.Actions.createPost]) && publicationItem[folderId]" class="actions-icon cursor-pointer" (click)="AddPublication('2',publicationItem[folderId].ProcessId)">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 44d05d041..9c677e644 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -22,7 +22,7 @@
       </div>
       <div class="div-body width-100" *ngIf="publicationItem[folderId].DateBegin">
         <p class="item-content-detail">{{publicationItem[folderId].Detail}}</p>
-        <p class="item-content-date">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
+        <p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
 
     </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index d7f01d283..0f3e7537f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "5fe1abcff",
-  "SHA": "5fe1abcffa2c8d725bcc977072028e2b4b59779a",
+  "shortSHA": "8ed49dc20",
+  "SHA": "8ed49dc2006f318a456a2e39bbe2d3291ffcefe8",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sat Mar 4 07:21:33 2023 +0100'",
-  "lastCommitMessage": "add models",
-  "lastCommitNumber": "4846",
+  "lastCommitTime": "'Tue Mar 7 11:48:38 2023 +0100'",
+  "lastCommitMessage": "remove duplicated header set background to event pages",
+  "lastCommitNumber": "4847",
   "change": "",
-  "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",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 66be958e2d7b21b9a80e567bcfc995ec9e53d7cc Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 12:21:09 +0100
Subject: [PATCH 4/8] =?UTF-8?q?fix=20eventos=20para=20approva=C3=A7=C3=A3o?=
 =?UTF-8?q?=20not=20opening?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/agenda/agenda.page.html                |  2 +-
 .../pages/gabinete-digital/gabinete-digital.page.ts  |  2 +-
 src/app/pages/publications/publications.page.ts      |  2 +-
 .../view-publications/view-publications.page.ts      |  2 +-
 version/git-version.ts                               | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 6f43254c6..661a44cde 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -248,7 +248,7 @@
         <div class="height-100">
           <div class="timeline-container height-100 d-flex pt-20 pl-20 pl-20 filter-{{segment}}"  >
 
-            <div  class="ss-timeline timeline-mobile flex-grow-1  d-md-none text-black height-100 width-100 overflow-y-auto" >
+            <div  class="ss-timeline timeline-mobile flex-grow-1 pr-10  d-md-none text-black height-100 width-100 overflow-y-auto" >
               <div *ngFor="let events of TimelineMDList | keyvalue;" >
 
                 <div  class="EventListBox-container" >
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index ec8d49448..635b3ad59 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -481,7 +481,7 @@ export class GabineteDigitalPage implements OnInit {
     /* else if (workflowName == "Expediente") {
       this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
     } */
-    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
+    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == 'Aprovar Evento') {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
     else {
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 260a10994..8a9402f82 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -16,7 +16,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Storage } from '@ionic/storage';
 import { PermissionService } from 'src/app/services/permission.service';
-import { ActionModel } from 'src/app/models/beast-orm';
+import { ActionModel, PublicationModel } from 'src/app/models/beast-orm';
 
 
 @Component({
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index deb5571b5..75971806c 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -137,7 +137,7 @@ export class ViewPublicationsPage implements OnInit {
   getPublicationDetail() {
     this.showLoader = true;
     const folderId = this.folderId
-    this.publications.GetPresidentialAction(folderId).subscribe(res=>{
+    this.publications.GetPresidentialAction(folderId).subscribe(res =>{ 
       this.showLoader = false;
       this.publicationItem[folderId] = res
       this.storage.set(folderId+"name", res)
diff --git a/version/git-version.ts b/version/git-version.ts
index 0f3e7537f..80563c274 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "8ed49dc20",
-  "SHA": "8ed49dc2006f318a456a2e39bbe2d3291ffcefe8",
+  "shortSHA": "070edbd4f",
+  "SHA": "070edbd4faf94338eccc488162df486371263948",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Tue Mar 7 11:48:38 2023 +0100'",
-  "lastCommitMessage": "remove duplicated header set background to event pages",
-  "lastCommitNumber": "4847",
+  "lastCommitTime": "'Tue Mar 7 12:31:43 2023 +0100'",
+  "lastCommitMessage": "fix begin date html erro",
+  "lastCommitNumber": "4848",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/publications/publications.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 9253c33f08f05215aa3d2fc84b8b48f6df66f312 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 12:56:11 +0100
Subject: [PATCH 5/8] fix gabinete

---
 .../gabinete-digital/gabinete-digital.page.html      |  8 ++++++--
 .../pages/gabinete-digital/gabinete-digital.page.ts  |  5 +++--
 .../all-processes/all-processes.page.ts              |  4 ++--
 version/git-version.ts                               | 12 ++++++------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 61fe35092..243915577 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -43,7 +43,7 @@
                       <div class="item-top-detail">
                         <div class="item-subject">
                           <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
-                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
+                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}..</ion-label>
                         </div>
                         <div *ngIf="task.DocumentsQty != 0" class="item-icon">
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -64,6 +64,7 @@
                         </div>
                       </div>
                       <div *ngIf="task.Agenda" class="item-middle-detail-extra">
+                        {{ task | json }}
                         <div class="item-middle-detail-extra-text">
                           <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
                             <!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
@@ -76,7 +77,10 @@
                       </div>
                       <div class="item-bottom-detail d-flex align-items-center">
                         <div class="item-workflow">
-                          <span class="label">{{task.activityInstanceName}}</span>
+                          <span class="label">{{task.activityInstanceName}} .,.,.</span>
+                          <div *ngIf="task.activityInstanceName == 'Aprovar Evento' ">
+                            {{ task | json }}
+                          </div>
                         </div>
                         <div class="item-date">
                           <ion-label>{{ task.CreateDate || task.taskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 635b3ad59..4881dc570 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -481,12 +481,13 @@ export class GabineteDigitalPage implements OnInit {
     /* else if (workflowName == "Expediente") {
       this.router.navigate(['/home/gabinete-digital/pedidos',serialNumber,'gabinete-digital']);
     } */
-    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == 'Aprovar Evento') {
+    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
     else {
-
+      throw(`${workflowName} && ${activityName} no route`)
     }
+
   }
 
   onSegmentVistaChange() {
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 8bf877621..24a2dd00c 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -172,11 +172,11 @@ export class AllProcessesPage implements OnInit {
     else if (workflowName == "Pedido de Parecer do Presidente") {
       this.router.navigate(['/home/gabinete-digital/pedidos', serialNumber, 'gabinete-digital']);
     }
-    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR') {
+    else if (workflowName == 'Agenda Pessoal PR' || workflowName == 'Agenda Oficial PR' || workflowName == 'Agenda Oficial MDGPR' || workflowName == 'Agenda Pessoal MDGPR' || activityName == "Aprovar Evento" || workflowName == "Agendar Evento") {
       this.router.navigate(['/home/gabinete-digital/event-list/approve-event', serialNumber, 'gabinete-digital']);
     }
     else {
-      
+      throw(`${workflowName} && ${activityName} no route`)
     }
   }
 
diff --git a/version/git-version.ts b/version/git-version.ts
index f92b0193d..2684cb814 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "66be958e2",
-  "SHA": "66be958e2d7b21b9a80e567bcfc995ec9e53d7cc",
+  "shortSHA": "79509a305",
+  "SHA": "79509a305538f7ae6e4d0327e3a314fe37954f3e",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 9 12:21:09 2023 +0100'",
-  "lastCommitMessage": "fix eventos para approvação not opening",
-  "lastCommitNumber": "4849",
+  "lastCommitTime": "'Thu Mar 9 12:22:54 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "4852",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/modals/add-note/add-note.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.html\n\tmodified:   src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 0b4cafda22aba43e3e2acb6f454b2a8ae51ef467 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 15:15:06 +0100
Subject: [PATCH 6/8] remove all date

---
 .../pages/agenda/new-event/new-event.page.ts  |  1 +
 src/app/pages/search/search.module.ts         | 25 +++++++
 src/app/pages/search/search.page.html         | 25 ++++++-
 src/app/pages/search/search.page.ts           | 67 +++++++++++++++++--
 version/git-version.ts                        | 12 ++--
 5 files changed, 117 insertions(+), 13 deletions(-)

diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts
index f6a3f174a..3b00ac7cb 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -226,6 +226,7 @@ export class NewEventPage implements OnInit {
     _date .setMinutes(minutes + 15)
     return _date 
   }
+  
   setStartDate() {
     if(!this.postEvent.StartDate) { 
       this.postEvent.StartDate = this.roundTimeQuarterHour();
diff --git a/src/app/pages/search/search.module.ts b/src/app/pages/search/search.module.ts
index 9191a7ca8..27ae27bff 100644
--- a/src/app/pages/search/search.module.ts
+++ b/src/app/pages/search/search.module.ts
@@ -10,6 +10,21 @@ import { SearchPage } from './search.page';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 /*  */
 /* import { TagCloudModule } from 'angular-tag-cloud-module'; */
+import { MatDatepickerModule } from '@angular/material/datepicker';
+import { MatInputModule } from '@angular/material/input';
+
+import { MatNativeDateModule } from '@angular/material/core';
+
+import {
+  NgxMatDatetimePickerModule,
+  NgxMatNativeDateModule,
+  NgxMatTimepickerModule
+} from '@angular-material-components/datetime-picker';
+
+import { ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatSelectModule } from '@angular/material/select';
+import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
 
 @NgModule({
   imports: [
@@ -20,6 +35,16 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
     /*  */
     SearchPageRoutingModule,
     BtnModalDismissPageModule,
+    NgxMatDatetimePickerModule,
+    NgxMatNativeDateModule,
+    NgxMatTimepickerModule,
+    NgxMatMomentModule,
+    MatDatepickerModule,
+    MatInputModule,
+    MatNativeDateModule,
+    ReactiveFormsModule,
+    MatButtonModule,
+    MatSelectModule
   ],
   declarations: [SearchPage],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html
index 3bf731fd7..56a9b572b 100644
--- a/src/app/pages/search/search.page.html
+++ b/src/app/pages/search/search.page.html
@@ -59,18 +59,37 @@
           </div>
         </div>
       </ion-form>
-
       <!--  -->
       <li *ngIf="showAdvanceSearch" class="d-flex date-container ion-justify-content-between">
         <div class="icon-mer icon">
           <ion-icon name="restaurant-outline" src="assets/images/icons-advance-search-document.svg"></ion-icon>
         </div>
-        <div class="input-container d-flex ion-align-items-">
-          <ion-datetime class="cursor-pointer" [(ngModel)]='searchDocumentDate'  placeholder="Data" display-timezone="utc"></ion-datetime>
+        <div class="input-container d-flex flex-grow-1 justify-center align-center materia-top">
+
+          <mat-form-field appearance="none" class="date-hour-picker" (click)="clickDate()" style="
+            margin-top: -11px;
+            margin-left: 10px;
+          ">
+            <input matInput [ngxMatDatetimePicker]="picker1"
+              placeholder="Data Inicio*"
+              [(ngModel)]="searchDocumentDate"
+            >
+            <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" (click)="clickDate()" ></mat-datepicker-toggle>
+            <ngx-mat-datetime-picker #picker1 (click)="clickDate()"
+              [showSpinners]="showSpinners"
+              [showSeconds]="showSeconds"
+              [stepHour]="stepHour" [stepMinute]="stepMinute"
+              [stepSecond]="stepSecond"
+              [touchUi]="touchUi"
+              >
+            </ngx-mat-datetime-picker>
+          </mat-form-field>
+
           <div class="icon cursor-pointer" (click)="clearInputDocumentDate()">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' "name="restaurant-outline" src="assets/images/icons-search-close.svg"></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " name="restaurant-outline" src="assets/images/theme/gov/icons-search-close.svg"></ion-icon>
           </div>
+
         </div>
       </li>
       <!-- Sender -->
diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 453e3869d..f0bfa1c51 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { ModalController, NavParams  } from '@ionic/angular';
 import { SearchService } from "../../services/search.service";
 import { formatDate } from '@angular/common';
@@ -14,14 +14,40 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag
 import { Router } from '@angular/router';
 import { environment } from 'src/environments/environment';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
+import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
+import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
+
+const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
+  parse: {
+    dateInput: "YYYY-MMMM-DD HH:mm"
+  },
+  display: {
+    dateInput: "DD MMM YYYY H:mm",
+    monthYearLabel: "MMM YYYY",
+    dateA11yLabel: "LL",
+    monthYearA11yLabel: "MMMM YYYY"
+  }
+}
 
 @Component({
   selector: 'app-search',
   templateUrl: './search.page.html',
   styleUrls: ['./search.page.scss'],
+  providers: [
+    { provide: NGX_MAT_DATE_FORMATS, useValue: CUSTOM_DATE_FORMATS },
+  ]
 })
 export class SearchPage implements OnInit {
 
+  public showSpinners = true;
+  public showSeconds = false;
+  public touchUi = false;
+  public enableMeridian = false;
+  public stepHour = 1;
+  public stepMinute = 15;
+  public stepSecond = 15;
+  //
+
   // https params
   searchSubject: string;
   searchDocumentDate: string;
@@ -61,6 +87,9 @@ export class SearchPage implements OnInit {
 
   showSearchInput = false
 
+
+  @ViewChild('picker1') picker1: any;
+
   constructor(private modalController: ModalController,
     private search: SearchService,
     private modalCtrl: ModalController,
@@ -213,6 +242,38 @@ export class SearchPage implements OnInit {
   }
 
 
+  roundTimeQuarterHour(timeToReturn = new Date()) {
+    let date: any = new Date(timeToReturn) || new Date();
+    const minutes = date.getMinutes();
+    date.setSeconds(0);
+
+    if(minutes % 15 != 0) {
+      
+      if (minutes > 45) {
+        date.setMinutes(60)
+      } else if (minutes > 30) {
+        date.setMinutes(45)
+      } else if (minutes > 15) {
+        date.setMinutes(30)
+      } else if (minutes > 0) {
+        date.setMinutes(15)
+      }
+
+    } 
+
+    return date
+  }
+
+  clickDate() {
+    if(!this.searchDocumentDate) {
+      this.searchDocumentDate = this.roundTimeQuarterHour()
+    }
+  }
+
+  clearInputDocumentDate() {
+    this.searchDocumentDate = "";
+  }
+
   loadWordCloud() {
 
     setTimeout(() => {
@@ -720,9 +781,7 @@ export class SearchPage implements OnInit {
     this.searchSender = "";
   }
 
-  clearInputDocumentDate(){
-    this.searchDocumentDate = "";
-  }
+
 
   clearInputOrganicEntity(){
     this.searchOrganicEntiry = "";
diff --git a/version/git-version.ts b/version/git-version.ts
index 2684cb814..368550285 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "79509a305",
-  "SHA": "79509a305538f7ae6e4d0327e3a314fe37954f3e",
+  "shortSHA": "9253c33f0",
+  "SHA": "9253c33f08f05215aa3d2fc84b8b48f6df66f312",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 9 12:22:54 2023 +0100'",
-  "lastCommitMessage": "merge",
-  "lastCommitNumber": "4852",
+  "lastCommitTime": "'Thu Mar 9 12:56:11 2023 +0100'",
+  "lastCommitMessage": "fix gabinete",
+  "lastCommitNumber": "4853",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/search/search.module.ts\n\tmodified:   src/app/pages/search/search.page.html\n\tmodified:   src/app/pages/search/search.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 789c2f4e8b10fe5ecb2975baf9b1a328f8f72607 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 15:18:19 +0100
Subject: [PATCH 7/8] remove json text

---
 .../gabinete-digital/gabinete-digital.page.html      |  8 ++------
 version/git-version.ts                               | 12 ++++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 243915577..61fe35092 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -43,7 +43,7 @@
                       <div class="item-top-detail">
                         <div class="item-subject">
                           <!-- ... {{ task.SerialNumber || task.serialNumber}} {{ task.WorkflowName || task.workflowName }} {{ task.activityInstanceName }} -->
-                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}..</ion-label>
+                          <ion-label>{{ task.Folio || task.Subject || task.workflowInstanceDataFields.Subject}}</ion-label>
                         </div>
                         <div *ngIf="task.DocumentsQty != 0" class="item-icon">
                           <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-attachment.svg"></ion-icon>
@@ -64,7 +64,6 @@
                         </div>
                       </div>
                       <div *ngIf="task.Agenda" class="item-middle-detail-extra">
-                        {{ task | json }}
                         <div class="item-middle-detail-extra-text">
                           <ion-label *ngIf=" task.WorkflowName == 'Agenda Oficial PR' || task.WorkflowName == 'Agenda Pessoal PR'">
                             <!-- Agenda {{task.Agenda || task.workflowInstanceDataFields.Agenda}} do Presidente da República -->
@@ -77,10 +76,7 @@
                       </div>
                       <div class="item-bottom-detail d-flex align-items-center">
                         <div class="item-workflow">
-                          <span class="label">{{task.activityInstanceName}} .,.,.</span>
-                          <div *ngIf="task.activityInstanceName == 'Aprovar Evento' ">
-                            {{ task | json }}
-                          </div>
+                          <span class="label">{{task.activityInstanceName}}</span>
                         </div>
                         <div class="item-date">
                           <ion-label>{{ task.CreateDate || task.taskStartDate  | date: 'dd-MM-yyyy HH:mm' }}</ion-label>
diff --git a/version/git-version.ts b/version/git-version.ts
index 368550285..e3e80ed28 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "9253c33f0",
-  "SHA": "9253c33f08f05215aa3d2fc84b8b48f6df66f312",
+  "shortSHA": "0b4cafda2",
+  "SHA": "0b4cafda22aba43e3e2acb6f454b2a8ae51ef467",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 9 12:56:11 2023 +0100'",
-  "lastCommitMessage": "fix gabinete",
-  "lastCommitNumber": "4853",
+  "lastCommitTime": "'Thu Mar 9 15:15:06 2023 +0100'",
+  "lastCommitMessage": "remove all date",
+  "lastCommitNumber": "4854",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/search/search.module.ts\n\tmodified:   src/app/pages/search/search.page.html\n\tmodified:   src/app/pages/search/search.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From b8a1734abbbe321eedb202ddde21592f161acf12 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Thu, 9 Mar 2023 16:35:54 +0100
Subject: [PATCH 8/8] fix

---
 .../group-messages/group-messages.page.ts     | 39 ++++++++++--------
 .../group-messages/group-messages.page.ts     | 41 +++++++++++--------
 .../chat-popover/chat-popover.page.html       |  2 +-
 .../popover/chat-popover/chat-popover.page.ts | 18 +++++---
 version/git-version.ts                        | 12 +++---
 5 files changed, 64 insertions(+), 48 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 da629f705..2b1529809 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
       else if (res.data == 'edit') {
         this.editGroup(this.roomId);
+      }  else if (res.data == 'addUser') {
+          
+        this.addContacts();
       }
     });
   }
@@ -820,25 +823,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async addContacts() {
-    
+    if(this.isAdmin) {
 
-    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
-    });
+      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.getRoomInfo();
+      });
+    }
 
-    await modal.present();
-
-    modal.onDidDismiss().then(() => {
-      this.getRoomInfo();
-    });
   }
 
   async editGroup(roomId) {
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 031820182..5ac3f36a4 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       });
       await modal.present();
       modal.onDidDismiss().then(res => {
-        
+        console.log(res)
         if (res.data == 'leave') {
           this.getRoomInfo();
           this.closeAllDesktopComponents.emit();
@@ -546,6 +546,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
           
           //this.closeAllDesktopComponents.emit();
           this.openEditGroupPage.emit(this.roomId);
+        } else if (res.data == 'addUser') {
+          
+          this.openGroupContactsPage();
         }
         else {
 
@@ -616,24 +619,26 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
   async addContacts() {
     
+    if(this.isAdmin) {
+      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.getRoomInfo();
+      });
+    }
 
-    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.getRoomInfo();
-    });
   }
 
 
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html
index 3ae9c4475..855a51407 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.html
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.html
@@ -6,7 +6,7 @@
     </button>
   </div>
   <div class="buttons">
-    <button class="btn-cancel" shape="round" >Adicionar</button>
+    <button *ngIf="isAdmin" (click)="addUser()" class="btn-cancel" shape="round" >Adicionar</button>
     <button (click)="leaveGroup()" class="btn-cancel" shape="round" >Sair do Grupo</button>
     <button *ngIf="isAdmin" (click)="openChangeGroupName()" class="btn-cancel btn-cancel mt-10" shape="round" >Alterar nome do grupo</button>
     <div class="solid"></div>
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 633eb6cbe..2ee30fe75 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -5,8 +5,6 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
-import { HttpErrorResponse } from '@angular/common/http';
-import { SessionStore } from 'src/app/store/session.service';
 
 
 @Component({
@@ -41,11 +39,11 @@ export class ChatPopoverPage implements OnInit {
   close(action:any){
     if( window.innerWidth < 701){
       this.popoverController.dismiss(action);
-      this.modalController.dismiss(action);
+      this.modalController.dismiss(action)
     }
     else{
       this.popoverController.dismiss(action);
-      this.modalController.dismiss(action);
+      this.modalController.dismiss(action)
     }
   }
 
@@ -126,16 +124,24 @@ export class ChatPopoverPage implements OnInit {
       }
     });
     this.popoverController.dismiss('delete');
-    this.modalController.dismiss('delete');
+    this.modalController.dismiss('delete')
   }
 
   async openChangeGroupName(){
     if( window.innerWidth < 701){
       this.popoverController.dismiss('edit');
+      this.modalController.dismiss('edit')
     }
     else{
-      this.modalController.dismiss('edit');
+      this.popoverController.dismiss('edit');
+      this.modalController.dismiss('edit')
     }
   }
 
+
+  async addUser() {
+    this.popoverController.dismiss('addUser');
+    this.modalController.dismiss('addUser')
+  }
+
 }
diff --git a/version/git-version.ts b/version/git-version.ts
index e3e80ed28..1a76ec54c 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0b4cafda2",
-  "SHA": "0b4cafda22aba43e3e2acb6f454b2a8ae51ef467",
+  "shortSHA": "789c2f4e8",
+  "SHA": "789c2f4e8b10fe5ecb2975baf9b1a328f8f72607",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Mar 9 15:15:06 2023 +0100'",
-  "lastCommitMessage": "remove all date",
-  "lastCommitNumber": "4854",
+  "lastCommitTime": "'Thu Mar 9 15:18:19 2023 +0100'",
+  "lastCommitMessage": "remove json text",
+  "lastCommitNumber": "4855",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified:   src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified:   src/app/shared/popover/chat-popover/chat-popover.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file