From 7ea5a2b577bf4379702ba20bacae07a655209fa4 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Mon, 8 Jul 2024 15:55:02 +0700 Subject: [PATCH 1/2] fixing kpi --- src/modules/08_KPI/components/Tab/04_Result.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/08_KPI/components/Tab/04_Result.vue b/src/modules/08_KPI/components/Tab/04_Result.vue index 91e22f8..a9f7196 100644 --- a/src/modules/08_KPI/components/Tab/04_Result.vue +++ b/src/modules/08_KPI/components/Tab/04_Result.vue @@ -172,11 +172,17 @@ function getData() { developmentMethod.value = data.developEvaluator; developmentPeriod.value = data.timeEvaluator; evaluatorComment.value = data.reasonEvaluator; - superiorCommentCheck.value = data.isReasonCommander.toString(); + superiorCommentCheck.value = + data.isReasonCommander != null + ? data.isReasonCommander.toString() + : null; superiorComment.value = data.reasonCommander; - additionalSuperiorCheck.value = data.isReasonCommanderHigh.toString(); + additionalSuperiorCheck.value = + data.isReasonCommanderHigh != null + ? data.isReasonCommanderHigh.toString() + : null; additionalSuperiorComment.value = data.reasonCommanderHigh; result1.value = data.totalPoint1; result2.value = data.totalPoint2_1 + data.totalPoint2_2; From a79ef8430fd7af70a44328e51536d518f1a30fae Mon Sep 17 00:00:00 2001 From: Kittapath Date: Tue, 9 Jul 2024 00:03:00 +0700 Subject: [PATCH 2/2] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89env?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4217d60..900c7fd 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -9,7 +9,8 @@ env: REGISTRY: docker.frappet.com IMAGE_NAME: ehr/bma-ehr-user DEPLOY_HOST: frappet.com - COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user + COMPOSE_PATH: /home/frappet/docker/bma-ehr + # COMPOSE_PATH: /home/frappet/docker/bma/bma-ehr-user jobs: # act workflow_dispatch -W .github/workflows/release.yaml --input IMAGE_VER=test-v6.1 -s DOCKER_USER=sorawit -s DOCKER_PASS=P@ssword -s SSH_PASSWORD=P@ssw0rd