diff --git a/src/views/Dashboard/DashboardBOD.js b/src/views/Dashboard/DashboardBOD.js index 87625f3..344faf5 100644 --- a/src/views/Dashboard/DashboardBOD.js +++ b/src/views/Dashboard/DashboardBOD.js @@ -666,8 +666,8 @@ const DashboardBOD = () => { label: "", // data: [50, 120, 72, 60], data: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.total).filter(value => value !== 0) : [], - borderColor: ["#023E8A", "#C851B7", "#FD7034", "#3A0CA3", "#A36A16"], - backgroundColor: ["#023E8A", "#C851B7", "#FD7034", "#3A0CA3", "#A36A16"], + borderColor: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.color) : [], + backgroundColor: PROJECT_VALUE_PER_DIVISION ? PROJECT_VALUE_PER_DIVISION.map((item, idx) => item.color) : [], borderWidth: 2, borderSkipped: false }, diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index 79cb44d..f2bcc41 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -1018,7 +1018,7 @@ const DashboardProject = () => { - +
{
- + {/*
{
- + */}
{ - + {/*
{ marginBottom: 5, marginRight: 2, }} - > + > */} {/*
Health By Schedule
On Budget
*/} - + {/* Total Invoice {isReadyIntegrationInvoice ? ( @@ -1626,7 +1626,7 @@ const DashboardProject = () => {
-
+
*/}
}; const columns = [ - {title: "Activity Name", dataIndex: "name", key: "name"} + {title: "Activity", dataIndex: "name", key: "name"}, + {title: "Gantt", dataIndex: "name_version", key: "name_version"}, + {title: "Assign HR", dataIndex: "user_name", key: "user_name"}, + {title: "Progress (%)", dataIndex: "persentase_progress", key: "persentase_progress"}, ] const columnActivityToHr = [ @@ -150,13 +153,19 @@ const ReportAnalysis = ({ openDialog, closeDialog, toggleDialog, projectId }) => value: search, operator: "AND", }, + { + 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`, payload, HEADER) + .post(`${BASE_SIMPRO_LUMEN}/activity/search-analysis`, payload, HEADER) .then((res) => res) .catch((error) => error.response);