From 20118de309b37452edad653df5df4dd8a4c14b9d Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Tue, 28 Jan 2025 18:27:41 +0700
Subject: [PATCH] fixing score probation

---
 .../components/probation/FormEvaluation/FormEvaluateScore.vue | 4 ++--
 .../probation/FormEvaluation/FormEvaluateScoreAdd.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
index a2c3c0cc1..a6f1eb53c 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
@@ -391,7 +391,7 @@ function putformData() {
     develop_self_learning_percent: Number(self_learning_percent.value),
     develop_training_seminar_percent: Number(training_seminar_percent.value),
     develop_other_training_percent: Number(other_training_percent.value),
-    achievement_score: Number(score1.value),
+    achievement_score: Number(score1Per60.value),
     achievement_percent: Number(percent_score1.value),
     achievement_score_total: Number(achievement_score_total.value),
     achievement_result: Number(achievement_result.value),
@@ -399,7 +399,7 @@ function putformData() {
     behavior_percent: Number(percent_score2.value),
     behavior_score_total: Number(behavior_score_total.value),
     behavior_result: Number(behavior_result.value),
-    sum_score: Number(score1.value) + Number(score2.value),
+    sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
     sum_percent: percent_sum.value,
     chairman_dated: dateToISO(dateAutherise.value),
     develop_result: Number(develop_result.value),
diff --git a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
index fc66cbd80..2aaa5d924 100644
--- a/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
+++ b/src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
@@ -363,7 +363,7 @@ const putformData = () => {
     develop_self_learning_percent: Number(self_learning_percent.value),
     develop_training_seminar_percent: Number(training_seminar_percent.value),
     develop_other_training_percent: Number(other_training_percent.value),
-    achievement_score: Number(score1.value),
+    achievement_score: Number(score1Per60.value),
     achievement_percent: Number(percent_score1.value),
     achievement_score_total: Number(achievement_score_total.value),
     achievement_result: Number(achievement_result.value),
@@ -371,7 +371,7 @@ const putformData = () => {
     behavior_percent: Number(percent_score2.value),
     behavior_score_total: Number(behavior_score_total.value),
     behavior_result: Number(behavior_result.value),
-    sum_score: Number(score1.value) + Number(score2.value),
+    sum_score: (Number(score1Per60.value) + Number(score2.value)) / 2,
     sum_percent: percent_sum.value,
     develop_result: Number(develop_result.value),
     chairman_dated: dateToISO(dateAutherise.value),