diff --git a/src/views/SimproV2/ResourceWorker/DialogForm.js b/src/views/SimproV2/ResourceWorker/DialogForm.js index 096b1a0..1067ed3 100644 --- a/src/views/SimproV2/ResourceWorker/DialogForm.js +++ b/src/views/SimproV2/ResourceWorker/DialogForm.js @@ -6,13 +6,11 @@ import { import { DatePicker, Tooltip, Select, Input as InputAntd } from 'antd'; import moment from 'moment'; import 'antd/dist/antd.css'; -import { formatRupiah, formatNumber } from '../../../const/CustomFunc' +import { formatNumber } from '../../../const/CustomFunc' import { useTranslation } from 'react-i18next'; const { Option } = Select const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit, roleList, divisiList, role_name, companyList, company_id }) => { - const [openDialogMap, setOpenDialogMap] = useState(false) - const [id, setId] = useState(0) const [resourceName, setResourceName] = useState('') const [username, setUsername] = useState('') @@ -90,11 +88,19 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi alert("Please input NIK (KTP/ ID Card)"); return; } - if (!roleId && roleId === "") { + if (!resourceName && resourceName === "") { + alert("Please input name"); + return; + } + if (!employeeType && employeeType === "") { + alert("Please input employe type"); + return; + } + if (!roleId && roleId === "" && statusCustomer === false) { alert("Please select the role"); return; } - if (!divisionId && divisionId === "") { + if (!divisionId && divisionId === "" && statusCustomer === false) { alert("Please select the division"); return; } @@ -117,6 +123,8 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi if(statusCustomer === false) { data.role_id = roleId; data.divisi_id = divisionId; + } else { + data.is_customer = statusCustomer } if (birthDate && birthDate != "") { @@ -163,12 +171,13 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi 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; + } else { + data.is_customer = statusCustomer } if (birthDate && birthDate != "") { @@ -274,7 +283,6 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi @@ -340,7 +348,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi <> - + @@ -348,7 +356,7 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi - + diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js index f28eeaa..466daf9 100644 --- a/src/views/SimproV2/ResourceWorker/index.js +++ b/src/views/SimproV2/ResourceWorker/index.js @@ -4,7 +4,6 @@ import DialogFormUserShift from './DialogFormUserShift'; import React, { useState, useEffect, useMemo } from 'react'; 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 { NotificationContainer, NotificationManager } from 'react-notifications'; import { useLocation } from "react-router-dom"; @@ -14,11 +13,7 @@ import { } from '../../../const/ApiConst'; import { useTranslation } from 'react-i18next'; import { - formatNumber, - formatRupiah, - formatThousand, - renderFormatRupiah, - checkActMenup, + checkActMenup } from "../../../const/CustomFunc"; const ResourceWorker = ({ params, ...props }) => {