From a89b2739c8d9b5d320e107b1366017c8e01607f3 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 21 Aug 2023 11:42:34 +0100
Subject: [PATCH] update fix

---
 .../document-set-up-meeting.page.html         |  4 ++--
 .../group-contacts/group-contacts.page.html   |  4 ++--
 .../group-contacts/group-contacts.page.ts     | 14 +++++++----
 .../despachos/despachos.page.html             |  1 -
 .../gabinete-digital.page.html                |  7 ++++++
 .../group-contacts/group-contacts.page.ts     | 14 +++++++----
 .../shared/chat/new-group/new-group.page.ts   | 23 ++++++++++---------
 src/global.scss                               |  3 +++
 version/git-version.ts                        | 14 +++++------
 9 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index 5bf1e4c7f..1be6f7630 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -317,12 +317,12 @@
             <ion-label>
               <p class="d-flex ion-justify-content-between">
                 <span class="attach-title-item">{{document.Assunto}}</span>
-                <span class="app-name">{{document.appName}}</span>
+                <span class="app-name" *ngIf="document.appName">{{document.appName}}</span>
                 <span class="close-button text-black" (click)="removeAttachment(i)" >
                   <ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
                 </span>
               </p>
-              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yyyy HH:mm'}} </span></p>
+              <p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{(document.Data ||document.DocDate) | date: 'dd-MM-yyyy HH:mm'}} </span></p>
             </ion-label>
           </ion-item>
           </ion-list>
diff --git a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
index ee75fc6ca..715a66e53 100644
--- a/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
+++ b/src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html
@@ -33,7 +33,7 @@
   <div class="main-content">
     <div *ngIf="members">
       <ion-label class="members-label">Contactos selecção:</ion-label>
-      <ion-list class="members-list" *ngFor="let user of members">
+      <div class="members-list" *ngFor="let user of members">
         <ion-item-sliding>
           <ion-item lines="none" class="members-checkbox ion-no-border ion-no-padding">
             <ion-checkbox checked disabled color="primary"></ion-checkbox>
@@ -44,7 +44,7 @@
             <ion-item-option color="danger">Apagar</ion-item-option>
           </ion-item-options>
       </ion-item-sliding>
-      </ion-list>
+      </div>
     </div>
 
     
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 cc35f393c..e3d5078a3 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
@@ -95,20 +95,26 @@ export class GroupContactsPage implements OnInit {
 
         if(!foundUser) {
           this.objectUserSingleStone.push(user)
+        } else {
+          'not found'
         }
         
       }
       
+      
+      const  userContainer = {}
       for(const user of this.objectUserSingleStone) {
         const firstLetter = user.name.charAt(0)
 
-        if(!this.userContainer[firstLetter]) {
-          this.userContainer[firstLetter] = [user]
+        if(!userContainer[firstLetter]) {
+          userContainer[firstLetter] = [user]
         } else {
-          this.userContainer[firstLetter].push(user)
+          userContainer[firstLetter].push(user)
         }
         
       }
+
+      this.userContainer = userContainer
       
 
       this.showLoader = false;
@@ -167,7 +173,7 @@ export class GroupContactsPage implements OnInit {
 
   doRefresh(ev){
     this.loadUsers();
-    this.getMembers();
+    //this.getMembers();
     ev.target.complete();
   }
 
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html
index a0814f3d1..3efac5be7 100644
--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html
@@ -10,7 +10,6 @@
     <div class="title flex-1"><ion-label>Despachos</ion-label></div>
     <div class="theicon btn-refresh d-flex align-center">
 
-
       <div class="d-flex" (click)="reorderList('old')" *ngIf="ordinance == 'recent' ">
 
         <ion-icon class="mr-10" src="assets/images/theme/gov/crescente.svg"></ion-icon>
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 58ef682aa..58b4d666d 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -725,6 +725,13 @@
                   TaskService.pendentesstore.newList.length}} correspondência nova</span>
               </p>
 
