From 3a9c0f1e5df63312342e20080ce96d1fae36c1c1 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 15:19:03 +0100
Subject: [PATCH 1/6] Improve

---
 .../pages/gabinete-digital/gabinete-digital.page.ts  |  8 +++++++-
 .../publications/new-action/new-action.module.ts     |  1 -
 .../all-processes/all-processes.page.ts              | 10 ++++++----
 version/git-version.ts                               | 12 ++++++------
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 3808f3ac2..fb28b3647 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -147,6 +147,9 @@ export class GabineteDigitalPage implements OnInit {
     }
 
     this.checkRoutes();
+
+    window['all-process-gabinete'] = this.updateAllProcess
+
   }
   closeAllDesktopComponent() {
     this.desktopComponent = {
@@ -593,7 +596,7 @@ export class GabineteDigitalPage implements OnInit {
     this.showDiplomasGerar = false
   }
 
-  updateAllProcess() {
+  updateAllProcess = () => {
     this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
     .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list)
@@ -609,6 +612,9 @@ export class GabineteDigitalPage implements OnInit {
     //   .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
     //   .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList)
     // }
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   get getAllProcessCount() {
diff --git a/src/app/pages/publications/new-action/new-action.module.ts b/src/app/pages/publications/new-action/new-action.module.ts
index 3924eab40..421c27f06 100644
--- a/src/app/pages/publications/new-action/new-action.module.ts
+++ b/src/app/pages/publications/new-action/new-action.module.ts
@@ -18,7 +18,6 @@ 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';
-import { MAT_DATE_LOCALE } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';
 import { MatDialogModule } from '@angular/material/dialog';
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 97a971346..764e5b04c 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
@@ -41,6 +41,8 @@ export class AllProcessesPage implements OnInit {
     public ThemeService: ThemeService
   ) {
     this.loggeduser = SessionStore.user;
+
+    window['all-process'] = this.updateAllProcess
   }
 
   ngOnInit() {
@@ -62,9 +64,9 @@ export class AllProcessesPage implements OnInit {
   doRefresh(event) {
     if (event) {
       setTimeout(() => {
-        try {
-  event?.target?.complete();
-} catch(error) {}
+      try {
+        event?.target?.complete();
+      } catch(error) {}
       }, 2000);
     }
     setTimeout(() => {
@@ -79,7 +81,7 @@ export class AllProcessesPage implements OnInit {
     }, 1000);
   }
 
-  updateAllProcess() {
+  updateAllProcess = () => {
     this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento)
     .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list)
     .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList).concat(this.pendentesstore.list)
diff --git a/version/git-version.ts b/version/git-version.ts
index fc80d7b13..ea2f1466f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d933df5b3",
-  "SHA": "d933df5b31737aaf00a0113b669227b73c6e354a",
+  "shortSHA": "16d2fac86",
+  "SHA": "16d2fac86425ee17fd8fc25fd93ae35e7bc337e4",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Thu Feb 9 16:05:36 2023 +0100'",
-  "lastCommitMessage": "feature",
-  "lastCommitNumber": "4761",
+  "lastCommitTime": "'Fri Feb 10 13:07:08 2023 +0100'",
+  "lastCommitMessage": "improve",
+  "lastCommitNumber": "4762",
   "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/new-publication/new-publication.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.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.module.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 9c1372b59542759c371025a525fcce1cf2892579 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 16:45:12 +0100
Subject: [PATCH 2/6] List count

---
 src/app/models/GetTasksListType.ts                  |  4 +++-
 src/app/store/deplomas.service.ts                   | 11 +++++++++++
 src/app/store/despacho-store.service.ts             |  4 ++++
 src/app/store/despachospr-store.service.ts          |  4 ++++
 src/app/store/eventoaprovacao-store.service.ts      | 10 ++++++++++
 src/app/store/expedientegd-store.service.ts         |  4 ++++
 src/app/store/pedidos-store.service.ts              |  6 ++++++
 src/app/store/pendestes-store.service.ts            |  3 +++
 src/app/store/presidential-actions-store.service.ts |  3 +++
 src/app/store/to-day-event-storage.service.ts       |  3 +++
 version/git-version.ts                              | 12 ++++++------
 11 files changed, 57 insertions(+), 7 deletions(-)

diff --git a/src/app/models/GetTasksListType.ts b/src/app/models/GetTasksListType.ts
index cf2615c4a..cfc62c2fe 100644
--- a/src/app/models/GetTasksListType.ts
+++ b/src/app/models/GetTasksListType.ts
@@ -10,4 +10,6 @@ export let GetTasksListType:
 "Agenda Oficial PR" |
 "image/x-icon" |
 "Despacho" |
-"Agendar Evento"
\ No newline at end of file
+"Agendar Evento" |
+"Agenda Oficial MDGPR,Agenda Pessoal MDGPR" |
+"Agenda Oficial PR,Agenda Pessoal PR"
\ No newline at end of file
diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index 0c65d82e6..081133719 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -112,12 +112,20 @@ export class DeplomasService {
     this._diplomasListCount = value.length
     this._diplomasParaAssinar = value
     this.saveDiplomasParaAssinar()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   resetDiplomasReview(value: any[]) {
     this._diplomasReviewList =value
     this._diplomasReviewCount = value.length
     this.saveDiplomasReviewList()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   resetDiplomaGerar(value: any[]) {
@@ -126,6 +134,9 @@ export class DeplomasService {
     this._diplomasGerarList = value
 
     this.savetDiplomaGerar()
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
 
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index af4871c7e..4d1bca69e 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -109,6 +109,10 @@ export class DespachoStoreService {
   reset(eventsList: any) {
     this._list = eventsList
     this.save({dynamicCount:true})
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   private save = ({dynamicCount = false})=> {
diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts
index 684c80161..f2887242e 100644
--- a/src/app/store/despachospr-store.service.ts
+++ b/src/app/store/despachospr-store.service.ts
@@ -38,6 +38,10 @@ reset(eventsList: any) {
 
   this.count = this._list.length
   this.save()
+
+  if(window['all-process']) {
+    window['all-process']()
+  }
 }
 
 private save() {
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index 78802a652..4ad195930 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -63,7 +63,12 @@ export class EventoaprovacaoStoreService {
       this.count = this.countPr + this.countMd
 
       this.savePr()
+
+      if(window['all-process']) {
+        window['all-process']()
+      }
     }
+    
   }
 
   resetmd(eventsList: any) {
@@ -73,6 +78,11 @@ export class EventoaprovacaoStoreService {
       this.countMd = this._listMd.length
       this.count = this.countPr + this.countMd
       this.saveMd()
+
+
+      if(window['all-process']) {
+        window['all-process']()
+      }
     }
   }
 
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index 4c12344be..4f56f4810 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -36,6 +36,10 @@ export class ExpedientegdStoreService {
   reset(eventsList: any) {
     this._list = eventsList
     this.save()
+
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   private save() {
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index ec683d1b5..3a1d01c03 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -62,6 +62,9 @@ export class PedidosStoreService {
  
     this.countparecer = this._listParecer.length
     this.saveDeferimento()
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
  
   resetdeferimento(list: any) {
@@ -69,6 +72,9 @@ export class PedidosStoreService {
  
    this.countdeferimento =this._listDeferimento.length
    this.saveParecer()
+   if(window['all-process']) {
+    window['all-process']()
+  }
   }
 
   private saveParecer() {
diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts
index da0a04b44..cf05d495c 100644
--- a/src/app/store/pendestes-store.service.ts
+++ b/src/app/store/pendestes-store.service.ts
@@ -42,6 +42,9 @@ export class PendestesStoreService {
 
     this.count = this._list.length
     this.save()
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   private save() {
diff --git a/src/app/store/presidential-actions-store.service.ts b/src/app/store/presidential-actions-store.service.ts
index 7ea3adae0..4301ed5d6 100644
--- a/src/app/store/presidential-actions-store.service.ts
+++ b/src/app/store/presidential-actions-store.service.ts
@@ -32,6 +32,9 @@ export class PresidentialActionsStoreService {
     this._list = list
 
     this.save(this._list)
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   private save(list: Publication[]) {
diff --git a/src/app/store/to-day-event-storage.service.ts b/src/app/store/to-day-event-storage.service.ts
index 2bc45749d..692884833 100644
--- a/src/app/store/to-day-event-storage.service.ts
+++ b/src/app/store/to-day-event-storage.service.ts
@@ -38,6 +38,9 @@ export class ToDayEventStorageService {
   reset(eventsList: EventList[]) {
     this._eventsList = eventsList
     this.save()
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   private save() {
diff --git a/version/git-version.ts b/version/git-version.ts
index ea2f1466f..dd24183af 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "16d2fac86",
-  "SHA": "16d2fac86425ee17fd8fc25fd93ae35e7bc337e4",
+  "shortSHA": "3a9c0f1e5",
+  "SHA": "3a9c0f1e5df63312342e20080ce96d1fae36c1c1",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Feb 10 13:07:08 2023 +0100'",
-  "lastCommitMessage": "improve",
-  "lastCommitNumber": "4762",
+  "lastCommitTime": "'Mon Feb 13 15:19:03 2023 +0100'",
+  "lastCommitMessage": "Improve",
+  "lastCommitNumber": "4763",
   "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.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.module.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/models/GetTasksListType.ts\n\tmodified:   src/app/store/deplomas.service.ts\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/eventoaprovacao-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts\n\tmodified:   src/app/store/pedidos-store.service.ts\n\tmodified:   src/app/store/pendestes-store.service.ts\n\tmodified:   src/app/store/presidential-actions-store.service.ts\n\tmodified:   src/app/store/to-day-event-storage.service.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 2907c0d12323f8571a68eac0dc7505b3872ecd4b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 16:50:00 +0100
Subject: [PATCH 3/6] fix

---
 src/app/store/deplomas.service.ts |  3 +++
 version/git-version.ts            | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index 081133719..02fe1c309 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -105,6 +105,9 @@ export class DeplomasService {
     this._diplomasAssinadoListCount = value.length
     this._diplomasAssinadoList = value
     this.saveDiplomasAssinadoList()
+    if(window['all-process']) {
+      window['all-process']()
+    }
   }
 
   resetDiplomasParaAssinar(value: any[]) {
diff --git a/version/git-version.ts b/version/git-version.ts
index 1a2b93f36..4353db687 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "9c1372b59",
-  "SHA": "9c1372b59542759c371025a525fcce1cf2892579",
+  "shortSHA": "d285f8b31",
+  "SHA": "d285f8b314e19c836e63898bb8f9944619b7f9b1",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 16:45:12 2023 +0100'",
-  "lastCommitMessage": "List count",
-  "lastCommitNumber": "4764",
+  "lastCommitTime": "'Mon Feb 13 16:46:21 2023 +0100'",
+  "lastCommitMessage": "fix",
+  "lastCommitNumber": "4770",
   "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:   capacitor.config.ts\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/pages/publications/new-action/new-action.page.html\n\tmodified:   src/app/pages/publications/new-action/new-action.page.scss\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.scss\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/services/native-notification.service.ts\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.scss\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.html\n\tmodified:   src/app/shared/publication/new-action/new-action.page.html\n\tmodified:   src/app/shared/publication/new-action/new-action.page.scss\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/publication/new-publication/new-publication.page.scss\n\tnew file:   src/assets/images/exclamation-mark.png\n\tnew file:   src/assets/images/exclamation_mark.svg\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/store/deplomas.service.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 44dddff12453e7f9e43677a42999900a7437e3f6 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 17:51:36 +0100
Subject: [PATCH 4/6] add break line to tet

---
 src/app/Rules/aprove-event.service.ts         |  5 ++--
 .../modals/view-event/view-event.page.html    |  2 +-
 .../despacho-pr/despacho-pr.page.html         |  2 +-
 .../despachos/despacho/despacho.page.html     |  2 +-
 .../diploma-assinar/diploma-assinar.page.html |  2 +-
 .../diplomas-gerar/diplomas-gerar.page.html   |  2 +-
 .../diplomas/diploma/diploma.page.html        |  2 +-
 .../approve-event-modal.page.html             |  2 +-
 .../approve-event/approve-event.page.html     |  2 +-
 .../event-list/event-list.page.ts             | 11 ++++----
 .../expediente-detail.page.html               |  2 +-
 .../expediente-pr/expediente-pr.page.html     |  2 +-
 .../gabinete-digital.page.html                | 26 ++++++++++---------
 .../gabinete-digital/gabinete-digital.page.ts | 11 ++++----
 .../pedidos/pedido/pedido.page.html           |  2 +-
 .../approve-event/approve-event.page.html     |  2 +-
 .../agenda/event-list/event-list.page.ts      | 17 +++++-------
 .../all-processes/all-processes.page.ts       |  2 +-
 .../events-to-approve.page.ts                 | 10 +++----
 .../task-details/task-details.page.html       |  2 +-
 src/app/store/deplomas.service.ts             | 12 +++++++++
 src/app/store/despacho-store.service.ts       |  3 +++
 src/app/store/despachospr-store.service.ts    |  3 +++
 .../store/eventoaprovacao-store.service.ts    |  6 +++++
 src/app/store/expedientegd-store.service.ts   |  3 +++
 src/app/store/pedidos-store.service.ts        | 12 ++++++---
 src/app/store/pendestes-store.service.ts      |  3 +++
 .../presidential-actions-store.service.ts     |  3 +++
 src/app/store/to-day-event-storage.service.ts |  3 +++
 version/git-version.ts                        | 10 +++----
 30 files changed, 101 insertions(+), 65 deletions(-)

diff --git a/src/app/Rules/aprove-event.service.ts b/src/app/Rules/aprove-event.service.ts
index 9311edf6c..40e6f7de2 100644
--- a/src/app/Rules/aprove-event.service.ts
+++ b/src/app/Rules/aprove-event.service.ts
@@ -38,9 +38,8 @@ export class AproveEventService {
 
   async GetTasksListEventosPR() {
     try {
-      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-      let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-      let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+      let eventsPRList = prEventsOficial
       eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
   
       return eventsPRList;
diff --git a/src/app/modals/view-event/view-event.page.html b/src/app/modals/view-event/view-event.page.html
index 2c8945d3b..e53b7f520 100644
--- a/src/app/modals/view-event/view-event.page.html
+++ b/src/app/modals/view-event/view-event.page.html
@@ -86,7 +86,7 @@
           <div *ngIf="loadedEvent.Body.Text">
             <h5>Detalhes</h5>
             <ion-item lines="none" class="ion-no-margin ion-no-padding">
-              <div disabled class="width-100" [innerHTML]="loadedEvent.Body.Text" rows="6"></div>
+              <pre class="width-100 text">{{ loadedEvent.Body.Text }} </pre>
             </ion-item>
             <div class="line"></div>
           </div>
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 b8bbd202a..6b98b8450 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
@@ -57,7 +57,7 @@
           <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
             <h5>Detalhes</h5>
             <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+                <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
             </ion-item>
           </div>
         </div>
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 b4a49a6b2..44434b0a6 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -55,7 +55,7 @@
           <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
             <h5>Detalhes</h5>
             <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+                <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
             </ion-item>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
index 773282f43..175e404a9 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html
@@ -54,7 +54,7 @@
         <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
           <h5>Detalhes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
           </ion-item>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
index f2db050cc..b0e5484f0 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html
@@ -53,7 +53,7 @@
         <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
           <h5>Detalhes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+            <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
           </ion-item>
         </div>
       </div>
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 ed948f68f..30062f8df 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html
@@ -56,7 +56,7 @@
         <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
           <h5>Detalhes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+              <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
           </ion-item>
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
index 5b82fb495..31f2befd4 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html
@@ -83,7 +83,7 @@
     <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
     <h5>Detalhes</h5>
     <ion-item lines="none" class="ion-no-padding ion-no-margin">
-      <div [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></div>
+      <pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
     </ion-item>
   </div>
   <div class="line"></div>
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 a90f16d22..0b10b0992 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
@@ -85,7 +85,7 @@
             <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
               <h5>Detalhes</h5>
               <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                  <p [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+                <pre class="width-100 text">{{loadedEvent.workflowInstanceDataFields.Body }} </pre>
               </ion-item>
               <div class="line"></div>
             </div>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 8ace81ef5..21365a0f8 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -156,9 +156,8 @@ export class EventListPage implements OnInit {
 
       
       if (this.segment != 'PR') {
-        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-        this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+        this.eventsMDGPRList = mdEventsOficial
 
         this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
         this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
@@ -170,9 +169,9 @@ export class EventListPage implements OnInit {
         
       }
       else if (this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+
+        this.eventsPRList = prEventsOficial
         
         this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
         this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
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 fb1087d1b..72e94874d 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
@@ -51,7 +51,7 @@
           </div>
           <h5>Detalhes</h5>
           <ion-item class="ion-no-margin ion-no-padding">
-              <p [innerHTML]="task.Note"></p>
+              <pre class="width-100 text">{{ task.Note }} </pre>
           </ion-item>
         </div>
         <div class="bottom-content width-100">
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
index 1d2c86be3..98f198d7b 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html
@@ -59,7 +59,7 @@
           <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
             <h5>Detalhes</h5>
             <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+              <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
             </ion-item>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 172493ee9..6c977b307 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -193,6 +193,20 @@
                 <p class="text-center exp-card-content"> {{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
               </div>
 
+              
+              <!-- List -->
+              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
+                <div class="d-flex justify-center">
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
+                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
+                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
+                </div>
+                <p class="text-center exp-card-title">Diplomas para Assinar</p>
+                <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
+              </div>
+              
 
               <!-- List -->
               <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks, p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">
@@ -206,18 +220,6 @@
                 <p class="text-center exp-card-content"> {{ deplomasStore.countDiplomasAssinadoListCount }} <span class="title1">Documentos</span></p>
               </div>
 
-              <!-- List -->
-              <div *ngIf="p.userPermission([p.permissionList.Gabinete.pr_tasks])" (click)="openDiplomasAssinarPage(); selectedElement='DiplomasParaAssinar'" [class.active]="selectedElement == 'DiplomasParaAssinar'" class="box-hover exp-card d-flex flex-column justify-center">
-                <div class="d-flex justify-center">
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement != 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/gov/icons-expediente-diploma-hover.svg"></ion-icon>
-                  <ion-icon  *ngIf="ThemeService.currentTheme == 'doneIt' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma.svg"></ion-icon>
-                  <ion-icon hidden *ngIf="ThemeService.currentTheme == 'doneIt' && selectedElement == 'DiplomasParaAssinar' " src="assets/images/theme/{{ThemeService.currentTheme}}/icons-expediente-diploma-hover.svg"></ion-icon>
-                </div>
-                <p class="text-center exp-card-title">Diplomas para Assinar</p>
-                <p class="text-center exp-card-content"> {{ deplomasStore.diplomasParaAssinartCount }} <span class="title1">Documentos</span></p>
-              </div>
 
               <!-- List -->
               <div *ngIf="SessionStore.user.Profile == 'Consultant' && environment.presidencial"  (click)="openDiplomaPorElaborar('gerarDiplomas'); selectedElement='gerarDiplomas'" [class.active]="selectedElement == 'gerarDiplomas'" class="box-hover exp-card d-flex flex-column justify-center">
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index fb28b3647..70bea67d8 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -615,6 +615,7 @@ export class GabineteDigitalPage implements OnInit {
     if(window['all-process']) {
       window['all-process']()
     }
+
   }
 
   get getAllProcessCount() {
@@ -731,9 +732,8 @@ export class GabineteDigitalPage implements OnInit {
       this.updateAllProcess()
     }
 
-    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-    let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-    let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+    let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+    let eventsMDGPRList = mdEventsOficial
     
     eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
 
@@ -741,9 +741,8 @@ export class GabineteDigitalPage implements OnInit {
     this.eventoaprovacaostore.resetmd(eventsMDGPRList);
     this.updateAllProcess()
 
-    let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise();
-    let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise();
-    let eventsPRList = prEventsOficial.concat(prEventsPessoal);
+    let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+    let eventsPRList = prEventsOficial
     eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
 
     this.eventoaprovacaostore.countPr = eventsPRList.length
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 a7f0c7ddf..f2fb679b9 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -57,7 +57,7 @@
           <div *ngIf="task.Note">
             <h5>Detalhes</h5>
             <ion-item class="ion-no-margin ion-no-padding">
-                <p [innerHTML]="task.Note"></p>
+                <pre class="width-100 text">{{ task.Note }} </pre>
             </ion-item>
           </div>
         </div>
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/shared/agenda/approve-event/approve-event.page.html
index a1d40cc9c..66fbb19d6 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -92,7 +92,7 @@
             <div *ngIf="loadedEvent.workflowInstanceDataFields.Body">
               <h5>Detalhes</h5>
               <ion-item lines="none" class="ion-no-margin ion-no-padding">
-                  <p class="text" [innerHTML]="loadedEvent.workflowInstanceDataFields.Body"></p>
+                  <pre class="width-100 text">{{ loadedEvent.workflowInstanceDataFields.Body }} </pre>
               </ion-item>
               <div class="line"></div>
             </div>
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 440f8d888..2e5b06e99 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -88,9 +88,8 @@ export class EventListPage implements OnInit {
         this.showLoader = false;
       }
       else if(this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        let allEvents = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+        let allEvents = prEventsOficial
         
         if(allEvents.length > 0) {
           this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
@@ -115,19 +114,17 @@ export class EventListPage implements OnInit {
     
     try {
       if(this.segment == 'MDGPR') {
-        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-        let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-  
-        let allEvents = mdEventsOficial.concat(mdEventsPessoal);
+        let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+
+        let allEvents = mdEventsOficial
         if(allEvents.length > 0) {
           this.eventsMDGPRList = this.sortService.sortArrayByDate(allEvents).reverse();
         }
         this.showLoader = false;
       }
       else if(this.segment == 'PR') {
-        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-        let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
-        let allEvents = prEventsOficial.concat(prEventsPessoal);
+        let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
+        let allEvents = prEventsOficial
         
         if(allEvents.length > 0) {
           this.eventsPRList = this.sortService.sortArrayByDate(allEvents).reverse();
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 764e5b04c..a26b1fd2f 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
@@ -157,7 +157,7 @@ export class AllProcessesPage implements OnInit {
       else if (activityName == 'Diploma Assinado') {
         this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
       } else {
-        alert('Bug!');
+        throw('Bug!');
       }
     }
     else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index 4b9b3272e..c49eb4b39 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -71,9 +71,8 @@ export class EventsToApprovePage implements OnInit {
     
     this.getFromDB();
     if(this.segment != 'PR') {
-      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
-      let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
-      this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+      let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
+      this.eventsMDGPRList = mdEventsOficial
       this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
       this.eventsMDGPRList = ( this.eventsMDGPRList || []).filter(function(item) {
         return item.activityInstanceName != 'Editar Evento'
@@ -86,11 +85,10 @@ export class EventsToApprovePage implements OnInit {
       this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
     }
     else if(this.segment == 'PR') {
-      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
-      let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
+      let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
       // console.log(prEventsOficial)
       // console.log(prEventsPessoal)
-      this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+      this.eventsPRList = prEventsOficial
       this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
       this.eventsPRList = (this.eventsPRList || []).filter(function(item) {
         return item.activityInstanceName != 'Editar Evento'
diff --git a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
index 6b49a086f..c4688824a 100644
--- a/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
+++ b/src/app/shared/gabinete-digital/generic/task-details/task-details.page.html
@@ -49,7 +49,7 @@
       <div *ngIf="fulltask.workflowInstanceDataFields.TaskMessage">
         <h5>Detalhes</h5>
         <ion-item class="ion-no-margin ion-no-padding">
-            <p [innerHTML]="fulltask.workflowInstanceDataFields.TaskMessage"></p>
+          <pre class="width-100 text">{{ fulltask.workflowInstanceDataFields.TaskMessage }} </pre>
         </ion-item>
       </div>
     </div>
diff --git a/src/app/store/deplomas.service.ts b/src/app/store/deplomas.service.ts
index 02fe1c309..b14581d85 100644
--- a/src/app/store/deplomas.service.ts
+++ b/src/app/store/deplomas.service.ts
@@ -108,6 +108,9 @@ export class DeplomasService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   resetDiplomasParaAssinar(value: any[]) {
@@ -119,6 +122,9 @@ export class DeplomasService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   resetDiplomasReview(value: any[]) {
@@ -129,6 +135,9 @@ export class DeplomasService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   resetDiplomaGerar(value: any[]) {
@@ -140,6 +149,9 @@ export class DeplomasService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
 
diff --git a/src/app/store/despacho-store.service.ts b/src/app/store/despacho-store.service.ts
index 4d1bca69e..36038eb1e 100644
--- a/src/app/store/despacho-store.service.ts
+++ b/src/app/store/despacho-store.service.ts
@@ -113,6 +113,9 @@ export class DespachoStoreService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private save = ({dynamicCount = false})=> {
diff --git a/src/app/store/despachospr-store.service.ts b/src/app/store/despachospr-store.service.ts
index f2887242e..dd76d51d0 100644
--- a/src/app/store/despachospr-store.service.ts
+++ b/src/app/store/despachospr-store.service.ts
@@ -42,6 +42,9 @@ reset(eventsList: any) {
   if(window['all-process']) {
     window['all-process']()
   }
+  if(window['all-process-gabinete']) {
+    window['all-process-gabinete']()
+  }
 }
 
 private save() {
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index 4ad195930..d6d5ce341 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -67,6 +67,9 @@ export class EventoaprovacaoStoreService {
       if(window['all-process']) {
         window['all-process']()
       }
+      if(window['all-process-gabinete']) {
+        window['all-process-gabinete']()
+      }
     }
     
   }
@@ -83,6 +86,9 @@ export class EventoaprovacaoStoreService {
       if(window['all-process']) {
         window['all-process']()
       }
+      if(window['all-process-gabinete']) {
+        window['all-process-gabinete']()
+      }
     }
   }
 
diff --git a/src/app/store/expedientegd-store.service.ts b/src/app/store/expedientegd-store.service.ts
index 4f56f4810..66b580228 100644
--- a/src/app/store/expedientegd-store.service.ts
+++ b/src/app/store/expedientegd-store.service.ts
@@ -40,6 +40,9 @@ export class ExpedientegdStoreService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private save() {
diff --git a/src/app/store/pedidos-store.service.ts b/src/app/store/pedidos-store.service.ts
index 3a1d01c03..13f5abcad 100644
--- a/src/app/store/pedidos-store.service.ts
+++ b/src/app/store/pedidos-store.service.ts
@@ -65,6 +65,9 @@ export class PedidosStoreService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
  
   resetdeferimento(list: any) {
@@ -72,9 +75,12 @@ export class PedidosStoreService {
  
    this.countdeferimento =this._listDeferimento.length
    this.saveParecer()
-   if(window['all-process']) {
-    window['all-process']()
-  }
+    if(window['all-process']) {
+      window['all-process']()
+    }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private saveParecer() {
diff --git a/src/app/store/pendestes-store.service.ts b/src/app/store/pendestes-store.service.ts
index cf05d495c..7863633f6 100644
--- a/src/app/store/pendestes-store.service.ts
+++ b/src/app/store/pendestes-store.service.ts
@@ -45,6 +45,9 @@ export class PendestesStoreService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private save() {
diff --git a/src/app/store/presidential-actions-store.service.ts b/src/app/store/presidential-actions-store.service.ts
index 4301ed5d6..6132fe909 100644
--- a/src/app/store/presidential-actions-store.service.ts
+++ b/src/app/store/presidential-actions-store.service.ts
@@ -35,6 +35,9 @@ export class PresidentialActionsStoreService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private save(list: Publication[]) {
diff --git a/src/app/store/to-day-event-storage.service.ts b/src/app/store/to-day-event-storage.service.ts
index 692884833..8c21af6d6 100644
--- a/src/app/store/to-day-event-storage.service.ts
+++ b/src/app/store/to-day-event-storage.service.ts
@@ -41,6 +41,9 @@ export class ToDayEventStorageService {
     if(window['all-process']) {
       window['all-process']()
     }
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   private save() {
diff --git a/version/git-version.ts b/version/git-version.ts
index 4353db687..c1c762fe5 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "d285f8b31",
-  "SHA": "d285f8b314e19c836e63898bb8f9944619b7f9b1",
+  "shortSHA": "2907c0d12",
+  "SHA": "2907c0d12323f8571a68eac0dc7505b3872ecd4b",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 16:46:21 2023 +0100'",
+  "lastCommitTime": "'Mon Feb 13 16:50:00 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "4770",
+  "lastCommitNumber": "4771",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/store/deplomas.service.ts",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/Rules/aprove-event.service.ts\n\tmodified:   src/app/modals/view-event/view-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\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.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\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/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/store/deplomas.service.ts\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/eventoaprovacao-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts\n\tmodified:   src/app/store/pedidos-store.service.ts\n\tmodified:   src/app/store/pendestes-store.service.ts\n\tmodified:   src/app/store/presidential-actions-store.service.ts\n\tmodified:   src/app/store/to-day-event-storage.service.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From 1f5abcaa7a5e9a759596ea52975412f708d6394a Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 18:23:20 +0100
Subject: [PATCH 5/6] fix agenda

---
 src/app/pages/agenda/edit-event/edit-event.page.html |  1 -
 src/app/pages/agenda/new-event/new-event.page.ts     |  1 +
 .../publications/edit-action/edit-action.page.html   |  1 -
 .../edit-event-to-approve.page.html                  |  1 -
 .../shared/agenda/edit-event/edit-event.page.html    |  1 -
 src/app/shared/agenda/new-event/new-event.page.html  |  1 -
 .../edit-event-to-approve/edit-event.page.html       |  2 --
 .../publication/edit-action/edit-action.page.html    |  1 -
 version/git-version.ts                               | 12 ++++++------
 9 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 9aa9dc4b6..b78db52cd 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -134,7 +134,6 @@
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
                     [(ngModel)]="postEvent.StartDate"
-                    [min]="currentDate"
                     [max]="maxDate"
                     [disabled]="disabled"
                   >
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 7c59d1f29..f20ea370e 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -87,6 +87,7 @@ export class NewEventPage implements OnInit {
   autoEndTime;
   CalendarNamesOptions = ['Oficial', 'Pessoal']
   roomId:string;
+  globalEnd = new Date('1999')
 
   constructor(
     private modalController: ModalController,
diff --git a/src/app/pages/publications/edit-action/edit-action.page.html b/src/app/pages/publications/edit-action/edit-action.page.html
index 2933fc864..ce5c80a40 100644
--- a/src/app/pages/publications/edit-action/edit-action.page.html
+++ b/src/app/pages/publications/edit-action/edit-action.page.html
@@ -37,7 +37,6 @@
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Choose a date*"
               [formControl]="folder.DateBegin"
-              [min]="minDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
index 9ef231ee2..31aa914c6 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html
@@ -158,7 +158,6 @@
                   <input matInput [ngxMatDatetimePicker]="picker1"
                     placeholder="Choose a date"
                     [(ngModel)]="eventProcess.workflowInstanceDataFields.StartDate"
-                    [min]="minDate" [max]="maxDate"
                     [disabled]="disabled"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/shared/agenda/edit-event/edit-event.page.html
index 28eb86268..aa3eda5fc 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.html
+++ b/src/app/shared/agenda/edit-event/edit-event.page.html
@@ -119,7 +119,6 @@
               [(ngModel)]="postEvent.StartDate"
               [max]="maxDate"
               [disabled]="disabled"
-              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 21c47292c..84e5ccbab 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -136,7 +136,6 @@
               placeholder="Data Inicio*"
               [(ngModel)]="postEvent.StartDate"
               [disabled]="disabled"
-              [min]="currentDate"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1" ></mat-datepicker-toggle>
             <ngx-mat-datetime-picker #picker1              
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index 39d3d3d43..cd22a5879 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -113,7 +113,6 @@
                     placeholder="Choose a date"
                     [(ngModel)]="startDate"
                     [disabled]="disabled"
-                    [min]="currentDate"
                   >
                   <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #picker1
@@ -141,7 +140,6 @@
                     placeholder="Choose a date"
                     [(ngModel)]="endDate"
                     [disabled]="disabled"
-                    [min]="currentDate"
                   >
                   <mat-datepicker-toggle id="new-fim" matSuffix [for]="fim"></mat-datepicker-toggle>
                   <ngx-mat-datetime-picker #fim
diff --git a/src/app/shared/publication/edit-action/edit-action.page.html b/src/app/shared/publication/edit-action/edit-action.page.html
index 8223373e4..d79b24285 100644
--- a/src/app/shared/publication/edit-action/edit-action.page.html
+++ b/src/app/shared/publication/edit-action/edit-action.page.html
@@ -37,7 +37,6 @@
             <input matInput [ngxMatDatetimePicker]="picker1"
               placeholder="Choose a date*"
               [(ngModel)]="folder.DateBegin"
-              [min]="currentDate"
               [disabled]="disabled"
             >
             <mat-datepicker-toggle id="new-inicio" matSuffix [for]="picker1"></mat-datepicker-toggle>
diff --git a/version/git-version.ts b/version/git-version.ts
index c1c762fe5..55b530f86 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "2907c0d12",
-  "SHA": "2907c0d12323f8571a68eac0dc7505b3872ecd4b",
+  "shortSHA": "44dddff12",
+  "SHA": "44dddff12453e7f9e43677a42999900a7437e3f6",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 16:50:00 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "4771",
+  "lastCommitTime": "'Mon Feb 13 17:51:36 2023 +0100'",
+  "lastCommitMessage": "add break line to tet",
+  "lastCommitNumber": "4772",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/Rules/aprove-event.service.ts\n\tmodified:   src/app/modals/view-event/view-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.html\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.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html\n\tmodified:   src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html\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/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified:   src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified:   src/app/store/deplomas.service.ts\n\tmodified:   src/app/store/despacho-store.service.ts\n\tmodified:   src/app/store/despachospr-store.service.ts\n\tmodified:   src/app/store/eventoaprovacao-store.service.ts\n\tmodified:   src/app/store/expedientegd-store.service.ts\n\tmodified:   src/app/store/pedidos-store.service.ts\n\tmodified:   src/app/store/pendestes-store.service.ts\n\tmodified:   src/app/store/presidential-actions-store.service.ts\n\tmodified:   src/app/store/to-day-event-storage.service.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/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file

From b84161765eb39c499d9b5cad1a20c48d22abd1c5 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 13 Feb 2023 18:50:31 +0100
Subject: [PATCH 6/6] set default time

---
 .../document-set-up-meeting.page.ts              |  9 ++++++++-
 .../pages/agenda/edit-event/edit-event.page.ts   |  9 +++++++--
 src/app/pages/agenda/new-event/new-event.page.ts |  9 +++++++--
 .../book-meeting-modal.page.ts                   | 16 +++++++++++++---
 .../publications/new-action/new-action.page.ts   |  9 ++++++++-
 .../shared/agenda/edit-event/edit-event.page.ts  |  8 +++++++-
 .../shared/agenda/new-event/new-event.page.ts    |  9 ++++++++-
 .../publication/new-action/new-action.page.ts    |  9 ++++++++-
 version/git-version.ts                           | 12 ++++++------
 9 files changed, 72 insertions(+), 18 deletions(-)

diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
index f5b0e38f2..d37a9b6ea 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts
@@ -164,7 +164,7 @@ export class DocumentSetUpMeetingPage implements OnInit {
 
   setEndDate() {
     if(!this.postData.EndDate) {
-      this.postData.EndDate = this.postData.StartDate;
+      this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
     }
   }
 
@@ -463,6 +463,13 @@ export class DocumentSetUpMeetingPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
   checkRoleInArray(str) {
     return this._eventService.calendarRole.includes(str);
   }
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts
index e62cd8684..e30588840 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.ts
+++ b/src/app/pages/agenda/edit-event/edit-event.page.ts
@@ -62,13 +62,11 @@ export class EditEventPage implements OnInit {
   public showSeconds = false;
   public touchUi = false;
   public enableMeridian = false;
-  public minDate = new Date().toISOString().slice(0,10)
   public endMinDate = new Date(new Date().getTime() + 15 * 60000).toISOString().slice(0,10)
   public maxDate: any;
   public stepHour = 1;
   public stepMinute = 15;
   public stepSecond = 15;
-  currentDate = this.roundTimeQuarterHour();
 
   loadedEventAttachments: Attachment[] = [];
   taskParticipants: any = [];
@@ -193,6 +191,13 @@ export class EditEventPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
   onSelectedRecurringChanged(ev?:any) {
 
     this.calculetedLastOccurrence(ev);
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 f20ea370e..804edb193 100644
--- a/src/app/pages/agenda/new-event/new-event.page.ts
+++ b/src/app/pages/agenda/new-event/new-event.page.ts
@@ -51,7 +51,6 @@ export class NewEventPage implements OnInit {
   public stepMinute = 15;
   public stepSecond = 15;
   public color: ThemePalette = 'primary';
-  currentDate = this.roundTimeQuarterHour();
 
   Form: FormGroup;
   validateFrom = false
@@ -190,7 +189,7 @@ export class NewEventPage implements OnInit {
 
   setDefaultTime() {
     this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
   }
 
   close() {
@@ -219,6 +218,12 @@ export class NewEventPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
   setStartDate() {
     if(!this.postEvent.StartDate) { 
       this.postEvent.StartDate = this.roundTimeQuarterHour();
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
index 5b47f7d17..907e76b46 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
@@ -135,8 +135,9 @@ export class BookMeetingModalPage implements OnInit {
       this.postData.Subject = this.task.Folio;
       this.postData.CalendarName = "Oficial";
 
-     this.dateControlStart = new FormControl(moment(this.roundTimeQuarterHour()));
-     this.dateControlEnd = new FormControl(moment(new Date(this.roundTimeQuarterHour())));
+      let startDate = this.roundTimeQuarterHour()
+     this.dateControlStart = new FormControl(moment(startDate));
+     this.dateControlEnd = new FormControl(moment(this.roundTimeQuarterHourPlus15(startDate)));
 
      this.postData.Category = 'Reunião'
 
@@ -200,7 +201,7 @@ export class BookMeetingModalPage implements OnInit {
   
   setDefaultTime() {
     this.postData.StartDate =  this.roundTimeQuarterHour();
-    this.postData.EndDate = (new Date(this.postData.StartDate.getTime() + 15 * 60000))
+    this.postData.EndDate = this.roundTimeQuarterHourPlus15(this.postData.StartDate);
   }
 
   getAttachments() {
@@ -520,6 +521,15 @@ export class BookMeetingModalPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
+  
+
   setStartDate() {
     this.postData.StartDate = this.roundTimeQuarterHour();
   }
diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts
index 07555701b..575f1121d 100644
--- a/src/app/pages/publications/new-action/new-action.page.ts
+++ b/src/app/pages/publications/new-action/new-action.page.ts
@@ -73,7 +73,7 @@ export class NewActionPage implements OnInit {
     this.folder = new PublicationFolder();
 
     this.dateControlStart = new FormControl(this.roundTimeQuarterHour());
-    this.dateControlEnd = new FormControl(this.dateControlStart.value);
+    this.dateControlEnd = new FormControl(this.roundTimeQuarterHourPlus15(this.dateControlStart.value));
 
 
   }
@@ -177,4 +177,11 @@ export class NewActionPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
 }
diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts
index 759750e44..81a806fc8 100644
--- a/src/app/shared/agenda/edit-event/edit-event.page.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.page.ts
@@ -48,7 +48,6 @@ export class EditEventPage implements OnInit {
   public stepHour = 1;
   public stepMinute = 15;
   public stepSecond = 15;
-  currentDate = this.roundTimeQuarterHour();
 
   Form: FormGroup;
   validateFrom = false
@@ -238,6 +237,13 @@ export class EditEventPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
   onSelectedRecurringChanged(ev:any){
 
     this.calculetedLastOccurrence(ev);
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts
index d5f6d6104..79770cd98 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -227,7 +227,7 @@ export class NewEventPage implements OnInit {
 
   setDefaultTime() {
     this.postEvent.StartDate = this.roundTimeQuarterHour(this.CalendarDate);
-    this.postEvent.EndDate = this.postEvent.StartDate;
+    this.postEvent.EndDate = this.roundTimeQuarterHourPlus15(this.postEvent.StartDate);
   }
 
   roundTimeQuarterHour(timeToReturn = new Date()): Date {
@@ -254,6 +254,13 @@ export class NewEventPage implements OnInit {
     return date
   }
 
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
+
 
   roundTimeQuarterHour1 (timeToReturn) {
     let date: any = new Date(timeToReturn) || new Date();
diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts
index 87683b872..c52d4fb31 100644
--- a/src/app/shared/publication/new-action/new-action.page.ts
+++ b/src/app/shared/publication/new-action/new-action.page.ts
@@ -185,6 +185,13 @@ export class NewActionPage implements OnInit {
 
     return date
   }
+
+  roundTimeQuarterHourPlus15(date:Date) {
+    const _date = new Date(date);
+    const minutes = _date .getMinutes();
+    _date .setMinutes(minutes + 15)
+    return _date 
+  }
   
 
   setStartDate() {
@@ -192,6 +199,6 @@ export class NewActionPage implements OnInit {
   }
 
   setEndDate() {
-    this.folder.DateEnd = this.folder.DateBegin;
+    this.folder.DateEnd = this.roundTimeQuarterHourPlus15(this.folder.DateBegin);
   }
 }
diff --git a/version/git-version.ts b/version/git-version.ts
index 55b530f86..62873964d 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "44dddff12",
-  "SHA": "44dddff12453e7f9e43677a42999900a7437e3f6",
+  "shortSHA": "1f5abcaa7",
+  "SHA": "1f5abcaa7a5e9a759596ea52975412f708d6394a",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Feb 13 17:51:36 2023 +0100'",
-  "lastCommitMessage": "add break line to tet",
-  "lastCommitNumber": "4772",
+  "lastCommitTime": "'Mon Feb 13 18:23:20 2023 +0100'",
+  "lastCommitMessage": "fix agenda",
+  "lastCommitNumber": "4773",
   "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/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/publications/edit-action/edit-action.page.html\n\tmodified:   src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/app/shared/publication/edit-action/edit-action.page.html",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/publications/new-action/new-action.page.ts\n\tmodified:   src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/publication/new-action/new-action.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file