From 86c2a2c3ce01a75f3306680be2245646d62a437b Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Mon, 28 Jun 2021 15:45:49 +0100
Subject: [PATCH] save

---
 .../diplomas/diploma/diploma.page.ts                 |  2 +-
 .../pages/gabinete-digital/diplomas/diplomas.page.ts |  2 --
 .../pages/gabinete-digital/gabinete-digital.page.ts  |  4 +---
 .../gabinete-digital/diplomas/diplomas.page.html     |  9 ---------
 .../gabinete-digital/diplomas/diplomas.page.ts       | 12 +++++-------
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
index 19cf3bffe..b7e328184 100644
--- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts
@@ -57,7 +57,7 @@ export class DiplomaPage implements OnInit {
   }
 
   goBack() {
-    if (window.innerWidth <= 800) {
+    if (window.innerWidth < 801) {
       this.router.navigate(['/home/gabinete-digital/diplomas']);
     } else {
       let navigationExtras: NavigationExtras = {
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
index e43640af9..c33e839ff 100644
--- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts
@@ -83,8 +83,6 @@ constructor(
   }
 
   async LoadList(){
-    
-
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
 
     console.log('diplomas', diplomas);
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 1fc8f360e..a2ffad9d7 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -481,14 +481,12 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   openDiplomasPage(segment:string) {
-  
-    this.closeAllDesktopComponents();
-    
     if( window.innerWidth <= 801){
       let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
       this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
     }
     else{
+      this.closeAllDesktopComponents();
       this.segment = segment;
       let navigationExtras: NavigationExtras = { queryParams: {"diplomas": true,}};
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
index 56dd370c9..649c7d666 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.html
@@ -19,15 +19,6 @@
   </ion-toolbar>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
-  
   <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">
diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
index 3b001438e..0a61077ed 100644
--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts
@@ -31,10 +31,9 @@ constructor(
   }
 
   ngOnInit() {
-    this.LoadList();
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.doRefresh();
+        this.LoadList();
       }
     });
   }
@@ -57,9 +56,12 @@ constructor(
   }
 
   async LoadList(){
+    this.diplomasList = new Array();
+
+    console.log('OOOKAY');
     
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.diplomasList = new Array();
+    
 
     console.log(diplomas);
     switch (this.segment) {
@@ -168,16 +170,12 @@ constructor(
           });
         });
         this.showLoader = false;
-        
         break;
     }
   }
 
   doRefresh() {
     this.LoadList();
-    setTimeout(() => {
-      //event.target.complete();
-    }, 2000);
   }
 
 }