update
This commit is contained in:
@ -12,6 +12,7 @@ class DashboardAdapter extends Adapter {
|
|||||||
var apires = this.getApiResultDefined();
|
var apires = this.getApiResultDefined();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
let nik = req.query.nik || "";
|
||||||
let year = req.query.year || new Date().getFullYear();
|
let year = req.query.year || new Date().getFullYear();
|
||||||
let startDate = year + "-01-01";
|
let startDate = year + "-01-01";
|
||||||
let endDate = parseInt(year) + 1 + "-01-01";
|
let endDate = parseInt(year) + 1 + "-01-01";
|
||||||
@ -22,12 +23,14 @@ class DashboardAdapter extends Adapter {
|
|||||||
SELECT COALESCE(SUM(amount),0)
|
SELECT COALESCE(SUM(amount),0)
|
||||||
FROM tbl_requestbudget
|
FROM tbl_requestbudget
|
||||||
WHERE isdeleted = 0 AND years = ? AND tbl_requestbudget.isused = 0
|
WHERE isdeleted = 0 AND years = ? AND tbl_requestbudget.isused = 0
|
||||||
|
${nik != "" ? " AND iby=?" : ""}
|
||||||
) AS total_requested_budget,
|
) AS total_requested_budget,
|
||||||
|
|
||||||
(
|
(
|
||||||
SELECT COALESCE(SUM(amount),0)
|
SELECT COALESCE(SUM(amount),0)
|
||||||
FROM tbl_budgetcapexinfo
|
FROM tbl_budgetcapexinfo
|
||||||
WHERE isdeleted = 0 AND years = ?
|
WHERE isdeleted = 0 AND years = ?
|
||||||
|
${nik != "" ? " AND iby=?" : ""}
|
||||||
) AS total_remaining_budget,
|
) AS total_remaining_budget,
|
||||||
|
|
||||||
(
|
(
|
||||||
@ -36,10 +39,25 @@ class DashboardAdapter extends Adapter {
|
|||||||
WHERE isdeleted = 0
|
WHERE isdeleted = 0
|
||||||
AND idt >= ?
|
AND idt >= ?
|
||||||
AND idt < ?
|
AND idt < ?
|
||||||
|
${nik != "" ? " AND iby=?" : ""}
|
||||||
) AS total_used_budget
|
) 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) {
|
if (err) {
|
||||||
apires.meta.code = 500;
|
apires.meta.code = 500;
|
||||||
apires.meta.message = err.toString();
|
apires.meta.message = err.toString();
|
||||||
@ -65,9 +83,13 @@ class DashboardAdapter extends Adapter {
|
|||||||
WHERE isdeleted = 0
|
WHERE isdeleted = 0
|
||||||
AND idt >= ?
|
AND idt >= ?
|
||||||
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) {
|
if (err) {
|
||||||
apires.meta.code = 500;
|
apires.meta.code = 500;
|
||||||
apires.meta.message = err.toString();
|
apires.meta.message = err.toString();
|
||||||
@ -84,9 +106,13 @@ class DashboardAdapter extends Adapter {
|
|||||||
WHERE isdeleted = 0
|
WHERE isdeleted = 0
|
||||||
AND idt >= ?
|
AND idt >= ?
|
||||||
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) {
|
if (err) {
|
||||||
apires.meta.code = 500;
|
apires.meta.code = 500;
|
||||||
apires.meta.message = err.toString();
|
apires.meta.message = err.toString();
|
||||||
@ -104,9 +130,13 @@ class DashboardAdapter extends Adapter {
|
|||||||
WHERE isdeleted = 0
|
WHERE isdeleted = 0
|
||||||
AND idt >= ?
|
AND idt >= ?
|
||||||
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) {
|
if (err) {
|
||||||
apires.meta.code = 500;
|
apires.meta.code = 500;
|
||||||
apires.meta.message = err.toString();
|
apires.meta.message = err.toString();
|
||||||
@ -124,9 +154,13 @@ class DashboardAdapter extends Adapter {
|
|||||||
WHERE isdeleted = 0
|
WHERE isdeleted = 0
|
||||||
AND idt >= ?
|
AND idt >= ?
|
||||||
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) {
|
if (err) {
|
||||||
apires.meta.code = 500;
|
apires.meta.code = 500;
|
||||||
apires.meta.message = err.toString();
|
apires.meta.message = err.toString();
|
||||||
@ -225,6 +259,8 @@ class DashboardAdapter extends Adapter {
|
|||||||
var apires = this.getApiResultDefined();
|
var apires = this.getApiResultDefined();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
let nik = req.query.nik || "";
|
||||||
|
|
||||||
let year = req.query.year || new Date().getFullYear();
|
let year = req.query.year || new Date().getFullYear();
|
||||||
let start = year + "-01-01";
|
let start = year + "-01-01";
|
||||||
let end = parseInt(year) + 1 + "-01-01";
|
let end = parseInt(year) + 1 + "-01-01";
|
||||||
@ -251,14 +287,17 @@ class DashboardAdapter extends Adapter {
|
|||||||
|
|
||||||
// JUSTIFICATION
|
// JUSTIFICATION
|
||||||
let qryJustification = `
|
let qryJustification = `
|
||||||
SELECT MONTH(idt) as month, COUNT(*) total
|
SELECT MONTH(idt) as month, COUNT(*) total
|
||||||
FROM tbl_justification
|
FROM tbl_justification
|
||||||
WHERE isdeleted=0
|
WHERE isdeleted=0
|
||||||
AND idt>=? AND idt<?
|
AND idt>=? AND idt<? ${nik != "" ? " AND iby=?" : ""}
|
||||||
GROUP BY MONTH(idt)
|
GROUP BY MONTH(idt)
|
||||||
`;
|
`;
|
||||||
|
|
||||||
db.query(qryJustification, [start, end], function (err, result) {
|
const params = [start, end];
|
||||||
|
if (nik != "") params.push(nik);
|
||||||
|
|
||||||
|
db.query(qryJustification, params, function (err, result) {
|
||||||
if (result) {
|
if (result) {
|
||||||
result.forEach((r) => {
|
result.forEach((r) => {
|
||||||
justification[r.month - 1] = r.total;
|
justification[r.month - 1] = r.total;
|
||||||
@ -267,14 +306,14 @@ class DashboardAdapter extends Adapter {
|
|||||||
|
|
||||||
// PR
|
// PR
|
||||||
let qryPR = `
|
let qryPR = `
|
||||||
SELECT MONTH(idt) as month, COUNT(*) total
|
SELECT MONTH(idt) as month, COUNT(*) total
|
||||||
FROM tbl_pr
|
FROM tbl_pr
|
||||||
WHERE isdeleted=0
|
WHERE isdeleted=0
|
||||||
AND idt>=? AND idt<?
|
AND idt>=? AND idt<? ${nik != "" ? " AND iby=?" : ""}
|
||||||
GROUP BY MONTH(idt)
|
GROUP BY MONTH(idt)
|
||||||
`;
|
`;
|
||||||
|
|
||||||
db.query(qryPR, [start, end], function (err, result) {
|
db.query(qryPR, params, function (err, result) {
|
||||||
if (result) {
|
if (result) {
|
||||||
result.forEach((r) => {
|
result.forEach((r) => {
|
||||||
pr[r.month - 1] = r.total;
|
pr[r.month - 1] = r.total;
|
||||||
@ -283,14 +322,14 @@ class DashboardAdapter extends Adapter {
|
|||||||
|
|
||||||
// PO
|
// PO
|
||||||
let qryPO = `
|
let qryPO = `
|
||||||
SELECT MONTH(idt) as month, COUNT(*) total
|
SELECT MONTH(idt) as month, COUNT(*) total
|
||||||
FROM tbl_po
|
FROM tbl_po
|
||||||
WHERE isdeleted=0
|
WHERE isdeleted=0
|
||||||
AND idt>=? AND idt<?
|
AND idt>=? AND idt<? ${nik != "" ? " AND iby=?" : ""}
|
||||||
GROUP BY MONTH(idt)
|
GROUP BY MONTH(idt)
|
||||||
`;
|
`;
|
||||||
|
|
||||||
db.query(qryPO, [start, end], function (err, result) {
|
db.query(qryPO, params, function (err, result) {
|
||||||
if (result) {
|
if (result) {
|
||||||
result.forEach((r) => {
|
result.forEach((r) => {
|
||||||
po[r.month - 1] = r.total;
|
po[r.month - 1] = r.total;
|
||||||
@ -299,14 +338,14 @@ class DashboardAdapter extends Adapter {
|
|||||||
|
|
||||||
// BAST
|
// BAST
|
||||||
let qryBAST = `
|
let qryBAST = `
|
||||||
SELECT MONTH(idt) as month, COUNT(*) total
|
SELECT MONTH(idt) as month, COUNT(*) total
|
||||||
FROM tbl_bast
|
FROM tbl_bast
|
||||||
WHERE isdeleted=0
|
WHERE isdeleted=0
|
||||||
AND idt>=? AND idt<?
|
AND idt>=? AND idt<? ${nik != "" ? " AND iby=?" : ""}
|
||||||
GROUP BY MONTH(idt)
|
GROUP BY MONTH(idt)
|
||||||
`;
|
`;
|
||||||
|
|
||||||
db.query(qryBAST, [start, end], function (err, result) {
|
db.query(qryBAST, params, function (err, result) {
|
||||||
if (result) {
|
if (result) {
|
||||||
result.forEach((r) => {
|
result.forEach((r) => {
|
||||||
bast[r.month - 1] = r.total;
|
bast[r.month - 1] = r.total;
|
||||||
|
|||||||
Reference in New Issue
Block a user