Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

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>

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>

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

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>

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

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>

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

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>

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

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>

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

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>

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>

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;

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>

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

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>

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

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>

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

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>