ordo
/
surveyor_indonesia_frontend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

updt

pull/2/head
Yusuf 2 years ago
parent
678a51f39f
commit
415a573566
3 changed files with 70 additions and 50 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 58
      src/views/DashboardPMOV1/index.js
  2. 57
      src/views/DashboardPMOV1/projectPhaseChart.js
  3. 3
      src/views/SimproV2/CreatedProyek/DialogFormProyek.js

58
src/views/DashboardPMOV1/index.js
Unescape View File

@ -34,7 +34,6 @@ function BoxDashboard({ value, title, secondaryTitle, icon, bgColor }) {
) )
} }
// pardon this, i've no time
function BoxDashboardNoIcon({ value, title, secondaryTitle, bgColor }) { function BoxDashboardNoIcon({ value, title, secondaryTitle, bgColor }) {
return ( return (
<> <>
@ -61,6 +60,9 @@ const DashboardPM = () => {
const [PROJECTACTUALCOSTTOTAL, SET_PROJECTACTUALCOSTTOTAL] = useState(0) const [PROJECTACTUALCOSTTOTAL, SET_PROJECTACTUALCOSTTOTAL] = useState(0)
const [PROJECTCOSTTOTAL, SET_PROJECTCOSTTOTAL] = useState(0) const [PROJECTCOSTTOTAL, SET_PROJECTCOSTTOTAL] = useState(0)
const [TOTALREVENUE, SET_TOTALREVENUE] = 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 token = localStorage.getItem("token")
const HEADER = { const HEADER = {
@ -78,6 +80,10 @@ const DashboardPM = () => {
result.data.totalActualCost != undefined ? SET_PROJECTCOSTTOTAL(result.data.totalActualCost) : SET_PROJECTCOSTTOTAL(0) 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.totalPlannedCost != undefined ? SET_PROJECTBUDGETTOTAL(result.data.totalPlannedCost) : SET_PROJECTBUDGETTOTAL(0)
result.data.totalRevenue != undefined ? SET_TOTALREVENUE(result.data.totalRevenue) : SET_TOTALREVENUE(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(() => { useEffect(() => {
@ -95,34 +101,42 @@ const DashboardPM = () => {
lg: 32, lg: 32,
}} }}
> >
<Col span={6} style={{ margin: '' }}> <Col span={4} style={{ margin: '' }}>
<BoxDashboard
icon={<i style={{ color: '#fff' }} class="zmdi zmdi-calendar-note zmdi-hc-2x"></i>}
value={PROJECTCOUNT}
bgColor="#0287c7"
title="Projects"
/>
</Col>
<Col span={5} style={{ margin: '' }}>
<BoxDashboard <BoxDashboard
icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-4x"></i>} icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-2x"></i>}
value={`${formatRibuanDecimal(PROJECTBUDGETTOTAL)}`} value={`${formatRibuanDecimal(PROJECTBUDGETTOTAL)}`}
bgColor="#077857" bgColor="#cf6102"
title="Budget" title="Budget"
/> />
</Col> </Col>
<Col span={6} style={{ margin: '' }}> <Col span={5} style={{ margin: '' }}>
<BoxDashboard <BoxDashboard
icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-4x"></i>} icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-2x"></i>}
value={`${formatRibuanDecimal(PROJECTCOSTTOTAL)}`} value={`${formatRibuanDecimal(PROJECTCOSTTOTAL)}`}
bgColor="#077857" bgColor="#f51d1d"
title="Spent on Projects" title="Spent on Projects"
/> />
</Col> </Col>
<Col span={6} style={{ margin: '' }}> <Col span={5} style={{ margin: '' }}>
<BoxDashboard <BoxDashboard
icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-4x"></i>} icon={<i style={{ color: '#fff' }} class="zmdi zmdi-money zmdi-hc-2x"></i>}
value={`${formatRibuanDecimal(TOTALREVENUE)}`} value={`${formatRibuanDecimal(TOTALREVENUE)}`}
bgColor="#077857" bgColor="#077857"
title="Revenue" title="Revenue"
/> />
</Col> </Col>
<Col span={6} style={{ margin: '' }}> <Col span={4} style={{ margin: '' }}>
<BoxDashboard <BoxDashboard
icon={<i style={{ color: '#fff' }} class="zmdi zmdi-accounts-alt zmdi-hc-4x"></i>} icon={<i style={{ color: '#fff' }} class="zmdi zmdi-accounts-alt zmdi-hc-2x"></i>}
value="-" value={MANPOWERS}
bgColor="#0287c7" bgColor="#0287c7"
title="Manpowers" title="Manpowers"
/> />
@ -134,6 +148,12 @@ const DashboardPM = () => {
<Panel key="1"> <Panel key="1">
<Row style={{ margin: '15px 10px 0px 0px' }}> <Row style={{ margin: '15px 10px 0px 0px' }}>
<Col span={8} > <Col span={8} >
<Row>
<Col span={24}>
<h6 class="text-center">Car Management</h6>
<h6 class="text-center">Total Vehicles: -</h6>
</Col>
</Row>
<Row <Row
gutter={{ gutter={{
xs: 8, xs: 8,
@ -145,15 +165,15 @@ const DashboardPM = () => {
<Col span={12}> <Col span={12}>
<BoxDashboardNoIcon <BoxDashboardNoIcon
value="-" value="-"
bgColor="#077857" bgColor="#5e5c70"
title="Active / Standby" title="On Duty"
/> />
</Col> </Col>
<Col span={12}> <Col span={12}>
<BoxDashboardNoIcon <BoxDashboardNoIcon
value="-" value="-"
bgColor="#077857" bgColor="#5e5c70"
title="Need Maintenance" title="At Pool"
/> />
</Col> </Col>
</Row> </Row>
@ -167,7 +187,7 @@ const DashboardPM = () => {
> >
<Col span={12}> <Col span={12}>
<BoxDashboardNoIcon <BoxDashboardNoIcon
bgColor="#077857" bgColor="#5e5c70"
title="" title=""
value={<i style={{ color: '#fff' }} class="zmdi zmdi-truck zmdi-hc-2x"></i>} value={<i style={{ color: '#fff' }} class="zmdi zmdi-truck zmdi-hc-2x"></i>}
/> />
@ -175,14 +195,14 @@ const DashboardPM = () => {
<Col span={12}> <Col span={12}>
<BoxDashboardNoIcon <BoxDashboardNoIcon
value="-" value="-"
bgColor="#077857" bgColor="#5e5c70"
title="On Maintenance" title="On Maintenance"
/> />
</Col> </Col>
</Row> </Row>
</Col> </Col>
<Col span={8}> <Col span={8}>
<ProjectPhaseChart /> <ProjectPhaseChart projectPhases={PROJECTPHASES} projectsByPhase={PROJECTSBYPHASE} />
</Col> </Col>
<Col span={8}> <Col span={8}>
<ProjectTypeChart /> <ProjectTypeChart />

57
src/views/DashboardPMOV1/projectPhaseChart.js vendored
Unescape View File

@ -1,36 +1,37 @@
import React from 'react'; import React from 'react';
import { Bar } from 'react-chartjs-2'; import { HorizontalBar } from 'react-chartjs-2';
import { faker } from '@faker-js/faker';
const options = { const options = {
indexAxis: 'y',
responsive: true, responsive: true,
title: {
display: true,
text: 'PROJECT BY PHASE'
}
}; };
const labels = ['January', 'February', 'March', 'April', 'May', 'June', 'July']; export const ProjectPhaseChart = ({ projectPhases, projectsByPhase }) => {
let dataSets = []
export const data = { let total = []
labels,
datasets: [ for (var i = 0; i < projectsByPhase.length; i++) {
{ total = []
label: 'Dataset 1', for (var j = 0; j < projectPhases.length; j++) {
data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })), if (projectPhases[j] != projectsByPhase[i].name) {
borderColor: 'rgb(255, 99, 132)', total.push(0)
backgroundColor: 'rgba(255, 99, 132, 0.5)', } else {
}, total.push(projectsByPhase[i].total)
{ }
label: 'Dataset 2', }
data: labels.map(() => faker.datatype.number({ min: -1000, max: 1000 })), dataSets.push({
borderColor: 'rgb(53, 162, 235)', label: projectsByPhase[i].name,
backgroundColor: 'rgba(53, 162, 235, 0.5)', data: total,
}, backgroundColor: projectsByPhase[i].color,
], borderColor: '#000000',
});
}
const data = {
datasets: dataSets,
labels: projectPhases,
}; };
return <HorizontalBar options={options} data={data} />;
export function ProjectPhaseChart() {
return <Bar options={options} data={data} />;
} }

3
src/views/SimproV2/CreatedProyek/DialogFormProyek.js
Unescape View File

@ -80,7 +80,6 @@ const DialogFormProyek = ({
.get(`${PROYEK_GET_ID(id)}`, HEADER) .get(`${PROYEK_GET_ID(id)}`, HEADER)
.then((res) => res) .then((res) => res)
.catch((err) => err.response); .catch((err) => err.response);
console.log("proyek by id", result);
if (result && result.data && result.data.code === 200) { if (result && result.data && result.data.code === 200) {
const val = result.data.data; const val = result.data.data;
setName(val.nama); setName(val.nama);
@ -305,7 +304,7 @@ const DialogFormProyek = ({
akhir_proyek: endDate, akhir_proyek: endDate,
type_proyek_id: parseInt(typeProject), type_proyek_id: parseInt(typeProject),
phase_id: parseInt(phaseProject), phase_id: parseInt(phaseProject),
budget_health: budgetHealth, health_budget: budgetHealth,
pm_id: pic, pm_id: pic,
investor, investor,
finance, finance,

Write Preview
Loading…
Cancel
Save