From 336e8621640b71e54b7ed426c52513bd64e93bd4 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:18:21 +0700 Subject: [PATCH 1/9] add apiConst --- src/const/ApiConst.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index 973b84c..0f12fb5 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -121,11 +121,11 @@ export let BASE_OSPRO = "http://localhost:8444/generic-ospro-backend"; export let BASE_SIMPRO_LUMEN = `${BASE_OSPRO}/api`; export let BASE_SIMPRO_LUMEN_IMAGE = `${BASE_OSPRO}/assets/image`; export let BASE_SIMPRO_LUMEN_FILE = `${BASE_OSPRO}/assets/file/project`; -export let BASE_SIMPRO_LUMEN_FILE_COMPANY = (file, company_name) => { - return `${BASE_OSPRO}/assets/${company_name}/file/project/${file}`; +export let BASE_SIMPRO_LUMEN_FILE_COMPANY = (file, company_name, dateFile) => { + return `${BASE_OSPRO}/assets/${company_name}/${dateFile}/file/project/${file}`; } -export let BASE_SIMPRO_LUMEN_IMAGE_COMPANY = (file, company_name) => { - return `${BASE_OSPRO}/assets/${company_name}/image/${file}`; +export let BASE_SIMPRO_LUMEN_IMAGE_COMPANY = (file, company_name, dateFile) => { + return `${BASE_OSPRO}/assets/${company_name}/${dateFile}/image/${file}`; } export const USERROLE_ADD = `${BASE_SIMPRO}/user-role/add`; @@ -736,8 +736,8 @@ export const FOLDER_DOCUMENT_PROYEK_ADD = `${BASE_SIMPRO_LUMEN}/folder-document- export const FOLDER_DOCUMENT_PROYEK_SEARCH = `${BASE_SIMPRO_LUMEN}/folder-document-proyek/search`; export const FOLDER_DOCUMENT_PROYEK_UPDATE = (id) => `${BASE_SIMPRO_LUMEN}/folder-document-proyek/update/${id}`; -export const FOLDER_DOCUMENT_PROYEK_DELETE = (id) => - `${BASE_SIMPRO_LUMEN}/folder-document-proyek/delete/${id}`; +export const FOLDER_DOCUMENT_PROYEK_DELETE = (id, company_id) => + `${BASE_SIMPRO_LUMEN}/folder-document-proyek/delete/${id}/${company_id}`; export const FOLDER_DOCUMENT_PROYEK_GET_TREE = (proyek_id) => `${BASE_SIMPRO_LUMEN}/folder-document-proyek/get-tree/${proyek_id}`; From 01da2075059f12d72ee488f45605b8e0db054965 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:18:36 +0700 Subject: [PATCH 2/9] add state --- src/containers/DefaultLayout/DefaultLayout.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js index 3f2fbbb..ef4d6af 100644 --- a/src/containers/DefaultLayout/DefaultLayout.js +++ b/src/containers/DefaultLayout/DefaultLayout.js @@ -370,6 +370,7 @@ class DefaultLayout extends Component { token={props.location.state ? props.location.state.token : localStorage.getItem("token")} menu_login={props.location.state ? props.location.state.menu_login : localStorage.getItem("menu_login")} user_name={props.location.state ? props.location.state.user_name : localStorage.getItem("user_name")} + configApp={props.location.state ? props.location.state.configApp : localStorage.getItem("configApp")} {...props} /> )} /> From d62b85f0158f96d261b47e57078b24bcb8abaf0f Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:19:20 +0700 Subject: [PATCH 3/9] add image url --- src/views/Master/MasterCompany/DialogForm.js | 31 ++++++++++++++------ src/views/Master/MasterCompany/index.js | 3 +- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/views/Master/MasterCompany/DialogForm.js b/src/views/Master/MasterCompany/DialogForm.js index 1b34c6c..33149f0 100644 --- a/src/views/Master/MasterCompany/DialogForm.js +++ b/src/views/Master/MasterCompany/DialogForm.js @@ -13,7 +13,7 @@ import { useTranslation } from 'react-i18next'; import axios from "../../../const/interceptorApi" import moment from 'moment'; import { - USER_SEARCH, MENU_COMPANY_DELETE, USER_DELETE, ROLE_SEARCH, COMPANY_MANAGEMENT_GET_ID, MENU_COMPANY_SEARCH, BASE_SIMPRO_LUMEN_IMAGE + USER_SEARCH, MENU_COMPANY_DELETE, USER_DELETE, ROLE_SEARCH, COMPANY_MANAGEMENT_GET_ID, MENU_COMPANY_SEARCH, BASE_SIMPRO_LUMEN_IMAGE_COMPANY } from '../../../const/ApiConst'; const token = window.localStorage.getItem('token'); const config = { @@ -594,6 +594,24 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company } }; + const imageUrl = (() => { + let imageType = ''; + let createdAt = ''; + + if (typeImage === 'imageHeader' && imageHeader) { + imageType = imageHeader.image; + createdAt = moment(imageHeader.created_at).format('YYYY-MM'); + } else if (typeImage === 'imageLogin' && imageLogin) { + imageType = imageLogin.image; + createdAt = moment(imageLogin.created_at).format('YYYY-MM'); + } else if (typeImage === 'favIcon' && imageFavIcon) { + imageType = imageFavIcon.image; + createdAt = moment(imageFavIcon.created_at).format('YYYY-MM'); + } + + return BASE_SIMPRO_LUMEN_IMAGE_COMPANY(imageType, companyNameProp, createdAt); + })(); + const renderFromCompany = () => { return ( <> @@ -823,21 +841,16 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, company typeImage !== 'imageSlider' ? ( imageLogin || imageHeader || imageFavIcon ? ( Image Preview ) : ('-') ) : ( {imageSlider && imageSlider.map((item, index) => ( - + ))} diff --git a/src/views/Master/MasterCompany/index.js b/src/views/Master/MasterCompany/index.js index 80fe48b..9c5c9b5 100644 --- a/src/views/Master/MasterCompany/index.js +++ b/src/views/Master/MasterCompany/index.js @@ -147,7 +147,8 @@ const MasterCompany = ({ params }) => { .then((res) => res) .catch((err) => err.response); if (result && result.data && result.data.code === 200) { - setProjectImageHeader(result.data.data); + const dataRes = result.data.data; + setProjectImageHeader(dataRes); } } From 7d951d4532576f9a9e26ca16bfbdd4bb094cae94 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:19:55 +0700 Subject: [PATCH 4/9] Enterprise condition --- src/views/Master/MasterTransaction/index.js | 24 ++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/src/views/Master/MasterTransaction/index.js b/src/views/Master/MasterTransaction/index.js index d8d2449..2d62159 100644 --- a/src/views/Master/MasterTransaction/index.js +++ b/src/views/Master/MasterTransaction/index.js @@ -85,21 +85,25 @@ class index extends Component { , }, - { - title: this.state.role_name === 'Super Admin' ? "Company Name" : null, - dataIndex: "join_first_company_name", - key: "join_first_company_name", - render: (text, record) => { - return this.state.role_name === 'Super Admin' ? ( - {record.join_first_company_name} - ) : null; + ...(this.state.role_name === 'Super Admin' ? [ + { + title: "Company Name", + dataIndex: "join_first_company_name", + key: "join_first_company_name", + render: (text, record) => { + return { record.join_first_company_name }; + } + }] : []) + , + { title: 'Type Paket', dataIndex: 'type_paket', key: 'type_paket', className: "nowrap", + render: (text,record) => { + return { !["Basic","Free"].includes(record.type_paket) ? 'Enterprise' : record.type_paket} } }, - { title: 'Type Paket', dataIndex: 'type_paket', key: 'type_paket', className: "nowrap" }, { title: this.props.t('Expired Date'), dataIndex: 'exp_ospro', key: 'exp_ospro', render: (text,record) => { - return moment(record.exp_ospro).format('DD MMMM, YYYY'); + return { moment(record.exp_ospro).format('DD MMMM, YYYY') }; } }, ]; From 2c9de77ce2e3bca615f72e56294ac941112d99ea Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:20:19 +0700 Subject: [PATCH 5/9] add state --- src/views/Pages/Login/Login.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js index 391f85f..df23776 100644 --- a/src/views/Pages/Login/Login.js +++ b/src/views/Pages/Login/Login.js @@ -212,7 +212,8 @@ class Login extends Component { company_id, role_name, all_project, - user_name + user_name, + configApp } }); } @@ -375,7 +376,7 @@ class Login extends Component {

Welcome to OSPRO!

Please sign-in to your account and start the adventure

- + @@ -393,7 +394,7 @@ class Login extends Component { }} /> - + @@ -427,7 +428,7 @@ class Login extends Component { - + {this.state.loader ? ( @@ -436,7 +437,7 @@ class Login extends Component { )} - + From f08e16d67da94032f8b88c4fb58215733e2cc4a1 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:33:51 +0700 Subject: [PATCH 6/9] add state --- .../CreatedProyek/AsignCustProject.js | 7 ++-- .../SimproV2/CreatedProyek/AsignHrProject.js | 8 ++--- .../SimproV2/CreatedProyek/DialogDocument.js | 34 +++++++++---------- .../CreatedProyek/DialogFormProyek.js | 2 +- .../SimproV2/CreatedProyek/DialogGantt.js | 24 ++++--------- src/views/SimproV2/Gantt/GanttFrame.js | 6 ++-- src/views/SimproV2/Gantt/index.js | 6 ++-- 7 files changed, 36 insertions(+), 51 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/AsignCustProject.js b/src/views/SimproV2/CreatedProyek/AsignCustProject.js index 9bc6cb2..60d2020 100644 --- a/src/views/SimproV2/CreatedProyek/AsignCustProject.js +++ b/src/views/SimproV2/CreatedProyek/AsignCustProject.js @@ -13,8 +13,7 @@ import { NotificationContainer, NotificationManager } from 'react-notifications' import SweetAlert from 'react-bootstrap-sweetalert'; import FormAsignCust from './DialogAssignCust'; -const AssignCustProject = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, company_id }) => { - const token = localStorage.getItem("token") +const AssignCustProject = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, company_id, token }) => { const HEADER = { headers: { "Content-Type": "application/json", @@ -42,7 +41,7 @@ const AssignCustProject = ({ openDialog, closeDialog, toggleDialog, idTask, proy }, "columns": [ { "name": "name", "logic_operator": "ilike", "value": "", "table_name": "m_users" }, - { "name": "proyek_id", "logic_operator": "=", "value": idTask }, + { "name": "proyek_id", "logic_operator": "=", "value": parseInt(idTask) }, { "name": "is_customer", "logic_operator": "=", "value": "true" } ], "joins": [ @@ -84,7 +83,7 @@ const AssignCustProject = ({ openDialog, closeDialog, toggleDialog, idTask, proy } const onConfirmDelete = async () => { - let urlDel = ASSIGN_HR_PROJECT_DELETE(idDelete, company_id) + let urlDel = ASSIGN_HR_PROJECT_DELETE(idDelete, parseInt(company_id)) const result = await axios.delete(urlDel, HEADER) .then(res => res) .catch((error) => error.response); diff --git a/src/views/SimproV2/CreatedProyek/AsignHrProject.js b/src/views/SimproV2/CreatedProyek/AsignHrProject.js index 315ef1b..f38eea7 100644 --- a/src/views/SimproV2/CreatedProyek/AsignHrProject.js +++ b/src/views/SimproV2/CreatedProyek/AsignHrProject.js @@ -11,8 +11,7 @@ import SweetAlert from 'react-bootstrap-sweetalert'; import FormAsignHr from './FormAsignHr'; import { formatThousand } from '../../../const/CustomFunc'; -const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, company_id, proyekName }) => { - const token = localStorage.getItem("token") +const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, company_id, proyekName, token }) => { const HEADER = { headers: { "Content-Type": "application/json", @@ -93,7 +92,7 @@ const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, compan "length": -1 }, "columns": [ - { "name": "company_id", "logic_operator": "=", "value": company_id }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id) }, ], "orders": { "columns": [ @@ -119,8 +118,7 @@ const AssignHrProject = ({ openDialog, closeDialog, toggleDialog, idTask, compan "length": -1 }, "columns": [ - { "name": "created_by", "logic_operator": "ilike", "value": "" }, - { "name": "company_id", "logic_operator": "=", "value": company_id }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id) }, ], "joins": [], "orders": { diff --git a/src/views/SimproV2/CreatedProyek/DialogDocument.js b/src/views/SimproV2/CreatedProyek/DialogDocument.js index 1314dca..0826206 100644 --- a/src/views/SimproV2/CreatedProyek/DialogDocument.js +++ b/src/views/SimproV2/CreatedProyek/DialogDocument.js @@ -10,9 +10,7 @@ import axios from "../../../const/interceptorApi" import { NotificationContainer, NotificationManager } from 'react-notifications'; import DialogRequest from './FormDocument'; import DialogRequestFolder from './FormFolderDocument'; -const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName }) => { - const token = localStorage.getItem("token") - const role = window.localStorage.getItem('role_name'); +const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, companyId, token, role_name, companyName }) => { const HEADER = { headers: { "Content-Type": "application/json", @@ -34,7 +32,7 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN setLoading(true); getDataDocument(); } - }, [parseInt(idTask), openDialog]) + }, [openDialog]) useEffect(() => { if (!openDialog) { @@ -75,7 +73,7 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN } const handleDownload = (id, file) => { - fetch(DOCUMENT_DOWNLOAD(id, parseInt(idTask)), { + fetch(DOCUMENT_DOWNLOAD(id, parseInt(companyId)), { headers: new Headers({ 'Content-Type': 'application/json', 'Authorization': `Bearer ${token}` @@ -93,12 +91,8 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN }); } - const handleShow = (file) => { - let configApp = ''; - if (role !== 'Super Admin') { - configApp = JSON.parse(window.localStorage.getItem('configApp')); - } - const urlShow = `${BASE_SIMPRO_LUMEN_FILE_COMPANY(file, configApp != '' ? configApp.company_name : 'undifined')}` + const handleShow = (file, dateFile) => { + const urlShow = `${BASE_SIMPRO_LUMEN_FILE_COMPANY(file, companyName, dateFile)}` window.open(urlShow); } @@ -122,15 +116,16 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN openDialogRequest() } - const renderShowDokumen = (file) => { - let arrayFile = file.split(".") + const renderShowDokumen = (data) => { + let arrayFile = data.file.split(".") + const dateFile = moment(data.created_at).format('YYYY-MM'); let length = arrayFile.length length = length - 1 const fileExt = arrayFile[length]; - if (fileExt == "pdf" || fileExt == "png" || fileExt == "jpg" || fileExt == "jpeg" || fileExt == "gif") { + if (["pdf", "png", "jpg", "jpeg", "gif"].includes(fileExt)) { return ( - + ) } @@ -159,7 +154,7 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN {record.isDir && }{" "} - {text.file ? renderShowDokumen(text.file) : ""} + {text.file ? renderShowDokumen(text) : ""} , }, @@ -205,7 +200,7 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN } const onConfirmDelete = async () => { - let urlDel = DOCUMENT_DELETE(idDelete, parseInt(idTask)) + let urlDel = DOCUMENT_DELETE(idDelete, parseInt(companyId)) const result = await axios.delete(urlDel, HEADER) .then(res => res) .catch((error) => error.response); @@ -223,7 +218,7 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN } const onConfirmDeleteFolder = async () => { - let urlDel = FOLDER_DOCUMENT_PROYEK_DELETE(idDelete) + let urlDel = FOLDER_DOCUMENT_PROYEK_DELETE(idDelete, parseInt(companyId)) const result = await axios.delete(urlDel, HEADER) .then(res => res) .catch((error) => error.response); @@ -319,6 +314,9 @@ const DialogDocument = ({ openDialog, closeDialog, toggleDialog, idTask, proyekN idTask={parseInt(idTask)} parentIdNewFolder={parentIdNewFolder} dataEdit={dataEdit} + companyId={companyId} + token={token} + role_name={role_name} /> { - const token = localStorage.getItem("token"); const HEADER = { headers: { "Content-Type": "application/json", diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index 92fe367..62ff784 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -13,18 +13,7 @@ import DialogUserGantt from './DialogUserGantt'; import { Link } from 'react-router-dom'; const { Option } = Select -const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, hierarchyId, hierarchyName, openDialogHierarchy, isLogin, token, role_id, user_id, dataViewStartDate }) => { - if (role_id && user_id && token && isLogin) { - role_id = role_id; - user_id = user_id; - token = token; - isLogin = isLogin; - } else { - role_id = localStorage.getItem("role_id"); - user_id = localStorage.getItem("user_id"); - token = localStorage.getItem("token"); - isLogin = localStorage.getItem("isLogin"); - } +const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, companyId, hierarchyId, hierarchyName, openDialogHierarchy, isLogin, token, role_id, user_id, dataViewStartDate }) => { const HEADER = { headers: { "Content-Type": "application/json", @@ -140,11 +129,12 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName diff --git a/src/views/SimproV2/Gantt/GanttFrame.js b/src/views/SimproV2/Gantt/GanttFrame.js index aa9f79c..fed3f82 100644 --- a/src/views/SimproV2/Gantt/GanttFrame.js +++ b/src/views/SimproV2/Gantt/GanttFrame.js @@ -4,9 +4,9 @@ import { BASE_SIMPRO_LUMEN } from '../../../const/ApiConst'; const GanttFrame = React.memo((props) => { const history = useHistory(); - const { versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, company_id, role_name } = props; - const iframeSrc = `https://project-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=${company_id}`; - // 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=${company_id}`; + const { versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, companyId, role_name } = props; + const iframeSrc = `https://project-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}`; + // 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}`; const [batchEntityData, setBatchEntityData] = useState(null); useEffect(() => { diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js index 817985c..e07e9d8 100644 --- a/src/views/SimproV2/Gantt/index.js +++ b/src/views/SimproV2/Gantt/index.js @@ -15,13 +15,13 @@ import GanttFrame from "./GanttFrame"; let roCount = 0; const Gantt = (props) => { - let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name='', hierarchy=[], user_name=''; + let role_id = 0, user_id = 0, isLogin = false, token = '', companyId = 0, all_project = null, role_name='', hierarchy=[], user_name=''; if (props && props.role_id && props.user_id) { role_id = props.role_id; user_id = props.user_id; token = props.token; isLogin = props.isLogin; - company_id = props.company_id; + companyId = props.company_id; all_project = props.all_project; role_name = props.role_name; isLogin = props.isLogin; @@ -114,7 +114,7 @@ const Gantt = (props) => { token={token} ro={ro} role_name={role_name} - company_id={company_id} + companyId={companyId} timestamp={timestamp} /> )} From 2c4b8a48d1d7e380da46e08609dd392a3c56b831 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:34:29 +0700 Subject: [PATCH 7/9] update file input --- .../SimproV2/CreatedProyek/FormDocument.js | 17 +++++++---------- .../CreatedProyek/FormFolderDocument.js | 4 ---- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/FormDocument.js b/src/views/SimproV2/CreatedProyek/FormDocument.js index d3f4379..fbeecac 100644 --- a/src/views/SimproV2/CreatedProyek/FormDocument.js +++ b/src/views/SimproV2/CreatedProyek/FormDocument.js @@ -6,9 +6,8 @@ import { DOCUMENT_ADD } from '../../../const/ApiConst'; import 'antd/dist/antd.css'; import { NotificationManager } from 'react-notifications'; -const DialogRequest = ({ openDialog, closeDialog, toggleDialog, idTask, parentIdNewFolder }) => { - const token = localStorage.getItem("token"); - const role = window.localStorage.getItem('role_name'); +const DialogRequest = ({ openDialog, closeDialog, toggleDialog, idTask, parentIdNewFolder, token, role_name, companyId }) => { + const HEADER = { headers: { "Content-Type": "application/json", @@ -34,12 +33,9 @@ const DialogRequest = ({ openDialog, closeDialog, toggleDialog, idTask, parentId } const uploadDokumen = async () => { - let configApp = '' const formData = new FormData; - if (role !== 'Super Admin') { - configApp = JSON.parse(window.localStorage.getItem('configApp')); - formData.append('company_name',configApp.company_name); - } + + formData.append('company_id', parseInt(companyId)); formData.append('dokumen', file, file.name); if (parentIdNewFolder > 0) { formData.append('ref_id', parentIdNewFolder); // folder_id @@ -73,8 +69,9 @@ const DialogRequest = ({ openDialog, closeDialog, toggleDialog, idTask, parentId return (
- - setFile(e.target.files[0])} /> + + setFile(e.target.files[0])}/> + *All Type File Accepted
) diff --git a/src/views/SimproV2/CreatedProyek/FormFolderDocument.js b/src/views/SimproV2/CreatedProyek/FormFolderDocument.js index 32fe696..2ea5c7b 100644 --- a/src/views/SimproV2/CreatedProyek/FormFolderDocument.js +++ b/src/views/SimproV2/CreatedProyek/FormFolderDocument.js @@ -33,10 +33,6 @@ const DialogRequestFolder = ({ openDialog, closeDialog, toggleDialog, idTask, pa } const saveFolder = async () => { - - - - let payload = { "proyek_id": idTask, "name_folder": folderName From a8de9dd6a366a566d06e65ed5fe912c0a7d590af Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:35:19 +0700 Subject: [PATCH 8/9] update payload & add state --- src/views/SimproV2/CreatedProyek/index.js | 78 +++++++++++++++++++---- 1 file changed, 65 insertions(+), 13 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index 68ffdb5..e5f9a50 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -91,7 +91,7 @@ const url = ""; const format = "DD-MM-YYYY"; const CreatedProyek = ({ params, ...props }) => { - let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name = '', hierarchy = [], user_name = ''; + let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name = '', hierarchy = [], user_name = '', configApp={}; if (props && props.role_id && props.user_id) { role_id = props.role_id; user_id = props.user_id; @@ -155,6 +155,8 @@ const CreatedProyek = ({ params, ...props }) => { const [openDialogDoc, setOpenDialogDoc] = useState(false); const [proyekName, setProyekName] = useState(""); const [openDialogProyek, setOpenDialogProyek] = useState(false); + const [companyId, setCompanyId] = useState(props.role_name !== 'Super Admin' ? company_id : 0); + const [companyName, setCompanyName] = useState(''); // project charter const [projectCharter, setProjectCharter] = useState(null); const [projectParticipant, setProjectParticipant] = useState(null); @@ -369,7 +371,14 @@ const CreatedProyek = ({ params, ...props }) => { } const payload = { - columns: [], + columns: [ + { + name: "deleted_at", + logic_operator: "isnull", + value: "null", + operator: "AND" + } + ], group_column: { "operator": "AND", "group_operator": "OR", @@ -401,6 +410,9 @@ const CreatedProyek = ({ params, ...props }) => { "currency_symbol", "mulai_proyek", "akhir_proyek", + "company_id", + "deleted_at", + "deleted_by_id" ], joins: [ { @@ -553,11 +565,12 @@ const CreatedProyek = ({ params, ...props }) => { }; - const handleOpenDialogProyek = async (id) => { + const handleOpenDialogProyek = async (text) => { + setCompanyId(text.company_id); setOpenDialogProyek(true); - setidTask(id); - if (id !== 0) { - await getProjectImage(id); + setidTask(text.id); + if (text.id !== 0) { + await getProjectImage(text.id); } }; @@ -565,6 +578,7 @@ const CreatedProyek = ({ params, ...props }) => { setDataViewStartDate(data.mulai_proyek) setidTask(data.id); setProyekName(data.nama); + setCompanyId(data.company_id); setOpenDialogGantt(true); }; @@ -599,12 +613,16 @@ const CreatedProyek = ({ params, ...props }) => { const handleOpenAsignHr = (data) => { setidTask(data.id); setProyekName(data.nama); + setCompanyId(data.company_id); + setCompanyName(role_name === 'Super Admin' ? data.join_third_company_name : JSON.parse(props.configApp).company_name); setOpenDialogAsignHR(true); }; const handleOpenAsignCust = (data) => { setidTask(data.id); setProyekName(data.nama); + setCompanyId(data.company_id); + setCompanyName(role_name === 'Super Admin' ? data.join_third_company_name : JSON.parse(props.configApp).company_name); setOpenDialogAsignCust(true); }; @@ -1375,7 +1393,14 @@ const CreatedProyek = ({ params, ...props }) => { const handleExportExcel = async () => { const payload = { - columns: [], + columns: [ + { + name: "deleted_at", + logic_operator: "isnull", + value: "null", + operator: "AND" + } + ], group_column: { "operator": "AND", "group_operator": "OR", @@ -1462,7 +1487,14 @@ const CreatedProyek = ({ params, ...props }) => { ]; const payload = { - columns: [], + columns: [ + { + name: "deleted_at", + logic_operator: "isnull", + value: "null", + operator: "AND" + } + ], group_column: { "operator": "AND", "group_operator": "OR", @@ -1568,6 +1600,8 @@ const CreatedProyek = ({ params, ...props }) => { const handleOpenDokumen = async (data) => { await setidTask(data.id); setProyekName(data.nama); + setCompanyId(data.company_id); + setCompanyName(role_name === 'Super Admin' ? data.join_third_company_name : JSON.parse(props.configApp).company_name); setOpenDialogDoc(true); }; @@ -1627,7 +1661,7 @@ const CreatedProyek = ({ params, ...props }) => {
handleOpenDialogProyek(text.id)} + onClick={() => handleOpenDialogProyek(text)} > @@ -1656,7 +1690,17 @@ const CreatedProyek = ({ params, ...props }) => { {!loadVersionGantt && text.type_proyek_id !== 9 && ( <> {dataVersionGantt.slice(0, 8).map((res) => ( - +
@@ -1888,9 +1932,10 @@ const CreatedProyek = ({ params, ...props }) => { dataDivisions={dataDivisions} dataPM={dataPm} projectImage={image} - company_id={company_id} + company_id={companyId} role_name={role_name} companyList={companyList} + token={token} /> ), [ @@ -1952,7 +1997,8 @@ const CreatedProyek = ({ params, ...props }) => { handleClose={handleCloseDialogAsignHr} idTask={idTask} proyekName={proyekName} - company_id={company_id} + company_id={companyId} + token={token} /> ), [openDialogAsignHR] @@ -1968,7 +2014,8 @@ const CreatedProyek = ({ params, ...props }) => { handleClose={handleCloseDialogAsignCust} idTask={idTask} proyekName={proyekName} - company_id={company_id} + company_id={companyId} + token={token} /> ), [openDialogAsignCust] @@ -2003,6 +2050,10 @@ const CreatedProyek = ({ params, ...props }) => { handleClose={handleCloseDialogDoc} idTask={idTask} proyekName={proyekName} + companyId={companyId} + token={token} + role_name={role_name} + companyName={companyName} /> ), [openDialogDoc] @@ -2053,6 +2104,7 @@ const CreatedProyek = ({ params, ...props }) => { token={token} isLogin={isLogin} proyekName={proyekName} + companyId={companyId} dataViewStartDate={dataViewStartDate} /> ), From 51d33a632524d6dd3f506ec7b39f1b2aaaf7bee4 Mon Sep 17 00:00:00 2001 From: wahyun Date: Tue, 2 Apr 2024 10:35:49 +0700 Subject: [PATCH 9/9] update url image --- src/views/SimproV2/Settings/DialogForm.js | 2 +- src/views/SimproV2/Settings/components/MyProfile/Index.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/Settings/DialogForm.js b/src/views/SimproV2/Settings/DialogForm.js index 14ca80f..bf974ee 100644 --- a/src/views/SimproV2/Settings/DialogForm.js +++ b/src/views/SimproV2/Settings/DialogForm.js @@ -323,7 +323,7 @@ const DialogForm = ({ {
handleImageClick() : ''}>
@@ -416,7 +416,7 @@ const Index = () => {