diff --git a/src/views/SimproV2/Kanban/DialogFormActivity.js b/src/views/SimproV2/Kanban/DialogFormActivity.js index a8e9680..4565e87 100644 --- a/src/views/SimproV2/Kanban/DialogFormActivity.js +++ b/src/views/SimproV2/Kanban/DialogFormActivity.js @@ -6,7 +6,7 @@ import { import { DatePicker, Tooltip, Drawer, Divider, Layout, Button, Space, Progress } from 'antd'; import { CloseOutlined, - MinusOutlined, + MinusOutlined, PlusOutlined } from '@ant-design/icons'; import { formatRupiah, formatNumber } from '../../../const/CustomFunc' @@ -20,17 +20,17 @@ import { import 'antd/dist/antd.css'; // const { Option } = Select -const DialogFormActivity = ({ +const DialogFormActivity = ({ activityProject, - openDialogActivity, - closeDialogActivity, + openDialogActivity, + closeDialogActivity, handleOpenDialogReport, - toggleDialogActivity, - typeDialogActivity, - proyek_id, - version_gantt_id, - idBoard, - dataHr, + toggleDialogActivity, + typeDialogActivity, + proyek_id, + version_gantt_id, + idBoard, + dataHr, dataEditCard, userToActivityDelete, userToActivityAdd @@ -63,9 +63,9 @@ const DialogFormActivity = ({ setId(dataEditCard.id) setText(dataEditCard.activity) - setProgress(dataEditCard.persentase_progress) + setProgress(dataEditCard.persentase_progress) setStartDate(moment(dataEditCard.start_date)) - setEndDate(moment(dataEditCard.end_date)) + setEndDate(moment(dataEditCard.end_date)) dataEditCard.assign_hr.map((item) => { item.value = item.id_hr item.label = item.name @@ -91,7 +91,7 @@ const DialogFormActivity = ({ closeDialogActivity('cancel', 'none') setVolumePlan(0) } - + const handleSave = () => { let data = ''; @@ -112,7 +112,7 @@ const DialogFormActivity = ({ alert("hr cannot be empty!"); return false; } - + if (typeDialogActivity === "Save") { data = { @@ -138,7 +138,7 @@ const DialogFormActivity = ({ } userToActivityAdd(dataSaveHr) }) - + IdDeleteHrTemporary.map((item)=>{ @@ -149,7 +149,7 @@ const DialogFormActivity = ({ setHrTemporaryAdd([]) setIdDeleteHrTemporary([]) setHrTemporary([]) - + progress == 100 ? data = { "text": text, @@ -179,11 +179,10 @@ const DialogFormActivity = ({ } - const onChangeHr = (newValue, actionMeta) => { - if (typeDialogActivity === "Edit") { + const onChangeHr = (newValue, actionMeta) => { + if (typeDialogActivity === "Edit") { if (actionMeta.action === 'select-option') { const item = actionMeta.option - // console.log("actionMeta", item); // let dataSaveHr = { // "user_id": item.id, // "role_proyek_id": item.proyek_role, @@ -196,18 +195,18 @@ const DialogFormActivity = ({ } else if (actionMeta.action === 'remove-value') { const id = actionMeta.removedValue.id // userToActivityDelete(id) - for (let k in hrTemporary) { + for (let k in hrTemporary) { if (hrTemporary[k].id == id) { setIdDeleteHrTemporary([...IdDeleteHrTemporary, id]) } } - - } + + } } - + setHr(newValue) }; - + const increase = () => { let newPercent = progress + 10; if (newPercent > 100) { @@ -216,7 +215,7 @@ const DialogFormActivity = ({ setProgress(newPercent); }; - + const decline = () => { let newPercent = progress - 10; if (newPercent < 0) { @@ -240,13 +239,13 @@ const DialogFormActivity = ({ { dateItem.set({hour:0,minute:0,second:0}) - setStartDate(dateItem)}} + setStartDate(dateItem)}} /> - + { dateItem.set({hour:23,minute:59,second:59}) setEndDate(dateItem)}} diff --git a/src/views/SimproV2/Kanban/DialogFormReport.js b/src/views/SimproV2/Kanban/DialogFormReport.js index 295e6e9..4eb8553 100644 --- a/src/views/SimproV2/Kanban/DialogFormReport.js +++ b/src/views/SimproV2/Kanban/DialogFormReport.js @@ -110,10 +110,6 @@ const DialogFormReport = ({ closeDialogReport('cancel', 'none') } - const handleReport = () => { - console.log('Button Triggered') - } - const handleGetReportActivity = async (id) => { const payload = { columns: [ @@ -249,7 +245,6 @@ const DialogFormReport = ({ if (typeDialogReport === "Edit") { if (actionMeta.action === 'select-option') { const item = actionMeta.option - // console.log("actionMeta", item); // let dataSaveHr = { // "user_id": item.id, // "role_proyek_id": item.proyek_role, @@ -378,7 +373,7 @@ const DialogFormReport = ({ onChange={onChangeHr} /> - + diff --git a/src/views/SimproV2/ReferralCode/DialogForm.js b/src/views/SimproV2/ReferralCode/DialogForm.js index 6e5a46c..7416b20 100644 --- a/src/views/SimproV2/ReferralCode/DialogForm.js +++ b/src/views/SimproV2/ReferralCode/DialogForm.js @@ -21,7 +21,6 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi const { t } = useTranslation() useEffect(() => { - console.log('dataEdit', dataEdit); if (typeDialog === "Edit") { setId(dataEdit.id) setCode(dataEdit.code) @@ -54,7 +53,6 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi type, allocation } - console.log('data', data); closeDialog('save', data); } else { data = { @@ -66,7 +64,6 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi type, allocation } - console.log('data', data); closeDialog('edit', data); } handleClear()