diff --git a/src/views/Dashboard/DashboardProjectCarousell.js b/src/views/Dashboard/DashboardProjectCarousell.js
index 5d37ea0..9b21734 100644
--- a/src/views/Dashboard/DashboardProjectCarousell.js
+++ b/src/views/Dashboard/DashboardProjectCarousell.js
@@ -1,6 +1,6 @@
import React, { useEffect, useMemo, useRef, useState } from "react";
import axios from "axios";
-import { Row, Col, Button, Input,Spin } from "antd";
+import { Row, Col, Button, Input, Spin } from "antd";
import {
CardDashboard,
CardExpenditure,
@@ -77,14 +77,8 @@ const DashboardProject = (args) => {
Authorization: `Bearer ${token}`,
},
};
- const { PROJECT_ID } = useParams();
- const mapRef = useRef();
- const [mymap, setMymap] = useState(null);
const [activeTabIdx, setActiveTabIdx] = useState(0);
const [activeTabCommentIdx, setActiveTabCommentIdx] = useState(0);
- const [planningProgress, setPlanningProgress] = useState(0);
- const [actualProgress, setActualProgress] = useState(0);
- const [isReadyComments, setIsReadyComments] = useState(false);
const [isSendingComment, setIsSendingComment] = useState(false);
const [isReadyProjectDetail, setIsReadyProjectDetail] = useState(false);
const [isReadySCurve, setIsReadySCurve] = useState(false);
@@ -95,23 +89,17 @@ const DashboardProject = (args) => {
const [healthBySchedule, setHealthBySchedule] = useState("-");
const [allDataMaster, sourceData] = useState([]);
const [isHierarchy, setIsHierarchy] = useState(false);
- let history = useHistory();
// Carousell
const [activeIndex, setActiveIndex] = useState(0);
const [animating, setAnimating] = useState(false);
const [loading, setLoading] = useState(true);
+ const [carouselPaused, setCarouselPaused] = useState(false);
useEffect(() => {
setLoading(true);
- getReportDistribution();
- },[]);
-
- useEffect(() => {
- if (activeTabIdx === 1) {
- initMap();
- }
- }, [activeTabIdx]);
+ getAllData();
+ }, []);
const getAllData = async () => {
setIsReadyProjectDetail(false);
@@ -141,7 +129,7 @@ const DashboardProject = (args) => {
return;
} else if (result.status == 200 && result.data.data) {
const dataResault = result.data.data;
- console.log("Resault Data",dataResault);
+ console.log("Resault Data", dataResault);
sourceData(dataResault);
setIsReadyGantt(true);
setIsReadyProjectDetail(true);
@@ -158,63 +146,6 @@ const DashboardProject = (args) => {
}
};
- const getReportDistribution = async () => {
- const URL = `${BASE_OSPRO}/api/project/get-report-distribution`;
- const payload = {
- project_id: 138,
- start_date: moment()
- .startOf("month")
- .subtract(1, "years")
- .format("YYYY-MM-DD"),
- end_date: moment(new Date()).subtract(1, "years").format("YYYY-MM-DD"),
- };
- const result = await axios
- .post(URL, payload, HEADER)
- .then((res) => res)
- .catch((err) => err.response);
- console.log("getReportDistribution", result);
- if (!result) {
- NotificationManager.error(`Could not connect to internet.`, "Failed");
- return;
- }
-
- if (result.status !== 200) {
- NotificationManager.error(
- `Get report distribution failed, ${result.data.message}`,
- "Failed"
- );
- setLoading(false);
- return;
- } else if (result.status == 200 && result.data.data) {
- setLoading(false);
- setReportDistribution(result.data.data);
- }
- };
-
- const initMap = () => {
- let mymap = L.map("map-area", {
- center: center,
- zoom: 13,
- });
-
- setMymap(mymap);
- L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
- attribution:
- '©
OpenStreetMap contributors',
- }).addTo(mymap);
- };
-
- useEffect(() => {
- if (mymap) {
- if (reportDistribution.length > 0) {
- reportDistribution.map((item, idx) => {
- L.marker([item.lat, item.lon])
- .addTo(mymap)
- .bindPopup(PopupContent(item));
- });
- }
- }
- }, [mymap, reportDistribution]);
useEffect(() => {
// Add event listener for receiving messages from the iframe
@@ -238,1283 +169,555 @@ const DashboardProject = (args) => {
}
};
- const next = () => {
- if (animating) return;
- const nextIndex = activeIndex === dummyData.length - 1 ? 0 : activeIndex + 1;
- setActiveIndex(nextIndex);
- };
+ const next = () => {
+ if (animating) return;
+ const nextIndex = activeIndex === allDataMaster.length - 1 ? 0 : activeIndex + 1;
+ setActiveIndex(nextIndex);
+ };
- const previous = () => {
- if (animating) return;
- const nextIndex = activeIndex === 0 ? dummyData.length - 1 : activeIndex - 1;
- setActiveIndex(nextIndex);
- };
+ const previous = () => {
+ if (animating) return;
+ const nextIndex = activeIndex === 0 ? allDataMaster.length - 1 : activeIndex - 1;
+ setActiveIndex(nextIndex);
+ };
- const goToIndex = (newIndex) => {
- if (animating) return;
- setActiveIndex(newIndex);
- };
+ const goToIndex = (newIndex) => {
+ if (animating) return;
+ setActiveIndex(newIndex);
+ };
- const dummyData = [
- {
- "project": {
- "id": 138,
- "nama":"Survey Tanah Bidang",
- "budget_health":"on-budget",
- "schedule_health":"on-schedule",
- "company": "Kementrian PUPR",
- "gantt": {
- "gantt_id": 896,
- "name_version":"Proses Tender",
- }
- },
- "manpower":1,
- "assigned":0,
- "actual":0,
- "project_manager": "FATHAN",
- "activity" : {
- "start_date":"-",
- "end_date":"13 September 2023",
- "planned_start":"-",
- "planned_end":"-",
- "planning":0,
- "actual":0
- },
- "key":1
- },
- {
- "project": {
- "id": 138,
- "nama":"Survey Tanah Bidang",
- "budget_health":"on-budget",
- "schedule_health":"on-schedule",
- "company": "Kementrian PUPR",
- "gantt": {
- "gantt_id": 897,
- "name_version":"Eksekusi",
- }
- },
- "manpower":1,
- "assigned":0,
- "actual":0,
- "project_manager": "FATHAN",
- "activity" : {
- "start_date":"11 September 2023",
- "end_date":"11 September 2023",
- "planned_start":"-",
- "planned_end":"-",
- "planning":0,
- "actual":0
- },
- "key":2
- },
- {
- "project": {
- "id": 138,
- "nama":"Survey Tanah Bidang",
- "budget_health":"on-budget",
- "schedule_health":"on-schedule",
- "company": "Kementrian PUPR",
- "gantt": {
- "gantt_id": 898,
- "name_version":"Document meeting",
- }
- },
- "manpower":1,
- "assigned":0,
- "actual":0,
- "project_manager": "FATHAN",
- "activity" : {
- "start_date":"11 September 2023",
- "end_date":"11 September 2023",
- "planned_start":"-",
- "planned_end":"-",
- "planning":0,
- "actual":0
- },
- "key":3
- }
- ]
- // const slides = allDataMaster.map((item, index) => {
- // let URL_GANTT = "";
- // let version_gantt = "";
- // item.project.gantt.map((itemGantt, index) => {
- // URL_GANTT = `http://localhost:8444/adw-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${itemGantt.gantt_id}&proyek_id=${itemGantt.proyek_id}&token=${token}&ro=1`;
- // version_gantt = itemGantt.name_version
- // });
- // const today = moment();
- // const assignedList = item.assigned
- // .filter((itemAssigned) =>
- // today.isBetween(moment(itemAssigned.start_date), moment(itemAssigned.end_date))
- // )
- // .map((itemMap) => itemMap.user_id);
- // // SCurve
- // let statusHealthBySchedule = "on-schedule";
- // let selisihProgress = 0;
- // let SetplanningProgress = 0;
- // let SetactualProgress = 0;
- // let now = new Date().toISOString().slice(0, 10);
- // let dates = item.SCurve[0].data?.date;
- // let n = dates.findIndex(
- // (element) => new Date(now) < new Date(element)
- // );
- // if (
- // item.SCurve[0].length > 0 &&
- // item.SCurve[0].data?.percentagePlan &&
- // item.SCurve[0].data?.percentagePlan.length > 0
- // ) {
- // SetplanningProgress = item.SCurve[0].data?.percentagePlan[n];
- // if (n < 0) {
- // SetplanningProgress = 100;
- // }
- // }
- // if (
- // item.SCurve[0].length > 0 &&
- // item.SCurve[0].data?.percentageReal &&
- // item.SCurve[0].data?.percentageReal.length > 0
- // ) {
- // SetactualProgress =
- // item.SCurve[0].data?.percentageReal[
- // item.SCurve[0].data?.percentageReal.length - 1
- // ];
- // }
- // selisihProgress = SetplanningProgress - SetactualProgress;
- // if (selisihProgress > 0 && selisihProgress <= 5) {
- // statusHealthBySchedule = "warning";
- // } else if (selisihProgress > 5) {
- // statusHealthBySchedule = "danger";
- // }
- // return (
- //
setAnimating(true)}
- // onExited={() => setAnimating(false)}
- // key={parseInt(item.key)}>
- //
- //
- //
- //
- //
- //
- //
- //
- // Project
- //
- //
- // {isReadyProjectDetail &&
- // isReadyGantt ? (
- // (() => {
- // let parentNames = "";
- // if (item.hierarchy.length > 0)
- // {
- // for ( let i = item.hierarchy.length - 1; i >= 0; i--) {
- // parentNames += " - ";
- // parentNames += item.hierarchy[i].name;
- // }
- // }
- // return item.project.nama +
- // parentNames +
- // " - " +
- // version_gantt
- // })()
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // Project Manager
- //
- //
- // {isReadyProjectDetail ? (
- // item.project_manager
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // Customer
- //
- //
- // {isReadyProjectDetail ? (
- // item.project.company
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // Schedule
- //
- //
- //
- //
- //
- //
- // Planned Start
- //
- //
- // {isReadyProjectDetail ? (
- // item.activity.planned_start ? (
- // moment(item.activity.planned_start).format("D MMMM YYYY")
- // ) : (
- // "-"
- // )
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- // Actual Start
- //
- //
- // {isReadyProjectDetail ? (
- // item.activity.start_date ? (
- // moment(item.activity.start_date).format("D MMMM YYYY")
- // ) : (
- // "-"
- // )
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- // Planned Finish
- //
- //
- // {isReadyProjectDetail ? (
- // item.activity.planned_end ? (
- // moment(item.activity.planned_end).format("D MMMM YYYY")
- // ) : (
- // "-"
- // )
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- // Estimated Finish
- //
- //
- // {isReadyProjectDetail ? (
- // item.activity.end_date ? (
- // moment(item.activity.end_date).format("D MMMM YYYY")
- // ) : (
- // "-"
- // )
- // ) : (
- //
- // )}
- //
- //
- //
- //
- //
- //
- //
- //
- // setActiveTabIdx(0)}
- // >
- // S Curve
- //
- //
- //
- // setActiveTabIdx(1)}
- // >
- // Maps
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // {activeTabIdx === 1 && (
- //
- // )}
- //
- //
- //
- //
- //
- //
- // Progress
- //
- // {isReadySCurve ? (
- //
100 ? 100 : SetplanningProgress}
- // />
- // ) : (
- //
- // )}
- //
- // {isReadySCurve ? (
- // 100 || SetactualProgress > 100
- // ? parseFloat(
- // (SetactualProgress / SetplanningProgress) * 100
- // ).toFixed(0)
- // : SetactualProgress
- // }
- // />
- // ) : (
- //
- // )}
- //
- //
- //
- //
- // {isReadyOverdueActivities && (
- //
- // )}
- // {isReadySCurve && (
- //
- // )}
- //
- //
- //
- //
- //
- //
- // Manpower : {item.manpower}
- //
- //
- //
- //
- //
- //
- // Assigned: {item.assigned && assignedList.length}
- //
- //
- //
- //
- // Actual : {item.actual}
- //
- //
- //
- //
- //
- //
- //
- //
- //
- //
- // setActiveTabCommentIdx(0)}
- // >
- // Behind Task
- //
- //
- //
- // setActiveTabCommentIdx(1)}
- // >
- // Comment From Customer
- //
- //
- //
- //
- // {activeTabCommentIdx === 0 && (
- //
- // {isReadyOverdueActivities && item.overdueActivities != [] && item.overdueActivities.length > 0 ? (
- // item.overdueActivities.map((overdueItem, idx) => {
- // let end_date;
- // let planned_end;
- // let diffDays = 0;
- // let message = "";
- // if (overdueItem.end_date && overdueItem.end_date !== null) {
- // end_date = moment(overdueItem.end_date);
- // planned_end = moment(overdueItem.planned_end);
- // diffDays = end_date.diff(planned_end, "days");
+ const renderProjectIssues = (issues) => {
+ return issues.map((data, index) => (
+
+
Tingkat Kepelikan Isu {data.level_issue}
+
Penjelasan {data.description}
+
+ ));
+ };
+
- // if (isNaN(diffDays)) {
- // return null;
- // } else {
- // if (diffDays > 0) {
- // message = `Overdue by ${diffDays + 1} days`;
- // } else {
- // return null;
- // }
- // }
- // }
+ const renderProjectRisks = (risks) => (
+ risks.map((data, index) => (
+
+
Tingkat Dampak Resiko {data.level_risk}
+
Penjelasan {data.description}
+
Pencegahan {data.preventive_risk}
+
+ ))
+ );
- // return
;
- // })
- // ) : (
- //
- // No overdue activity found.
- //
- // )}
- //
- // )}
- // {activeTabCommentIdx === 1 &&(
- //
- // {item.project_comment && item.project_comment != [] ? (
- // item.project_comment.map((commentItem, idx) => {
- // return
- // })
- // ) : (
- //
- // No comments found.
- //
- // )}
- //
- // )}
- //
- //
- //
- //
- //
- // );
- // });
- const slides = dummyData.map((item, index) => {
- const URL_GANTT = `https://konstruksi-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${item.project.gantt.gantt_id}&proyek_id=${item.project.id}&token=${token}&ro=1`;
+ const slides = allDataMaster.map((item, index) => {
+ let URL_GANTT = "";
+ let version_gantt = "";
+ if (item.gantt !== null) {
+ URL_GANTT = `http://localhost:8444/adw-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${item.gantt.id}&proyek_id=${item.gantt.proyek_id}&token=${token}&ro=1`;
+ version_gantt = item.gantt.name_version
+ } else {
+ URL_GANTT = "";
+ version_gantt = "";
+ }
+
return (
setAnimating(true)}
onExited={() => setAnimating(false)}
key={parseInt(item.key)}>
-
-
-
-
+
+
+
+
+
-
- Project
-
-
- {item.project ? (
- item.project.nama + "-" + item.project.gantt.name_version
- ) : (
-
- )}
-
+ Project
-
-
+
+ {item.project ? (
+ item.project.nama + "-" + item.project?.gantt?.name_version
+ ) : (
+
+ )}
+
+
+
-
-
+
+
+
+
-
- Project Manager
-
-
- {item.project_manager ? (
- item.project_manager
- ) : (
-
- )}
-
+ Project Manager
-
-
+
+ {item.project_manager ? (
+ item.project_manager
+ ) : (
+
+ )}
+
+
+
-
-
+
+
+
+
-
- Customer
-
-
- {item.project ? (
+ Customer
+
+
+ {item.project ? (
+ item.project.company !== "" && item.project.company !== undefined ? (
item.project.company
) : (
-
- )}
-
-
-
-
+ "-"
+ )
+ ) : (
+
+ )}
+
+
+
+
-
-
+
+
+
+
+
+
+
+ Schedule
+
+
+
+
+
+
+ Planned Start
+
+
+ {item.project ? (
+ item.project.mulai_proyek
+ ) : (
+
+ )}
+
+
+
+
+
+ Planned Finish
+
+
+ {item.project ? (
+ item.project.akhir_proyek
+ ) : (
+
+ )}
+
+
+
+
+
+
+
+ Actual Start
+
+
+ {item.activity ? (
+ item.activity.start_date
+ ) : (
+
+ )}
+
+
+
+
+
+ Actual Finish
+
+
+ {item.activity ? (
+ item.activity.end_date
+ ) : (
+
+ )}
+
+
+
+
+
+
-
+
setActiveTabIdx(0)}
>
-
-
-
-
-
-
- Planned Start
-
-
- {item.activity ? (
- item.activity.planned_start
- ) : (
-
- )}
-
-
-
-
-
- Actual Start
-
-
- {item.activity ? (
- item.activity.start_date
- ) : (
-
- )}
-
-
-
-
-
- Planned Finish
-
-
- {item.activity ? (
- item.activity.planned_end
- ) : (
-
- )}
-
-
-
-
-
- Estimated Finish
-
-
- {item.activity ? (
- item.activity.end_date
- ) : (
-
- )}
-
-
-
-
+ S Curve
+
setActiveTabIdx(1)}
+ >
+ Issue & Risk
-
-
-
+
+
+
setActiveTabIdx(0)}
>
- S Curve
+
-
-
+ {activeTabIdx === 1 && (
+
+
+
+ Issue
+
+
+ {console.log('item.project_issue', item.project_issue)}
+ {item.project_issue && item.project_issue.length > 0 ? (
+ renderProjectIssues(item.project_issue)
+ ) :
+ tidak ada data
+
}
+
+ Risk
+
+
+ {console.log('item.project_risk', item.project_risk)}
+ {item.project_risk && item.project_risk.length > 0 ? (
+ renderProjectRisks(item.project_risk)
+ ) :
+ tidak ada data
+
}
+
+ )}
+
+
+
+
+
+
+
+
+
+
setActiveTabIdx(1)}
>
- Maps
+ Progress
-
-
-
-
-
+ {item.activity ? (
+
100 ? 100 : item.activity.planning}
+ />
+ ) : (
+
+ )}
+
+ {item.activity ? (
+ 100 || item.activity.actual > 100
+ ? parseFloat(
+ (item.activity.actual / item.activity.planning) * 100
+ ).toFixed(0)
+ : item.activity.actual
+ }
+ />
+ ) : (
+
+ )}
+
+
+
+
+ {item.project.budget_health && (
+
+ )}
+ {item.project.schedule_health && (
+
+ )}
+
+
+
+
+
-
+ Manpower : {item.manpower}
- {activeTabIdx === 1 && (
-
- )}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
- Progress
+ Assigned: {item.assigned}
- {item.activity ? (
- 100 ? 100 : item.activity.planning}
- />
- ) : (
-
- )}
-
- {item.activity ? (
- 100 || item.activity.actual > 100
- ? parseFloat(
- (item.activity.actual / item.activity.planning) * 100
- ).toFixed(0)
- : item.activity.actual
- }
- />
- ) : (
-
- )}
-
-
-
-
- {item.project.budget_health && (
-
- )}
- {item.project.schedule_health && (
-
- )}
-
-
-
-
-
-
- Manpower : {item.manpower}
-
-
-
-
+
+
+
+ Actual : {item.actual}
+
+
+
+
+
+
+
+
+
setActiveTabCommentIdx(0)}
>
- Assigned: {item.assigned}
+ Behind Task
setActiveTabCommentIdx(1)}
>
- Actual : {item.actual}
+ Comment From Customer
-
-
-
-
-
-
- setActiveTabCommentIdx(0)}
- >
- Behind Task
-
-
-
- setActiveTabCommentIdx(1)}
- >
- Comment From Customer
-
-
-
-
{activeTabCommentIdx === 0 && (
-
{
>
No overdue activity found.
- )}
+ )}
{activeTabCommentIdx === 1 && (
<>
-
- No comments found.
-
+ style={{ padding: 5, marginBottom: 5, marginRight: 2, marginLeft: 2 }}
+ >
+
+
+
+
+
+
+ No comments found.
+
- )}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
);
});
@@ -1575,30 +778,21 @@ const DashboardProject = (args) => {
-
+
-
- {slides}
-
-
-
+ {slides}
+
+
+
+
+
+