diff --git a/src/views/Dashboard/DashboardBOD.js b/src/views/Dashboard/DashboardBOD.js index b7a8687..822de60 100644 --- a/src/views/Dashboard/DashboardBOD.js +++ b/src/views/Dashboard/DashboardBOD.js @@ -925,8 +925,8 @@ const DashboardBOD = (props) => { setHealthPerDivisionMode(mode)} chartType="vertical-bar" diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index 19dc791..a843992 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -385,7 +385,7 @@ const DashboardProject = (props) => { let selisihProgress = 0; let planningProgress = 0; let actualProgress = 0; - let statusHealthBySchedule = "on-schedule"; + let statusHealthBySchedule = "behind-schedule"; if ( result.data.data.length > 0 && result.data.data[0].data?.budget_control @@ -438,7 +438,7 @@ const DashboardProject = (props) => { selisihProgress = planningProgress - actualProgress; if (selisihProgress > 0 && selisihProgress <= 20) { statusHealthBySchedule = "warning"; - } else if (selisihProgress > 5) { + } else if (selisihProgress == 0 || selisihProgress < 0) { statusHealthBySchedule = "behind-schedule"; } setHealthBySchedule(statusHealthBySchedule); diff --git a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js index 6cddc65..f475c47 100644 --- a/src/views/SimproV2/CreatedProyek/DialogFormProyek.js +++ b/src/views/SimproV2/CreatedProyek/DialogFormProyek.js @@ -389,10 +389,18 @@ const DialogFormProyek = ({ const handleDatePickerStart = (date, dateString) => { setStartDate(date); + if (endDate) { + const duration = moment(endDate).diff(moment(date), 'days'); + setProjectDuration(duration); + } }; const handleDatePickerEnd = (date, dateString) => { setEndDate(date); + if (startDate) { + const duration = moment(date).diff(moment(startDate), 'days'); + setProjectDuration(duration); + } }; const nextStep = () => { diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index 8060f93..d7ae691 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -135,7 +135,8 @@ const DialogGantt = ({ openDialog, closeDialog, role_name, toggleDialog, idTask, company_id: companyId, dataViewStartDate, companyName, - role_name + role_name, + ganttName : text.name_version } }}> @@ -149,7 +150,7 @@ const DialogGantt = ({ openDialog, closeDialog, role_name, toggleDialog, idTask, , }, - { title: 'Nama', dataIndex: 'name_version', key: 'name_version' }, + { title: 'Nama', dataIndex: 'name_version', key: 'name_version'}, { title: 'Tipe kalkulasi', dataIndex: 'calculation_type', key: 'calculation_type' }, { title: 'Deskripsi', dataIndex: 'description', key: 'description' }, { title: 'Tanggal dibuat', dataIndex: 'created_at', key: 'created_at', render: (text, record) => (
{text ? moment(text).format("D-M-YYYY") : "-"}
) }, diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index fbd297d..c0c8204 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -1718,7 +1718,8 @@ const CreatedProyek = ({ params, ...props }) => { role_name, company_id: text.company_id, dataViewStartDate, - companyName: (role_name === 'Super Admin' ? text.join_third_company_name : JSON.parse(configApp).company_name) + companyName: (role_name === 'Super Admin' ? text.join_third_company_name : JSON.parse(configApp).company_name), + ganttName : res.name_version } }}>
diff --git a/src/views/SimproV2/Gantt/GanttFrame.js b/src/views/SimproV2/Gantt/GanttFrame.js index decf9d0..be06e2f 100644 --- a/src/views/SimproV2/Gantt/GanttFrame.js +++ b/src/views/SimproV2/Gantt/GanttFrame.js @@ -2,11 +2,11 @@ import React, { useEffect, useState } from 'react'; import { useHistory, withRouter } from 'react-router-dom'; import { BASE_SIMPRO_LUMEN } from '../../../const/ApiConst'; -const GanttFrame = React.memo(({ versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, companyId, role_name, company_name }) => { +const GanttFrame = React.memo(({ versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, companyId, role_name, company_name, ganttName }) => { const history = useHistory(); - const { versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, companyId, role_name, company_name } = props; - const iframeSrc = `https://si-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${companyId}&company_name=${company_name}`; - // const iframeSrc = `http://localhost:8444/generic-ospro-gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${companyId}&company_name=${company_name}`; + + const iframeSrc = `https://si-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${companyId}&company_name=${company_name}&gantt_name=${ganttName}`; + // const iframeSrc = `http://localhost:8444/surveyor_indonesia_gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}×tamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${companyId}&company_name=${company_name}&gantt_name=${ganttName}`; const [batchEntityData, setBatchEntityData] = useState(null); useEffect(() => { diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js index e2483f7..5a2d04c 100644 --- a/src/views/SimproV2/Gantt/index.js +++ b/src/views/SimproV2/Gantt/index.js @@ -12,12 +12,13 @@ const Gantt = (props) => { const location = useLocation(); const { company_id, dataViewStartDate, companyName, role_name } = location.state || {}; - let role_id = '', userId = '', isLogin = '', token = ''; + let role_id = '', userId = '', isLogin = '', token = '', ganttName = ''; if (props.location.state && props.location.state.role_id && props.location.state.user_id) { role_id = props.location.state.role_id; userId = props.location.state.user_id; token = props.location.state.token; isLogin = props.location.state.isLogin; + ganttName = props.location.state.ganttName; } else { role_id = localStorage.getItem("role_id"); userId = localStorage.getItem("user_id"); @@ -116,6 +117,7 @@ const Gantt = (props) => { timestamp={timestamp} dataViewStartDate={dataViewStartDate} company_name={companyName} + ganttName={ganttName} /> )}