diff --git a/src/views/DashboardPMOV1/index.js b/src/views/DashboardPMOV1/index.js
index d6473b0..b53365a 100644
--- a/src/views/DashboardPMOV1/index.js
+++ b/src/views/DashboardPMOV1/index.js
@@ -34,7 +34,6 @@ function BoxDashboard({ value, title, secondaryTitle, icon, bgColor }) {
)
}
-// pardon this, i've no time
function BoxDashboardNoIcon({ value, title, secondaryTitle, bgColor }) {
return (
<>
@@ -61,6 +60,9 @@ const DashboardPM = () => {
const [PROJECTACTUALCOSTTOTAL, SET_PROJECTACTUALCOSTTOTAL] = useState(0)
const [PROJECTCOSTTOTAL, SET_PROJECTCOSTTOTAL] = useState(0)
const [TOTALREVENUE, SET_TOTALREVENUE] = useState(0)
+ const [MANPOWERS, SET_MANPOWERS] = useState(0)
+ const [PROJECTPHASES, SET_PROJECTPHASES] = useState([])
+ const [PROJECTSBYPHASE, SET_PROJECTSBYPHASE] = useState([])
const token = localStorage.getItem("token")
const HEADER = {
@@ -78,6 +80,10 @@ const DashboardPM = () => {
result.data.totalActualCost != undefined ? SET_PROJECTCOSTTOTAL(result.data.totalActualCost) : SET_PROJECTCOSTTOTAL(0)
result.data.totalPlannedCost != undefined ? SET_PROJECTBUDGETTOTAL(result.data.totalPlannedCost) : SET_PROJECTBUDGETTOTAL(0)
result.data.totalRevenue != undefined ? SET_TOTALREVENUE(result.data.totalRevenue) : SET_TOTALREVENUE(0)
+ result.data.manpowers != undefined ? SET_MANPOWERS(result.data.manpowers) : SET_MANPOWERS(0)
+ result.data.projectPhases != undefined ? SET_PROJECTPHASES(result.data.projectPhases) : SET_PROJECTPHASES([])
+ result.data.projectsByPhase != undefined ? SET_PROJECTSBYPHASE(result.data.projectsByPhase) : SET_PROJECTSBYPHASE([])
+
}
useEffect(() => {
@@ -95,34 +101,42 @@ const DashboardPM = () => {
lg: 32,
}}
>
-
+
+ }
+ value={PROJECTCOUNT}
+ bgColor="#0287c7"
+ title="Projects"
+ />
+
+
}
+ icon={}
value={`${formatRibuanDecimal(PROJECTBUDGETTOTAL)}`}
- bgColor="#077857"
+ bgColor="#cf6102"
title="Budget"
/>
-
+
}
+ icon={}
value={`${formatRibuanDecimal(PROJECTCOSTTOTAL)}`}
- bgColor="#077857"
+ bgColor="#f51d1d"
title="Spent on Projects"
/>
-
+
}
+ icon={}
value={`${formatRibuanDecimal(TOTALREVENUE)}`}
bgColor="#077857"
title="Revenue"
/>
-
+
}
- value="-"
+ icon={}
+ value={MANPOWERS}
bgColor="#0287c7"
title="Manpowers"
/>
@@ -134,6 +148,12 @@ const DashboardPM = () => {
+
+
+ Car Management
+ Total Vehicles: -
+
+
{
@@ -167,7 +187,7 @@ const DashboardPM = () => {
>
}
/>
@@ -175,14 +195,14 @@ const DashboardPM = () => {
-
+
diff --git a/src/views/DashboardPMOV1/projectPhaseChart.js b/src/views/DashboardPMOV1/projectPhaseChart.js
index 111e748..253b3ec 100644
--- a/src/views/DashboardPMOV1/projectPhaseChart.js
+++ b/src/views/DashboardPMOV1/projectPhaseChart.js
@@ -1,36 +1,37 @@
import React from 'react';
-import { Bar } from 'react-chartjs-2';
-import { faker } from '@faker-js/faker';
+import { HorizontalBar } from 'react-chartjs-2';
const options = {
- indexAxis: 'y',
responsive: true,
+ title: {
+ display: true,
+ text: 'PROJECT BY PHASE'
+ }
};
-const labels = ['January', 'February', 'March', 'April', 'May', 'June', 'July'];
-
-export const data = {
- labels,
- datasets: [
- {
- label: 'Dataset 1',
- data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })),
- borderColor: 'rgb(255, 99, 132)',
- backgroundColor: 'rgba(255, 99, 132, 0.5)',
- },
- {
- label: 'Dataset 2',
- data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })),
- borderColor: 'rgb(53, 162, 235)',
- backgroundColor: 'rgba(53, 162, 235, 0.5)',
- },
- ],
-};
-
-export function ProjectPhaseChart() {
- return ;
+export const ProjectPhaseChart = ({ projectPhases, projectsByPhase }) => {
+ let dataSets = []
+ let total = []
+
+ for (var i = 0; i < projectsByPhase.length; i++) {
+ total = []
+ for (var j = 0; j < projectPhases.length; j++) {
+ if (projectPhases[j] != projectsByPhase[i].name) {
+ total.push(0)
+ } else {
+ total.push(projectsByPhase[i].total)
+ }
+ }
+ dataSets.push({
+ label: projectsByPhase[i].name,
+ data: total,
+ backgroundColor: projectsByPhase[i].color,
+ borderColor: '#000000',
+ });
+ }
+ const data = {
+ datasets: dataSets,
+ labels: projectPhases,
+ };
+ return ;
}
-
-
-
-
diff --git a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js
index 43320f7..57c74a9 100644
--- a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js
+++ b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js
@@ -80,7 +80,6 @@ const DialogFormProyek = ({
.get(`${PROYEK_GET_ID(id)}`, HEADER)
.then((res) => res)
.catch((err) => err.response);
- console.log("proyek by id", result);
if (result && result.data && result.data.code === 200) {
const val = result.data.data;
setName(val.nama);
@@ -305,7 +304,7 @@ const DialogFormProyek = ({
akhir_proyek: endDate,
type_proyek_id: parseInt(typeProject),
phase_id: parseInt(phaseProject),
- budget_health: budgetHealth,
+ health_budget: budgetHealth,
pm_id: pic,
investor,
finance,