From 448f94802fd9b29869fcf8e2e37a222a72884e31 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 25 Apr 2024 16:29:38 +0700 Subject: [PATCH] updated cal indicator --- .../08_KPI/components/Tab/01_Assessment.vue | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/src/modules/08_KPI/components/Tab/01_Assessment.vue b/src/modules/08_KPI/components/Tab/01_Assessment.vue index a0d67d4..ad6bcc9 100644 --- a/src/modules/08_KPI/components/Tab/01_Assessment.vue +++ b/src/modules/08_KPI/components/Tab/01_Assessment.vue @@ -42,12 +42,19 @@ function fetchListPlanned() { evaluationResults: (e.point / 5) * e.weight, })); rows_01.value = newRow; - const result = newRow.reduce( - (sum: number, e: any) => sum + e.evaluationResults, - 0 - ); - totalResults1.value = (result * 80) / 100; + if (newRow.length > 0) { + const result = newRow.reduce( + (sum: number, e: any) => sum + e.evaluationResults, + 0 + ); + const weight = newRow.reduce( + (sum: number, e: any) => sum + e.weight, + 0 + ); + + totalResults1.value = (result * 60) / weight; + } }) .catch((err) => { messageError($q, err); @@ -68,11 +75,19 @@ function fetchListRole() { evaluationResults: (e.point / 5) * e.weight, })); rows_02.value = newRow; - const result = newRow.reduce( - (sum: number, e: any) => sum + e.evaluationResults, - 0 - ); - totalResults2.value = (result * 80) / 100; + + if (newRow.length > 0) { + const result = newRow.reduce( + (sum: number, e: any) => sum + e.evaluationResults, + 0 + ); + const weight = newRow.reduce( + (sum: number, e: any) => sum + e.weight, + 0 + ); + + totalResults2.value = (result * 60) / weight; + } }) .catch((err) => { messageError($q, err); @@ -94,12 +109,19 @@ function fetchAssigned() { })); rows_03.value = newRow; - const result = newRow.reduce( - (sum: number, e: any) => sum + e.evaluationResults, - 0 - ); - totalResults3.value = (result * 80) / 100; + if (newRow.length > 0) { + const result = newRow.reduce( + (sum: number, e: any) => sum + e.evaluationResults, + 0 + ); + const weight = newRow.reduce( + (sum: number, e: any) => sum + e.weight, + 0 + ); + + totalResults3.value = (result * 20) / weight; + } }) .catch((err) => { messageError($q, err); @@ -114,7 +136,7 @@ function onInfo() { } const resultWork = computed(() => { const total = totalResults1.value + totalResults2.value + totalResults3.value; - return parseFloat(((total * 80) ).toFixed(2)); + return total.toFixed(2); }); onMounted(() => {