+              <p class="text-center exp-card-content">
+                <span class="number">{{TaskService.pendentesstore.count}} </span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count == 0">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count == 1">correspondência</span>
+                <span class="title1" *ngIf="TaskService.pendentesstore.count > 1">correspondências</span>
+              </p>
+
             </div>
 
 
diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
index 00e1b7b81..2934ebd5f 100644
--- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
@@ -202,21 +202,27 @@ export class GroupContactsPage implements OnInit {
 
         if(!foundUser) {
           this.objectUserSingleStone.push(user)
+        } else {
+          console.log('not found')
         }
         
       }
       
+      const  userContainer = {}
+
       for(const user of this.objectUserSingleStone) {
         const firstLetter = user.name.charAt(0)
 
-        if(!this.userContainer[firstLetter]) {
-          this.userContainer[firstLetter] = [user]
+        if(!userContainer[firstLetter]) {
+          userContainer[firstLetter] = [user]
         } else {
-          this.userContainer[firstLetter].push(user)
+          userContainer[firstLetter].push(user)
         }
-        
       }
 
+
+      this.userContainer = userContainer
+
       this.showLoader = false;
     });
   }
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 5b15f0187..db2f7025a 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -135,17 +135,18 @@ export class NewGroupPage implements OnInit{
 
     if(res?.result?.rid) {
       this.addGroupMessage.emit(res.result.rid);
-      await this.ChatSystemService.getAllRooms();
-
-      if(!this.ChatSystemService.getGroupRoom(res.result.rid)) {
-        this.createGroupWithAttachmentsCath(res)
-      } else {
-        setTimeout(()=> {
-          
-          this.createGroupWithAttachments(res)
-          
-        }, 500)
-      }
+      
+      this.ChatSystemService.getAllRooms(() => {
+        if(!this.ChatSystemService.getGroupRoom(res.result.rid)) {
+          this.createGroupWithAttachmentsCath(res)
+        } else {
+          setTimeout(()=> {
+            
+            this.createGroupWithAttachments(res)
+            
+          }, 500)
+        }
+      }, res.result.rid);
 
 
       
diff --git a/src/global.scss b/src/global.scss
index b04fe890e..996b141a9 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1646,3 +1646,6 @@ h5, .buttons{
 }
 
 
+.ngx-mat-timepicker input {
+  user-select: none !important;
+}
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index 83d2a6b40..4e67919a0 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "f6c911fc3",
-  "SHA": "f6c911fc3272645484878a6515ca68f31f223003",
+  "shortSHA": "fdce8db60",
+  "SHA": "fdce8db602a0eb8141d95d38600bc5afd23aeb2a",
   "branch": "developer-prod",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Sun Aug 20 21:02:08 2023 +0100'",
-  "lastCommitMessage": "notification event",
-  "lastCommitNumber": "5174",
-  "change": "diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html\nindex a0814f3d1..3efac5be7 100644\n--- a/src/app/pages/gabinete-digital/despachos/despachos.page.html\n+++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html\n@@ -10,7 +10,6 @@\n     <div class=\"title flex-1\"><ion-label>Despachos</ion-label></div>\n     <div class=\"theicon btn-refresh d-flex align-center\">\n \n-\n       <div class=\"d-flex\" (click)=\"reorderList('old')\" *ngIf=\"ordinance == 'recent' \">\n \n         <ion-icon class=\"mr-10\" src=\"assets/images/theme/gov/crescente.svg\"></ion-icon>",
-  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified:   src/app/modals/view-document/view-document.page.ts\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/services/chat/chat-system.service.ts\n\tmodified:   src/app/shared/chat/messages/contacts/contacts.page.ts\n\nChanges not staged for commit:\n  (use \"git add <file>...\" to update what will be committed)\n  (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html",
+  "lastCommitTime": "'Sun Aug 20 22:00:23 2023 +0100'",
+  "lastCommitMessage": "update create event from document",
+  "lastCommitNumber": "5175",
+  "change": "",
+  "changeStatus": "On branch developer-prod\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html\n\tmodified:   src/app/pages/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos/despachos.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified:   src/app/shared/chat/new-group/new-group.page.ts\n\tmodified:   src/global.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file