From cce1eccf8c22d59800a4d1f352478faaa4e39acb Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Fri, 27 Dec 2024 12:00:25 +0700
Subject: [PATCH] fix: order => taskStatusCount function to filter by
 responsible user ID

---
 .../09_task-order/order_view/MainPage.vue     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue
index 30925126..53af6ad0 100644
--- a/src/pages/09_task-order/order_view/MainPage.vue
+++ b/src/pages/09_task-order/order_view/MainPage.vue
@@ -576,9 +576,11 @@ function openFailedDialog(
   pageState.failedDialog = true;
 }
 
-function taskStatusCount(index: number, id: string) {
+function taskStatusCount(index: number, id: string, responsibleUserId: string) {
   const task = fullTaskOrder.value?.taskList.filter(
-    (t) => t.requestWorkStep.requestWork.productService.productId === id,
+    (t) =>
+      t.requestWorkStep.requestWork.productService.productId === id &&
+      t.requestWorkStep.responsibleUserId === responsibleUserId,
   );
   if (index === 1) {
     return task?.filter(
@@ -920,14 +922,14 @@ watch([currentFormData.value.taskStatus], () => {
                       </span>
                       <span class="q-ml-auto row items-center q-gutter-x-sm">
                         <div
-                          v-for="v in 3"
-                          :key="v"
+                          v-for="taskStatus in 3"
+                          :key="taskStatus"
                           class="rounded q-px-sm row items-center"
                           style="background: hsl(var(--text-mute) / 0.1)"
                           :style="`color: hsl(var(--${
-                            v === 1
+                            taskStatus === 1
                               ? 'warning'
-                              : v === 2
+                              : taskStatus === 2
                                 ? 'positive'
                                 : 'negative'
                           }-bg))`"
@@ -937,8 +939,13 @@ watch([currentFormData.value.taskStatus], () => {
                             size="xs"
                             class="q-pr-sm"
                           />
-
-                          {{ taskStatusCount(v, product.id) }}
+                          {{
+                            taskStatusCount(
+                              taskStatus,
+                              product.id,
+                              v.responsibleUser.id,
+                            )
+                          }}
                         </div>
                       </span>
                     </template>