diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js index 7973899..2d397e8 100644 --- a/src/views/Pages/Login/Login.js +++ b/src/views/Pages/Login/Login.js @@ -217,6 +217,7 @@ class Login extends Component { window.localStorage.setItem('role_id', data_user.role_id); window.localStorage.setItem('company_id', data_user.company_id); window.localStorage.setItem('role_name', data_user.role.name); + window.localStorage.setItem('hierarchy', JSON.stringify(data_user.hierarchy)); } else { console.log("kode : ", doLogin.data.code); // NotificationManager.error('Cek username atau password anda!', 'Gagal Login!'); diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index 9a08500..b234c91 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -292,7 +292,8 @@ const CreatedProyek = ({ params, ...props }) => { const getDataProyek = async () => { let start = 0; - + let hierarchy = []; + hierarchy.push(JSON.parse(localStorage.getItem("hierarchy"))); if (currentPage !== 1 && currentPage > 1) { start = currentPage * rowsPerPage - rowsPerPage; } @@ -335,6 +336,7 @@ const CreatedProyek = ({ params, ...props }) => { if (parseInt(role_id) !== 1) { payload["columns"] = [ { name: "id", logic_operator: "=", value: proyek_id, operator: "AND" }, + { name: "created_by_id", logic_operator: "IN", value: hierarchy, operator: "AND" } ]; } @@ -574,7 +576,7 @@ const CreatedProyek = ({ params, ...props }) => { "checklist_k3_id" ], "columns": [ - { "name": "proyek_id", "logic_operator": "=", "value": id, "operator": "AND" } + { "name": "proyek_id", "logic_operator": "=", "value": id, "operator": "AND" } ] } const URL = `${BASE_OSPRO}/api/project-to-checklist-k3/search`; @@ -583,11 +585,11 @@ const CreatedProyek = ({ params, ...props }) => { .then(res => res) .catch((error) => error.response); - if(result && result.status==200){ - console.log("cek get project to checklist k3",result.data.data) + if (result && result.status == 200) { + console.log("cek get project to checklist k3", result.data.data) let dataRes = result.data.data; if (dataRes.length > 0) { - setK3Search(dataRes); + setK3Search(dataRes); } } } @@ -611,8 +613,8 @@ const CreatedProyek = ({ params, ...props }) => { .catch((error) => error.response); if (result && result.data && result.data.code == 200) { - const {value_proyek,area_kerja,scoupe_of_work, kode_sortname,nama,mulai_proyek,rencana_biaya,keterangan,durasi_proyek,project_objectives,potential_risk,currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when} = result.data.data; - const dataToSend = {value_proyek,area_kerja,scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when}; + const { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when } = result.data.data; + const dataToSend = { value_proyek, area_kerja, scoupe_of_work, kode_sortname, nama, mulai_proyek, rencana_biaya, keterangan, durasi_proyek, project_objectives, potential_risk, currency_symbol, nama_divisi, late_consequence, assumtion, considered_success_when }; setProjectCharter(dataToSend); } else { NotificationManager.error("Gagal Mengambil Data!!", "Failed"); @@ -1096,7 +1098,7 @@ const CreatedProyek = ({ params, ...props }) => { .post(IMAGE_UPLOAD, formData, HEADER_MULTIPART) .then(res => res) .catch((error) => error.response); - return "berhasil"; + return "berhasil"; }; const deleteImage = async (id) => { @@ -1106,7 +1108,7 @@ const CreatedProyek = ({ params, ...props }) => { .delete(URL, HEADER) .then(res => res) .catch((error) => error.response); - return "berhasil"; + return "berhasil"; }; const editProyek = async (data) => { @@ -1501,16 +1503,16 @@ const CreatedProyek = ({ params, ...props }) => { Request Tools */} {/* */} - { - /*text.type_proyek_id != 9 ?*/ -
handleOpenDialogGantt(text)}> - - - - Gantt -
- /*: null*/ - } + { + /*text.type_proyek_id != 9 ?*/ +
handleOpenDialogGantt(text)}> + + + + Gantt +
+ /*: null*/ + }
handleSCurve(text)}> @@ -2026,12 +2028,12 @@ const CreatedProyek = ({ params, ...props }) => { } - // visible={visible} - // onVisibleChange={handleVisibleChange} + // visible={visible} + // onVisibleChange={handleVisibleChange} >