From cde93ec08d6ff15c265077cc5b8598a6a63d6961 Mon Sep 17 00:00:00 2001 From: wahyu Date: Tue, 24 Oct 2023 09:41:42 +0700 Subject: [PATCH] select activity --- .../SimproV2/CreatedProyek/ReportAnalysis.js | 90 ++++++++++++++++--- 1 file changed, 76 insertions(+), 14 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/ReportAnalysis.js b/src/views/SimproV2/CreatedProyek/ReportAnalysis.js index df7915e..b74c6c8 100644 --- a/src/views/SimproV2/CreatedProyek/ReportAnalysis.js +++ b/src/views/SimproV2/CreatedProyek/ReportAnalysis.js @@ -24,6 +24,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => const [dataTable, setDatatable] = useState([]); const [dataTableActivityToHr, setDataTableActivityToHr] = useState([]); const [hrList, setHrList] = useState([]); + const [groupedActivity, setGroupedActivity] = useState([]); const [selectedHr, setSelectedHr] = useState(null); const toggle = (tab) => { @@ -102,6 +103,23 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => getDataHr() }, []); + useEffect(() => { + if (projectId) { + getGroupedActivity() + getDataHr() + } + }, [projectId]); + + const handleClose = () => { + setAvgActivityHr(0); + setSelectedHr(null); + setDataTableActivityToHr([]); + setAvgActivity(0); + setSearch(''); + setDatatable([]) + closeDialog() + } + const handleSearch = (e) => { const value = e.target.value; setSearch(value); @@ -131,8 +149,27 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => } const getDataHr = async () => { + const payload = { + columns: [ + { + name: "proyek_id", + logic_operator: "=", + value: projectId, + operator: "AND", + }, + ], + joins: [ + { + name: "m_users", + column_join: "user_id", + column_results: ["id", "name"] + }, + ], + orders: { columns: ["id"], ascending: false }, + paging: { start: 0, length: -1 }, + }; const result = await axios - .get(`${BASE_SIMPRO_LUMEN}/human-resource/list`, HEADER) + .post(`${BASE_SIMPRO_LUMEN}/user-to-proyek/search`, payload, HEADER) .then((res) => res) .catch((error) => error.response); @@ -209,6 +246,33 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => } }; + const getGroupedActivity = async () => { + const payload = { + columns: [ + { + name: "proyek_id", + logic_operator: "=", + value: projectId, + operator: "AND", + }, + ], + orders: { columns: ["id"], ascending: false }, + paging: { start: 0, length: -1 }, + }; + + const result = await axios + .post(`${BASE_SIMPRO_LUMEN}/activity/search-analysis-prep`, payload, HEADER) + .then((res) => res) + .catch((error) => error.response); + + if (result && result.data && result.data.code == 200) { + let dataRes = result.data.data || []; + setGroupedActivity(dataRes); + } else { + NotificationManager.error("Gagal Mengambil Data!!", "Failed"); + } + }; + const getDataActivity = async () => { setAvgActivity(0); let sum = 0; @@ -216,7 +280,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => columns: [ { name: "name", - logic_operator: "ilike", + logic_operator: "=", value: search, operator: "AND", }, @@ -251,7 +315,7 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => return ( <> - Report Analysis + Report Analysis
- +