From 0c1e2b01e16faa2d3174653bf750841b9813e05b Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 17 May 2023 09:34:44 +0700 Subject: [PATCH 1/2] Using current gantt instead of last gantt --- src/views/Dashboard/DashboardProject.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index e65d707..a554cae 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -40,7 +40,7 @@ const DashboardProject = () => { } } const { PROJECT_ID, GANTT_ID } = useParams(); - const URL_GANTT = `https://adw-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; + const URL_GANTT = `http://localhost/adw-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; const mapRef = useRef() const [projectName, setProjectName] = useState(""); const [projectManagerName, setProjectManagerName] = useState(""); @@ -235,6 +235,7 @@ const DashboardProject = () => { const URL = `${BASE_OSPRO}/api/project/get-s-curve`; const payload = { "project_id": PROJECT_ID.toString(), + "gantt_id": GANTT_ID.toString(), "period": "week", // "end_date": moment(new Date()).format('YYYY-MM-DD') } From 379142059dc43cb674effd34a74473dc79d452ec Mon Sep 17 00:00:00 2001 From: Wahyu Ramadhan Date: Wed, 17 May 2023 10:19:12 +0700 Subject: [PATCH 2/2] Fix url --- 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 a554cae..9568ab5 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -40,7 +40,7 @@ const DashboardProject = () => { } } const { PROJECT_ID, GANTT_ID } = useParams(); - const URL_GANTT = `http://localhost/adw-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; + const URL_GANTT = `https://adw-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; const mapRef = useRef() const [projectName, setProjectName] = useState(""); const [projectManagerName, setProjectManagerName] = useState("");