From 305f0dfc4a461e8e2aba6bbc9da07d55280d1d85 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Thu, 26 Dec 2024 17:08:11 +0700
Subject: [PATCH] fix: task receive => update user task status retrieval logic

---
 .../09_task-order/receive_view/MainPage.vue   | 56 +++++++++++++------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/pages/09_task-order/receive_view/MainPage.vue b/src/pages/09_task-order/receive_view/MainPage.vue
index 55c87d73..8ef629ec 100644
--- a/src/pages/09_task-order/receive_view/MainPage.vue
+++ b/src/pages/09_task-order/receive_view/MainPage.vue
@@ -102,8 +102,11 @@ async function fetchStatus() {
     {
       title: 'receive',
       status: getStatus(
-        fullTaskOrder.value?.userTask[0]?.userTaskStatus ||
-          UserTaskStatus.Pending,
+        fullTaskOrder.value.userTask.find(
+          (l) =>
+            l.userId ===
+            fullTaskOrder.value?.taskList[0].requestWorkStep.responsibleUserId,
+        )?.userTaskStatus || UserTaskStatus.Pending,
         2,
         -1,
       ),
@@ -115,8 +118,11 @@ async function fetchStatus() {
     {
       title: 'sendTaskOrder',
       status: getStatus(
-        fullTaskOrder.value?.userTask[0]?.userTaskStatus ||
-          UserTaskStatus.Pending,
+        fullTaskOrder.value.userTask.find(
+          (l) =>
+            l.userId ===
+            fullTaskOrder.value?.taskList[0].requestWorkStep.responsibleUserId,
+        )?.userTaskStatus || UserTaskStatus.Pending,
         2,
         2,
       ),
@@ -465,10 +471,14 @@ watch([currentFormData.value.taskStatus], () => {
               fullTaskOrder.taskList[0].requestWorkStep.responsibleUser?.email
             "
             :status="
-              fullTaskOrder.userTask[0]?.userTaskStatus ||
-              UserTaskStatus.Pending
+              fullTaskOrder.userTask.find(
+                (l) =>
+                  l.userId ===
+                  fullTaskOrder?.taskList[0].requestWorkStep.responsibleUserId,
+              )?.userTaskStatus || UserTaskStatus.Pending
             "
           />
+
           <InfoProductExpansion
             :code="currentFormData.code"
             :task-name="currentFormData.taskName"
@@ -486,8 +496,11 @@ watch([currentFormData.value.taskStatus], () => {
             :contact-tel="currentFormData.contactTel"
             :contact-name="currentFormData.contactName"
             :userTaskStatus="
-              fullTaskOrder?.userTask[0]?.userTaskStatus ||
-              UserTaskStatus.Pending
+              fullTaskOrder?.userTask.find(
+                (l) =>
+                  l.userId ===
+                  fullTaskOrder?.taskList[0].requestWorkStep.responsibleUserId,
+              )?.userTaskStatus || UserTaskStatus.Pending
             "
           >
             <div
@@ -571,17 +584,19 @@ watch([currentFormData.value.taskStatus], () => {
                   <div class="q-pa-md full-width">
                     <TableEmployee
                       :checkbox-on="
-                        fullTaskOrder.taskOrderStatus !==
-                          TaskOrderStatus.Pending &&
-                        fullTaskOrder.userTask.every(
-                          (v) => v.userTaskStatus !== UserTaskStatus.Submit,
+                        fullTaskOrder.taskList.every(
+                          (v) =>
+                            v.taskStatus === TaskStatus.InProgress ||
+                            v.taskStatus === TaskStatus.Success ||
+                            v.taskStatus === TaskStatus.Failed,
                         )
                       "
                       :check-all="
-                        fullTaskOrder.taskOrderStatus !==
-                          TaskOrderStatus.Pending &&
-                        fullTaskOrder.userTask.every(
-                          (v) => v.userTaskStatus !== UserTaskStatus.Submit,
+                        fullTaskOrder.taskList.every(
+                          (v) =>
+                            v.taskStatus === TaskStatus.InProgress ||
+                            v.taskStatus === TaskStatus.Success ||
+                            v.taskStatus === TaskStatus.Failed,
                         )
                       "
                       step-on
@@ -593,8 +608,13 @@ watch([currentFormData.value.taskStatus], () => {
                         <TaskStatusComponent
                           type="receive"
                           :readonly="
-                            fullTaskOrder.taskOrderStatus ===
-                            TaskOrderStatus.Pending
+                            (fullTaskOrder?.userTask.find(
+                              (l) =>
+                                l.userId ===
+                                fullTaskOrder?.taskList[0].requestWorkStep
+                                  .responsibleUserId,
+                            )?.userTaskStatus || UserTaskStatus.Pending) ===
+                            UserTaskStatus.Pending
                           "
                           :status="subProps.row.taskStatus"
                           @click-failed="