From 90f325946fe47cacf86b4bce66093f9e89fe4431 Mon Sep 17 00:00:00 2001 From: Rizki Date: Tue, 31 Mar 2026 10:17:38 +0700 Subject: [PATCH] fix: convert dashboard currency --- adapter/dashboardadapter.js | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/adapter/dashboardadapter.js b/adapter/dashboardadapter.js index 5bbb2f2..1952294 100644 --- a/adapter/dashboardadapter.js +++ b/adapter/dashboardadapter.js @@ -18,23 +18,23 @@ class DashboardAdapter extends Adapter { let endDate = parseInt(year) + 1 + "-01-01"; let qry = ` - SELECT + SELECT ( - SELECT COALESCE(SUM(amount),0) + SELECT COALESCE(SUM(CASE WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 THEN amount * rate_snapshot ELSE amount END),0) FROM tbl_requestbudget WHERE isdeleted = 0 AND years = ? AND tbl_requestbudget.isused = 0 ${nik != "" ? " AND iby=?" : ""} ) AS total_requested_budget, ( - SELECT COALESCE(SUM(amount),0) + SELECT COALESCE(SUM(CASE WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 THEN amount * rate_snapshot ELSE amount END),0) FROM tbl_budgetcapexinfo WHERE isdeleted = 0 AND years = ? ${nik != "" ? " AND iby=?" : ""} ) AS total_remaining_budget, ( - SELECT COALESCE(SUM(amount),0) + SELECT COALESCE(SUM(CASE WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 THEN amount * rate_snapshot ELSE amount END),0) FROM tbl_justification WHERE isdeleted = 0 AND idt >= ? @@ -202,7 +202,7 @@ class DashboardAdapter extends Adapter { let qry = ` SELECT - SUM(amount) as used_budget, + SUM(CASE WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 THEN amount * rate_snapshot ELSE amount END) as used_budget, MONTH(idt) as month FROM tbl_justification WHERE isdeleted=0 @@ -388,7 +388,7 @@ class DashboardAdapter extends Adapter { let qry = ` SELECT MONTH(idt) as month, - SUM(amount) as used_budget + SUM(CASE WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 THEN amount * rate_snapshot ELSE amount END) as used_budget FROM tbl_justification WHERE isdeleted=0 AND YEAR(idt)=? @@ -453,7 +453,13 @@ class DashboardAdapter extends Adapter { let qry = ` SELECT division, - SUM(amount) as total_used_budget + SUM( + CASE + WHEN rate_snapshot IS NOT NULL AND rate_snapshot > 0 + THEN amount * rate_snapshot + ELSE amount + END + ) as total_used_budget FROM tbl_justification WHERE isdeleted = 0 AND idt >= CONCAT(?, '-01-01 00:00:00')