From df8248c17b7b6f7659cd3050777e3eb458ab36f6 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Sun, 11 Jun 2023 22:35:07 +0100
Subject: [PATCH] realocate ion refreher

---
 .../despachos/despachos.page.html             | 18 ++++++-------
 .../diplomas-gerar/diplomas-gerar.page.html   | 25 +++++++------------
 .../gabinete-digital/gabinete-digital.page.ts |  6 ++++-
 .../pedidos/pedidos.page.html                 | 19 +++++++-------
 .../publication-detail.page.html              | 12 +++++----
 src/environments/suport/oapr.ts               |  4 +--
 version/git-version.ts                        | 12 ++++-----
 7 files changed, 47 insertions(+), 49 deletions(-)

diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index 76d9e4000..ce629ed79 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -59,18 +59,16 @@
   </div>
 </ion-header>
 <ion-content>
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+        pullingIcon="chevron-down-circle-outline"
+        pullingText="deslize para actualizar"
+        refreshingSpinner="circles"
+        refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
 
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-          pullingIcon="chevron-down-circle-outline"
-          pullingText="deslize para actualizar"
-          refreshingSpinner="circles"
-          refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
-
-
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
       <div class="height-100">
diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
index b5c06d54d..068076bff 100644
--- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
+++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html
@@ -19,16 +19,17 @@
 </ion-header>
 <ion-content>
 
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+      pullingIcon="chevron-down-circle-outline"
+      pullingText="deslize para actualizar"
+      refreshingSpinner="circles"
+      refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="main-content width-100 overflow-y-auto height-100">
 
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
     <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
 
     <div class="d-flex ion-justify-content-between ion-align-items-center" style="
@@ -136,14 +137,6 @@
 
 
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-          pullingIcon="chevron-down-circle-outline"
-          pullingText="deslize para actualizar"
-          refreshingSpinner="circles"
-          refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
 
     <div >
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 934fe72a2..a555bcbe6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -460,7 +460,11 @@ export class GabineteDigitalPage implements OnInit {
 
 
   doRefreshAside() {
-    window['gabinete-aside-refresh']()
+    
+    try {
+      window['gabinete-aside-refresh']()
+    } catch(error) {}
+    
     setTimeout(() => {
       this.loadAllProcesses();
     }, 1000) 
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
index c9b6d129f..d4d6a7b39 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html
@@ -76,16 +76,17 @@
 </ion-header>
 
 <ion-content>
-
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-refresher-content
+      pullingIcon="chevron-down-circle-outline"
+      pullingText="deslize para actualizar"
+      refreshingSpinner="circles"
+      refreshingText="A actualizar...">
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="main-content width-100 overflow-y-auto height-100">
-    <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <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" [ngSwitch]="segment">
       <ion-progress-bar type="indeterminate" *ngIf="skeletonLoader"></ion-progress-bar>
diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/publication-detail/publication-detail.page.html
index ae53fe01f..4739432c6 100644
--- a/src/app/pages/publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/publication-detail/publication-detail.page.html
@@ -1,6 +1,12 @@
 
 
 <ion-content>
+  <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+    <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
+    <ion-refresher-content>
+    </ion-refresher-content>
+  </ion-refresher>
+  
   <div class="content-container">
     <div *ngIf="publication.Title != ''">
     <div class="title-content">
@@ -14,11 +20,7 @@
         <p class="post-data">{{publication.DatePublication | date: 'dd-MM-yy | h:mm'}}</p>
       </div>
     </div>
-    <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
-      <ion-refresher-content>
-      </ion-refresher-content>
-    </ion-refresher>
+
     <div class="post-item">
       <div *ngIf="publication.FileBase64.length > 30" class="post-img">
         <img src="{{publication.FileBase64}}" alt="image" tappable (click)="openPreview(publication.FileBase64)">
diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts
index 5e804d434..3043d2525 100644
--- a/src/environments/suport/oapr.ts
+++ b/src/environments/suport/oapr.ts
@@ -32,7 +32,7 @@ export const oaprDev: Environment = {
   apiWsChatUrl: 'wss://gd-chat.oapr.gov.ao/websocket',
   logoLabel: 'Presidente da República',
   despachoLabel: 'Presidencial',
-  despachoLabel2: 'Despachos Presidenciais',
+  despachoLabel2: 'Despachos Presidênciais',
   production: false,
   domain: 'oapr.gov.ao',
   defaultuser: 'gmanuel@oapr.gov.ao',
@@ -44,6 +44,6 @@ export const oaprDev: Environment = {
   agendaVP: 'Agenda do MD',
   PR: 'PR',
   VP: '',
-  dispatchPR: 'Despachos Presidenciais',
+  dispatchPR: 'Despachos Presidênciais',
   sentryUrl: 'https://9920cc36f1d740b987426ee8d80cf588@o4504340905525248.ingest.sentry.io/4504340946419712',
 };
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index c3430d909..2e5a239c2 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "4f90a6649",
-  "SHA": "4f90a66493b84e3b8d78ff48c1c305531a9a9db2",
+  "shortSHA": "0c274ad21",
+  "SHA": "0c274ad218485b0acf5ddf38c3aa4171c1d0d3a5",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sun Jun 11 20:25:07 2023 +0100'",
-  "lastCommitMessage": "remove text",
-  "lastCommitNumber": "5001",
+  "lastCommitTime": "'Sun Jun 11 20:39:15 2023 +0100'",
+  "lastCommitMessage": "improve",
+  "lastCommitNumber": "5002",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedidos.page.html\n\tmodified:   src/app/pages/publications/publication-detail/publication-detail.page.html\n\tmodified:   src/environments/suport/oapr.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file