hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixing score resule probation

Browse source
This commit is contained in:
Warunee Tamkoo 2025-01-28 16:05:36 +07:00
parent bb1048830f
commit c8c4fa219b
1 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScoreAdd.vue
View file

@ -155,6 +155,29 @@ const achievement_result: any = computed(() => {
}
return 0;
});
const score1Per60 = computed(() => {
if (
etc.value === true &&
achievement_other.value.text !== undefined &&
achievement_other.value.level !== undefined
) {
return (
((learn_level.value +
apply_level.value +
success_level.value +
achievement_other.value.level) /
achievement_score_total.value) *
60
);
}
return (
((learn_level.value + apply_level.value + success_level.value) /
achievement_score_total.value) *
60
);
});
const score2 = computed(() => {
let sum_conduct = conduct_level.value.reduce(
(sum: number, level: number) => sum + level,
@ -1010,7 +1033,7 @@ watch(lengthdiscipline_level, (newLength) => {
</q-item-label>
<q-item-label caption style="color: #464444">
<div class="row text-weight-bold">
<div class="col">{{ score1 }}</div>
<div class="col">{{ score1Per60 }}</div>
<div class="col">{{ percent_score1 }}</div>
</div>
</q-item-label>
@ -1080,7 +1103,9 @@ watch(lengthdiscipline_level, (newLength) => {
</q-item-label>
<q-item-label caption style="color: #464444">
<div class="row text-weight-bold">
<div class="col">{{ score1 + score2 }}</div>
<div class="col">
{{ (score1Per60 + score2) / 2 }}
</div>
<div class="col">{{ percent_sum }}</div>
</div>
</q-item-label>
@ -1159,7 +1184,7 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="self_learning_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/>
</div>
@ -1183,7 +1208,7 @@ watch(lengthdiscipline_level, (newLength) => {
dense
type="number"
v-model="training_seminar_percent"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
hide-bottom-space
/>
</div>