From c0fea28eee679948b13ed812b6c0bafb233edf5d Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 14 Jul 2021 16:12:04 +0100
Subject: [PATCH 1/2] Fix skeleton loader

---
 .../despachos-pr/despachos-pr.page.html       |  2 +-
 .../despachos-pr/despachos-pr.page.ts         | 15 +--
 .../despachos/despachos.page.html             |  3 +-
 .../despachos/despachos.page.ts               |  5 +
 .../diplomas-assinar.page.html                |  2 +-
 .../diplomas-assinar/diplomas-assinar.page.ts | 94 ++++++++++---------
 .../diplomas/diplomas.page.html               |  2 +-
 .../diplomas/diplomas.page.ts                 |  5 +
 .../expediente/expediente.page.html           |  2 +-
 .../expediente/expediente.page.ts             |  7 +-
 .../expedientes-pr/expedientes-pr.page.html   |  2 +-
 .../expedientes-pr/expedientes-pr.page.ts     |  7 +-
 .../pedidos/pedidos.page.html                 |  2 +-
 .../gabinete-digital/pedidos/pedidos.page.ts  |  9 +-
 .../pendentes/pendentes.page.html             |  2 +-
 .../pendentes/pendentes.page.ts               |  7 +-
 .../despachos-pr/despachos-pr.page.html       |  2 +-
 .../despachos-pr/despachos-pr.page.ts         |  6 +-
 .../despachos/despachos.page.html             |  2 +-
 .../despachos/despachos.page.ts               |  6 +-
 .../diplomas-assinar.page.html                |  2 +-
 .../diplomas-assinar/diplomas-assinar.page.ts |  4 +
 .../diplomas/diplomas.page.html               |  2 +-
 .../diplomas/diplomas.page.ts                 |  8 +-
 .../expedientes-pr/expedientes-pr.page.html   |  2 +-
 .../expedientes-pr/expedientes-pr.page.ts     |  8 +-
 .../expedients/expedients.page.html           |  2 +-
 .../expedients/expedients.page.ts             |  8 +-
 .../pedidos/pedidos.page.html                 |  2 +-
 .../gabinete-digital/pedidos/pedidos.page.ts  |  7 ++
 .../pendentes/pendentes.page.html             |  2 +-
 .../pendentes/pendentes.page.ts               |  6 +-
 32 files changed, 146 insertions(+), 89 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
index 706867ea8..0a8e4d9c0 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -65,7 +65,7 @@
   
       </div>
     </div>
-  <div *ngIf="loading">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
index 679fcd1ce..01b1eba50 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -16,6 +16,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { User } from 'src/app/models/user.model';
 import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
