From b9c39b6320a2d1be89f7f0735b6d0020f5c2b1c3 Mon Sep 17 00:00:00 2001 From: farhantock Date: Sun, 19 May 2024 01:50:23 +0700 Subject: [PATCH] feat(chart): update labels request by client --- src/views/Dashboard/DashboardBOD.js | 75 +++++++++++++++++------------ 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/src/views/Dashboard/DashboardBOD.js b/src/views/Dashboard/DashboardBOD.js index b02eb47..02124e9 100644 --- a/src/views/Dashboard/DashboardBOD.js +++ b/src/views/Dashboard/DashboardBOD.js @@ -453,7 +453,7 @@ const DashboardBOD = (props) => {
-
Project Expenditure
+
RKAP {moment().format('YYYY')}
Total Project Expenditure from on-going project.
{PROJECT_EXPENDITURE ? @@ -463,13 +463,13 @@ const DashboardBOD = (props) => { Detailed View
-
+ {/*
All Dashboard
-
+
*/} :
@@ -491,53 +491,63 @@ const DashboardBOD = (props) => { return toRupiah(value, { useUnit: 'jt' }); } } - } - }, - elements: { - bar: { - borderWidth: 2, }, + y: { + ticks: { + autoSkip: false, + stepSize: 2 + } + } }, responsive: true, maintainAspectRatio: false, plugins: { legend: { display: false, - position: 'right', - labels: { - boxWidth: 10 - } }, datalabels: { color: '#FFFFFF', formatter: function (value, context) { - return value ? toRupiah(value, { useUnit: 'jt' }) : 0 + return value ? toRupiah(value, { useUnit: 'jt' }) : 0; } } }, }} data={{ - labels: ['Total Budget', 'Expenditure', 'Invoice', 'Cash In'], + labels: [ + `Target Pendapatan ${moment().format('YYYY')}`, + 'Realisasi Pendapatan', + 'Realisasi Cash In', + 'Anggaran Biaya', + 'Realisasi Anggaran Biaya', + 'Laba' + ], datasets: [ { label: '', data: [ - PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_budget ? PROJECT_EXPENDITURE.total_budget : 0, - PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_expenditure ? PROJECT_EXPENDITURE.total_expenditure : 0, - PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_invoice ? Math.floor(PROJECT_EXPENDITURE.total_invoice) : 0, - PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_paid_invoice ? PROJECT_EXPENDITURE.total_paid_invoice : 0 + PROJECT_EXPENDITURE?.total_budget || 0, + PROJECT_EXPENDITURE?.total_expenditure || 1000000000, + PROJECT_EXPENDITURE?.total_invoice ? Math.floor(PROJECT_EXPENDITURE.total_invoice) : 1000000000, + PROJECT_EXPENDITURE?.total_paid_invoice || 1000000000, + PROJECT_EXPENDITURE?.total_paid_invoice || 1000000000, + PROJECT_EXPENDITURE?.total_paid_invoice || 1000000000 ], borderColor: [ - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_budget && PROJECT_EXPENDITURE_COLOR.total_budget !== "" ? PROJECT_EXPENDITURE_COLOR.total_budget : '#480ca8', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_expenditure && PROJECT_EXPENDITURE_COLOR.total_expenditure !== "" ? PROJECT_EXPENDITURE_COLOR.total_expenditure : '#b5179e', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_invoice && PROJECT_EXPENDITURE_COLOR.total_invoice !== "" ? PROJECT_EXPENDITURE_COLOR.total_invoice : '#a26a16', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_paid_invoice && PROJECT_EXPENDITURE_COLOR.total_paid_invoice !== "" ? PROJECT_EXPENDITURE_COLOR.total_paid_invoice : '#4c4747' + PROJECT_EXPENDITURE_COLOR?.total_budget || '#480ca8', + PROJECT_EXPENDITURE_COLOR?.total_expenditure || '#b5179e', + PROJECT_EXPENDITURE_COLOR?.total_invoice || '#a26a16', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#4c4747', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#e00000', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#033a37' ], backgroundColor: [ - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_budget && PROJECT_EXPENDITURE_COLOR.total_budget !== "" ? PROJECT_EXPENDITURE_COLOR.total_budget : '#480ca8', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_expenditure && PROJECT_EXPENDITURE_COLOR.total_expenditure !== "" ? PROJECT_EXPENDITURE_COLOR.total_expenditure : '#b5179e', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_invoice && PROJECT_EXPENDITURE_COLOR.total_invoice !== "" ? PROJECT_EXPENDITURE_COLOR.total_invoice : '#a26a16', - PROJECT_EXPENDITURE_COLOR && PROJECT_EXPENDITURE_COLOR.total_paid_invoice && PROJECT_EXPENDITURE_COLOR.total_paid_invoice !== "" ? PROJECT_EXPENDITURE_COLOR.total_paid_invoice : '#4c4747' + PROJECT_EXPENDITURE_COLOR?.total_budget || '#480ca8', + PROJECT_EXPENDITURE_COLOR?.total_expenditure || '#b5179e', + PROJECT_EXPENDITURE_COLOR?.total_invoice || '#a26a16', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#4c4747', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#e00000', + PROJECT_EXPENDITURE_COLOR?.total_paid_invoice || '#033a37' ], borderRadius: 5, borderSkipped: false @@ -545,6 +555,7 @@ const DashboardBOD = (props) => { ], }} /> + : : @@ -556,6 +567,8 @@ const DashboardBOD = (props) => { backgroundColor="#f3f3f3" foregroundColor="#ecebeb" > + + @@ -640,8 +653,8 @@ const DashboardBOD = (props) => { { {
Project By Phase
-
Progress of project from multiple division.
+
Progress of project from multiple MP.