From 3dae0db03e713f2a8fa728ca8f12cb59195075ef Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Aug 2023 21:26:23 +0100
Subject: [PATCH] fix errors

---
 src/app/pages/agenda/agenda.page.html               |  2 +-
 .../group-contacts/group-contacts.page.ts           | 11 +++++++++++
 .../pages/chat/messages/contacts/contacts.page.html |  1 +
 .../pages/chat/messages/contacts/contacts.page.ts   | 13 ++++++++++++-
 .../gabinete-digital/gabinete-digital.page.html     |  2 +-
 .../new-publication/new-publication.page.html       |  2 +-
 .../all-processes/all-processes.page.ts             |  4 ++++
 src/app/shared/header/header.page.html              |  4 ++--
 version/git-version.ts                              | 12 ++++++------
 9 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html
index 3345eb5d4..75eaa0a5f 100644
--- a/src/app/pages/agenda/agenda.page.html
+++ b/src/app/pages/agenda/agenda.page.html
@@ -90,7 +90,7 @@
 
                   <div class="float-button"> 
                     
-                    <button title="Visualizar a lista de Eventos para aprovação" class="cursor-pointer resize pr-10" (click)="viewEventsToApprove()" *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])">
+                    <button title="Visualizar a lista de Eventos para aprovação" class="cursor-pointer resize pr-20-rem" (click)="viewEventsToApprove()" *ngIf="p.userPermission([p.permissionList.Gabinete.aprove_event])">
                       <ion-icon  *ngIf="ThemeService.currentTheme == 'default' " class="right-icons" src="assets/images/icons-received-event.svg"></ion-icon>
                       <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && !mobileComponent.showEventList" class="right-icons" src="assets/images/theme/gov/icons-received-event.svg"></ion-icon>
                       <ion-icon  *ngIf="ThemeService.currentTheme == 'gov' && mobileComponent.showEventList" class="right-icons" src="assets/images/theme/gov/icons-received-event-selected.svg"></ion-icon>
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
index a53da800b..5636f9a4f 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -190,11 +190,22 @@ export class GroupContactsPage implements OnInit {
     });
   }
 
+  loading = false
   updateGroup(){
+    if(this.loading) {
+      return 
+    }
+    
+    this.loading = true
+    console.log('this.room', this.room)
+    
     this.chatService.getRoomInfo(this.room._id).subscribe(room=>{
       this.room = room['room'];
       this.addContacts(this.room);
       this.openGroupMessages(room['room']._id);
+      this.loading = false
+    }, ()=> {
+      this.loading = false
     });
   }
 
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.html b/src/app/pages/chat/messages/contacts/contacts.page.html
index a915077f6..0817a687c 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.html
+++ b/src/app/pages/chat/messages/contacts/contacts.page.html
@@ -24,6 +24,7 @@
 </ion-header>
 
 <ion-content>
+  <ion-progress-bar class="position-absolute" type="indeterminate" *ngIf="loading"></ion-progress-bar>
   <ion-refresher  name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
       <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
       <ion-refresher-content>
diff --git a/src/app/pages/chat/messages/contacts/contacts.page.ts b/src/app/pages/chat/messages/contacts/contacts.page.ts
index 8dee2d862..9955b6bc1 100644
--- a/src/app/pages/chat/messages/contacts/contacts.page.ts
+++ b/src/app/pages/chat/messages/contacts/contacts.page.ts
@@ -81,16 +81,27 @@ export class ContactsPage implements OnInit {
   }
 
   clicked() {}