+import { __awaiter } from 'tslib';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -38,7 +39,6 @@ export class DespachosPrPage implements OnInit {
 
   profile:string;
   segment:string;
-  loading = false
 
   // @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
@@ -47,6 +47,7 @@ export class DespachosPrPage implements OnInit {
   inicial = false
 
   loggeduser: User;
+  skeletonLoader = true
 
   constructor (
     private processes:ProcessesService,
@@ -100,20 +101,22 @@ export class DespachosPrPage implements OnInit {
   async LoadList() {
 
     this.despachoList = new Array();
-
-    this.loading = true;
+    this.skeletonLoader = true
 
     let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
     let despachosPr;
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
-        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
+        despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho");
         break;
       case 'PR':
-        despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
+        despachosPr = await result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho");
         break;
     }
+
+    this.skeletonLoader = false
+    
     despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
     console.log(despachosPr);
 
@@ -141,8 +144,6 @@ export class DespachosPrPage implements OnInit {
     });
     console.log(this.despachoList);
 
-    this.loading = false;
-
    }
 
     sortArrayISODate(myArray: any) {
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index e280ad930..668ce96fd 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -65,7 +65,8 @@
 
       </div>
     </div>
-    <div *ngIf="despachoList?.length < 1">
+
+    <div *ngIf="skeletonLoader">
     
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
index 1bd78b36f..e7aeecbbe 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts
@@ -44,6 +44,7 @@ export class DespachosPage implements OnInit {
   loadedAttachments:any;
   dicIndex = 0;
   inicial = false
+  skeletonLoader = true
 
   constructor (
     private processes:ProcessesService,
@@ -83,10 +84,14 @@ export class DespachosPage implements OnInit {
 
   async LoadList() {
 
+    this.skeletonLoader = true
+
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
 
+    this.skeletonLoader = false
+
     await result.forEach( (element, index) => {
 
       let date = new Date(element.taskStartDate);
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index 119aa88b7..ce7ab7e18 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -64,7 +64,7 @@
         </ion-list>
       </div>
     </div>
-    <div *ngIf="!diplomasList">
+    <div *ngIf="skeletonLoader">
 
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index 0038ecf2b..fbb558eb1 100644
--- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -22,6 +22,8 @@ export class DiplomasAssinarPage implements OnInit {
  @Input() profile:string;
  @Input() segment:string;
 
+ skeletonLoader = true
+
  constructor(
    private processes:ProcessesService,
    private modalController: ModalController,
@@ -61,52 +63,54 @@ export class DiplomasAssinarPage implements OnInit {
    }, 2000);
  }
 
- async LoadList(){
+  async LoadList(){
 
-   let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-   this.diplomasList = new Array();
-       let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
-       console.log(diplomasAssinar);
-       diplomasAssinar.forEach(element => {
-         let DocId = element.workflowInstanceDataFields.FolderID;
-         let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-         this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-           this.totalDocs = res.DocumentsTotal;
-           console.log(res.DocumentsTotal);
-           let task = {
-             "SerialNumber": element.serialNumber,
-             "Folio": element.workflowInstanceDataFields.Subject,
-             "Senders": element.workflowInstanceDataFields.Sender,
-             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-             "Remetente": element.workflowInstanceDataFields.Remetente,
-             "DocumentsQty": element.totalDocuments,
-             "DocId": element.workflowInstanceDataFields.DocId,
-             "WorkflowName": element.workflowDisplayName,
-             "activityInstanceName": element.activityInstanceName,
-             "Status": element.workflowInstanceDataFields.Status,
-           }
-           this.diplomasList.push(task);
-         },
-         (error)=>{
-           let task = {
-             "SerialNumber": element.serialNumber,
-             "Folio": element.workflowInstanceDataFields.Subject,
-             "Senders": element.workflowInstanceDataFields.Sender,
-             "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
-             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-             "Remetente": element.workflowInstanceDataFields.Remetente,
-             "DocumentsQty": element.totalDocuments,
-             "DocId": element.workflowInstanceDataFields.DocId,
-             "WorkflowName": element.workflowDisplayName,
-             "activityInstanceName": element.activityInstanceName,
-             "Status": element.workflowInstanceDataFields.Status,
-           }
-           this.diplomasList.push(task);
-         });
-     });
-   this.showLoader = false;
- }
+    this.skeletonLoader = true
+
+    let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+    this.diplomasList = new Array();
+        let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
+        console.log(diplomasAssinar);
+        diplomasAssinar.forEach(element => {
+          let DocId = element.workflowInstanceDataFields.FolderID;
+          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
+            this.totalDocs = res.DocumentsTotal;
+            console.log(res.DocumentsTotal);
+            let task = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.workflowInstanceDataFields.Sender,
+              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
+              "DocumentsQty": element.totalDocuments,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+              "Status": element.workflowInstanceDataFields.Status,
+            }
+            this.diplomasList.push(task);
+          },
+          (error)=>{
+            let task = {
+              "SerialNumber": element.serialNumber,
+              "Folio": element.workflowInstanceDataFields.Subject,
+              "Senders": element.workflowInstanceDataFields.Sender,
+              "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+              "Remetente": element.workflowInstanceDataFields.Remetente,
+              "DocumentsQty": element.totalDocuments,
+              "DocId": element.workflowInstanceDataFields.DocId,
+              "WorkflowName": element.workflowDisplayName,
+              "activityInstanceName": element.activityInstanceName,
+              "Status": element.workflowInstanceDataFields.Status,
+            }
+            this.diplomasList.push(task);
+          });
+      });
+    this.showLoader = false;
+  }
 
   goBack() {
     this.router.navigate(['/home/gabinete-digital']);
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
index 2b2d25d5d..c1228ca86 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.html
@@ -94,7 +94,7 @@
         </ion-list>
       </div>
     </div>
-    <div *ngIf="!diplomasList">
+    <div *ngIf="skeletonLoader">
     
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index 27dceeb75..adfa661bb 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -19,6 +19,8 @@ serialNumber:string;
 
 segment:string;
 
+skeletonLoader = true
+
 constructor(
   private processes:ProcessesService,
   private router: Router,
@@ -144,9 +146,12 @@ constructor(
   async LoadList(){
     this.diplomasList = [];
     console.log(this.diplomasList);
+    this.skeletonLoader = true
 
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
+    this.skeletonLoader = false
+
     switch (this.segment) {
       case 'validar':
         let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html
index abb682931..7346232a2 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html
@@ -53,7 +53,7 @@
           </div>
     </ion-list>
   </div>
-  <div *ngIf="!taskslist">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
index 0500dd210..e1a5bc84e 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts
@@ -13,7 +13,7 @@ import { AlertService } from 'src/app/services/alert.service';
 export class ExpedientePage implements OnInit {
 
   segment:string;
-  showLoader: boolean;
+  skeletonLoader = true
   //profile:string;
 
   taskslist:DailyWorkTask[];
@@ -37,7 +37,8 @@ export class ExpedientePage implements OnInit {
   }
 
   LoadList(){
-    this.showLoader = true;
+    this.skeletonLoader = true
+
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       console.log(result);
       this.taskslist = new Array();
@@ -61,7 +62,7 @@ export class ExpedientePage implements OnInit {
         this.taskslist.push(task);
       });
       console.log(this.taskslist);
-      this.showLoader = false;
+      this.skeletonLoader = false;
     });
   }
 
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 2c0bca6ff..075333338 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -52,7 +52,7 @@
             </ion-item>
       </ion-list>
     </div>
-    <div *ngIf="!taskslist">
+    <div *ngIf="skeletonLoader">
     
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index 27e3597ea..611d72250 100644
--- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -28,6 +28,8 @@ export class ExpedientesPrPage implements OnInit {
   loggeduser: User;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
 
+  skeletonLoader = true
+
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
@@ -50,7 +52,8 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   LoadList(){
-    this.showLoader = true;
+    this.skeletonLoader = true
+
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
@@ -76,7 +79,7 @@ export class ExpedientesPrPage implements OnInit {
               this.taskslist.push(task);
             });
           console.log(this.taskslist);
-          this.showLoader = false;
+          this.skeletonLoader = false
         });
 
         break;
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index 586f92eed..08503b149 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -106,7 +106,7 @@
         </ion-list>
       </div>
     </div>
-    <div *ngIf="!parecerList && !deferimentoList">
+    <div *ngIf="skeletonLoader">
     
       <ion-list>
         <ion-item>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
index 2f393391c..62ab5762a 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts
@@ -31,6 +31,7 @@ export class PedidosPage implements OnInit {
  deferimentoList:any[];
  taskType: string;
  serialNumber:string;
+ skeletonLoader = true
 
  @Input() segment:string;
  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -95,12 +96,16 @@ export class PedidosPage implements OnInit {
   }
 
   async LoadList(){
+    this.skeletonLoader = true
+
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
 
       let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
       let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
+      this.skeletonLoader = false
+
       let allParecer = parecer.concat(parecerPr).reverse();
       this.parecerList = new Array();
 
@@ -128,8 +133,9 @@ export class PedidosPage implements OnInit {
     }
     else if(this.segment == 'deferimento') {
       this.taskType = "Pedido de Deferimento";
-      this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
+      await this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;
+        this.skeletonLoader = false
 
         console.log(result);
 
@@ -157,6 +163,7 @@ export class PedidosPage implements OnInit {
 
       });
     }
+
   }
 
   refreshing() {
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
index cef57a2b4..dacd52b14 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.html
@@ -65,7 +65,7 @@
 
       </div>
     </div>
-    <div *ngIf="pendentesList.length < 1">
+    <div *ngIf="skeletonLoader">
       <ion-list>
         <ion-item>
           <ion-thumbnail slot="end">
diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
index bdabd051d..cc0c8ce02 100644
--- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts
@@ -24,6 +24,7 @@ export class PendentesPage implements OnInit {
 
   @Input() profile:string;
   segment:string;
+  skeletonLoader = true
 
   constructor(
     private processes:ProcessesService,
@@ -60,7 +61,8 @@ export class PendentesPage implements OnInit {
   }
 
   async LoadList(){
-    this.showLoader = true;
+    
+    this.skeletonLoader = true
     this.pendentesList = new Array();
     let pendentes = await this.processes.GetPendingTasks(false).toPromise();
 
@@ -87,7 +89,8 @@ export class PendentesPage implements OnInit {
         this.pendentesList = this.sortArrayISODate(this.pendentesList);
 
     });
-    this.showLoader = false;
+    this.skeletonLoader = false;
+    
   }
 
   sortArrayISODate(myArray: any){
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index 4108d80ed..cf5a8c9b4 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -57,7 +57,7 @@
             </ion-item>
       </ion-list>
   </div>
-  <div *ngIf="despachoList?.length < 1" class="overflow-y-auto height-100">
+  <div *ngIf="skeletonLoader" class="overflow-y-auto height-100">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
index f81521de8..39498fa8d 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts
@@ -37,7 +37,7 @@ taskList:tasksList[] = [];
 taskType: string;
 serialNumber:string;
 totalDocs:any;
-loading = false
+skeletonLoader = true
 
 @Input() profile:string;
 segment:string;
@@ -99,7 +99,7 @@ goToDespachoPr(serialNumber:any){
 
   this.despachoList = new Array();
 
-  this.loading = true;
+  this.skeletonLoader = true;
 
   let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
   console.log(result);
@@ -143,7 +143,7 @@ goToDespachoPr(serialNumber:any){
 
   this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
 
-  this.loading = false;
+  this.skeletonLoader = false;
 
  }
 
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html
index a87c2957e..4b89cdbb5 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html
@@ -53,7 +53,7 @@
             </ion-item>
       </ion-list>
   </div>
-  <div *ngIf="despachoList.length < 1">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
index aa58991ee..877396f86 100644
--- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts
+++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts
@@ -43,6 +43,7 @@ export class DespachosPage implements OnInit {
  loadedAttachments:any;
  dicIndex = 0;
  inicial = false
+ skeletonLoader = true
 
  constructor (
    private processes:ProcessesService,
@@ -93,6 +94,8 @@ export class DespachosPage implements OnInit {
 
   async LoadList(){
 
+    this.skeletonLoader = true
+
     let result = await this.processes.GetTasksList("Despacho", false).toPromise();
     //let despachos = result.reverse().filter(data => data.activityInstanceName == "Despacho (Paralelo)");
     this.despachoList = new Array();
@@ -123,7 +126,8 @@ export class DespachosPage implements OnInit {
     });
 
     this.despachoList = this.sortArrayISODate(this.despachoList).reverse();
-
+    this.skeletonLoader = false
+    
   }
 
   sortArrayISODate(myArray: any){
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
index c2bc707aa..db4115473 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html
@@ -55,7 +55,7 @@
       </ion-list>
     </div>
   </div>
-  <div *ngIf="!diplomasList">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
index e11c80beb..73bb4e2d3 100644
--- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts
@@ -18,6 +18,7 @@ diplomasList:DailyWorkTask[] = [];
 showLoader: boolean;
 totalDocs:any;
 serialNumber:string;
+skeletonLoader = true
 
 @Input() profile:string;
 @Input() segment:string;
@@ -59,8 +60,11 @@ serialNumber:string;
 
   async LoadList(){
 
+    this.skeletonLoader = true
+
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
     this.diplomasList = new Array();
+    this.skeletonLoader = false
 
     console.log(diplomas);
     let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 649c7d666..c2393c8f9 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -82,7 +82,7 @@
       </ion-list>
     </div>
   </div>
-  <div *ngIf="!diplomasList">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index b08b51368..acc04bf1f 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -17,6 +17,7 @@ diplomasList:DailyWorkTask[] = [];
 showLoader: boolean;
 totalDocs:any;
 serialNumber:string;
+skeletonLoader = false
 
 @Input() segment:string;
 
@@ -46,12 +47,15 @@ constructor(
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  async LoadList(){
+  async LoadList() {
+
     this.diplomasList = [];
     console.log(this.diplomasList);
 
     console.log(this.segment);
 
+    this.skeletonLoader = true
+    
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
     switch (this.segment) {
@@ -118,6 +122,8 @@ constructor(
           console.log('No segment provided!');
           break;
     }
+
+    this.skeletonLoader = false
   }
 
   sortArrayISODate(myArray: any) {
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
index 2e6981968..c00ca3941 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.html
@@ -37,7 +37,7 @@
           </ion-item>
     </ion-list>
   </div>
-  <div *ngIf="!taskslist">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
index b68268d20..8967468a3 100644
--- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
+++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts
@@ -22,7 +22,7 @@ export class ExpedientesPrPage implements OnInit {
 
   taskslist:DailyWorkTask[];
   serialNumber:string;
-  showLoader:boolean;
+  skeletonLoader:boolean;
 
   loggeduser: User;
   @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
@@ -55,7 +55,7 @@ export class ExpedientesPrPage implements OnInit {
   }
 
   LoadList(){
-    this.showLoader = true;
+    this.skeletonLoader = true;
     switch (this.loggeduser.Profile) {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
@@ -81,7 +81,7 @@ export class ExpedientesPrPage implements OnInit {
               this.taskslist.push(task);
             });
           console.log(this.taskslist);
-          this.showLoader = false;
+          this.skeletonLoader = false;
         });
 
         break;
@@ -109,7 +109,7 @@ export class ExpedientesPrPage implements OnInit {
                 this.taskslist.push(task);
               });
             console.log(this.taskslist);
-            this.showLoader = false;
+            this.skeletonLoader = false;
           });
 
         break;
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.html b/src/app/shared/gabinete-digital/expedients/expedients.page.html
index b2d2f646f..b4c5cfde9 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.html
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.html
@@ -45,7 +45,7 @@
           </ion-item>
     </ion-list>
   </div>
-  <div *ngIf="!taskslist">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
index 29cdfdb35..dcf9a1b9b 100644
--- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts
+++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts
@@ -25,6 +25,7 @@ export class ExpedientsPage implements OnInit {
   serialNumber:string;
 
   @Input() profile:string;
+  skeletonLoader = true
 
   constructor(
     private processes:ProcessesService,
@@ -58,9 +59,14 @@ export class ExpedientsPage implements OnInit {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
-  LoadList(){
+  LoadList() {
+
+    this.skeletonLoader = true
+
     this.processes.GetTasksList("Expediente", false).subscribe(result => {
       this.taskslist = new Array();
+      this.skeletonLoader = false
+      
       let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
       res.forEach(element => {
         let date = new Date(element.taskStartDate);
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
index 95267f4be..10e41c44d 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html
@@ -98,7 +98,7 @@
       </ion-list>
     </div>
   </div>
-  <div *ngIf="!parecerList && !deferimentoList">
+  <div *ngIf="skeletonLoader">
   
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
index 2a30049e9..eb3e0be8a 100644
--- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
+++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts
@@ -37,6 +37,7 @@ export class PedidosPage implements OnInit {
   @Input() profile:string;
   @Input() segment:string;
   @Output() openPedido:EventEmitter<any> = new EventEmitter<any>();
+  skeletonLoader = true
 
   constructor(
     private router: Router,
@@ -72,12 +73,17 @@ export class PedidosPage implements OnInit {
   }
 
   async LoadList(){
+
+    this.skeletonLoader = true
+
     if(this.segment == 'parecer'){
       this.taskType = "Pedido de Parecer";
 
       let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
       let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise();
 
+      this.skeletonLoader = false
+
       let allParecer = parecer.concat(parecerPr).reverse();
       console.log(allParecer);
 
@@ -111,6 +117,7 @@ export class PedidosPage implements OnInit {
       this.taskType = "Pedido de Deferimento";
       this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => {
         this.taskslist = result;
+        this.skeletonLoader = false
 
         this.deferimentoList = new Array();
         let res = result.reverse();
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
index bcbb2202c..c05c0b65b 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.html
@@ -49,7 +49,7 @@
             </ion-item>
       </ion-list>
   </div>
-  <div *ngIf="pendentesList.length < 1">
+  <div *ngIf="skeletonLoader">
 
     <ion-list>
       <ion-item>
diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
index 53b35c705..906cc3cb0 100644
--- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
+++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts
@@ -21,7 +21,7 @@ export class PendentesPage implements OnInit {
   taskType: string;
   serialNumber:string;
   totalDocs:any;
-  showLoader: boolean;
+  skeletonLoader: boolean;
 
   @Input() profile:string;
   segment:string;
@@ -62,7 +62,7 @@ export class PendentesPage implements OnInit {
   }
 
   async LoadList(){
-    this.showLoader = true;
+    this.skeletonLoader = true;
     this.pendentesList = new Array();
     let pendentes = await this.processes.GetPendingTasks(false).toPromise();
 
@@ -88,7 +88,7 @@ export class PendentesPage implements OnInit {
         this.pendentesList = removeDuplicate( this.pendentesList)
         this.pendentesList = this.sortArrayISODate(this.pendentesList);
     });
-    this.showLoader = false;
+    this.skeletonLoader = false;
   }
 
   sortArrayISODate(myArray: any){

From a96853823446c32f8c12ce56a679afd242d0fcbb Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 14 Jul 2021 16:26:51 +0100
Subject: [PATCH 2/2] Change time format to 24 hours

---
 .../approve-event-modal/approve-event-modal.page.html     | 2 +-
 .../event-list/approve-event/approve-event.page.html      | 2 +-
 .../gabinete-digital/event-list/event-list.page.html      | 8 ++++----
 .../expedientes-pr/expediente-pr/expediente-pr.page.html  | 4 ++--
 .../view-publications/view-publications.page.html         | 4 ++--
 .../shared/agenda/approve-event/approve-event.page.html   | 2 +-
 src/app/shared/agenda/event-list/event-list.page.html     | 8 ++++----
 src/app/shared/agenda/new-event/new-event.page.ts         | 2 +-
 .../events-to-approve/events-to-approve.page.html         | 8 ++++----
 .../view-publications/view-publications.page.html         | 4 ++--
 10 files changed, 22 insertions(+), 22 deletions(-)

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 27e2d3e7c..943f62daa 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
@@ -49,7 +49,7 @@
         <div class="content-details">
           <ion-label>
             <p>1 {{customDate}}</p>
-            <p>2 das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p>2 das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
             <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">3 (Não se repete)</p>
             <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">4 Repete</p>
           </ion-label>
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 25dc37a1f..ecb232c96 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
@@ -31,7 +31,7 @@
         <div class="content-details">
           <ion-label>
             <p>{{customDate}}</p>
-            <p>das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p>das12 {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
             <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
             <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
           </ion-label>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index f0d9cddf6..50f3ccb77 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -38,8 +38,8 @@
               
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
-                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
                 </div>
                 <div class="approve-event-detail">
                   <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
@@ -58,8 +58,8 @@
               *ngFor="let event of eventsPRList" (click)="goToEventToApproveDetail(event.serialNumber)">
               <div class="content-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
-                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
                 </div>
                 <div class="approve-event-detail">
                   <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
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 f4df4a6d8..5c09ff957 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
@@ -86,8 +86,8 @@
                     <!-- [routerLink]="['/home/events', event.EventId, 'events']" -->
                     <div class="content-{{profile}}-{{event.CalendarName}} width-100 ">
                       <div class="approve-event-time">
-                        <p>{{event.StartDate | date: 'hh:mm'}}</p>
-                        <p>{{event.EndDate | date: 'hh:mm'}}</p>
+                        <p>{{event.StartDate | date: 'HH:mm'}}</p>
+                        <p>{{event.EndDate | date: 'HH:mm'}}</p>
                       </div>
                       <div class="approve-event-detail">
                         <p *ngIf="event.StartDate != event.EndDate">{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}}  |  {{event.Location}}</p>
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index d41f936b7..3dc836b6c 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -13,7 +13,7 @@
       <div class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
         <p class="item-content-detail">{{item.Detail}}</p>
-        <p class="item-content-date">{{item.DateBegin}}</p>
+        <p class="item-content-date">{{item.DateBegin | date: 'dd-MM-yy | HH:mm'}}</p>
       </div>
       <div class="actions-icon" (click)="AddPublication('2',item.ProcessId)">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
@@ -47,7 +47,7 @@
             <div class="post-title">
               <ion-label>{{publication.Title}}</ion-label>
             </div>
-            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</div>
+            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | HH:mm'}}</div>
           </div>
           <div class="post-description">
             <p>{{publication.Message}}</p>
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 482453ad1..d7ef655e1 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.html
+++ b/src/app/shared/agenda/approve-event/approve-event.page.html
@@ -38,7 +38,7 @@
         <div class="content-details">
           <ion-label>
             <p>{{customDate}}</p>
-            <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+            <p>das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'HH:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
             <p *ngIf="!loadedEvent.workflowInstanceDataFields.IsRecurring">(Não se repete)</p>
             <p *ngIf="loadedEvent.workflowInstanceDataFields.IsRecurring">Repete</p>
           </ion-label>
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index c1daf0751..b5352d06b 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -33,8 +33,8 @@
          (click)="openApproveModal(event.serialNumber, event)">
          <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
              <div class="approve-event-time">
-                 <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                 <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                 <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                 <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
                </div>
                <div class="approve-event-detail">
                  <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
@@ -52,8 +52,8 @@
              (click)="openApproveModal(event.serialNumber, event)">
              <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                  <div class="approve-event-time">
-                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                   <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
                  </div>
                  <div class="approve-event-detail">
                    <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
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 a19dbb451..0c7bc0d84 100644
--- a/src/app/shared/agenda/new-event/new-event.page.ts
+++ b/src/app/shared/agenda/new-event/new-event.page.ts
@@ -338,7 +338,7 @@ export class NewEventPage implements OnInit {
 
   restoreDatepickerData() {
     if (this.postEvent) {
-      this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY hh:mm"))
+      this.dateControlOccurrence = new FormControl(moment(this.postEvent.EventRecurrence.LastOccurrence, "DD MM YYYY HH:mm"))
     }
   }
 
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index 76ab1c5ea..bee6eaf62 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -37,8 +37,8 @@
         <!-- (click)="openApproveModal(event)" -->
         <div class="event-mdgpr-{{event.workflowInstanceDataFields.Agenda}} width-100">
             <div class="approve-event-time">
-                <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
               </div>
               <div class="approve-event-detail">
                 <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
@@ -57,8 +57,8 @@
             >
             <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
-                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>
-                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
+                  <p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
                 </div>
                 <div class="approve-event-detail">
                   <p *ngIf="event.workflowInstanceDataFields.StartDate != event.workflowInstanceDataFields.EndDate">{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/M/yy'}}  |  {{event.workflowInstanceDataFields.Location}}</p>
diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html
index 24dd457ad..4a8950b02 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -9,7 +9,7 @@
       <div class="div-title flex-grow-1">
         <ion-label class="title">{{item.Description}}</ion-label>
         <p class="item-content-detail">{{item.Detail}}</p>
-        <p class="item-content-date">{{ item.DateBegin | date: 'dd-MM-yy | hh:mm'}}</p>
+        <p class="item-content-date">{{ item.DateBegin | date: 'dd-MM-yy | HH:mm'}}</p>
       </div>
       <div class="actions-icon">
        <!--  <ion-icon (click)="AddPublication('1',item.ProcessId)" slot="end" src='assets/images/icons-add-photo.svg'></ion-icon> -->
@@ -47,7 +47,7 @@
             <div class="post-title">
               <ion-label>{{publication.Title}}</ion-label>
             </div>
-            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | hh:mm'}}</div>
+            <div class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | HH:mm'}}</div>
           </div>
           <div class="post-description">
             <p>{{publication.Message}}</p>