From f99618c4a28dc5b0ec01c9cb396af30e084fe47b Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 16:48:53 +0700
Subject: [PATCH 1/4] updated

---
 src/modules/08_KPI/components/Tab/04_Result.vue | 2 +-
 src/modules/08_KPI/components/Tab/TabMain.vue   | 3 ++-
 src/modules/08_KPI/store.ts                     | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/08_KPI/components/Tab/04_Result.vue b/src/modules/08_KPI/components/Tab/04_Result.vue
index a9f7196..b7d85a0 100644
--- a/src/modules/08_KPI/components/Tab/04_Result.vue
+++ b/src/modules/08_KPI/components/Tab/04_Result.vue
@@ -243,7 +243,7 @@ onMounted(() => {
           <q-space />
 
           <q-btn
-            v-if="store.dataEvaluation.evaluationStatus === 'COMPLETE'"
+            v-if="store.dataEvaluation.evaluationStatus === 'KP7'"
             outline
             flat
             dense
diff --git a/src/modules/08_KPI/components/Tab/TabMain.vue b/src/modules/08_KPI/components/Tab/TabMain.vue
index d672316..9ffb1e6 100644
--- a/src/modules/08_KPI/components/Tab/TabMain.vue
+++ b/src/modules/08_KPI/components/Tab/TabMain.vue
@@ -66,7 +66,8 @@ const splitterModel = ref<number>(12);
             store.tabOpen < 4 ||
             (store.tabOpen == 4 &&
               store.rolePerson === 'USER' &&
-              store.dataEvaluation.evaluationStatus != 'COMPLETE')
+              store.dataEvaluation.evaluationStatus != 'COMPLETE' &&
+              store.dataEvaluation.evaluationStatus != 'KP7')
           "
         />
         <q-tab name="5" label="ไฟล์เอกสาร" />
diff --git a/src/modules/08_KPI/store.ts b/src/modules/08_KPI/store.ts
index efe3bea..dadbf30 100644
--- a/src/modules/08_KPI/store.ts
+++ b/src/modules/08_KPI/store.ts
@@ -327,6 +327,10 @@ export const useKpiDataStore = defineStore("KPIDate", () => {
         tabOpen.value = 4;
         tabMain.value = "4";
         break;
+      case "KP7":
+        tabOpen.value = 4;
+        tabMain.value = "4";
+        break;
       default:
         tabOpen.value = 1;
         tabMain.value = "1";

From 3193564da16a81f8908632249007910da0ad0d94 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 16:58:19 +0700
Subject: [PATCH 2/4] fixing

---
 src/modules/08_KPI/components/Tab/TabMain.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/modules/08_KPI/components/Tab/TabMain.vue b/src/modules/08_KPI/components/Tab/TabMain.vue
index 9ffb1e6..627b9dd 100644
--- a/src/modules/08_KPI/components/Tab/TabMain.vue
+++ b/src/modules/08_KPI/components/Tab/TabMain.vue
@@ -66,7 +66,6 @@ const splitterModel = ref<number>(12);
             store.tabOpen < 4 ||
             (store.tabOpen == 4 &&
               store.rolePerson === 'USER' &&
-              store.dataEvaluation.evaluationStatus != 'COMPLETE' &&
               store.dataEvaluation.evaluationStatus != 'KP7')
           "
         />

From ae36c3c2fb3ba8e43361424a7772ce6d2d6321c9 Mon Sep 17 00:00:00 2001
From: Kittapath <kittapath@frappet.com>
Date: Tue, 9 Jul 2024 17:02:59 +0700
Subject: [PATCH 3/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20env?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 900c7fd..62ec8eb 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -9,8 +9,8 @@ env:
   REGISTRY: docker.frappet.com
   IMAGE_NAME: ehr/bma-ehr-user
   DEPLOY_HOST: frappet.com
-  COMPOSE_PATH: /home/frappet/docker/bma-ehr
-  # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user
+  # COMPOSE_PATH: /home/frappet/docker/bma-ehr
+  COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user
 
 jobs:
   # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd

From 098b924624affd0bd7b3cf1313227d55d98f06e5 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 9 Jul 2024 17:19:21 +0700
Subject: [PATCH 4/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/03_retire/views/addRetire.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/03_retire/views/addRetire.vue b/src/modules/03_retire/views/addRetire.vue
index 1da237a..8c97ac2 100644
--- a/src/modules/03_retire/views/addRetire.vue
+++ b/src/modules/03_retire/views/addRetire.vue
@@ -71,9 +71,9 @@ const clickBack = () => {
 const statusOrder = (val: boolean) => {
   switch (val) {
     case true:
-      return "ยับยั้งการลาออก";
+      return "ยับยั้ง";
     case false:
-      return "อนุมัติการลาออก";
+      return "อนุญาต";
   }
 };