diff --git a/adapter/dashboardadapter.js b/adapter/dashboardadapter.js index 5628e87..58a920a 100644 --- a/adapter/dashboardadapter.js +++ b/adapter/dashboardadapter.js @@ -12,6 +12,7 @@ class DashboardAdapter extends Adapter { var apires = this.getApiResultDefined(); try { + let nik = req.query.nik || ""; let year = req.query.year || new Date().getFullYear(); let startDate = year + "-01-01"; let endDate = parseInt(year) + 1 + "-01-01"; @@ -22,12 +23,14 @@ class DashboardAdapter extends Adapter { SELECT COALESCE(SUM(amount),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) FROM tbl_budgetcapexinfo WHERE isdeleted = 0 AND years = ? + ${nik != "" ? " AND iby=?" : ""} ) AS total_remaining_budget, ( @@ -36,10 +39,25 @@ class DashboardAdapter extends Adapter { WHERE isdeleted = 0 AND idt >= ? AND idt < ? + ${nik != "" ? " AND iby=?" : ""} ) AS total_used_budget `; - db.query(qry, [year, year, startDate, endDate], (err, budgetResult) => { + const params = [year]; + if (nik != "") { + params.push(nik); + } + params.push(year); + if (nik != "") { + params.push(nik); + } + params.push(startDate); + params.push(endDate); + if (nik != "") { + params.push(nik); + } + + db.query(qry, params, (err, budgetResult) => { if (err) { apires.meta.code = 500; apires.meta.message = err.toString(); @@ -65,9 +83,13 @@ class DashboardAdapter extends Adapter { WHERE isdeleted = 0 AND idt >= ? AND idt < ? + ${nik != "" ? " AND iby=?" : ""} `; - db.query(qryJustification, [startDate, endDate], (err, justificationResult) => { + const params = [startDate, endDate]; + if (nik != "") params.push(nik); + + db.query(qryJustification, params, (err, justificationResult) => { if (err) { apires.meta.code = 500; apires.meta.message = err.toString(); @@ -84,9 +106,13 @@ class DashboardAdapter extends Adapter { WHERE isdeleted = 0 AND idt >= ? AND idt < ? + ${nik != "" ? " AND iby=?" : ""} `; - db.query(qryPR, [startDate, endDate], (err, prResult) => { + const params = [startDate, endDate]; + if (nik != "") params.push(nik); + + db.query(qryPR, params, (err, prResult) => { if (err) { apires.meta.code = 500; apires.meta.message = err.toString(); @@ -104,9 +130,13 @@ class DashboardAdapter extends Adapter { WHERE isdeleted = 0 AND idt >= ? AND idt < ? + ${nik != "" ? " AND iby=?" : ""} `; - db.query(qryPO, [startDate, endDate], (err, poResult) => { + const params = [startDate, endDate]; + if (nik != "") params.push(nik); + + db.query(qryPO, params, (err, poResult) => { if (err) { apires.meta.code = 500; apires.meta.message = err.toString(); @@ -124,9 +154,13 @@ class DashboardAdapter extends Adapter { WHERE isdeleted = 0 AND idt >= ? AND idt < ? + ${nik != "" ? " AND iby=?" : ""} `; - db.query(qryBast, [startDate, endDate], (err, bastResult) => { + const params = [startDate, endDate]; + if (nik != "") params.push(nik); + + db.query(qryBast, params, (err, bastResult) => { if (err) { apires.meta.code = 500; apires.meta.message = err.toString(); @@ -225,6 +259,8 @@ class DashboardAdapter extends Adapter { var apires = this.getApiResultDefined(); try { + let nik = req.query.nik || ""; + let year = req.query.year || new Date().getFullYear(); let start = year + "-01-01"; let end = parseInt(year) + 1 + "-01-01"; @@ -251,14 +287,17 @@ class DashboardAdapter extends Adapter { // JUSTIFICATION let qryJustification = ` - SELECT MONTH(idt) as month, COUNT(*) total - FROM tbl_justification - WHERE isdeleted=0 - AND idt>=? AND idt=? AND idt { justification[r.month - 1] = r.total; @@ -267,14 +306,14 @@ class DashboardAdapter extends Adapter { // PR let qryPR = ` - SELECT MONTH(idt) as month, COUNT(*) total - FROM tbl_pr - WHERE isdeleted=0 - AND idt>=? AND idt=? AND idt { pr[r.month - 1] = r.total; @@ -283,14 +322,14 @@ class DashboardAdapter extends Adapter { // PO let qryPO = ` - SELECT MONTH(idt) as month, COUNT(*) total - FROM tbl_po - WHERE isdeleted=0 - AND idt>=? AND idt=? AND idt { po[r.month - 1] = r.total; @@ -299,14 +338,14 @@ class DashboardAdapter extends Adapter { // BAST let qryBAST = ` - SELECT MONTH(idt) as month, COUNT(*) total - FROM tbl_bast - WHERE isdeleted=0 - AND idt>=? AND idt=? AND idt { bast[r.month - 1] = r.total;