git pull made and peter chnages recived

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],
 })

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">

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]
 })

src/app/index/index.page.html

@@ -1,3 +1,4 @@
+
 <ion-content>
   <router-outlet></router-outlet>
 </ion-content>

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
+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]
+})

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;

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,

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)">
@@ -252,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" >

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();

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]

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>

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,

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)">
     

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -549,6 +549,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       }
       else if (res.data == 'edit') {
         this.editGroup(this.roomId);
+      }  else if (res.data == 'addUser') {
+          
+        this.addContacts();
       }
     });
   }
@@ -823,25 +826,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   async addContacts() {
-    
+    if(this.isAdmin) {
 
-    const modal = await this.modalController.create({
+      const modal = await this.modalController.create({
-      component: GroupContactsPage,
+        component: GroupContactsPage,
-      componentProps: {
+        componentProps: {
-        isCreated: this.isGroupCreated,
+          isCreated: this.isGroupCreated,
-        room: this.room,
+          room: this.room,
-        members: this.members,
+          members: this.members,
-        name: this.room.name,
+          name: this.room.name,
-      },
+        },
-      cssClass: 'contacts',
+        cssClass: 'contacts',
-      backdropDismiss: false
+        backdropDismiss: false
-    });
+      });
+  
+      await modal.present();
+  
+      modal.onDidDismiss().then(() => {
+        this.getRoomInfo();
+      });
+    }
 
-    await modal.present();
-
-    modal.onDidDismiss().then(() => {
-      this.getRoomInfo();
-    });
   }
 
   async editGroup(roomId) {

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],

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>

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;

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();
+        event?.target?.complete();
-} catch(error) {}
+      } catch(error) {}
       }, 2000);
     }
     this.RefreshEvents();
@@ -166,7 +166,7 @@ export class EventsPage implements OnInit {
       }
 
     }
-    
+
     this.showLoader = false;
     this.showAgendaLoader = false;
   }

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]
 })

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">

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]

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: [

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">

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: [

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]

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,
   ],

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]

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]
 })

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]

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">

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]

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>

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]

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]

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">

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],

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">

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]

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>

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]

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">

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]

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]

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,

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)">

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') {
+    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() {

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]

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">

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]

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

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: '',

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,

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)">

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, PublicationModel } from 'src/app/models/beast-orm';
 
 
 @Component({
@@ -146,7 +147,10 @@ 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')
 

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]
 })

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: '',

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],

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> -->

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',
@@ -136,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)
@@ -162,20 +163,24 @@ export class ViewPublicationsPage implements OnInit {
     const folderId = this.folderId
 
     try {
-      const res = await this.publications.GetPublicationsImages(folderId).toPromise();
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
-      let publicationList = []
   
-      for (let element of res) {
+      for (let publicationId of publicationIds) {
-        let ress = await this.publications.GetPublicationById(element).toPromise();
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
-        let item: Publication = this.publicationPipe.itemList(ress)
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
-        publicationList.push(item);
+       
+        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, this.publicationList[folderId]);
-      this.storage.set(folderId, publicationList);
+      this.getpublication = this.publicationList[folderId];
-      this.getpublication = publicationList;
     } catch(error) {
       this.showLoader = false;
     }

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]

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-">
+        <div class="input-container d-flex flex-grow-1 justify-center align-center materia-top">
-          <ion-datetime class="cursor-pointer" [(ngModel)]='searchDocumentDate'  placeholder="Data" display-timezone="utc"></ion-datetime>
+
+          <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 -->

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 = "";

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],

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>

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)
 
   }
 

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();
-    });
   }
 
 

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`)
     }
   }
 

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;
     }
   }
 

src/app/shared/popover/chat-popover/chat-popover.page.html

@@ -6,7 +6,7 @@
     </button>
   </div>
   <div class="buttons">
-    <button (click)="addContacts()" 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>

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -5,9 +5,12 @@ 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';
+<<<<<<< HEAD
 import { HttpErrorResponse } from '@angular/common/http';
 import { SessionStore } from 'src/app/store/session.service';
 import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
+=======
+>>>>>>> b8a1734abbbe321eedb202ddde21592f161acf12
 
 
 @Component({
@@ -43,11 +46,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)
     }
   }
 
@@ -128,38 +131,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 addContacts() {
-    
 
-    const modal = await this.modalController.create({
+  async addUser() {
-      component: GroupContactsPage,
+    this.popoverController.dismiss('addUser');
-      componentProps: {
+    this.modalController.dismiss('addUser')
-        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(); */
-    });
   }
 
 }

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: '',

src/app/shared/publication/view-publications/view-publications.page.html

@@ -20,9 +20,9 @@
           </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>
+        <p class="item-content-date" *ngIf="publicationItem[folderId].DateBegin != null">{{ publicationItem[folderId].DateBegin | date: 'dd-MM-yy  HH:mm'}}</p>
       </div>
 
     </div>

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();
+      const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise();
-      let publicationList = []
+
-  
+      for (let publicationId of publicationIds) {
-      for (let element of res) {
+        let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
-        let ress = await this.publications.GetPublicationById(element).toPromise();
+        let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
-        let item: Publication = this.publicationPipe.itemList(ress)
+       
-        publicationList.push(item);
+        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, this.publicationList[folderId]);
-      this.storage.set(folderId, publicationList);
+      this.getpublication = this.publicationList[folderId];
-      this.getpublication = publicationList;
     } catch(error) {
       this.showLoader = false;
     }