From 6faef6b050d2b046af7dbf4e516c4317da336d99 Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Tue, 28 Jan 2025 10:38:15 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=97?=
 =?UTF-8?q?=E0=B8=94=E0=B8=A5=E0=B8=AD=E0=B8=87=E0=B8=9B=E0=B8=8F=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B8=AB=E0=B8=99=E0=B9=89?=
 =?UTF-8?q?=E0=B8=B2=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20=E0=B9=81=E0=B8=9A=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9C=E0=B8=A5=20(=E0=B8=84=E0=B8=93=E0=B8=B0=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=A1=E0=B8=81=E0=B8=B2=E0=B8=A3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FormEvaluation/FormEvaluateScore.vue      | 41 ++++++++++++++-----
 .../FormEvaluation/FormEvaluateScoreAdd.vue   | 35 ++++++++++++----
 2 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index e7a095339..4426d2d76 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -212,19 +212,24 @@ const percent_sum: any = computed(() => {
 });
 const score4 = computed(() => {
   return (
-    Number(orientation.value) +
-    Number(self_learning.value) +
-    Number(training_seminar.value) +
-    Number(other_training.value)
+    (Number(orientation.value) +
+      Number(self_learning.value) +
+      Number(training_seminar.value) +
+      Number(other_training.value)) /
+    4
   );
 });
 const score5 = computed(() => {
-  return (
-    Number(orientation_percent.value) +
-    Number(self_learning_percent.value) +
-    Number(training_seminar_percent.value) +
-    Number(other_training_percent.value)
-  );
+  const total =
+    (Number(orientation_percent.value) +
+      Number(self_learning_percent.value) +
+      Number(training_seminar_percent.value) +
+      Number(other_training_percent.value)) /
+    4;
+
+  develop_result.value = total > 60 ? 1 : 0;
+
+  return total;
 });
 
 /**set true */
@@ -1057,6 +1062,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="orientation"
+                    :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                    hide-bottom-space
                   />
                 </div>
                 <div class="col">
@@ -1066,6 +1073,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="orientation_percent"
+                    :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                    hide-bottom-space
                   />
                 </div>
               </div>
@@ -1079,6 +1088,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="self_learning"
+                    :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                    hide-bottom-space
                   />
                 </div>
                 <div class="col">
@@ -1088,6 +1099,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="self_learning_percent"
+                    :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                    hide-bottom-space
                   />
                 </div>
               </div>
@@ -1101,6 +1114,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="training_seminar"
+                    :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                    hide-bottom-space
                   />
                 </div>
                 <div class="col">
@@ -1110,6 +1125,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="training_seminar_percent"
+                    :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                    hide-bottom-space
                   />
                 </div>
               </div>
@@ -1125,6 +1142,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="other_training"
+                    :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                    hide-bottom-space
                   />
                 </div>
                 <div class="col">
@@ -1134,6 +1153,8 @@ onMounted(async () => {
                     type="number"
                     :readonly="!status"
                     v-model="other_training_percent"
+                    :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                    hide-bottom-space
                   />
                 </div>
               </div>
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index fd3b0297a..f23acb0e1 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -216,18 +216,21 @@ const percent_sum: any = computed(() => {
 });
 const score4 = computed(() => {
   return (
-    Number(orientation.value) +
-    Number(self_learning.value) +
-    Number(training_seminar.value) +
-    Number(other_training.value)
+    (Number(orientation.value) +
+      Number(self_learning.value) +
+      Number(training_seminar.value) +
+      Number(other_training.value)) /
+    4
   );
 });
 const score5 = computed(() => {
   const total =
-    Number(orientation_percent.value) +
-    Number(self_learning_percent.value) +
-    Number(training_seminar_percent.value) +
-    Number(other_training_percent.value);
+    (Number(orientation_percent.value) +
+      Number(self_learning_percent.value) +
+      Number(training_seminar_percent.value) +
+      Number(other_training_percent.value)) /
+    4;
+
   develop_result.value = total > 60 ? 1 : 0;
 
   return total;
@@ -1122,6 +1125,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="orientation"
+                        :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                        hide-bottom-space
                       />
                     </div>
                     <div class="col">
@@ -1130,6 +1135,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="orientation_percent"
+                        :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                        hide-bottom-space
                       />
                     </div>
                   </div>
@@ -1142,6 +1149,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="self_learning"
+                        :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                        hide-bottom-space
                       />
                     </div>
                     <div class="col">
@@ -1150,6 +1159,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="self_learning_percent"
+                         :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                        hide-bottom-space
                       />
                     </div>
                   </div>
@@ -1162,6 +1173,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="training_seminar"
+                        :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                        hide-bottom-space
                       />
                     </div>
                     <div class="col">
@@ -1170,6 +1183,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="training_seminar_percent"
+                       :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                        hide-bottom-space
                       />
                     </div>
                   </div>
@@ -1184,6 +1199,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="other_training"
+                        :rules="[(val:number) => val <= 100 || 'คะแนนต้องไม่เกิน 100 คะแนน']"
+                        hide-bottom-space
                       />
                     </div>
                     <div class="col">
@@ -1192,6 +1209,8 @@ watch(lengthdiscipline_level, (newLength) => {
                         dense
                         type="number"
                         v-model="other_training_percent"
+                        :rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
+                        hide-bottom-space
                       />
                     </div>
                   </div>