From 6ef4dd6ab4e07164b9e1ee6b24243a0aa87d84c8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sat, 17 Jul 2021 10:49:52 +0100
Subject: [PATCH] Fix loader

---
 .../despachos-pr/despachos-pr.page.html       | 58 +++++++++----------
 .../despachos-pr/despachos-pr.page.ts         | 11 ++--
 .../diplomas-assinar/diplomas-assinar.page.ts |  5 +-
 .../expedientes-pr/expedientes-pr.page.ts     |  9 ++-
 .../despachos-pr/despachos-pr.page.html       |  2 +-
 5 files changed, 48 insertions(+), 37 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 e8ffdf7cc..87945ed56 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
@@ -32,36 +32,36 @@
       <div >
         <ion-list>
           <ion-item 
-              class="expediente ion-no-padding cursor-pointer"  
-              *ngFor = "let task of despachoList; let i = index"
-              (click)="goToDespachoPr(task.SerialNumber)"
-              >
-              <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
-                <div class="item width-100">
-                  <div class="exp-top-detail">
-                    <div class="exp-date">
-                      <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
-                    </div>
-                    <div class="exp-remetente">
-                      <ion-label>{{task.Senders}}</ion-label>
-                    </div>
-                    <div class="exp-workflow">
-                      <span class="label">{{task.activityInstanceName}}</span>
-                    </div>
-                    <div class="exp-icon d-flex align-center">
-                      <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                      <label>{{task.DocumentsQty}}</label>
-  
-                      <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
-                        <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                      </ion-menu-button> -->
-                    </div>
-                  </div>
-                  <div class="exp-bottom-detail">
-                    <ion-label>{{ task.Folio }}</ion-label>
-                  </div>
+            class="expediente ion-no-padding cursor-pointer"  
+            *ngFor = "let task of despachoList; let i = index"
+            (click)="goToDespachoPr(task.SerialNumber)"
+          >
+            <!--  [routerLink]="['/home/gabinete-digital/expediente',task.SerialNumber]" -->
+            <div class="item width-100">
+              <div class="exp-top-detail">
+                <div class="exp-date">
+                  <ion-label>{{ task.CreateDate | date: 'dd-MM-yy' }}</ion-label>
                 </div>
-              </ion-item>
+                <div class="exp-remetente">
+                  <ion-label>{{task.Senders}}</ion-label>
+                </div>
+                <div class="exp-workflow">
+                  <span class="label">{{task.activityInstanceName}}</span>
+                </div>
+                <div class="exp-icon d-flex align-center">
+                  <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  <label>{{task.DocumentsQty}}</label>
+
+                  <!-- <ion-menu-button (click)="docIndex(i)" style="width: 35px; height: 41px;" autoHide="false">
+                    <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
+                  </ion-menu-button> -->
+                </div>
+              </div>
+              <div class="exp-bottom-detail">
+                <ion-label>{{ task.Folio }}</ion-label>
+              </div>
+            </div>
+          </ion-item>
         </ion-list>
   
       </div>
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 0490c692b..e6d382f18 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
@@ -66,9 +66,11 @@ export class DespachosPrPage implements OnInit {
     //Inicializar segment
     this.segment = "despachos";
 
+    const location = window.location
+    const pathname = location.pathname + location.search
+  
     this.router.events.forEach((event) => {
-      if (event instanceof NavigationEnd &&
-          event.url.startsWith('/home/gabinete-digital?despachospr=true')) {
+      if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
         this.LoadList();
       }
     });
@@ -104,7 +106,8 @@ export class DespachosPrPage implements OnInit {
     this.skeletonLoader = true
 
     let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.despachoList = new Array();
+    this.despachoList = [];
+    this.skeletonLoader = false
     
     let despachosPr;
     switch (this.loggeduser.Profile) {
@@ -116,7 +119,7 @@ export class DespachosPrPage implements OnInit {
         break;
     }
 
-    this.skeletonLoader = false
+    
     
     despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
 
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 f5202ac9d..d2f7d0eeb 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
@@ -70,7 +70,7 @@ export class DiplomasAssinarPage implements OnInit {
     this.skeletonLoader = true
 
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.diplomasList = new Array();
+    this.diplomasList = [];
 
     let diplomasAssinar = diplomas.reverse().filter(data => data.activityInstanceName == "Assinar Diploma");
     console.log(diplomasAssinar);
@@ -112,6 +112,9 @@ export class DiplomasAssinarPage implements OnInit {
             this.diplomasList.push(task);
           });
     });
+
+
+    this.skeletonLoader = false
     this.showLoader = false;
     
   }
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 cc08a4d87..1bf575a6d 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
@@ -44,7 +44,7 @@ export class ExpedientesPrPage implements OnInit {
     const pathname = location.pathname + location.search
   
     this.router.events.forEach((event) => {
-      if (event instanceof NavigationEnd && event.url.startsWith('/home/gabinete-digital?expedientes-pr=true')) {
+      if (event instanceof NavigationEnd && event.url.startsWith(pathname)) {
         this.LoadList();
       }
     });
@@ -58,6 +58,8 @@ export class ExpedientesPrPage implements OnInit {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
           console.log(result);
+          this.skeletonLoader = false
+          this.showLoader =false
           this.taskslist = new Array();
           let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active");
           res.forEach(element => {
@@ -83,10 +85,13 @@ export class ExpedientesPrPage implements OnInit {
         });
 
         break;
-        case 'PR':
+      case 'PR':
           this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
             console.log(result);
             this.taskslist = new Array();
+            this.skeletonLoader = false
+            this.showLoader =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/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index f1fb76a31..e91bb1251 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
@@ -26,7 +26,7 @@
   
   <div class="main-container height-100 overflow-y-auto d-flex flex-column ">
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
-    <div  class=" height-100">
+    <div *ngIf="despachoList.length >= 1"  class=" height-100">
       
       <ion-list>
         <ion-item