diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index daa277c..30912f9 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -142,7 +142,7 @@ const CreatedProyek = ({ params, ...props }) => { const [userProyek, setUserProyek] = useState([]); const [materialProyek, setMaterialProyek] = useState([]); const [dataCharter, setDataCharter] = useState(null); - const [dataViewStartDate, setDataViewStartDate] = useState([]); + const [dataViewStartDate, setDataViewStartDate] = useState(""); const [materialResource, setMaterialResource] = useState([]); const [toolsResource, setToolsResource] = useState([]); const [dataTypeProyek, setDataTypeProyek] = useState([]); @@ -376,7 +376,7 @@ const CreatedProyek = ({ params, ...props }) => { paging: { start: start, length: rowsPerPage }, }; - if (all_project) { + if (all_project !== null && all_project === true) { payload["columns"] = [ { name: "company_id", logic_operator: "like", value: company_id, operator: "AND" } ]; @@ -512,6 +512,7 @@ const CreatedProyek = ({ params, ...props }) => { }; const handleOpenDialogGantt = (data) => { + console.log('data.mulai_proyek', data.mulai_proyek); setDataViewStartDate(data.mulai_proyek) setidTask(data.id); setProyekName(data.nama); @@ -1534,32 +1535,12 @@ const CreatedProyek = ({ params, ...props }) => { Assign Checklist K3 - {/*
handleOpenDialogMaterial(text)} - > - - - - Request Material Resource -
*/} - {/*
handleOpenDialogTools(text)}> - - - - Request Tools -
*/} - {/* */} - { - /*text.type_proyek_id != 9 ?*/ -
handleOpenDialogGantt(text)}> - - - - Gantt -
- /*: null*/ - } +
handleOpenDialogGantt(text)}> + + + + Gantt +
handleSCurve(text)}> @@ -1572,7 +1553,6 @@ const CreatedProyek = ({ params, ...props }) => { Report Analysis
- {/* */}
handleOpenDialogProyek(text.id)} @@ -1995,6 +1975,7 @@ const CreatedProyek = ({ params, ...props }) => { toggleDialog={toggleDialogHierarchy} idTask={idTask} proyekName={proyekName} + dataViewStartDate={dataViewStartDate} /> ), [openDialogHierarchy]