+  loading = false
 
   createRoom(username:string) {
+
+    if(this.loading) {
+      return 
+    }
+
+    this.loading = true
     let body = {
       username: username,
     }
     this.chatService.createRoom(body).subscribe(async(res) => {
       this.room = res['room'];
-      this.ChatSystemService.getAllRooms();
+      await this.ChatSystemService.getAllRooms();
       this.getDirectMessage(this.room._id);
+      this.loading = false
+    }, ()=> {
+      this.loading = false
     });
+
   }
 
   getDirectMessage(roomId:any) {
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index ff67bfee4..58ef682aa 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -83,7 +83,7 @@
 
         </div>
       </div>
-      <div *ngIf="segmentVista == 'listview' " class="d-flex px-20-rem pb-20 justify-content-end width-100">
+      <div *ngIf="segmentVista == 'listview' " class="d-flex px-20-rem pb-10 justify-content-end width-100">
         <div title="Pesquisa" class="d-flex align-center cursor-pointer width-100 justify-end">
           <!-- <div  (click)="openSearch();showSearch=true" *ngIf="!showSearch" class="d-flex">
               <ion-icon title="Perfil" *ngIf="ThemeService.currentTheme == 'doneIt' " class="font-35-rem" src="assets/images/theme/doneIt/icons-search.svg"></ion-icon>
diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html
index a954a90f6..2e89f18df 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -101,7 +101,7 @@
       </button>
     </ion-buttons>
     <ion-buttons slot="end">
-      <button *ngIf="publicationType == '2'" class="btn-ok" fill="clear" color="#fff" (click)="save()">
+      <button *ngIf="publicationType == '2' || publicationType == '1'" class="btn-ok" fill="clear" color="#fff" (click)="save()">
         <ion-label>Criar</ion-label>
       </button>
       <button *ngIf="publicationType == '3'" class="btn-ok" fill="clear" color="#fff" (click)="save()">
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
index 25c96b401..d1b9d0c98 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts
@@ -58,6 +58,10 @@ export class AllProcessesPage implements OnInit {
         
       }
     })
+
+    if(window['all-process-gabinete']) {
+      window['all-process-gabinete']()
+    }
   }
 
   ngAfterViewInit(): void {
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 0667e332d..83b920a9f 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -12,7 +12,7 @@
       </div>
 
       <div class="div-logo align-center justify-center">
-        <div class="logo-icon">
+        <div class="logo-icon pr-10-rem">
           <img *ngIf="ThemeService.currentTheme == 'default' " src='assets/images/logo-no-bg.png' alt='logo'>
           <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
           <img *ngIf="ThemeService.currentTheme == 'doneIt'"  src="assets/images/theme/doneIt/governoangola_A1.png" alt='logo'/>
@@ -52,7 +52,7 @@
     <div class="desktop mx-20">
       <div class="d-flex justify-space-between align-center">
         <div tab="events" class="div-logo height-fit-content">
-          <div class="logo-icon">
+          <div class="logo-icon pr-10-rem">
             <img *ngIf="ThemeService.currentTheme == 'default'" src='assets/images/logo-no-bg.png' alt='logo'>
             <img *ngIf="ThemeService.currentTheme == 'gov' " src='assets/images/theme/gov/governoangola_A.png' alt='logo'>
             <img *ngIf="ThemeService.currentTheme == 'doneIt' " src='assets/images/theme/{{ThemeService.currentTheme}}/governoangola_A1.png' alt='logo'>
diff --git a/version/git-version.ts b/version/git-version.ts
index 717604bf2..9a2ef0e49 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "4ae2e7cfa",
-  "SHA": "4ae2e7cfa89f34727d2ee71260e2d6d3a45934c9",
+  "shortSHA": "0c6463298",
+  "SHA": "0c64632986291d42bf592f52756dd37132b62d64",
   "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 14 14:11:15 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5154",
+  "lastCommitTime": "'Mon Aug 14 16:25:57 2023 +0100'",
+  "lastCommitMessage": "merge",
+  "lastCommitNumber": "5155",
   "change": "",
-  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tdeleted:    index.html\n\tmodified:   src/app/pages/agenda/agenda.page.scss\n\tmodified:   src/app/pages/agenda/view-event/view-event.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified:   src/app/shared/agenda/view-event/view-event.page.html\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.ts\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.html\n\tmodified:   src/app/pages/chat/messages/contacts/contacts.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified:   src/app/shared/header/header.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file