diff --git a/src/views/Dashboard/DashboardCustomer.js b/src/views/Dashboard/DashboardCustomer.js
index 10bed77..e4e6edb 100644
--- a/src/views/Dashboard/DashboardCustomer.js
+++ b/src/views/Dashboard/DashboardCustomer.js
@@ -101,8 +101,11 @@ const DashboardCustomer = () => {
const getProjectDetail = async () => {
setIsReadyProjectDetail(false);
- const URL = `${BASE_OSPRO}/api/project/detail/${PROJECT_ID}`;
- const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
+ let URL = `${BASE_OSPRO}/api/project/detail/${PROJECT_ID}`;
+ URL = `${BASE_OSPRO}/api/project/detail/${PROJECT_ID}/${GANTT_ID}/1`
+ const result = await axios.get(URL, HEADER)
+ .then(res => res)
+ .catch(err => err.response)
console.log('getProjectDetail', result);
if (!result) {
NotificationManager.error(`Could not connect to internet.`, "Failed");
@@ -195,7 +198,9 @@ const DashboardCustomer = () => {
const URL = `${BASE_OSPRO}/api/project/get-overdue-activities`;
const payload = {
"id": PROJECT_ID.toString(),
- "till_date": moment(new Date()).format('YYYY-MM-DD')
+ "till_date": moment(new Date()).format('YYYY-MM-DD'),
+ 'gantt': GANTT_ID.toString(),
+ 'scurve': SCURVE ? SCURVE.toString() : null
}
const result = await axios.post(URL, payload, HEADER).then(res => res).catch(err => err.response)
console.log('getOverdueActivities', result);
@@ -431,7 +436,7 @@ const DashboardCustomer = () => {
Project
-
{isReadyProjectDetail
+
{isReadyProjectDetail
? projectName
? calculationStatus
? projectName + " - S-Curve Ready"
diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js
index 9a08500..4245557 100644
--- a/src/views/SimproV2/CreatedProyek/index.js
+++ b/src/views/SimproV2/CreatedProyek/index.js
@@ -266,8 +266,8 @@ const CreatedProyek = ({ params, ...props }) => {
}
};
- const handleDashboard = async (text) => {
- const URL = `${BASE_OSPRO}/api/project/detail/${text.id}`;
+ const handleDashboard = async (id) => {
+ const URL = `${BASE_OSPRO}/api/project/detail/${id}`;
const result = await axios
.get(URL, HEADER)
.then((res) => res)
@@ -285,7 +285,7 @@ const CreatedProyek = ({ params, ...props }) => {
return;
} else if (result.status == 200 && result.data.data) {
history.push(
- `dashboard-customer/${text.id}/${result.data.gantt}/1`
+ `/dashboard-customer/${id}/${result.data.gantt}/1`
);
}
};
@@ -596,6 +596,10 @@ const CreatedProyek = ({ params, ...props }) => {
getProjectDetail(data.id);
};
+ const handleDashboardCustomer = async (data) => {
+ handleDashboard(data.id);
+ };
+
const handleOpenReport = async (data) => {
setOpenDialogRA(true);
setProjectId(data.id);
@@ -1615,7 +1619,7 @@ const CreatedProyek = ({ params, ...props }) => {