From 51cb9770ae8761235b6e706da109612ae847049b Mon Sep 17 00:00:00 2001 From: farhantock Date: Mon, 11 Dec 2023 12:49:20 +0700 Subject: [PATCH 1/4] delete unused --- .../CreatedProyek/.DialogHierarchy.js.swp | Bin 16384 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp diff --git a/src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp b/src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp deleted file mode 100644 index 426e022212eed132edc77a6f21437bfbeb612060..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 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 Date: Mon, 11 Dec 2023 12:50:43 +0700 Subject: [PATCH 2/4] add calculate progress --- src/const/ApiConst.js | 5 ++++ .../SimproV2/CreatedProyek/DialogHierarchy.js | 29 +++++++++++++++---- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index c13daa3..5552366 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -727,6 +727,11 @@ export const HIERARCHY_FTTH_DELETE = (id) => { export const HIERARCHY_FTTH_TREE = (id) => { return `${BASE_SIMPRO_LUMEN}/hierarchy-ftths/tree/${id}`; }; + +export const HIERARCHY_FTTH_COUNT_TREE = (id) => { + return `${BASE_SIMPRO_LUMEN}/hierarchy-ftths/count-tree/${id}`; +}; + export const WAYPOINT_SEARCH = `${BASE_SIMPRO_LUMEN}/waypoint/search`; export const IMAGE_UPLOAD = `${BASE_SIMPRO_LUMEN}/image/upload`; diff --git a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js index 2bb089d..563d14d 100644 --- a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js +++ b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js @@ -5,7 +5,7 @@ import { Space, Table, Tooltip, Spin } from 'antd'; import 'antd/dist/antd.css'; import moment from 'moment'; import SweetAlert from 'react-bootstrap-sweetalert'; -import { HIERARCHY_FTTH_DELETE, HIERARCHY_FTTH_TREE, VERSION_GANTT_SEARCH, HIERARCHY_FTTH_ADD, USER_LIST } from '../../../const/ApiConst'; +import { HIERARCHY_FTTH_DELETE, HIERARCHY_FTTH_TREE, HIERARCHY_FTTH_COUNT_TREE, HIERARCHY_FTTH_ADD, USER_LIST } from '../../../const/ApiConst'; import axios from "../../../const/interceptorApi" import { NotificationContainer, NotificationManager } from 'react-notifications'; import DialogUserGantt from './DialogUserGantt'; @@ -13,11 +13,8 @@ import DialogForm from './DialogFormHierarchy' import DialogFormGantt from './DialogFormGantt'; import DialogGantt from './DialogGantt'; import { useTranslation } from 'react-i18next'; -import { async } from '@dabeng/react-orgchart'; -import { Link } from 'react-router-dom'; -import { use } from 'i18next'; import _ from 'lodash'; -const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName }) => { +const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, dataViewStartDate }) => { const token = localStorage.getItem("token") const HEADER = { headers: { @@ -98,6 +95,22 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek setOpenDialogFormGantt(true) } + const handleHitungProgress = async (id) => { + const url = HIERARCHY_FTTH_COUNT_TREE(id) + const result = await axios + .get(url, HEADER) + .then(res => res) + .catch((error) => error.response); + + if (result && result.status == 200) { + setLoading(false); + } else { + setLoading(false); + NotificationManager.error(`Data gagal dihitung silahkan coba lagi!`, 'Failed!!'); + } + } + + const handleViewGant = (id, name) => { setParentId(id) setParentName(name) @@ -196,11 +209,14 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek {" "} + + + {" "} {" "} {text.dataGantt && ( - + )} , @@ -320,6 +336,7 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek hierarchyName={parentName} idTask={idTask} openDialogHierarchy={openDialog} + dataViewStartDate={dataViewStartDate} /> Date: Mon, 11 Dec 2023 12:51:00 +0700 Subject: [PATCH 3/4] search gantt --- .../SimproV2/CreatedProyek/DialogGantt.js | 84 +++++++++---------- 1 file changed, 39 insertions(+), 45 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogGantt.js b/src/views/SimproV2/CreatedProyek/DialogGantt.js index 27e0380..738a075 100644 --- a/src/views/SimproV2/CreatedProyek/DialogGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogGantt.js @@ -1,19 +1,19 @@ import React, { useEffect, useState, useMemo } from 'react' -import { Modal, ModalHeader, ModalBody, ModalFooter, Breadcrumb, BreadcrumbItem } from 'reactstrap'; +import { Modal, ModalHeader, ModalBody, Col, Row, Breadcrumb, BreadcrumbItem } from 'reactstrap'; import { Button } from 'reactstrap'; -import { Table, Tooltip, Spin } from 'antd'; +import { Select, Table, Tooltip, Spin } from 'antd'; import 'antd/dist/antd.css'; import moment from 'moment'; import SweetAlert from 'react-bootstrap-sweetalert'; -import { VERSION_GANTT_DELETE, VERSION_GANTT_SEARCH, USER_LIST } from '../../../const/ApiConst'; +import { VERSION_GANTT_DELETE, VERSION_GANTT_SEARCH } from '../../../const/ApiConst'; import axios from "../../../const/interceptorApi" import { NotificationContainer, NotificationManager } from 'react-notifications'; import DialogForm from './DialogFormGantt'; import DialogUserGantt from './DialogUserGantt'; - import { Link } from 'react-router-dom'; -const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName, hierarchyId, hierarchyName, openDialogHierarchy, isLogin, token, role_id, user_id }) => { +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; @@ -38,10 +38,10 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName const [alertDelete, setAlertDelete] = useState(false) const [idDelete, setIdDelete] = useState(0) const [idGantt, setIdGantt] = useState(0) - const [humanResource, setHumanResource] = useState([]) const [dataEdit, setDataEdit] = useState([]) const [typeDialog, setTypeDialog] = useState('') const [loading, setLoading] = useState(true); + const [searchGantt, setSearchGantt] = useState(null); useEffect(() => { if (openDialog && hierarchyId > 0 || idTask > 0 && !openDialogHierarchy) { @@ -51,33 +51,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName if (!openDialog) { setDataGantt([]); } - }, [hierarchyId, idTask, openDialog]) - - const getDataHumanResource = async () => { - const result = await axios - .get(USER_LIST, HEADER) - .then(res => res) - .catch((error) => error.response); - - if (result && result.status == 200) { - setTransferUser(result.data.data); - } else { - - } - } - - const setTransferUser = (data) => { - const finalData = [] - data.map((val, index) => { - let data = { - key: val.id, - title: val.name - } - finalData.push(data) - }); - setHumanResource(finalData) - } - + }, [hierarchyId, idTask, openDialog, searchGantt]) const getdataGantt = async () => { let payload; @@ -85,7 +59,8 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName payload = { "select": ["id", "name_version", "calculation_type", "description", "created_at", "progress"], "columns": [ - { "name": "hierarchy_ftth_id", "logic_operator": "=", "value": hierarchyId, "operator": "AND" } + { "name": "hierarchy_ftth_id", "logic_operator": "=", "value": hierarchyId, "operator": "AND" }, + { "name": "id", "logic_operator": "=", "value": searchGantt, "operator": "AND" } ], "orders": { "columns": ["name_version"], "ascending": true } } @@ -93,7 +68,8 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName payload = { "select": ["id", "name_version", "calculation_type", "description", "created_at", "progress"], "columns": [ - { "name": "proyek_id", "logic_operator": "=", "value": idTask, "operator": "AND" } + { "name": "proyek_id", "logic_operator": "=", "value": idTask, "operator": "AND" }, + { "name": "id", "logic_operator": "=", "value": searchGantt, "operator": "AND" } ], "orders": { "columns": ["name_version"], "ascending": true }, } @@ -168,6 +144,7 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName token: token, role_id: role_id, user_id: user_id, + dataViewStartDate: dataViewStartDate } }}> @@ -262,17 +239,36 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName <> - {hierarchyName ? + {hierarchyName ? ( Project {hierarchyName} - : -
Gantt Project {proyekName}
- } - {!hierarchyId && (<> - + ) : ( +
Gantt Project {proyekName}
+ )} + + + {!hierarchyId && ( + )} +
@@ -281,10 +277,8 @@ const DialogGantt = ({ openDialog, closeDialog, toggleDialog, idTask, proyekName
- {/* - - */} - + + Date: Mon, 11 Dec 2023 12:51:26 +0700 Subject: [PATCH 4/4] remove unused --- src/views/SimproV2/CreatedProyek/DialogInitDocument.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogInitDocument.js b/src/views/SimproV2/CreatedProyek/DialogInitDocument.js index 34ab19f..038708e 100644 --- a/src/views/SimproV2/CreatedProyek/DialogInitDocument.js +++ b/src/views/SimproV2/CreatedProyek/DialogInitDocument.js @@ -150,11 +150,11 @@ const DialogInitialDocument = ({ openDialog, closeDialog, toggleDialog, idTypePr render: (text, record) => <> - + {" "} - + {" "} - + ,