diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js index 3b6da19..ea23b39 100644 --- a/src/views/Dashboard/DashboardProject.js +++ b/src/views/Dashboard/DashboardProject.js @@ -36,10 +36,7 @@ const DashboardProject = () => { } } const { PROJECT_ID, GANTT_ID } = useParams(); - // const URL_GANTT = `http://103.73.125.81:8446/index.html?base_url=http://103.73.125.81:8444/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; - // const URL_GANTT = `https://adw-gantt.ospro.id/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1`; - // const URL_GANTT = ''; - const URL_GANTT = `http://192.168.1.104:8446/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(""); @@ -379,7 +376,7 @@ const DashboardProject = () => { if (reportDistribution.length > 0) { reportDistribution.map((item, idx) => { L.marker([item.lat, item.lon]).addTo(mymap).bindPopup(PopupContent(item)); - }); + }); } } }, [mymap, reportDistribution]) @@ -411,7 +408,7 @@ const DashboardProject = () => {
{!isReadyComments && } {isReadyComments && comments && comments.length < 1 &&
No comments found.
} - {comments && comments.length > 0 && comments.map((item, idx) => + {comments && comments.length > 0 && comments.map((item, idx) => )}
@@ -505,7 +502,7 @@ const DashboardProject = () => { - Acutal Start + Actual Start {isReadyProjectDetail ? actualStart ? moment(actualStart).format('D MMMM YYYY') : '-' @@ -634,13 +631,13 @@ const DashboardProject = () => { {isReadySCurve ? : - + }
{isReadySCurve ? : - + } @@ -728,4 +725,4 @@ const DashboardProject = () => { ); } -export default DashboardProject; \ No newline at end of file +export default DashboardProject; diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js index 4670cd0..79b8937 100644 --- a/src/views/SimproV2/Gantt/index.js +++ b/src/views/SimproV2/Gantt/index.js @@ -76,7 +76,7 @@ const Gantt = (props) => { const RenderGantt = () => (