From 5f1f47d7e9c69a435888364d63a88aa69ac12943 Mon Sep 17 00:00:00 2001 From: wahyuun Date: Wed, 20 Mar 2024 17:23:08 +0700 Subject: [PATCH 1/9] set last company id --- src/views/Master/MasterCompany/index.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/Master/MasterCompany/index.js b/src/views/Master/MasterCompany/index.js index a7bab4f..80fe48b 100644 --- a/src/views/Master/MasterCompany/index.js +++ b/src/views/Master/MasterCompany/index.js @@ -125,11 +125,13 @@ const MasterCompany = ({ params }) => { .then(res => res) .catch((error) => error.response); - if (result && result.data && result.data.code == 200) { - const sourceData = result.data.data; + if (result && result.data && result.data.code == 200) { + const sourceData = result.data.data; + const countRecord = result.data.totalRecord; + setDatatable(sourceData); - setTotalPage(result.data.totalRecord); - const lastCompanyId = sourceData[sourceData.length - 1].id; + setTotalPage(countRecord); + const lastCompanyId = countRecord > 0 ? sourceData[sourceData.length - 1].id : null; setLastCompanyId(lastCompanyId); setLoading(false) } else { @@ -187,7 +189,7 @@ const MasterCompany = ({ params }) => { const sourceData = result.data.data; setProjectImageSlider(sourceData); } - } + } const handleSearch = e => { const value = e.target.value From b91480143b3cc5c256d8fecc3fc0cbbe1a81fc59 Mon Sep 17 00:00:00 2001 From: wahyuun Date: Wed, 20 Mar 2024 17:24:21 +0700 Subject: [PATCH 2/9] update akses untuk super admin --- .../Master/MasterRoles/DialogMenuRoles.js | 48 +++++++++++++++++-- src/views/Master/MasterRoles/index.js | 22 +++++---- src/views/SimproV2/Divisi/index.js | 10 +--- src/views/SimproV2/ResourceWorker/index.js | 5 -- src/views/SimproV2/Satuan/index.js | 3 -- 5 files changed, 58 insertions(+), 30 deletions(-) diff --git a/src/views/Master/MasterRoles/DialogMenuRoles.js b/src/views/Master/MasterRoles/DialogMenuRoles.js index a00128e..0388eab 100644 --- a/src/views/Master/MasterRoles/DialogMenuRoles.js +++ b/src/views/Master/MasterRoles/DialogMenuRoles.js @@ -27,6 +27,7 @@ export default class DialogMenuRoles extends Component { stateCreate: [], stateUpdate: [], stateDelete: [], + role_name: props.role_name || '', stateReadAll: false, stateCreateAll: false, stateUpdateAll: false, @@ -35,10 +36,12 @@ export default class DialogMenuRoles extends Component { company_id: props.company_id || null, } } + async componentDidMount() { this.props.showDialog(this.showDialog); this.getAllMenu(); } + async componentDidUpdate() { if (this.state.isParentClick === true) { const { idRoles } = this.props @@ -50,21 +53,26 @@ export default class DialogMenuRoles extends Component { this.setState({ isParentClick: false, id: idRoles }); } } + showDialog = () => { this.setState({ isParentClick: true }); } + getAllMenu = async () => { const payload = { "paging": { "start": 0, "length": -1 }, - "columns": [ - { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" } - ], + "columns": [], "joins": [ { "name": "t_roles_menu", "column_join": "menu_id", "column_results": ["create", "update", "delete", "read"] }, { "name": "m_menu", "column_join": "menu_id", "column_results": ["name"] } ], "orders": { "columns": ["id"], "ascending": false } } + if (this.state.role_name !== "Super Admin") { + payload.columns.push( + { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" } + ) + } const result = await axios .post(MENU_COMPANY_SEARCH, payload, config) .then(res => res) @@ -73,9 +81,9 @@ export default class DialogMenuRoles extends Component { this.setState({ menu: result.data.data }, () => { this.setStateMenu(false); }); - } else { } } + setStateMenu = edit => { const stateMenu = []; this.state.menu.map((val) => { @@ -89,6 +97,7 @@ export default class DialogMenuRoles extends Component { }) }) } + setStateRead = edit => { const stateRead = []; this.state.menu.map((val) => { @@ -102,6 +111,7 @@ export default class DialogMenuRoles extends Component { }) }) } + setStateCreate = edit => { const stateCreate = []; this.state.menu.map((val) => { @@ -115,6 +125,7 @@ export default class DialogMenuRoles extends Component { }) }) } + setStateUpdate = edit => { const stateUpdate = []; this.state.menu.map((val) => { @@ -128,6 +139,7 @@ export default class DialogMenuRoles extends Component { }) }) } + setStateDelete = edit => { const stateDelete = []; this.state.menu.map((val) => { @@ -141,6 +153,7 @@ export default class DialogMenuRoles extends Component { }) }) } + checkMenuRoles = () => { let copyStateMenu = [...this.state.stateMenu]; this.props.menuRoles.map((val, indexMenu) => { @@ -158,6 +171,7 @@ export default class DialogMenuRoles extends Component { } }) } + checkReadRoles = () => { let copyStateRead = [...this.state.stateRead]; this.props.menuRoles.map((val) => { @@ -177,6 +191,7 @@ export default class DialogMenuRoles extends Component { } }) } + checkCreateRoles = () => { let copyStateCreate = [...this.state.stateCreate]; this.props.menuRoles.map((val) => { @@ -196,6 +211,7 @@ export default class DialogMenuRoles extends Component { } }) } + checkUpdateRoles = () => { let copyStateUpdate = [...this.state.stateUpdate]; this.props.menuRoles.map((val) => { @@ -215,6 +231,7 @@ export default class DialogMenuRoles extends Component { } }) } + checkDeleteRoles = () => { let copyStateDelete = [...this.state.stateDelete]; this.props.menuRoles.map((val) => { @@ -234,26 +251,32 @@ export default class DialogMenuRoles extends Component { } }) } + getIndexDataMenu = (id) => { let index = this.state.menu.findIndex(obj => obj.id === id); return index } + getIndexDataCreate = (id) => { let index = this.state.stateCreate.findIndex(obj => obj.id === id); return index } + getIndexDataDelete = (id) => { let index = this.state.stateDelete.findIndex(obj => obj.id === id); return index } + getIndexDataRead = (id) => { let index = this.state.stateRead.findIndex(obj => obj.id === id); return index } + getIndexDataUpdate = (id) => { let index = this.state.stateUpdate.findIndex(obj => obj.id === id); return index } + handleSave = () => { const { stateMenu, @@ -280,14 +303,17 @@ export default class DialogMenuRoles extends Component { this.props.closeDialog('save', arrayData); this.setState({ id: 0 }); } + handleCancel = () => { this.props.closeDialog('cancel', 'none') } + handleChangeCheckbox = (checked, index) => { let copyStateMenu = [...this.state.stateMenu]; copyStateMenu[index] = checked; this.setState({ stateMenu: copyStateMenu }) } + handleChangeCheckboxRead = (checked, index, menuItem = null, menuIdxList = []) => { let copyStateRead = [...this.state.stateRead]; copyStateRead[index] = checked; @@ -312,6 +338,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateRead: copyStateRead }) } + handleChangeCheckboxCreate = (checked, index, menuItem = null, menuIdxList = []) => { let copyStateCreate = [...this.state.stateCreate]; copyStateCreate[index] = checked; @@ -336,6 +363,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateCreate: copyStateCreate }) } + handleChangeCheckboxEdit = (checked, index, menuItem = null, menuIdxList = []) => { let copyStateEdit = [...this.state.stateUpdate]; copyStateEdit[index] = checked; @@ -360,6 +388,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateUpdate: copyStateEdit }) } + handleChangeCheckboxDelete = (checked, index, menuItem = null, menuIdxList = []) => { let copyStateDelete = [...this.state.stateDelete]; copyStateDelete[index] = checked; @@ -384,6 +413,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateDelete: copyStateDelete }) } + handleChangeCheckboxReadAll = (checked) => { let copyStateRead = [...this.state.stateRead]; copyStateRead.map((val, index) => { @@ -391,6 +421,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateRead: copyStateRead }) } + handleChangeCheckboxCreateAll = (checked, index) => { let copyStateCreate = [...this.state.stateCreate]; copyStateCreate.map((val, index) => { @@ -398,6 +429,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateCreate: copyStateCreate }) } + handleChangeCheckboxEditAll = (checked, index) => { let copyStateEdit = [...this.state.stateUpdate]; copyStateEdit.map((val, index) => { @@ -405,6 +437,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateUpdate: copyStateEdit }) } + handleChangeCheckboxDeleteAll = (checked, index) => { let copyStateDelete = [...this.state.stateDelete]; copyStateDelete.map((val, index) => { @@ -412,6 +445,7 @@ export default class DialogMenuRoles extends Component { }) this.setState({ stateDelete: copyStateDelete }) } + renderForm = () => { const { menu, stateRead, stateCreate, stateUpdate, stateDelete } = this.state; let menuIdxList = [] @@ -449,6 +483,7 @@ export default class DialogMenuRoles extends Component { ); }; + renderAll = () => { return ( @@ -460,9 +495,11 @@ export default class DialogMenuRoles extends Component { ) } + checkArray = (val) => { return val === false; } + handleAllChecked = (checked) => { this.setState({ allChecked: !this.state.allChecked }); if (checked === true) { @@ -486,6 +523,7 @@ export default class DialogMenuRoles extends Component { }) } } + render() { return ( @@ -523,4 +561,4 @@ export default class DialogMenuRoles extends Component { ) } -} \ No newline at end of file +} diff --git a/src/views/Master/MasterRoles/index.js b/src/views/Master/MasterRoles/index.js index 3d1137d..ff5045f 100644 --- a/src/views/Master/MasterRoles/index.js +++ b/src/views/Master/MasterRoles/index.js @@ -156,9 +156,9 @@ class index extends Component { { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" }, ) } else { - formData.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) + // formData.columns.push( + // { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, + // ) formData.joins.push( { "name": "m_company", "column_join": "company_id", "column_results": ["company_name"] } ) @@ -320,13 +320,17 @@ class index extends Component { handleMenuRoles = async (id) => { const formData = { "paging": { "start": 0, "length": -1 }, - "columns": [ - { "name": "role_id", "logic_operator": "=", "value": `${id}`, "operator": "AND" } - ], + "columns": [], "joins": [{ "name": "m_menu", "column_join": "menu_id", "column_results": ["parent_id", "name"] }], "orders": { "columns": ["id"], "ascending": false } } + if (this.state.role_name !== "Super Admin") { + formData.columns.push( + { "name": "role_id", "logic_operator": "=", "value": `${id}`, "operator": "AND" } + ) + } + const result = await axios .post(ROLEMENU_SEARCH, formData, this.state.config) .then(res => res) @@ -412,9 +416,9 @@ class index extends Component { { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" }, ) } else { - formData.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) + // formData.columns.push( + // { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, + // ) formData.joins.push( { "name": "m_company", "column_join": "company_id", "column_results": ["company_name"] } ) diff --git a/src/views/SimproV2/Divisi/index.js b/src/views/SimproV2/Divisi/index.js index d423c8f..627df0d 100644 --- a/src/views/SimproV2/Divisi/index.js +++ b/src/views/SimproV2/Divisi/index.js @@ -4,7 +4,7 @@ import React, { useState, useEffect, useMemo } from 'react'; import SweetAlert from 'react-bootstrap-sweetalert'; import axios from "../../../const/interceptorApi" import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap'; -import { DIVISI_LIST, DIVISI_ADD, DIVISI_EDIT, DIVISI_DELETE, DIVISI_SEARCH, COMPANY_MANAGEMENT_LIST } from '../../../const/ApiConst'; +import { DIVISI_ADD, DIVISI_EDIT, DIVISI_DELETE, DIVISI_SEARCH, COMPANY_MANAGEMENT_LIST } from '../../../const/ApiConst'; import { NotificationContainer, NotificationManager } from 'react-notifications'; import { Pagination, Button, Tooltip, Table, Spin } from 'antd'; import { useTranslation } from 'react-i18next'; @@ -120,9 +120,6 @@ const ProjectType = ({ params, ...props }) => { { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, ) } else { - payload.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) payload.joins.push( { name: "m_company", column_join: "company_id", column_results: ["company_name"] } ) @@ -183,9 +180,6 @@ const ProjectType = ({ params, ...props }) => { { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, ) } else { - payload.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) payload.joins.push( { name: "m_company", column_join: "company_id", column_results: ["company_name"] } ) @@ -414,7 +408,7 @@ const ProjectType = ({ params, ...props }) => { : null } - + { diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js index 9219541..7b0faaf 100644 --- a/src/views/SimproV2/ResourceWorker/index.js +++ b/src/views/SimproV2/ResourceWorker/index.js @@ -120,7 +120,6 @@ const ResourceWorker = ({ params, ...props }) => { const getDivisiList = async () => { const formData = { - "paging": { "start": 0, "length": -1 }, "orders": { "columns": ["id"], "ascending": false }, "columns": [], } @@ -129,10 +128,6 @@ const ResourceWorker = ({ params, ...props }) => { formData.columns.push( { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, ) - } else { - formData.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) } const result = await axios diff --git a/src/views/SimproV2/Satuan/index.js b/src/views/SimproV2/Satuan/index.js index 89cfad8..84c227f 100644 --- a/src/views/SimproV2/Satuan/index.js +++ b/src/views/SimproV2/Satuan/index.js @@ -127,9 +127,6 @@ const Satuan = ({ params, ...props }) => { { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id), "operator": "AND" }, ) } else { - payload.columns.push( - { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, - ) payload.joins.push( { name: "m_company", column_join: "company_id", column_results: ["company_name"] } ) From aacceb9530e1b8430de43e9e873c35d9f1e3dddc Mon Sep 17 00:00:00 2001 From: wahyuun Date: Wed, 20 Mar 2024 17:24:47 +0700 Subject: [PATCH 3/9] update kanban --- src/views/SimproV2/CreatedProyek/DialogGantt.js | 5 +++++ src/views/SimproV2/Kanban/index.js | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index b3dd3a2..92fe367 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -150,6 +150,11 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName {" "} + + + + + {" "} , }, diff --git a/src/views/SimproV2/Kanban/index.js b/src/views/SimproV2/Kanban/index.js index de647c2..56ebcc6 100644 --- a/src/views/SimproV2/Kanban/index.js +++ b/src/views/SimproV2/Kanban/index.js @@ -240,7 +240,7 @@ const Kanban = ({ params, ...props }) => { const payload = { columns: [ { - name: "created_by", + name: "created_by_id", logic_operator: "IN", value: hierarchy, operator: "AND" @@ -261,11 +261,9 @@ const Kanban = ({ params, ...props }) => { orders: { columns: ["id"], ascending: false }, }; - if (parseInt(role_id) !== 1) { - payload["columns"] = [ - { name: "id", logic_operator: "=", value: project, operator: "AND" }, - ]; - } + // if (parseInt(role_id) !== 1) { + // payload.columns.push( { name: "id", logic_operator: "=", value: project, operator: "AND" }); + // } const result = await axios .post(PROYEK_SEARCH, payload, HEADER) @@ -435,7 +433,7 @@ const Kanban = ({ params, ...props }) => { } } - // Board + // Board const handleCloseDialogBoard = (type, data) => { if (type === "save") { From ca29b6a68b29e7629b714c06c91523c0cc6a201e Mon Sep 17 00:00:00 2001 From: wahyuun Date: Wed, 20 Mar 2024 17:25:07 +0700 Subject: [PATCH 4/9] update profile for super admin --- .../Settings/components/Plan/Container1.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/SimproV2/Settings/components/Plan/Container1.js b/src/views/SimproV2/Settings/components/Plan/Container1.js index 85d06c3..dfc9ba9 100644 --- a/src/views/SimproV2/Settings/components/Plan/Container1.js +++ b/src/views/SimproV2/Settings/components/Plan/Container1.js @@ -8,7 +8,6 @@ import moment from "moment"; const Container1 = () => { const token = localStorage.getItem("token") const user_id = localStorage.getItem("user_id") - let company_id = '', configApp = ''; const role = window.localStorage.getItem('role_name'); const [totalPage, setTotalPage] = useState(0); const [transaction, setTransaction] = useState([]); @@ -17,9 +16,9 @@ const Container1 = () => { const givenDate = new Date(transaction.exp_ospro); const createdDate = new Date(transaction.created_at) const differenceInMillis = givenDate.getTime() - currentDate.getTime(); + const differenceInDays = role !== 'Super Admin' ? Math.floor(differenceInMillis / (1000 * 60 * 60 * 24)) : 30; - const differenceInDays = Math.floor(differenceInMillis / (1000 * 60 * 60 * 24)); - + let company_id = '', configApp = ''; if(role !== 'Super Admin') { company_id = localStorage.getItem("company_id"); configApp = JSON.parse(window.localStorage.getItem('configApp')); @@ -33,8 +32,10 @@ const Container1 = () => { useEffect(()=>{ getDataProyek(); - getDataTransaction(); getLimitInformation(); + if(role !== 'Super Admin') { + getDataTransaction(); + } },[]) const getDataProyek = async () => { @@ -88,13 +89,13 @@ const Container1 = () => { } const getLimitInformation = async () => { - const url = STORAGE_LIMIT_INFORMATION(configApp.company_name); + const url = STORAGE_LIMIT_INFORMATION(role !== 'Super Admin' ? configApp.company_name : 'Super Admin'); const result = await axios .get(url, config) .then((res) => res) .catch((error) => error.response); if (result.data) { - setLimitInformation(result.data); + setLimitInformation(role !== 'Super Admin' ? parseFloat(result.data) : 0); } else { NotificationManager.error("Gagal Mengambil Data!!", "Failed"); } @@ -169,13 +170,13 @@ const Container1 = () => {
- {Math.abs(differenceInDays)} days remaining until your plan requires update + { role !== 'Super Admin' ? Math.abs(differenceInDays) : 0} days remaining until your plan requires update
Storage
-
{storage} of {transaction.type_paket === 'Basic' ? 500 : 50}MB
+
{storage} of {transaction?.type_paket === 'Basic' ? 500 : 50}MB
@@ -192,7 +193,7 @@ const Container1 = () => {
- {((storage / (transaction.type_paket === 'Basic' ? 500 : 50)) * 100).toFixed(2)}% storage remaining until your plan requires update + {(((storage / (transaction.type_paket === 'Basic' ? 500 : 50)) * 100).toFixed(2))}% has been filled until your plan requires an update
From dffb6f58ebe9d9755dd64b2c449de09ef5d10036 Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 09:59:12 +0700 Subject: [PATCH 5/9] update customer selection --- .../SimproV2/ResourceWorker/DialogForm.js | 73 ++++++++++++------- src/views/SimproV2/ResourceWorker/index.js | 11 ++- 2 files changed, 51 insertions(+), 33 deletions(-) diff --git a/src/views/SimproV2/ResourceWorker/DialogForm.js b/src/views/SimproV2/ResourceWorker/DialogForm.js index 86a53ec..1301523 100644 --- a/src/views/SimproV2/ResourceWorker/DialogForm.js +++ b/src/views/SimproV2/ResourceWorker/DialogForm.js @@ -33,7 +33,9 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi const [divisionId, setDivisionId] = useState('') const [statusResource, setStatusResource] = useState('active') const [statusRestriction, setStatusRestriction] = useState(false) + const [statusCustomer, setStatusCustomer] = useState(false) const { t } = useTranslation() + useEffect(() => { if (typeDialog === "Edit" || typeDialog === "Set") { setId(dataEdit.id) @@ -55,6 +57,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi setDivisionId(dataEdit.divisi_id) setAddress(dataEdit.address) setStatusRestriction(dataEdit.status_boundary) + setStatusCustomer(dataEdit.is_customer) } else { setId(0) setResourceName('') @@ -76,6 +79,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi setCompanyId(null) setStatusResource('active') setStatusRestriction(false) + setStatusCustomer(false) } }, [dataEdit, openDialog]) @@ -104,14 +108,17 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi gender, birth_place: birthPlace, ktp_number: ktpNumber, - role_id: roleId, - divisi_id: divisionId, address, status_resource: statusResource, status_boundary: statusRestriction, company_id: role_name != "Super Admin" ? parseInt(company_id) : parseInt(scompany_id) } + if(statusCustomer === false) { + data.role_id = roleId; + data.divisi_id = divisionId; + } + if (birthDate && birthDate != "") { data['birth_date'] = birthDate; } @@ -153,13 +160,16 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi blood_type: bloodType, ktp_number: ktpNumber, biaya_per_jam: biayaPerJam.replace('.', ''), - role_id: roleId, - divisi_id: divisionId, address, status_resource: statusResource, status_boundary: statusRestriction, + is_customer: statusCustomer, company_id: role_name != "Super Admin" ? parseInt(company_id) : parseInt(scompany_id) } + if(statusCustomer === false) { + data.role_id = roleId; + data.divisi_id = divisionId; + } if (birthDate && birthDate != "") { data['birth_date'] = birthDate; @@ -283,25 +293,28 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi - - - - - - - - - - - - - - - + { + statusCustomer === false && ( + + + + + + + + + + + + + + + ) + } { role_name === 'Super Admin' && ( @@ -329,8 +342,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi ) } - - setStatusCustomer(e)}> @@ -342,13 +355,19 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi - + + + + + setAddress(e.target.value)} placeholder={t('inputaddress')} /> - ) diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js index 7b0faaf..f28eeaa 100644 --- a/src/views/SimproV2/ResourceWorker/index.js +++ b/src/views/SimproV2/ResourceWorker/index.js @@ -6,7 +6,6 @@ import SweetAlert from 'react-bootstrap-sweetalert'; import axios from "../../../const/interceptorApi" import moment from 'moment' import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap'; -import { DownloadOutlined } from '@ant-design/icons'; import { NotificationContainer, NotificationManager } from 'react-notifications'; import { useLocation } from "react-router-dom"; import { Pagination, Table, Button, Tooltip, Spin } from 'antd'; @@ -101,7 +100,7 @@ const ResourceWorker = ({ params, ...props }) => { } if (role_name !== "Super Admin") { formData.columns.push( - { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id), "operator": "AND" }, ) } else { formData.columns.push( @@ -126,7 +125,7 @@ const ResourceWorker = ({ params, ...props }) => { if (role_name !== "Super Admin") { formData.columns.push( - { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id), "operator": "AND" }, ) } @@ -231,7 +230,7 @@ const ResourceWorker = ({ params, ...props }) => { if (role_name !== "Super Admin") { payload.group_column.where.push( - { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id), "operator": "AND" }, ) } else { payload.group_column.where.push( @@ -380,7 +379,7 @@ const ResourceWorker = ({ params, ...props }) => { if (role_name !== "Super Admin") { payload.group_column.where.push( - { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, + { "name": "company_id", "logic_operator": "=", "value": parseInt(company_id), "operator": "AND" }, ) } else { payload.group_column.where.push( @@ -593,7 +592,7 @@ const ResourceWorker = ({ params, ...props }) => { title: t('roles'), dataIndex: 'join_first_name', key: 'join_first_name', - render: (text, record) => <>{record.join_first_name} + render: (text, record) => <>{ record.is_customer === true ? 'Customer' : record.join_first_name} }, { title: 'Phone No.', dataIndex: 'phone_number', key: 'phone_number' }, { title: 'Email', dataIndex: 'email', key: 'email' }, From bf2f1df05b16e1e3c48df11aff55ee324a356c3c Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 09:59:41 +0700 Subject: [PATCH 6/9] update id to company_menu.menu_id --- src/views/Master/MasterRoles/DialogMenuRoles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Master/MasterRoles/DialogMenuRoles.js b/src/views/Master/MasterRoles/DialogMenuRoles.js index 0388eab..e25446d 100644 --- a/src/views/Master/MasterRoles/DialogMenuRoles.js +++ b/src/views/Master/MasterRoles/DialogMenuRoles.js @@ -291,7 +291,7 @@ export default class DialogMenuRoles extends Component { menu.map((val, index) => { let data = { roles_id: id, - menu_id: val.id, + menu_id: val.menu_id, read: stateRead[index], create: stateCreate[index], update: stateUpdate[index], From d712508adea127cdeaeba1a9f5460d41649ffcfe Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 10:00:15 +0700 Subject: [PATCH 7/9] update all_project condition --- src/views/SimproV2/CreatedProyek/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index d9c86b4..68ffdb5 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -418,12 +418,12 @@ const CreatedProyek = ({ params, ...props }) => { paging: { start: start, length: rowsPerPage }, }; - if (all_project !== null && all_project === true) { + if (role_name !== 'Super Admin' && all_project === 'true') { payload.columns.push( - { name: "company_id", logic_operator: "like", value: company_id, operator: "AND" } + { name: "company_id", logic_operator: "like", value: parseInt(company_id), operator: "AND" } ); } - if (role_name !== 'Super Admin') { + if (role_name !== 'Super Admin' && all_project === 'null') { payload.columns.push( { name: "created_by_id", logic_operator: "IN", value: [JSON.parse(hierarchy)], operator: "AND" } ); From 68a542dbd011a208f27960540c5b0b2125f838ae Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 10:00:40 +0700 Subject: [PATCH 8/9] update is_customer --- src/views/SimproV2/CreatedProyek/DialogAssignCust.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogAssignCust.js b/src/views/SimproV2/CreatedProyek/DialogAssignCust.js index 57e6d8a..4d66d4e 100644 --- a/src/views/SimproV2/CreatedProyek/DialogAssignCust.js +++ b/src/views/SimproV2/CreatedProyek/DialogAssignCust.js @@ -44,14 +44,14 @@ const DialogAssignCust = ({ openDialog, closeDialog, toggleDialog, idTask, compa "select": [ "id", "name", - "role_id" + "is_customer" ], "paging": { "start": 0, "length": -1 }, "columns": [ - { "name": "role_id", "logic_operator": "=", "value": 44 }, + { "name": "is_customer", "logic_operator": "=", "value": true }, { "name": "company_id", "logic_operator": "=", "value": company_id }, ], "orders": { @@ -69,7 +69,7 @@ const DialogAssignCust = ({ openDialog, closeDialog, toggleDialog, idTask, compa if (result && result.status == 200) { let dataRes = result.data.data; - const filteredData = dataRes.filter(item => item.role_id === 44); + const filteredData = dataRes.filter(item => item.is_customer === true); setTransferUser(filteredData); } } From 4f88e93dfa9bb60b60790d63a691d8e1a5e79377 Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 10:06:21 +0700 Subject: [PATCH 9/9] add STORAGE_LIMIT_INFORMATION_ALL_COMPANY apiConst --- src/const/ApiConst.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index 7bdc817..aef19b7 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -283,6 +283,7 @@ export const TRANSACTION_EDIT = (id) => { export const STORAGE_LIMIT_INFORMATION = (company_name) => { return `${BASE_SIMPRO_LUMEN}/information-storage/${company_name}`; }; +export const STORAGE_LIMIT_INFORMATION_ALL_COMPANY = `${BASE_SIMPRO_LUMEN}/information-storage-all-company` export const ABSENSI_ADD = `${BASE_SIMPRO_LUMEN}/permit/add`; export const ABSENSI_SEARCH = `${BASE_SIMPRO_LUMEN}/permit/search`; @@ -853,4 +854,4 @@ export const SALES_CONTACT_GET_ID = (id) => { }; export const SALES_CONTACT_DELETE = (id) => { return `${BASE_SIMPRO_LUMEN}/sales-contact/delete/${id}`; -}; \ No newline at end of file +};