From 8568ac8fceb0e7d87ad60ac2895922171e9834ae Mon Sep 17 00:00:00 2001
From: net <tnp_sj149-3@hotmail.co.th>
Date: Mon, 19 Feb 2024 11:43:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=87=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=AD=E0=B9=88=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B9=89=E0=B8=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/00_support/components/FormChat.vue | 18 +++++++++++-------
 src/modules/00_support/store/Main.ts           |  3 ++-
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/modules/00_support/components/FormChat.vue b/src/modules/00_support/components/FormChat.vue
index 43cce077d..c3d393fed 100644
--- a/src/modules/00_support/components/FormChat.vue
+++ b/src/modules/00_support/components/FormChat.vue
@@ -114,10 +114,11 @@ const onLoad = (async (_: any, done: any) => {
         </q-avatar>
         <q-item-section v-if="store.currentIssue" class="q-pl-sm">
           <q-item-label>
-            <span class="tite-on-message-long">
+            <span class="title-on-message-long">
               <q-badge color="blue" outline>
                 {{ validateCategory(store.currentCategory) }}
               </q-badge>
+              {{ store.currentTitle }}
             </span>
           </q-item-label>
           <span>
@@ -191,7 +192,7 @@ const onLoad = (async (_: any, done: any) => {
                   }}</q-badge>
                 </div>
               </span>
-              <span class="tite-long text-weight-bold line-ellipsis">
+              <span class="title-long text-weight-bold line-ellipsis">
                 {{ item.title }}</span
               >
 
@@ -229,6 +230,7 @@ const onLoad = (async (_: any, done: any) => {
                   text-color="white"
                   :label="item.unreadCount"
                 />
+
                 <q-icon v-else name="mdi-check-all" size="xs" color="grey" />
               </div>
             </div>
@@ -281,12 +283,14 @@ const onLoad = (async (_: any, done: any) => {
                 <q-space />
                 <div
                   v-if="
-                    store.messageStatus?.result.some(
-                      (v) =>
+                    store.messageStatus?.result.some((v) => {
+                      return (
                         new Date(v.lastAccessDate).getTime() >=
                           new Date(item.createdAt).getTime() &&
+                        v.fromUserId !== store.userId &&
                         index + 1 === store.message?.result.message.length
-                    )
+                      );
+                    })
                   "
                   class="q-mr-xl"
                 >
@@ -366,7 +370,7 @@ const onLoad = (async (_: any, done: any) => {
 </template>
 
 <style scoped>
-.tite-long {
+.title-long {
   width: 180px;
   display: inline-block;
   text-overflow: ellipsis;
@@ -374,7 +378,7 @@ const onLoad = (async (_: any, done: any) => {
   white-space: nowrap;
 }
 
-.tite-on-message-long {
+.title-on-message-long {
   width: 250px;
   display: inline-block;
   text-overflow: ellipsis;
diff --git a/src/modules/00_support/store/Main.ts b/src/modules/00_support/store/Main.ts
index fcadc1f02..3d612a96c 100644
--- a/src/modules/00_support/store/Main.ts
+++ b/src/modules/00_support/store/Main.ts
@@ -87,7 +87,7 @@ export const useSupportStore = defineStore("supportServiceStore", () => {
   socket.on("read", (r) => {
     if (messageStatus.value) {
       messageStatus.value.result = messageStatus.value.result.map((v) => {
-        if (v.fromUserId !== r.fromUserId) return r;
+        if (v.fromUserId === r.fromUserId) return r;
         return v;
       });
     }
@@ -100,6 +100,7 @@ export const useSupportStore = defineStore("supportServiceStore", () => {
       issue.value.result = issue.value.result.map((v) => {
         if (v.id === r.issueId) {
           v.lastMessage = r.content;
+          v.updatedAt = r.updatedAt;
         }
         return v;
       });