updated kpi

src/api/KPI/api.kpis.ts

@@ -15,11 +15,10 @@ const KpiUser = `${env.API_URI}/kpi/user`;
 const kpiAchievement = `${env.API_URI}/kpi/user/achievement`;
 const kpiReason = `${env.API_URI}/kpi/reason`;
 
-
 // const placementKeycloak = `${env.API_URI}/placement/officer/keycloak`;
 const placementKeycloak = `${env.API_URI}/placement/officer/profileId`;
 // const orgPosition  = `${env.API_URI}/org/profile/keycloak/position `;
-const orgPosition  = `${env.API_URI}/org/profile/profileid/position`;
+const orgPosition = `${env.API_URI}/org/profile/profileid/position`;
 export default {
   kpiPeriod,
   kpiEvaluation,
@@ -48,9 +47,13 @@ export default {
   /**ประเมิน*/
   kpiAchievementDevelop: `${kpiAchievement}/development`,
 
-  kpiCommentP:(typP:string,type:string,role:string,id:string)=>`${kpiReason}/${typP}/${type}/${role}/${id}`,
+  kpiCommentP: (typP: string, type: string, role: string, id: string) =>
+    `${kpiReason}/${typP}/${type}/${role}/${id}`,
 
   placementKeycloak,
   orgPosition,
-  sendToCommander:`${KpiUser}/evaluation/admin/change-status`
+  sendToCommander: `${KpiUser}/evaluation/admin/change-status`,
+  sendToSummary: (id: string) => `${kpiEvaluation}/summary/${id}`,
+  updatePoint: (id: string) => `${kpiEvaluation}/point/${id}`,
+  openPoint: (id: string) => `${kpiEvaluation}/open/${id}`,
 };

src/modules/08_KPI/components/Tab/Dialog/DialogCommentProgress.vue

@@ -105,12 +105,7 @@ function onSubmitAdd() {
       showLoader();
       http
         .put(
-          config.API.kpiCommentP(
+          config.API.kpiCommentP("progress", type.value, "user", idList.value),
-            "progress",
-            type.value,
-            store.rolePerson.toLocaleLowerCase(),
-            idList.value
-          ),
           {
             reason: formDataAdd.reason,
             topic: formDataAdd.topic,

src/modules/08_KPI/views/form.vue

@@ -23,10 +23,10 @@ const route = useRoute();
 const id = ref<string>(route.params.id as string);
 const isReadonly = <boolean>(route.name === "KPIEditEvaluator" ? true : false);
 
-const plannedPoint = ref<string>("");
+// const plannedPoint = ref<string>("");
-const rolePoint = ref<string>("");
+// const rolePoint = ref<string>("");
-const specialPoint = ref<string>("");
+// const specialPoint = ref<string>("");
-const capacityPoint = ref<string>("");
+// const capacityPoint = ref<string>("");
 
 const store = useKpiDataStore();
 const $q = useQuasar();
@@ -71,11 +71,11 @@ async function fetchEvaluation() {
 
       fetchProfile(data.profileId);
 
-      plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
+      // plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
-      rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
+      // rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
-      specialPoint.value = data.specialPoint == null ? "" : data.specialPoint;
+      // specialPoint.value = data.specialPoint == null ? "" : data.specialPoint;
-      capacityPoint.value =
+      // capacityPoint.value =
-        data.capacityPoint == null ? "" : data.capacityPoint;
+      //   data.capacityPoint == null ? "" : data.capacityPoint;
     })
     .catch((e) => {
       messageError($q, e);
@@ -317,12 +317,12 @@ function openStatus() {
   modalStatus.value = true;
 }
 
-function sendToCommander() {
+function sendToEvauator() {
   dialogConfirm($q, () => {
     showLoader();
     http
       .post(config.API.sendToCommander, {
-        status: "EVALUATING",
+        evaluationStatus: "EVALUATING",
         id: [store.dataEvaluation.id],
       })
       .then(async (res) => {
@@ -338,6 +338,26 @@ function sendToCommander() {
   });
 }
 
+function goToSummary() {
+  dialogConfirm($q, () => {
+    showLoader();
+    http
+      .post(config.API.sendToSummary(store.dataEvaluation.id), {
+        status: "SUMMARY",
+      })
+      .then(async (res) => {
+        await getAll();
+        store.tabMain = "4";
+      })
+      .catch((e) => {
+        messageError($q, e);
+      })
+      .finally(() => {
+        hideLoader();
+      });
+  });
+}
+
 onMounted(async () => {
   showLoader();
   await getAll();
@@ -412,9 +432,11 @@ onMounted(async () => {
                   <div class="q-gutter-x-sm">
                     <span
                       v-if="
-                        (store.dataEvaluation.posExecutiveName == null &&
+                        (store.dataEvaluation.posTypeName != 'อำนวยการ' &&
+                          store.dataEvaluation.posTypeName != 'บริหาร' &&
                           store.indicatorWeightTotal != 100) ||
-                        (store.dataEvaluation.posExecutiveName != null &&
+                        (store.dataEvaluation.posTypeName == 'อำนวยการ' &&
+                          store.dataEvaluation.posTypeName == 'บริหาร' &&
                           (store.indicatorWeight1Total != 100 ||
                             store.indicatorWeight2Total != 20) &&
                           store.dataEvaluation.evaluationStatus == 'NEW')
@@ -429,9 +451,11 @@ onMounted(async () => {
                         store.dataEvaluation.evaluationStatus == 'NEW'
                       "
                       :disabled="
-                        (store.dataEvaluation.posExecutiveName == null &&
+                        (store.dataEvaluation.posTypeName != 'อำนวยการ' &&
+                          store.dataEvaluation.posTypeName != 'บริหาร' &&
                           store.indicatorWeightTotal != 100) ||
-                        (store.dataEvaluation.posExecutiveName != null &&
+                        (store.dataEvaluation.posTypeName == 'อำนวยการ' &&
+                          store.dataEvaluation.posTypeName == 'บริหาร' &&
                           (store.indicatorWeight1Total != 100 ||
                             store.indicatorWeight2Total != 20))
                       "
@@ -456,7 +480,7 @@ onMounted(async () => {
                       color="grey-2"
                       text-color="blue-6"
                       size="md"
-                      @click="sendToCommander"
+                      @click="sendToEvauator"
                     >
                       <q-tooltip>ทำการประเมิน</q-tooltip>
                     </q-btn>
@@ -499,6 +523,28 @@ onMounted(async () => {
                       <q-tooltip>ขอแก้ไขข้อตกลง</q-tooltip>
                     </q-btn>
 
+                    <q-btn
+                      v-if="
+                        store.rolePerson == 'EVALUATOR' &&
+                        store.tabMain === '3' &&
+                        store.dataEvaluation.evaluationStatus ===
+                          'EVALUATING_EVALUATOR'
+                      "
+                      :disabled="
+                        store.dataEvaluation.evaluatorId == null ||
+                        store.dataEvaluation.summaryPoint > 0
+                      "
+                      unelevated
+                      round
+                      icon="mdi-send"
+                      color="grey-2"
+                      text-color="blue-6"
+                      size="md"
+                      @click="goToSummary()"
+                    >
+                      <q-tooltip>สรุปผลการประเมิน</q-tooltip>
+                    </q-btn>
+
                     <q-btn
                       unelevated
                       round
@@ -597,7 +643,8 @@ onMounted(async () => {
                       <span class="text-grey-6 col">คะแนนประเมิน</span>
                       <span class="text-weight-medium text-primary col">
                         {{
-                          store.dataEvaluation.posExecutiveName == null
+                          store.dataEvaluation.posTypeName != "อำนวยการ" &&
+                          store.dataEvaluation.posTypeName != "บริหาร"
                             ? (
                                 store.indicatorScoreVal +
                                 store.competencyScoreVal +