From 2c47bb80483d790310005f01006f572f641b0d80 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Mon, 3 Apr 2023 13:04:55 +0700 Subject: [PATCH 1/5] Task #860q7btm6 changing error message --- src/views/SimproV2/ResourceWorker/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js index b7a4e35..486e8dd 100644 --- a/src/views/SimproV2/ResourceWorker/index.js +++ b/src/views/SimproV2/ResourceWorker/index.js @@ -429,7 +429,7 @@ const ResourceWorker = ({ params }) => { getDataUser(); NotificationManager.success(`Data resource berhasil diedit`, 'Success!!'); } else { - NotificationManager.error(`Data resource gagal di edit`, `Failed!!`); + NotificationManager.error(`${result.data.message}`, `Failed!!`); } } From bd84731142907694c3bbf55bdb90647861e31e67 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 4 Apr 2023 11:01:46 +0700 Subject: [PATCH 2/5] Task #860q2vhvg add sync HR --- src/const/ApiConst.js | 1 + src/views/SimproV2/ResourceWorker/index.js | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/const/ApiConst.js b/src/const/ApiConst.js index d90b6af..f964656 100644 --- a/src/const/ApiConst.js +++ b/src/const/ApiConst.js @@ -236,6 +236,7 @@ export const TOOLS_CREATE = `${BASE_SIMPRO_LUMEN}/req-tools/create` export const USER_ADD = `${BASE_SIMPRO_LUMEN}/human-resource/add` export const USER_SEARCH = `${BASE_SIMPRO_LUMEN}/human-resource/search` export const USER_LIST = `${BASE_SIMPRO_LUMEN}/human-resource/list` +export const USER_SYNC = `${BASE_SIMPRO_LUMEN}/human-resource/sync` export const USER_EDIT = (id) => { return `${BASE_SIMPRO_LUMEN}/human-resource/update/${id}` } export const USER_DELETE = (id) => { return `${BASE_SIMPRO_LUMEN}/human-resource/delete/${id}` } diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js index 486e8dd..f4f6af5 100644 --- a/src/views/SimproV2/ResourceWorker/index.js +++ b/src/views/SimproV2/ResourceWorker/index.js @@ -10,7 +10,7 @@ import { DownloadOutlined } from '@ant-design/icons'; import { NotificationContainer, NotificationManager } from 'react-notifications'; import { Pagination, Table, Button, Tooltip } from 'antd'; import { - PROYEK_SEARCH, USER_ADD, USER_SEARCH, USER_EDIT, USER_DELETE, ROLE_SEARCH, DIVISI_SEARCH, USER_SHIFT_ADD + PROYEK_SEARCH, USER_ADD, USER_SEARCH, USER_EDIT, USER_DELETE, ROLE_SEARCH, DIVISI_SEARCH, USER_SHIFT_ADD, USER_SYNC } from '../../../const/ApiConst'; import { useTranslation } from 'react-i18next'; const url = ""; @@ -229,6 +229,12 @@ const ResourceWorker = ({ params }) => { } + const handleSync = async () => { + await axios.get(USER_SYNC, HEADER) + .then(res => res) + .catch((error)=>error.response) + } + const handleExportExcel = async () => { let start = 0; @@ -554,6 +560,9 @@ const ResourceWorker = ({ params }) => { + + + From 0ff6577cbec9244fa4de11e586aa5f3d310df75e Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Thu, 6 Apr 2023 10:43:44 +0700 Subject: [PATCH 3/5] Task #860qf9799 fix infinity loop --- src/views/Dashboard/DashboardProject.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index ebe52eb..e65d707 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -116,7 +116,7 @@ const DashboardProject = () => { ]) } fetchData() - }, [manPower, assignedHr]) + }, []) useEffect(() => { let deviation = 0; From 2507c3e327b8284d4f7497ea9b660dace48abac2 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 11 Apr 2023 01:14:49 +0700 Subject: [PATCH 4/5] Fix closedialog hierarchy ftth --- src/views/SimproV2/CreatedProyek/DIalogHierarchy.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/SimproV2/CreatedProyek/DIalogHierarchy.js b/src/views/SimproV2/CreatedProyek/DIalogHierarchy.js index f82aa87..4709a87 100644 --- a/src/views/SimproV2/CreatedProyek/DIalogHierarchy.js +++ b/src/views/SimproV2/CreatedProyek/DIalogHierarchy.js @@ -103,6 +103,10 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek setOpenDialogGantt(true) } + const closeDialogGantt = () => { + setOpenDialogGantt(false); + }; + const toggleDialogFormGantt = () => { setOpenDialogFormGantt(!openDialogFormGantt) } @@ -304,6 +308,7 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek From aa62f338ef769fc14fbd2482ff23e640bafefe97 Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Tue, 11 Apr 2023 14:02:33 +0700 Subject: [PATCH 5/5] Hotfix --- src/views/SimproV2/CreatedProyek/DialogFormGantt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/SimproV2/CreatedProyek/DialogFormGantt.js b/src/views/SimproV2/CreatedProyek/DialogFormGantt.js index 61994c0..d999b92 100644 --- a/src/views/SimproV2/CreatedProyek/DialogFormGantt.js +++ b/src/views/SimproV2/CreatedProyek/DialogFormGantt.js @@ -41,7 +41,7 @@ const DialogFormGantt = ({ openDialog, closeDialog, toggleDialog, idTask, parent description, calculation_type: calculationType, proyek_id: idTask, - id_hierarcy_ftth: parentId + hierarchy_ftth_id: parentId }