From 0f3416cc3031874f4cd6d4738068d07696ab3190 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Aug 2023 12:15:18 +0100
Subject: [PATCH] fix

---
 src/app/pages/chat/chat.page.html                |  2 +-
 src/app/pages/chat/chat.page.ts                  |  3 ++-
 .../gabinete-digital/gabinete-digital.page.html  |  2 +-
 src/app/services/chat/chat-system.service.ts     | 16 ++++++++++++++++
 src/app/services/task.service.ts                 |  2 +-
 .../all-processes/all-processes.page.html        |  2 +-
 version/git-version.ts                           | 12 ++++++------
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index aa369b2b7..f8dbc834c 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -187,7 +187,7 @@
 
         <app-empty-chat [texto]="emptyTextDescription"
           class="height-100 flex-column"
-          [style.display]="showEmptyComponent ? 'flex' : 'none'"
+          [style.display]="showEmptyComponent && !showContacts && !showNewGroup && !showEditGroup && !showGroupContacts && !showGroupMessages && !showNewEvent ? 'flex' : 'none'"
           #messagecontainer>
         </app-empty-chat>
 
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 9f21d4c31..8196ac1e0 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -282,7 +282,7 @@ export class ChatPage implements OnInit {
     }
   }
   openContactsPage() {
-    
+    this.segment = 'Contactos';
     this.idSelected = '';
     this.closeAllDesktopComponents();
 
@@ -295,6 +295,7 @@ export class ChatPage implements OnInit {
     }
   }
   openNewGroupPage() {
+    this.segment = 'Grupos';
     this.idSelected = '';
     if (window.innerWidth < 701) {
       this.newGroup();
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 12c4759c4..c78e364c8 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 justify-content-end width-100">
+      <div *ngIf="segmentVista == 'listview' " class="d-flex px-20-rem pb-20 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/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts
index 8f95bb69c..de3410cf0 100644
--- a/src/app/services/chat/chat-system.service.ts
+++ b/src/app/services/chat/chat-system.service.ts
@@ -706,6 +706,22 @@ export class ChatSystemService {
     }
   }
 
+
+  async createGroup__(name, customFields = {}) {
+    const res: any = await this.createPrivateRoom(name, SessionStore.user.UserName, customFields);
+    console.log('room is created', res)
+    if(res?.result?.rid) {
+      try {
+        await this.getAllRooms();
+        return res
+      } catch (e) {}
+      console.log('room is loaded')
+      return res
+    } else {
+      return res
+    }
+  }
+
   getGroupByName(name ) {
     return this._group.find( e=> e.name == name)
   }
diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts
index a975234d4..85ea6cd63 100644
--- a/src/app/services/task.service.ts
+++ b/src/app/services/task.service.ts
@@ -44,7 +44,7 @@ export class TaskService {
   
   AllProcess = []
   showLoader: boolean = false
-  showLoaderNum = 0
+  showLoaderNum: number = 0
   loadCount = false
   loadNum = 0
 
diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
index 8a0b53797..c3e89c5a3 100644
--- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
+++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.html
@@ -180,7 +180,7 @@
       </ion-item-sliding>
     </div>
 
-    <div *ngIf="!TaskService.showLoaderNum != 0 && AllProcess.length == 0"
+    <div *ngIf="TaskService.showLoaderNum == 0 && AllProcess.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center">
       <span>Lista vazia</span>
     </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index 6fbc66a15..494d1b35f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "cd4fda997",
-  "SHA": "cd4fda997ccace9519e23ba34643390ebb83fb85",
+  "shortSHA": "fa6450f32",
+  "SHA": "fa6450f3285f9d28851e8debc4cf9e05bcdf6c4e",
   "branch": "developer",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Aug 14 10:17:05 2023 +0100'",
-  "lastCommitMessage": "fix",
-  "lastCommitNumber": "5149",
+  "lastCommitTime": "'Mon Aug 14 11:00:35 2023 +0100'",
+  "lastCommitMessage": "changes",
+  "lastCommitNumber": "5152",
   "change": "",
-  "changeStatus": "On branch developer\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   src/app/home/home.page.ts\n\tmodified:   src/app/pages/events/attendees/attendees.page.ts\n\tmodified:   src/app/pages/events/events.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.html\n\tmodified:   src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts\n\tmodified:   src/app/pages/publications/view-publications/view-publications.page.html\n\tmodified:   src/app/pages/search/organic-entity/organic-entity.page.html\n\tmodified:   src/app/pages/search/organic-entity/organic-entity.page.ts\n\tmodified:   src/app/pages/search/search.page.html\n\tmodified:   src/app/pages/search/search.page.ts\n\tmodified:   src/app/pages/search/sender/sender.page.html\n\tmodified:   src/app/pages/search/sender/sender.page.ts\n\tmodified:   src/app/services/events/attendees/attendees.page.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/services/search.service.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.module.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified:   src/app/shared/event/attendee-modal/attendee-modal.page.ts\n\tmodified:   src/app/shared/publication/view-publications/publication-detail/publication-detail.page.html\n\tmodified:   src/app/shared/publication/view-publications/view-publications.page.html\n\tmodified:   src/firebase-messaging-sw.js\n\tmodified:   version/git-version.ts",
+  "changeStatus": "On branch developer\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/chat/chat.page.html\n\tmodified:   src/app/pages/chat/chat.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/services/task.service.ts\n\tmodified:   src/app/shared/gabinete-digital/all-processes/all-processes.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file