From cd4fda997ccace9519e23ba34643390ebb83fb85 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Mon, 14 Aug 2023 10:17:05 +0100
Subject: [PATCH] fix

---
 src/app/pages/agenda/agenda.page.ts           | 43 ++++++++++---------
 .../group-messages/group-messages.page.html   |  6 +--
 src/app/services/chat/room.service.ts         |  3 ++
 .../group-messages/group-messages.page.html   |  4 +-
 version/git-version.ts                        | 10 ++---
 5 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts
index 5d792d7db..bd019d5ad 100644
--- a/src/app/pages/agenda/agenda.page.ts
+++ b/src/app/pages/agenda/agenda.page.ts
@@ -290,29 +290,32 @@ export class AgendaPage implements OnInit {
   weeksToShow = []
 
   weekToShow() {
-    let num = 0;
 
-    function Week(a) {
-      for(let b of a.querySelectorAll('td')) {
-        if(!b.className.includes('text-muted')) {
-          num++;
-          return true
+    setTimeout(() => {
+      let num = 0;
+
+      function Week(a) {
+        for(let b of a.querySelectorAll('td')) {
+          if(!b.className.includes('text-muted')) {
+            num++;
+            return true
+          }
         }
       }
-    }
-
-    for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
-      Week(a)
-    } 
-
-    if(num <= 5) {
-      
-      this.weeksToShow = ["week-5"]
-    } else {
-      
-      this.weeksToShow = ["week-6"]
-    }
-
+  
+      for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
+        Week(a)
+      } 
+  
+      if(num <= 5) {
+        
+        this.weeksToShow = ["week-5"]
+      } else {
+        
+        this.weeksToShow = ["week-6"]
+      }
+  
+    }, 250)
 
   }
 
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index d6a166595..0bb0603c7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -203,9 +203,9 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
-      <div *ngIf="msg.t == 'au'" class="info-text-leave">
-        <div *ngFor="let user of allUsers">
-          <div *ngIf="msg.msg == user.username">
+      <div *ngIf="msg.t == 'au' &&  msg.msg != sessionStore.user.UserName" >
+        <div *ngFor="let user of allUsers" >
+          <div *ngIf="msg.msg == user.username" class="info-text-leave">
             <ion-label>Adicionou {{user.name}}</ion-label><br />
           </div>
         </div>
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index ee17fea88..d740b20f2 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -715,6 +715,9 @@ export class RoomService {
 
       const messages = await MessageModel.filter({rid:this.id}).execute()
 
+
+      console.log('MessageModel', messages)
+
       for (let  ChatMessage of messages) { 
         const wewMessage = await this.simplePrepareMessage(ChatMessage)
         wewMessage.from = 'Offline'
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index b3187bd9c..6045d38f7 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -207,9 +207,9 @@
         </div>
         {{last ? scrollToBottom() : ''}}
       </div>
-      <div *ngIf="msg.t == 'au'" class="info-text-leave">
+      <div *ngIf="msg.t == 'au' && msg.msg != sessionStore.user.UserName">
         <div *ngFor="let user of allUsers">
-          <div *ngIf="msg.msg == user.username">
+          <div *ngIf="msg.msg == user.username" class="info-text-leave">
             <ion-label>Adicionou {{user.name}}</ion-label><br />
           </div>
         </div>
diff --git a/version/git-version.ts b/version/git-version.ts
index 4cab5177f..8cb72e65f 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "b1e5857c8",
-  "SHA": "b1e5857c823920ddf52aaaef26d6391ee5ad7347",
+  "shortSHA": "2645d1e08",
+  "SHA": "2645d1e081fd138bdda2b12af913ab0c497683f9",
   "branch": "developer-bug",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Aug 11 16:46:06 2023 +0100'",
+  "lastCommitTime": "'Fri Aug 11 17:02:51 2023 +0100'",
   "lastCommitMessage": "fix",
-  "lastCommitNumber": "5147",
+  "lastCommitNumber": "5148",
   "change": "",
-  "changeStatus": "On branch developer-bug\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/services/chat/room.service.ts\n\tmodified:   src/app/shared/chat/messages/messages.page.ts",
+  "changeStatus": "On branch developer-bug\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/agenda/agenda.page.ts\n\tmodified:   src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified:   src/app/services/chat/room.service.ts\n\tmodified:   src/app/shared/chat/group-messages/group-messages.page.html",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file