From d71b2a172fb4e87da399f3f826bb44f1fb0e5ebd Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Thu, 14 Dec 2023 14:49:27 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20assess=20?=
 =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99=20evaluate?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/assess/api.assess.ts                  |  7 ----
 src/api/evaluate/api.evaluate.ts              |  7 ++++
 src/app.config.ts                             |  4 +-
 src/modules/01_dashboard/views/Dashboard.vue  |  2 +-
 src/modules/06_assess/router.ts               | 13 ------
 .../components/Stepper.vue                    |  4 +-
 .../components/Tab1.vue                       | 42 +++++++++++--------
 .../components/Tab2.vue                       | 30 ++++++-------
 .../components/step/step1.vue                 |  0
 .../components/step/step2.vue                 |  0
 .../components/step/step3.vue                 |  4 +-
 .../components/step/step4.vue                 |  0
 .../components/step/step5.vue                 |  0
 .../components/step/step6.vue                 |  2 +-
 .../components/step/step7.vue                 |  4 +-
 .../components/step/step8.vue                 |  0
 .../components/step/step9.vue                 |  0
 .../components/viewstep/viewPDF.vue           |  0
 .../components/viewstep/viewStep1.vue         |  0
 .../components/viewstep/viewStep3.vue         |  6 +--
 .../components/viewstep/viewStep7.vue         |  6 +--
 src/modules/06_evaluate/router.ts             | 13 ++++++
 .../{06_assess => 06_evaluate}/store.ts       |  2 +-
 .../views/EvaluateMain.vue}                   |  8 ++--
 src/router/index.ts                           |  4 +-
 25 files changed, 83 insertions(+), 75 deletions(-)
 delete mode 100644 src/api/assess/api.assess.ts
 create mode 100644 src/api/evaluate/api.evaluate.ts
 delete mode 100644 src/modules/06_assess/router.ts
 rename src/modules/{06_assess => 06_evaluate}/components/Stepper.vue (94%)
 rename src/modules/{06_assess => 06_evaluate}/components/Tab1.vue (75%)
 rename src/modules/{06_assess => 06_evaluate}/components/Tab2.vue (73%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step1.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step2.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step3.vue (96%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step4.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step5.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step6.vue (97%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step7.vue (87%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step8.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/step/step9.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/viewstep/viewPDF.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/viewstep/viewStep1.vue (100%)
 rename src/modules/{06_assess => 06_evaluate}/components/viewstep/viewStep3.vue (76%)
 rename src/modules/{06_assess => 06_evaluate}/components/viewstep/viewStep7.vue (57%)
 create mode 100644 src/modules/06_evaluate/router.ts
 rename src/modules/{06_assess => 06_evaluate}/store.ts (91%)
 rename src/modules/{06_assess/views/AssessMain.vue => 06_evaluate/views/EvaluateMain.vue} (85%)

diff --git a/src/api/assess/api.assess.ts b/src/api/assess/api.assess.ts
deleted file mode 100644
index 9044570..0000000
--- a/src/api/assess/api.assess.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import env from "../index";
-
-const assess = `${env.API_GEN_REPORT}`;
-
-export default {
-  reportTemplate: () => `${assess}/report-template/docx`,
-};
diff --git a/src/api/evaluate/api.evaluate.ts b/src/api/evaluate/api.evaluate.ts
new file mode 100644
index 0000000..99b9f37
--- /dev/null
+++ b/src/api/evaluate/api.evaluate.ts
@@ -0,0 +1,7 @@
+import env from "../index";
+
+const report = `${env.API_GEN_REPORT}`;
+
+export default {
+  reportTemplate: () => `${report}/report-template/docx`,
+};
diff --git a/src/app.config.ts b/src/app.config.ts
index 1f0fd69..03429af 100644
--- a/src/app.config.ts
+++ b/src/app.config.ts
@@ -5,14 +5,14 @@ import testtest from "./api/test/api.test";
 import retirementResign from "./api/leave/api.leave";
 import placementTransfer from "./api/transfer/api.transfer";
 import message from "./api/api.message";
-import assess from "./api/assess/api.assess";
+import evaluate from "./api/evaluate/api.evaluate";
 
 const API = {
   ...testtest,
   ...retirementResign,
   ...placementTransfer,
   ...message,
-  ...assess,
+  ...evaluate,
 };
 
 export default {
diff --git a/src/modules/01_dashboard/views/Dashboard.vue b/src/modules/01_dashboard/views/Dashboard.vue
index 1bd3a57..b568017 100644
--- a/src/modules/01_dashboard/views/Dashboard.vue
+++ b/src/modules/01_dashboard/views/Dashboard.vue
@@ -36,7 +36,7 @@ const items = ref<any>([
     title: "ประเมินผล",
     sub: "ข้อมูลการประเมินผลการปฏิบัติราชการ",
     color: "lime-4",
-    path: "/assess",
+    path: "/evaluate",
     active: false,
   },
   {
diff --git a/src/modules/06_assess/router.ts b/src/modules/06_assess/router.ts
deleted file mode 100644
index 3daea05..0000000
--- a/src/modules/06_assess/router.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-const assessMain = () => import("@/modules/06_assess/views/AssessMain.vue");
-
-export default [
-  {
-    path: "/assess",
-    name: "assess",
-    component: assessMain,
-    meta: {
-      Auth: true,
-      Key: [7],
-    },
-  },
-];
diff --git a/src/modules/06_assess/components/Stepper.vue b/src/modules/06_evaluate/components/Stepper.vue
similarity index 94%
rename from src/modules/06_assess/components/Stepper.vue
rename to src/modules/06_evaluate/components/Stepper.vue
index 4b12080..965245c 100644
--- a/src/modules/06_assess/components/Stepper.vue
+++ b/src/modules/06_evaluate/components/Stepper.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { ref } from "vue";
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 </script>
 
 <template>
diff --git a/src/modules/06_assess/components/Tab1.vue b/src/modules/06_evaluate/components/Tab1.vue
similarity index 75%
rename from src/modules/06_assess/components/Tab1.vue
rename to src/modules/06_evaluate/components/Tab1.vue
index 2c10a49..66e7502 100644
--- a/src/modules/06_assess/components/Tab1.vue
+++ b/src/modules/06_evaluate/components/Tab1.vue
@@ -2,25 +2,25 @@
 import { onMounted } from "vue";
 import { useQuasar } from "quasar";
 
-import Stepper from "@/modules/06_assess/components/Stepper.vue";
-import Step1 from "@/modules/06_assess/components/step/step1.vue";
-import Step2 from "@/modules/06_assess/components/step/step2.vue";
-import Step3 from "@/modules/06_assess/components/step/step3.vue";
-import Step4 from "@/modules/06_assess/components/step/step4.vue";
-import Step5 from "@/modules/06_assess/components/step/step5.vue";
-import Step6 from "@/modules/06_assess/components/step/step6.vue";
-import Step7 from "@/modules/06_assess/components/step/step7.vue";
-import Step8 from "@/modules/06_assess/components/step/step8.vue";
-import Step9 from "@/modules/06_assess/components/step/step9.vue";
+import Stepper from "@/modules/06_evaluate/components/Stepper.vue";
+import Step1 from "@/modules/06_evaluate/components/step/step1.vue";
+import Step2 from "@/modules/06_evaluate/components/step/step2.vue";
+import Step3 from "@/modules/06_evaluate/components/step/step3.vue";
+import Step4 from "@/modules/06_evaluate/components/step/step4.vue";
+import Step5 from "@/modules/06_evaluate/components/step/step5.vue";
+import Step6 from "@/modules/06_evaluate/components/step/step6.vue";
+import Step7 from "@/modules/06_evaluate/components/step/step7.vue";
+import Step8 from "@/modules/06_evaluate/components/step/step8.vue";
+import Step9 from "@/modules/06_evaluate/components/step/step9.vue";
 
-import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue";
-import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue";
-import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue";
+import ViewStep1 from "@/modules/06_evaluate/components/viewstep/viewStep1.vue";
+import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue";
+import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 import { useCounterMixin } from "@/stores/mixin";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 const mixin = useCounterMixin();
 const { dialogConfirm } = mixin;
 
@@ -117,9 +117,17 @@ onMounted(() => {
     </div>
 
     <div class="col-xs-12 col-sm-9">
-      <div class="toptitle">
-        {{ store.step }}.{{ store.titel[store.step - 1] }}
+      <div class="col-12 row">
+        <div class="col-9">
+          <div class="toptitle">
+            {{ store.step }}.{{ store.titel[store.step - 1] }}
+          </div>
+        </div>
+        <div class="col-3 text-right">
+          <router-link to="https://accreditation.ocsc.go.th/accreditation/search/curriculum">ไปยัง ก.พ. เพื่อตรวจสอบข้อมูล</router-link>
+        </div>
       </div>
+
       <div class="row q-col-gutter-md col-12">
         <div
           :class="
diff --git a/src/modules/06_assess/components/Tab2.vue b/src/modules/06_evaluate/components/Tab2.vue
similarity index 73%
rename from src/modules/06_assess/components/Tab2.vue
rename to src/modules/06_evaluate/components/Tab2.vue
index cec0565..7039195 100644
--- a/src/modules/06_assess/components/Tab2.vue
+++ b/src/modules/06_evaluate/components/Tab2.vue
@@ -2,25 +2,25 @@
 import { ref, onMounted } from "vue";
 import { useQuasar } from "quasar";
 
-import Stepper from "@/modules/06_assess/components/Stepper.vue";
-import Step1 from "@/modules/06_assess/components/step/step1.vue";
-import Step2 from "@/modules/06_assess/components/step/step2.vue";
-import Step3 from "@/modules/06_assess/components/step/step3.vue";
-import Step4 from "@/modules/06_assess/components/step/step4.vue";
-import Step5 from "@/modules/06_assess/components/step/step5.vue";
-import Step6 from "@/modules/06_assess/components/step/step6.vue";
-import Step7 from "@/modules/06_assess/components/step/step7.vue";
-import Step8 from "@/modules/06_assess/components/step/step8.vue";
-import Step9 from "@/modules/06_assess/components/step/step9.vue";
+import Stepper from "@/modules/06_evaluate/components/Stepper.vue";
+import Step1 from "@/modules/06_evaluate/components/step/step1.vue";
+import Step2 from "@/modules/06_evaluate/components/step/step2.vue";
+import Step3 from "@/modules/06_evaluate/components/step/step3.vue";
+import Step4 from "@/modules/06_evaluate/components/step/step4.vue";
+import Step5 from "@/modules/06_evaluate/components/step/step5.vue";
+import Step6 from "@/modules/06_evaluate/components/step/step6.vue";
+import Step7 from "@/modules/06_evaluate/components/step/step7.vue";
+import Step8 from "@/modules/06_evaluate/components/step/step8.vue";
+import Step9 from "@/modules/06_evaluate/components/step/step9.vue";
 
-import ViewStep1 from "@/modules/06_assess/components/viewstep/viewStep1.vue";
-import ViewStep3 from "@/modules/06_assess/components/viewstep/viewStep3.vue";
-import ViewStep7 from "@/modules/06_assess/components/viewstep/viewStep7.vue";
+import ViewStep1 from "@/modules/06_evaluate/components/viewstep/viewStep1.vue";
+import ViewStep3 from "@/modules/06_evaluate/components/viewstep/viewStep3.vue";
+import ViewStep7 from "@/modules/06_evaluate/components/viewstep/viewStep7.vue";
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 import { useCounterMixin } from "@/stores/mixin";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 const mixin = useCounterMixin();
 const { dialogConfirm } = mixin;
 
diff --git a/src/modules/06_assess/components/step/step1.vue b/src/modules/06_evaluate/components/step/step1.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step1.vue
rename to src/modules/06_evaluate/components/step/step1.vue
diff --git a/src/modules/06_assess/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step2.vue
rename to src/modules/06_evaluate/components/step/step2.vue
diff --git a/src/modules/06_assess/components/step/step3.vue b/src/modules/06_evaluate/components/step/step3.vue
similarity index 96%
rename from src/modules/06_assess/components/step/step3.vue
rename to src/modules/06_evaluate/components/step/step3.vue
index 35ba5b5..0e862f3 100644
--- a/src/modules/06_assess/components/step/step3.vue
+++ b/src/modules/06_evaluate/components/step/step3.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 const mixin = useCounterMixin();
 const { date2Thai } = mixin;
 
diff --git a/src/modules/06_assess/components/step/step4.vue b/src/modules/06_evaluate/components/step/step4.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step4.vue
rename to src/modules/06_evaluate/components/step/step4.vue
diff --git a/src/modules/06_assess/components/step/step5.vue b/src/modules/06_evaluate/components/step/step5.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step5.vue
rename to src/modules/06_evaluate/components/step/step5.vue
diff --git a/src/modules/06_assess/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue
similarity index 97%
rename from src/modules/06_assess/components/step/step6.vue
rename to src/modules/06_evaluate/components/step/step6.vue
index 7bbc006..9c442d5 100644
--- a/src/modules/06_assess/components/step/step6.vue
+++ b/src/modules/06_evaluate/components/step/step6.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
 
 const fileEvaluation1 = ref<any>();
 
diff --git a/src/modules/06_assess/components/step/step7.vue b/src/modules/06_evaluate/components/step/step7.vue
similarity index 87%
rename from src/modules/06_assess/components/step/step7.vue
rename to src/modules/06_evaluate/components/step/step7.vue
index 77ab9a0..fcebfca 100644
--- a/src/modules/06_assess/components/step/step7.vue
+++ b/src/modules/06_evaluate/components/step/step7.vue
@@ -2,9 +2,9 @@
 import { reactive, ref } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 const mixin = useCounterMixin();
 const { date2Thai } = mixin;
 
diff --git a/src/modules/06_assess/components/step/step8.vue b/src/modules/06_evaluate/components/step/step8.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step8.vue
rename to src/modules/06_evaluate/components/step/step8.vue
diff --git a/src/modules/06_assess/components/step/step9.vue b/src/modules/06_evaluate/components/step/step9.vue
similarity index 100%
rename from src/modules/06_assess/components/step/step9.vue
rename to src/modules/06_evaluate/components/step/step9.vue
diff --git a/src/modules/06_assess/components/viewstep/viewPDF.vue b/src/modules/06_evaluate/components/viewstep/viewPDF.vue
similarity index 100%
rename from src/modules/06_assess/components/viewstep/viewPDF.vue
rename to src/modules/06_evaluate/components/viewstep/viewPDF.vue
diff --git a/src/modules/06_assess/components/viewstep/viewStep1.vue b/src/modules/06_evaluate/components/viewstep/viewStep1.vue
similarity index 100%
rename from src/modules/06_assess/components/viewstep/viewStep1.vue
rename to src/modules/06_evaluate/components/viewstep/viewStep1.vue
diff --git a/src/modules/06_assess/components/viewstep/viewStep3.vue b/src/modules/06_evaluate/components/viewstep/viewStep3.vue
similarity index 76%
rename from src/modules/06_assess/components/viewstep/viewStep3.vue
rename to src/modules/06_evaluate/components/viewstep/viewStep3.vue
index a9e694f..c83e2d6 100644
--- a/src/modules/06_assess/components/viewstep/viewStep3.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep3.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 </script>
 
 <template>
diff --git a/src/modules/06_assess/components/viewstep/viewStep7.vue b/src/modules/06_evaluate/components/viewstep/viewStep7.vue
similarity index 57%
rename from src/modules/06_assess/components/viewstep/viewStep7.vue
rename to src/modules/06_evaluate/components/viewstep/viewStep7.vue
index 700dad1..126be47 100644
--- a/src/modules/06_assess/components/viewstep/viewStep7.vue
+++ b/src/modules/06_evaluate/components/viewstep/viewStep7.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import ViewPDF from "@/modules/06_assess/components/viewstep/viewPDF.vue";
+import ViewPDF from "@/modules/06_evaluate/components/viewstep/viewPDF.vue";
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 </script>
 
 <template>
diff --git a/src/modules/06_evaluate/router.ts b/src/modules/06_evaluate/router.ts
new file mode 100644
index 0000000..560cad3
--- /dev/null
+++ b/src/modules/06_evaluate/router.ts
@@ -0,0 +1,13 @@
+const evaluateMain = () => import("@/modules/06_evaluate/views/EvaluateMain.vue");
+
+export default [
+  {
+    path: "/evaluate",
+    name: "evaluate",
+    component: evaluateMain,
+    meta: {
+      Auth: true,
+      Key: [7],
+    },
+  },
+];
diff --git a/src/modules/06_assess/store.ts b/src/modules/06_evaluate/store.ts
similarity index 91%
rename from src/modules/06_assess/store.ts
rename to src/modules/06_evaluate/store.ts
index ed06a40..456e1ff 100644
--- a/src/modules/06_assess/store.ts
+++ b/src/modules/06_evaluate/store.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { ref } from "vue";
 
-export const useAssessStore = defineStore("asses", () => {
+export const useEvaluateStore = defineStore("evaluateStore", () => {
   const tabMenu = ref<string>("1");
   const step = ref<number>(1);
   const titel = ref<string[]>([
diff --git a/src/modules/06_assess/views/AssessMain.vue b/src/modules/06_evaluate/views/EvaluateMain.vue
similarity index 85%
rename from src/modules/06_assess/views/AssessMain.vue
rename to src/modules/06_evaluate/views/EvaluateMain.vue
index 85c292e..70356e9 100644
--- a/src/modules/06_assess/views/AssessMain.vue
+++ b/src/modules/06_evaluate/views/EvaluateMain.vue
@@ -5,12 +5,12 @@ import { useRouter } from "vue-router";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
-import Tab1 from "@/modules/06_assess/components/Tab1.vue"; // ชำนาญการ
-import Tab2 from "@/modules/06_assess/components/Tab2.vue"; // ชำนาญการพิเศษ
+import Tab1 from "@/modules/06_evaluate/components/Tab1.vue"; // ชำนาญการ
+import Tab2 from "@/modules/06_evaluate/components/Tab2.vue"; // ชำนาญการพิเศษ
 
-import { useAssessStore } from "@/modules/06_assess/store";
+import { useEvaluateStore } from "@/modules/06_evaluate/store";
 
-const store = useAssessStore();
+const store = useEvaluateStore();
 const router = useRouter();
 const $q = useQuasar();
 </script>
diff --git a/src/router/index.ts b/src/router/index.ts
index 4dc9efd..d87127d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -7,7 +7,7 @@ import ModuleTransfer from "@/modules/02_transfer/router";
 import ModuleRetire from "@/modules/03_retire/router";
 import ModuleCheckin from "@/modules/04_checkin/router";
 import ModuleLeave from "@/modules/05_leave/router";
-import ModuAssesss from "@/modules/06_assess/router";
+import ModuEvaluate from "@/modules/06_evaluate/router";
 import ModuAppealComplain from "@/modules/07_appealComplain/router";
 // TODO: ใช้หรือไม่?
 import keycloak from "@/plugins/keycloak";
@@ -33,7 +33,7 @@ const router = createRouter({
         ...ModuleRetire,
         ...ModuleCheckin,
         ...ModuleLeave,
-        ...ModuAssesss,
+        ...ModuEvaluate,
         ...ModuAppealComplain,
       ],
     },