From 08d1994fae5f10fb6573adaa6bafde1296998e90 Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Tue, 23 Jan 2024 17:29:54 +0700
Subject: [PATCH 1/5] update html title

---
 public/OSPRO.ico                              | Bin 0 -> 105726 bytes
 public/index.html                             |   4 ++--
 src/App.js                                    |   2 --
 src/containers/DefaultLayout/DefaultLayout.js |   2 ++
 src/routes.js                                 |   2 +-
 src/views/Pages/Login/Login.js                |  16 ++++++++++++++++
 6 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 public/OSPRO.ico

diff --git a/public/OSPRO.ico b/public/OSPRO.ico
new file mode 100644
index 0000000000000000000000000000000000000000..113520704ff10e10a1a985138d1e55e7f1e368c4
GIT binary patch
literal 105726
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
KCh}}3?|%Sl9|~Xq

literal 0
HcmV?d00001

diff --git a/public/index.html b/public/index.html
index ee2b6ef..0529c99 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,13 +8,13 @@
   <meta name="description" content="OSPRO">
   <meta name="author" content="Integrasia Utama">
   <meta name="keyword" content="OSPRO,Integrasia,OSLOG,Asset,WebGIS,Aplikasi,Tracking System">
-  <title id="title"></title>
+  <title id="title">OSPRO</title>
   <!--
       manifest.json provides metadata used when your web app is added to the
       homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
     -->
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-  <link rel="shortcut icon" href="%PUBLIC_URL%/simpro-icon.ico">
+  <link rel="shortcut icon" href="%PUBLIC_URL%/OSPRO.ico">
   <!-- <link rel="shortcut icon" href="%PUBLIC_URL%/favicon_bmd_denpasar.ico"> -->
   <link rel="stylesheet" href="https://unpkg.com/@coreui/icons@1.0.0/css/all.min.css">
   <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
diff --git a/src/App.js b/src/App.js
index 1329aa9..f46e383 100644
--- a/src/App.js
+++ b/src/App.js
@@ -27,11 +27,9 @@ class App extends Component {
 				const htmlTitle = data.html_title || 'OSPRO';
 				document.title = htmlTitle;
 			} else {
-				console.log('No data found in localStorage for key "configApp".');
 				document.title = 'OSPRO';
 			}
 		} catch (error) {
-			console.error('Error in componentDidMount:', error);
 			document.title = 'OSPRO';
 		}
 	}
diff --git a/src/containers/DefaultLayout/DefaultLayout.js b/src/containers/DefaultLayout/DefaultLayout.js
index 6e9aab5..85b82c7 100644
--- a/src/containers/DefaultLayout/DefaultLayout.js
+++ b/src/containers/DefaultLayout/DefaultLayout.js
@@ -118,6 +118,8 @@ class DefaultLayout extends Component {
 			e.preventDefault()
 		}
 		await localStorage.removeItem("role_id");
+		await localStorage.removeItem("company_id");
+		document.getElementById('title').innerText = 'OSPRO';
 		await window.localStorage.clear();
 		this.props.history.replace('/login')
 	}
diff --git a/src/routes.js b/src/routes.js
index b9920f1..ac74528 100644
--- a/src/routes.js
+++ b/src/routes.js
@@ -22,7 +22,7 @@ const Layer = React.lazy(() => import('./views/Layers/Layer'));
 const Layers = React.lazy(() => import('./views/Layers/Layers'));
 const Lembur = React.lazy(() => import('./views/Master/MasterLembur'));
 const MapConfig = React.lazy(() => import('./views/MapConfig'));
-const Menu = React.lazy(() => import('./views/Master/MasterMenu'));
+const Menu = React.lazy(() => import('./views/Master/MenuCompany'));
 const OfficeHours = React.lazy(() => import('./views/Master/MasterOfficeHours'));
 const Organization = React.lazy(() => import('./views/Master/MasterOrganization'));
 const PanicButton = React.lazy(() => import('./views/SimproV2/PanicButton'));
diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js
index 8cbdca8..47c8e9d 100644
--- a/src/views/Pages/Login/Login.js
+++ b/src/views/Pages/Login/Login.js
@@ -58,6 +58,21 @@ class Login extends Component {
 		this.handleChange = this.handleChange.bind(this);
 		this.showHide = this.showHide.bind(this);
 	}
+	updatePageTitle = () => {
+		try {
+			const storedData = localStorage.getItem('configApp');
+			if (storedData !== null) {
+				const data = JSON.parse(storedData);
+				const htmlTitle = data.html_title || 'OSPRO';
+				console.log('htmlTitle', htmlTitle);
+				document.getElementById('title').innerText = htmlTitle;
+			} else {
+				document.title = 'OSPRO';
+			}
+		} catch (error) {
+			document.title = 'OSPRO';
+		}
+	}
 	showHide(e) {
 		e.preventDefault();
 		e.stopPropagation();
@@ -255,6 +270,7 @@ class Login extends Component {
 			window.localStorage.setItem('all_project', data_user.role.all_project);
 			window.localStorage.setItem('hierarchy', JSON.stringify(data_user.hierarchy));
 			window.localStorage.setItem('configApp', JSON.stringify(data_user.configApp));
+			this.updatePageTitle();
 		} else {
 			// NotificationManager.error('Cek username atau password anda!', 'Gagal Login!');
 			NotificationManager.error(doLogin.data.message, 'Login Failed!');

From 4b22ba52c417b8acc1170ce8d7734b93687145c5 Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Tue, 23 Jan 2024 17:30:18 +0700
Subject: [PATCH 2/5] update filter

---
 src/views/Dashboard/DashboardBOD.js | 91 +++++++++--------------------
 1 file changed, 28 insertions(+), 63 deletions(-)

diff --git a/src/views/Dashboard/DashboardBOD.js b/src/views/Dashboard/DashboardBOD.js
index 64084b4..a63d260 100644
--- a/src/views/Dashboard/DashboardBOD.js
+++ b/src/views/Dashboard/DashboardBOD.js
@@ -15,19 +15,19 @@ import { HealthByBudget, HealthBySchedule } from './Components';
 import { Link } from 'react-router-dom';
 import { Card, CardBody, CardHeader, Input } from "reactstrap";
 const DashboardBOD = (props) => {
-	let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name='', hierarchy=[], user_name='';
-  if (props && props.role_id && props.user_id) {
-    role_id = props.role_id;
-    user_id = props.user_id;
-    token = props.token;
-    isLogin = props.isLogin;
-    company_id = props.company_id;
-    all_project = props.all_project;
-    role_name = props.role_name;
-    isLogin = props.isLogin;
-    hierarchy = props.hierarchy;
-    user_name = props.user_name;
-  }
+	let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name = '', hierarchy = [], user_name = '';
+	if (props && props.role_id && props.user_id) {
+		role_id = props.role_id;
+		user_id = props.user_id;
+		token = props.token;
+		isLogin = props.isLogin;
+		company_id = props.company_id;
+		all_project = props.all_project;
+		role_name = props.role_name;
+		isLogin = props.isLogin;
+		hierarchy = props.hierarchy;
+		user_name = props.user_name;
+	}
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -61,13 +61,6 @@ const DashboardBOD = (props) => {
 
 	const [READY_TABLE_DETAIL_EXPENDITURE, SET_READY_TABLE_DETAIL_EXPENDITURE] = useState(false);
 	const [DATA_DETAIL_EXPENDITURE, SET_DATA_DETAIL_EXPENDITURE] = useState([]);
-	const currentYear = new Date().getFullYear();
-	const years = Array.from({ length: 6 }, (_, index) => currentYear - index);
-	const storedYear = localStorage.getItem('selectedYear');
-	const initialYear = storedYear ? storedYear : currentYear.toString();
-
-	const [searchColumn, setSearchColumn] = useState(initialYear);
-
 	useEffect(() => {
 		getCompanyCashFlow(); // expenditure
 		getCompanyExpenditureColor(); // expenditure Color
@@ -82,14 +75,13 @@ const DashboardBOD = (props) => {
 		getProjectScheduleHealthPerDivision(); // project by schedule health per division
 		getTotalProjectPerDivision(); // project by division
 		getTotalProjectValuePerDivision(); // project value by division
-		localStorage.setItem('selectedYear', searchColumn);
-	}, [searchColumn])
+	}, [])
 
 
 
 	// project expenditure
 	const getCompanyCashFlow = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-company-cashflow/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-company-cashflow/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project Expenditure.";
 
@@ -115,31 +107,31 @@ const DashboardBOD = (props) => {
 	// Project Expenditure Color
 
 	const getCompanyExpenditureColor = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-expenditure-color/${company_id}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-expenditure-color/${company_id}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		SET_PROJECT_EXPENDITURE_COLOR(result.data.data)
 	}
 
 	const getCompanyFinancialHealthColor = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-financial-health-color/${company_id}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-financial-health-color/${company_id}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		SET_PROJECT_FINANCIAL_HEALTH_COLOR(result.data.data)
 	}
 
 	const getCompanyScheduleHealthColor = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-schedule-health-color/${company_id}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-schedule-health-color/${company_id}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		SET_PROJECT_SCHEDULE_HEALTH_COLOR(result.data.data)
 	}
 
 	const getCompanyInvoiceColor = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-invoice-color/${company_id}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-invoice-color/${company_id}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		SET_PROJECT_INVOICE_COLOR(result.data.data)
 	}
 
 	const getInvoiceOutstanding = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-invoice-outstanding/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-invoice-outstanding/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project Invoice vs Cash In.";
 
@@ -162,7 +154,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getProjectPerScheduleHealth = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-schedule-health/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-schedule-health/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Schedule Health.";
 
@@ -186,7 +178,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getProjectPerBudgetHealth = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-budget-health/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-budget-health/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Budget Health.";
 
@@ -209,7 +201,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getProjectBudgetHealthPerDivision = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-budget-health-per-division/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-budget-health-per-division/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Schedule Health per Division.";
 
@@ -233,7 +225,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getProjectScheduleHealthPerDivision = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-schedule-health-per-division/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-schedule-health-per-division/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Schedule Health.";
 
@@ -256,7 +248,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getProjectPerPhase = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-phase/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-phase/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Phase.";
 
@@ -281,7 +273,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getTotalProjectPerDivision = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-division/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-per-division/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project by Division.";
 
@@ -306,7 +298,7 @@ const DashboardBOD = (props) => {
 	}
 
 	const getTotalProjectValuePerDivision = async () => {
-		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-value-per-division/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-total-project-value-per-division/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Project Value by Division";
 
@@ -335,7 +327,7 @@ const DashboardBOD = (props) => {
 			return;
 		}
 		setOpenDetailedView(true);
-		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-expenditure/${searchColumn}/${company_id}/${all_project}/${hierarchy}`
+		const URL = `${BASE_OSPRO}/api/dashboard/get-detail-expenditure/${company_id}/${all_project}/${hierarchy}/${role_name}`
 		const result = await axios.get(URL, HEADER).then(res => res).catch(err => err.response)
 		const content = "Get Detail Expenditure";
 
@@ -454,33 +446,6 @@ const DashboardBOD = (props) => {
 		<div style={{ marginLeft: -25, marginRight: -25 }}>
 			{/* <FloatingFilter /> */}
 			<NotificationContainer />
-			<Row>
-				<Col span={24} style={{ backgroundColor: '#fff', height: '8vh', display: 'flex', justifyContent: 'space-between' }}>
-					<div style={{ marginTop: '7px', marginLeft: '10px' }}>
-						<h4>Dashboard</h4>
-					</div>
-					<div style={{ display: 'flex', marginRight: '15px' }}>
-						<div style={{ marginTop: '11px', marginRight: '5px' }}>
-							<p>Search by Years</p>
-						</div>
-						<div>
-							<Input
-								type="select"
-								value={searchColumn}
-								style={{ width: '100px', marginTop: '7px', cursor: 'pointer' }}
-								onChange={(e) => setSearchColumn(e.target.value)}
-								name="select"
-							>
-								{years.map((year) => (
-									<option key={year} value={year.toString()}>
-										{year}
-									</option>
-								))}
-							</Input>
-						</div>
-					</div>
-				</Col>
-			</Row>
 			<Row>
 				<Col span={12}>
 					<Row>

From 33e3e36706351ce297ce5f9afdfaeda078f12ff7 Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Tue, 23 Jan 2024 17:30:29 +0700
Subject: [PATCH 3/5] update from adw

---
 src/views/Dashboard/DashboardProject.js | 218 ++++++++++++++++--------
 1 file changed, 145 insertions(+), 73 deletions(-)

diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js
index 376bada..7ec0cbe 100644
--- a/src/views/Dashboard/DashboardProject.js
+++ b/src/views/Dashboard/DashboardProject.js
@@ -30,7 +30,9 @@ import {
 } from "./Components";
 import { Fab, Action } from "react-tiny-fab";
 import "react-tiny-fab/dist/styles.css";
-import { useHistory, useLocation, useParams } from "react-router-dom";
+import { useHistory, useParams } from "react-router-dom";
+import { Icon } from '@iconify/react';
+import arrowLeft from '@iconify/icons-ion/ios-arrow-back';
 
 const { TextArea } = Input;
 
@@ -64,8 +66,7 @@ const center = {
 };
 
 const DashboardProject = (props) => {
-
-  let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name='', hierarchy=[], user_name='';
+  let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name = '', hierarchy = [], user_name = '';
   if (props && props.role_id && props.user_id) {
     role_id = props.role_id;
     user_id = props.user_id;
@@ -78,7 +79,6 @@ const DashboardProject = (props) => {
     hierarchy = props.hierarchy;
     user_name = props.user_name;
   }
-
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -87,7 +87,7 @@ const DashboardProject = (props) => {
   };
   const { PROJECT_ID, GANTT_ID, SCURVE } = useParams();
   const URL_GANTT = `https://project-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1&role_name=${role_name}&company_id=${company_id}`;
-    // const URL_GANTT = `http://localhost:8444/generic-ospro-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1&role_name=${role_name}&company_id=${company_id}`;
+  // const URL_GANTT = `http://localhost:8444/generic-ospro-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${GANTT_ID}&proyek_id=${PROJECT_ID}&token=${token}&ro=1&role_name=${role_name}&company_id=${company_id}`;
   const mapRef = useRef();
   const [projectName, setProjectName] = useState("");
   const [projectManagerName, setProjectManagerName] = useState("");
@@ -140,6 +140,8 @@ const DashboardProject = (props) => {
   const [isReadyGanttParents, setIsReadyGanttParents] = useState(false);
   const [calculationStatus, setCalculationStatus] = useState(false);
   const [isHierarchy, setIsHierarchy] = useState(null);
+  const [dataOverdue, setDataOverdue] = useState(null);
+  const [projectType, setProjectType] = useState(null);
   let history = useHistory();
 
   useEffect(() => {
@@ -150,6 +152,7 @@ const DashboardProject = (props) => {
     getGantt();
     getGanttParents();
     return () => {
+      console.log("unmount RenderMap");
     };
   }, []);
 
@@ -158,9 +161,10 @@ const DashboardProject = (props) => {
       getSCurve();
     }
     window.addEventListener("message", handleIframeMessage);
-
+    window.addEventListener('message', handleGetOverdue);
     return () => {
       window.removeEventListener("message", handleIframeMessage);
+      window.removeEventListener("message", handleGetOverdue);
     };
   }, [isHierarchy]);
 
@@ -183,8 +187,13 @@ const DashboardProject = (props) => {
 
   useEffect(() => {
     let deviation = 0;
-    if (plannedCost && totalCost) {
-      deviation = plannedCost - totalCost;
+    // Convert plannedCost and totalCost to numbers
+    const plannedCostNumber = parseFloat(plannedCost);
+    const totalCostNumber = parseFloat(totalCost);
+
+    // Check if conversion is successful
+    if (!isNaN(plannedCostNumber) && !isNaN(totalCostNumber)) {
+      deviation = plannedCostNumber - totalCostNumber;
     }
     setRemToComplete(deviation.toString());
   }, [plannedCost, totalCost]);
@@ -199,6 +208,7 @@ const DashboardProject = (props) => {
       const response = await axios.get(url, HEADER);
       setManPower(response.data.totalRecord);
     } catch (error) {
+      console.error("Failed to get manpower:", error);
     }
   };
 
@@ -215,6 +225,7 @@ const DashboardProject = (props) => {
       }
       setIsReadyGantt(true);
     } catch (error) {
+      console.error("Failed to get gantt data:", error);
       setIsReadyGantt(true);
     }
   };
@@ -227,6 +238,7 @@ const DashboardProject = (props) => {
       setDataGanttParents(response);
       setIsReadyGanttParents(true);
     } catch (error) {
+      console.error("Failed to get gantt data:", error);
       setIsReadyGanttParents(true);
     }
   };
@@ -244,6 +256,7 @@ const DashboardProject = (props) => {
       setAssignedHrCount(assignedList.length);
       setAssignedHr(assignedList);
     } catch (error) {
+      console.error("Failed to get assigned HR:", error);
     }
   };
 
@@ -300,6 +313,7 @@ const DashboardProject = (props) => {
       .get(URL, HEADER)
       .then((res) => res)
       .catch((err) => err.response);
+    console.log("getProjectDetail", result);
     if (!result) {
       NotificationManager.error(`Could not connect to internet.`, "Failed");
       setIsReadyProjectDetail(true);
@@ -314,6 +328,8 @@ const DashboardProject = (props) => {
       setIsReadyProjectDetail(true);
       return;
     } else if (result.status == 200 && result.data.data) {
+      console.log(result.data.data);
+      // setComments(result.data.data);
       setProjectName(result.data.data.nama ? result.data.data.nama : "-");
       setProjectManagerName(
         result.data.data.projectManager ? result.data.data.projectManager : "-"
@@ -341,6 +357,7 @@ const DashboardProject = (props) => {
             ? result.data.data.header?.planned_end
             : null
       );
+      setProjectType(result.data.data.type_proyek_id);
       setActualStart(
         result.data.data.header?.start_date
           ? result.data.data.header.start_date
@@ -408,6 +425,7 @@ const DashboardProject = (props) => {
       let selisihProgress = 0;
       let planningProgress = 0;
       let actualProgress = 0;
+      console.log("test flow ", result.data.data);
       let statusHealthBySchedule = "on-schedule";
       if (
         result.data.data.length > 0 &&
@@ -431,21 +449,13 @@ const DashboardProject = (props) => {
           result.data.data[0].data.budget_control.cost_deviation?.toString()
         );
       }
-      let now = new Date().toISOString().slice(0, 10);
-      let dates = result.data.data[0].data?.date;
-      let n = dates.findIndex(
-        (element) => new Date(now) < new Date(element[0])
-      );
-      if (n < 0) {
-        n = dates.length - 1;
-      }
       if (
         result.data.data.length > 0 &&
         result.data.data[0].data?.percentagePlan &&
         result.data.data[0].data?.percentagePlan.length > 0
       ) {
-        planningProgress = result.data.data[0].data?.percentagePlan[n];
-        setPlanningProgress(planningProgress);
+        planningProgress = result.data.data[0].data?.percentagePlan[result.data.data[0].data?.percentagePlan.length - 1];
+        setPlanningProgress(Math.ceil(planningProgress));
       }
       if (
         result.data.data.length > 0 &&
@@ -484,6 +494,7 @@ const DashboardProject = (props) => {
       .post(URL, payload, HEADER)
       .then((res) => res)
       .catch((err) => err.response);
+    console.log("getOverdueActivities", result);
     if (!result) {
       NotificationManager.error(`Could not connect to internet.`, "Failed");
       setIsReadyOverdueActivities(true);
@@ -520,6 +531,7 @@ const DashboardProject = (props) => {
       .post(URL, payload, HEADER)
       .then((res) => res)
       .catch((err) => err.response);
+    console.log("getIntegrationInvoice", result);
     if (!result) {
       NotificationManager.error(`Could not connect to internet.`, "Failed");
       setIsReadyIntegrationInvoice(true);
@@ -566,6 +578,7 @@ const DashboardProject = (props) => {
       .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");
       setIsReadyReportDistribution(true);
@@ -618,6 +631,7 @@ const DashboardProject = (props) => {
       .post(URL, payload, HEADER)
       .then((res) => res)
       .catch((err) => err.response);
+    console.log("getComments", result);
     if (!result) {
       NotificationManager.error(`Could not connect to internet.`, "Failed");
       setIsReadyComments(true);
@@ -638,6 +652,7 @@ const DashboardProject = (props) => {
   };
 
   const handleSendComment = async () => {
+    // console.log('handleSendComment', comment);
     setIsSendingComment(true);
     if (comment === "") {
       NotificationManager.error(
@@ -684,6 +699,10 @@ const DashboardProject = (props) => {
     setIsSendingComment(false);
   };
 
+  const handleBack = async () => {
+    window.parent.location.reload();
+  };
+
   const initMap = () => {
     let mymap = L.map("map-area", {
       center: center,
@@ -731,6 +750,12 @@ const DashboardProject = (props) => {
     }
   };
 
+  const handleGetOverdue = (event) => {
+    if (event.data.type === 'dataOverdueUpdate') {
+      setDataOverdue(event.data.dataOverdue);
+    }
+  }
+
   const RenderGantt = useMemo(
     () => (
       <iframe
@@ -804,53 +829,82 @@ const DashboardProject = (props) => {
   }, [comment, comments, isSendingComment, isReadyComments]);
 
   const RenderBehindTasks = useMemo(() => {
-    return (
-      <div>
-        {!isReadyOverdueActivities && <ListLoader />}
-        {isReadyOverdueActivities &&
-          overdueActivities &&
-          overdueActivities.length < 1 && (
-            <div
-              style={{
-                flex: 1,
-                textAlign: "center",
-                color: "#E80053",
-                marginTop: 50,
-                marginBottom: 50,
-              }}
-            >
-              No overdue activity found.
-            </div>
-          )}
-        {isReadyOverdueActivities &&
-          overdueActivities &&
-          overdueActivities.length > 0 &&
-          overdueActivities.map((item, idx) => {
-            let end_date;
-            let planned_end;
-            let diffDays = 0;
-            let message = "";
-            if (item.end_date && item.end_date !== null) {
-              end_date = moment(item.end_date);
-              planned_end = moment(item.planned_end);
-              diffDays = end_date.diff(planned_end, "days");
-              if (isNaN(diffDays)) {
-                return null;
-              } else {
-                if (diffDays > 0) {
-                  message = `Overdue by ${diffDays + 1} days`;
-                } else {
+    return SCURVE ?
+      (
+        <div>
+          {!isReadyOverdueActivities && <ListLoader />}
+          {isReadyOverdueActivities &&
+            overdueActivities &&
+            overdueActivities.length < 1 && (
+              <div
+                style={{
+                  flex: 1,
+                  textAlign: "center",
+                  color: "#E80053",
+                  marginTop: 50,
+                  marginBottom: 50,
+                }}
+              >
+                No overdue activity found.
+              </div>
+            )}
+          {isReadyOverdueActivities &&
+            overdueActivities &&
+            overdueActivities.length > 0 &&
+            overdueActivities.map((item, idx) => {
+              let end_date;
+              let planned_end;
+              let diffDays = 0;
+              let message = "";
+              if (item.end_date && item.end_date !== null) {
+                end_date = moment(item.end_date);
+                planned_end = moment(item.planned_end);
+                diffDays = end_date.diff(planned_end, "days");
+                if (isNaN(diffDays)) {
                   return null;
+                } else {
+                  if (diffDays > 0) {
+                    message = `Overdue by ${diffDays + 1} days`;
+                  } else {
+                    return null;
+                  }
                 }
               }
-            }
-            return (
-              <BehindTaskItem key={idx} name={item.name} message={message} />
-            );
-          })}
-      </div>
-    );
-  }, [overdueActivities, isReadyOverdueActivities]);
+              return (
+                <BehindTaskItem key={idx} name={item.name + ' - ' + item.name_version} message={message} scurve={SCURVE} proyek_id={PROJECT_ID} gantt_id={item.version_gantt_id} />
+              );
+            })}
+        </div>
+      )
+      :
+      (
+        <div>
+          {!dataOverdue && <ListLoader />}
+          {dataOverdue &&
+            dataOverdue.length < 1 && (
+              <div
+                style={{
+                  flex: 1,
+                  textAlign: "center",
+                  color: "#E80053",
+                  marginTop: 50,
+                  marginBottom: 50,
+                }}
+              >
+                No overdue activity found.
+              </div>
+            )}
+          {dataOverdue &&
+            dataOverdue.length > 0 &&
+            dataOverdue.map((item, idx) => {
+              let message = `Overdue by ${item.overdue} days`;
+              return (
+                <BehindTaskItem key={idx} name={item.text} message={message} />
+              );
+            })}
+        </div>
+      );
+  }, [dataOverdue, isReadyOverdueActivities, overdueActivities]);
 
   return (
     <div style={{ marginLeft: -25, marginRight: -25 }}>
@@ -858,7 +912,23 @@ const DashboardProject = (props) => {
       <Row>
         <Col span={18}>
           <Row>
-            <Col span={8}>
+            {
+              !SCURVE ?
+                <Col span={2}>
+                  <Button
+                    style={{
+                      height: "100%",
+                      width: "100%",
+                      fontSize: "18px"
+                    }}
+                    onClick={handleBack}
+                    type="primary"
+                  >
+                    <Icon icon={arrowLeft} style={{ fontSize: "20px" }} /> Back
+                  </Button>
+                </Col> : null
+            }
+            <Col span={!SCURVE ? 6 : 8}>
               <div
                 style={{
                   border: "solid",
@@ -1026,7 +1096,7 @@ const DashboardProject = (props) => {
             </Col>
           </Row>
           <Row>
-            <Col span={SCURVE ? 8 : 10}>
+            <Col span={SCURVE ? 8 : projectType != 9 ? 8 : 10}>
               <div
                 style={{
                   border: "solid",
@@ -1151,7 +1221,7 @@ const DashboardProject = (props) => {
                 </div>
               </div>
             </Col>
-            {SCURVE ? (
+            {SCURVE || projectType != 9 ? (
               <Col span={16}>
                 <div
                   style={{
@@ -1290,15 +1360,17 @@ const DashboardProject = (props) => {
                           BCWP (cost vs perform)
                         </Col>
                         <Col span={5} style={{ fontSize: 11 }}>
-                          {isReadySCurve ? (
-                            bcwp ? (
-                              renderFormatRupiah(bcwp, "Rp.")
-                            ) : (
-                              "-"
+                          {isReadySCurve ?
+                            (
+                              planningProgress > 100 || actualProgress > 100
+                                ?
+                                renderFormatRupiah(((parseInt(plannedCost) * parseFloat((actualProgress / planningProgress) * 100).toFixed(0)) / 100).toString(), "Rp.")
+                                :
+                                renderFormatRupiah(((parseInt(plannedCost) * parseInt(actualProgress)) / 100).toString(), "Rp.")
                             )
-                          ) : (
-                            <SingleTextLoader width={100} height={10} />
-                          )}
+                            : (
+                              "-"
+                            )}
                         </Col>
                         <Col
                           span={7}

From b5be295c54785c02d8a55c6ff1caa5246621f021 Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Tue, 23 Jan 2024 17:31:01 +0700
Subject: [PATCH 4/5] update menu page

---
 .../{MasterMenu => MenuCompany}/DialogForm.js |  48 +-
 .../Master/MenuCompany/DialogMasterMenu.js    | 418 ++++++++++++++++++
 .../{MasterMenu => MenuCompany}/index.js      |  89 +++-
 3 files changed, 544 insertions(+), 11 deletions(-)
 rename src/views/Master/{MasterMenu => MenuCompany}/DialogForm.js (77%)
 create mode 100644 src/views/Master/MenuCompany/DialogMasterMenu.js
 rename src/views/Master/{MasterMenu => MenuCompany}/index.js (77%)

diff --git a/src/views/Master/MasterMenu/DialogForm.js b/src/views/Master/MenuCompany/DialogForm.js
similarity index 77%
rename from src/views/Master/MasterMenu/DialogForm.js
rename to src/views/Master/MenuCompany/DialogForm.js
index be33f53..e9cbc50 100644
--- a/src/views/Master/MasterMenu/DialogForm.js
+++ b/src/views/Master/MenuCompany/DialogForm.js
@@ -7,7 +7,7 @@ import 'antd/dist/antd.css';
 import { useTranslation } from 'react-i18next';
 
 const { Option } = Select
-const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit, dataMenu }) => {
+const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdit, dataMenu, listCompany, role_name, company_id }) => {
   const [id, setId] = useState(0)
   const [name, setName] = useState('')
   const [url, setUrl] = useState('')
@@ -15,17 +15,19 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
   const [icon, setIcon] = useState('')
   const [sequence, setSequence] = useState(0)
   const [parentId, setParentId] = useState(null)
+  const [selectedCompany, setSelectedCompany] = useState(null)
   const { t } = useTranslation()
 
   useEffect(() => {
     if (typeDialog === "Edit") {
       setId(dataEdit.id)
-      setName(dataEdit.name)
+      setName(dataEdit.join_first_name)
       setUrl(dataEdit.url)
       setIcon(dataEdit.icon)
-      setParentId(dataEdit.parent_id)
+      setParentId(dataEdit.parent_menu_id)
       setSequence(dataEdit.sequence)
       setAliasName(dataEdit.alias_name)
+      setSelectedCompany(dataEdit.company_id)
     } else {
       setId(0)
       setName('')
@@ -61,12 +63,16 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
     const err = validation();
     if (!err) {
       if (typeDialog === "Save") {
+        if (role_name === 'Super Admin') {
+          company_id = selectedCompany
+        }
         data = {
           name,
           url,
           sequence: parseInt(sequence),
           icon,
           alias_name: aliasName,
+          company_id: company_id
         }
 
         if (parentId && parentId > 0) {
@@ -75,6 +81,9 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
 
         closeDialog('save', data);
       } else {
+        if (role_name === 'Super Admin') {
+          company_id = selectedCompany
+        }
         data = {
           id,
           name,
@@ -82,12 +91,12 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
           sequence: parseInt(sequence),
           icon,
           alias_name: aliasName,
+          company_id: company_id
         }
 
         if (parentId && parentId > 0) {
           data['parent_id'] = parentId
         }
-
         closeDialog('edit', data);
       }
       setId(0)
@@ -127,6 +136,10 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
     )
   }
 
+  const onChangeCompany = (val) => {
+    setSelectedCompany(val);
+  };
+
   const renderForm = () => {
     return (
       <Form>
@@ -135,6 +148,33 @@ const DialogForm = ({ openDialog, closeDialog, toggleDialog, typeDialog, dataEdi
             <span style={{ color: "red" }}>*</span> Wajib diisi.
           </Col>
         </Row>
+        {role_name === 'Super Admin' &&
+          <Row>
+            <Col md={12}>
+              <FormGroup>
+                <Label className="capitalize">
+                  {t('company')}<span style={{ color: "red" }}>*</span>
+                </Label>
+                <Select
+                  showSearch
+                  filterOption={(inputValue, option) =>
+                    option.children.toLowerCase().includes(inputValue.toLowerCase())
+                  }
+                  value={selectedCompany}
+                  defaultValue={selectedCompany}
+                  onChange={onChangeCompany}
+                  style={{ width: "100%" }}
+                >
+                  {listCompany.map((res) => (
+                    <Option key={res.id} value={res.id}>
+                      {res.company_name}
+                    </Option>
+                  ))}
+                </Select>
+              </FormGroup>
+            </Col>
+          </Row>
+        }
         <Row>
           <Col>
             <FormGroup>
diff --git a/src/views/Master/MenuCompany/DialogMasterMenu.js b/src/views/Master/MenuCompany/DialogMasterMenu.js
new file mode 100644
index 0000000..c2aef01
--- /dev/null
+++ b/src/views/Master/MenuCompany/DialogMasterMenu.js
@@ -0,0 +1,418 @@
+import * as XLSX from 'xlsx';
+import DialogForm from './DialogForm.js';
+import React, { useState, useEffect, useMemo } from 'react';
+import SweetAlert from 'react-bootstrap-sweetalert';
+import axios from 'axios';
+import { Button, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
+import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap';
+import { MENU_ADD, MENU_SEARCH, MENU_EDIT, MENU_DELETE, MENU_LIST } from '../../../const/ApiConst.js';
+import { NotificationContainer, NotificationManager } from 'react-notifications';
+import { Pagination, Tooltip, Table, Spin } from 'antd';
+import { useTranslation } from 'react-i18next';
+const token = window.localStorage.getItem('token');
+const column = [
+    { name: "Nama" },
+    { name: "Url" },
+    { name: "Ikon" },
+    { name: "Alias" },
+    { name: "Urutan" },
+    { name: "Parent" },
+]
+
+const Index = ({ params, openDialog, toggleDialog, closeDialog }) => {
+    const [alertDelete, setAlertDelete] = useState(false)
+    const [allDataMenu, setAllDataMenu] = useState([])
+    const [clickOpenModal, setClickOpenModal] = useState(false)
+    const [currentPage, setCurrentPage] = useState(1)
+    const [dataEdit, setDataEdit] = useState([])
+    const [dataExport, setDataExport] = useState([])
+    const [dataTable, setDatatable] = useState([])
+    const [idDelete, setIdDelete] = useState(0)
+    const [rowsPerPage, setRowsPerPage] = useState(10)
+    const [search, setSearch] = useState('')
+    const [tooltipDelete, setTooltipDelete] = useState(false)
+    const [tooltipEdit, setTooltipEdit] = useState(false)
+    const [tooltipExport, setTooltipExport] = useState(false)
+    const [tooltipTambah, setTooltipTambah] = useState(false)
+    const [totalPage, setTotalPage] = useState(0)
+    const [typeDialog, setTypeDialog] = useState('Save')
+    const [loading, SetLoading] = useState(false)
+    const { t } = useTranslation()
+    // const pageName = params.name;
+
+    const config = {
+        headers:
+        {
+            Authorization: `Bearer ${token}`,
+            "Content-type": `application/json`
+        }
+    };
+
+    useEffect(() => {
+        getDataMenu();
+    }, [search, currentPage, rowsPerPage])
+
+    useEffect(() => {
+        const cekData = dataExport || []
+        if (cekData.length > 0) {
+            exportExcel()
+        }
+    }, [dataExport])
+
+    const handleSearch = e => {
+        const value = e.target.value
+        setSearch(value);
+        setCurrentPage(1)
+    };
+
+    const getDataAllMenu = async () => {
+        const result = await axios
+            .get(MENU_LIST, config)
+            .then(res => res)
+            .catch((error) => error.response);
+
+        if (result && result.data && result.data.code == 200) {
+            let arr = []
+            let dataRes = result.data.data;
+            for (const v in dataRes) {
+                arr.push(dataRes[v])
+            }
+            setAllDataMenu(arr);
+        } else {
+            NotificationManager.error('Gagal Mengambil Data!!', 'Failed');
+        }
+    }
+
+    const getDataMenu = async () => {
+        SetLoading(true)
+        let start = 0;
+
+        if (currentPage !== 1 && currentPage > 1) {
+            start = (currentPage * rowsPerPage) - rowsPerPage
+        }
+
+        const payload = {
+            "paging": { "start": start, "length": rowsPerPage },
+            "columns": [
+                { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" }
+            ],
+            "joins": [{
+                "name": "m_menu",
+                "column_join": "parent_id",
+                "column_results": [
+                    "name"
+                ]
+            }],
+            "orders": { "columns": ["id"], "ascending": false }
+        }
+
+        const result = await axios
+            .post(MENU_SEARCH, payload, config)
+            .then(res => res)
+            .catch((error) => error.response);
+
+        if (result && result.data && result.data.code == 200) {
+            setDatatable(result.data.data);
+            setTotalPage(result.data.totalRecord);
+            SetLoading(false)
+        } else {
+            NotificationManager.error('Gagal Mengambil Data!!', 'Failed');
+            SetLoading(false)
+        }
+    }
+
+    const handleOpenDialog = async (type) => {
+        await setTypeDialog(type)
+        getDataAllMenu();
+        // setOpenDialog(true)
+    }
+
+    const handleCloseDialog = (type, data) => {
+        if (type === "save") {
+            saveMenu(data);
+        } else if (type === "edit") {
+            editMenu(data);
+        }
+        setDataEdit([])
+        // setOpenDialog(false)
+    }
+
+    const toggleAddDialog = () => {
+        // setOpenDialog(!openDialog)
+    }
+
+    const handleCancel = () => {
+        closeDialog('cancel', 'none')
+        // setDatatable([]);
+        // setBaseUrl([]);
+        // setAvailableBaseUrl(false);
+        // setLoading(false);
+    }
+
+
+    const onConfirmDelete = async () => {
+        const url = MENU_DELETE(idDelete)
+        const result = await axios.delete(url, config)
+            .then(res => res)
+            .catch((error) => error.response);
+        if (result && result.data && result.data.code === 200) {
+            getDataMenu()
+            setIdDelete(0)
+            setAlertDelete(false)
+            NotificationManager.success(`Data menu berhasil dihapus`, 'Success!!');
+        } else {
+            setIdDelete(0)
+            setAlertDelete(false)
+            NotificationManager.error(`Data menu gagal dihapus`, 'Failed!!');
+        }
+    }
+
+    const saveMenu = async (data) => {
+        const formData = data
+
+        const result = await axios.post(MENU_ADD, formData, config)
+            .then(res => res)
+            .catch((error) => error.response);
+
+        if (result && result.data && result.data.code === 200) {
+            getDataMenu();
+            getDataAllMenu();
+            NotificationManager.success(`Data menu berhasil ditambahkan`, 'Success!!');
+        } else {
+            NotificationManager.error(`Data menu gagal ditambahkan`, 'Failed!!');
+        }
+
+    }
+
+    const editMenu = async (data) => {
+        const formData = data
+        const url = MENU_EDIT(data.id)
+        const result = await axios.put(url, formData, config)
+            .then(res => res)
+            .catch((error) => error.response);
+
+        if (result && result.data && result.data.code === 200) {
+            getDataMenu();
+            NotificationManager.success(`Data menu berhasil diubah`, 'Success!!');
+        } else {
+            NotificationManager.error(`Data menu gagal diubah`, `Failed!!`);
+        }
+    }
+
+    const handleEdit = (data) => {
+        setDataEdit(data)
+        handleOpenDialog('Edit');
+    }
+
+    const handleDelete = async (id) => {
+        await setAlertDelete(true)
+        await setIdDelete(id)
+    }
+
+    const onShowSizeChange = (current, pageSize) => {
+        setRowsPerPage(pageSize)
+    }
+
+    const onPagination = (current, pageSize) => {
+        setCurrentPage(current)
+    }
+
+    const toggle = (param) => {
+        if (param === "edit") {
+            setTooltipEdit(!tooltipEdit)
+        } else if (param === "delete") {
+            setTooltipDelete(!tooltipDelete)
+        } else if (param === "tambah") {
+            setTooltipTambah(!tooltipTambah)
+        } else if (param === "export") {
+            setTooltipExport(!tooltipExport)
+        }
+    }
+
+    const handleExportExcel = async () => {
+        const payload = {
+            "paging": { "start": 0, "length": -1 },
+            "columns": [
+                { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" }
+            ],
+            "joins": [{
+                "name": "m_menu",
+                "column_join": "parent_id",
+                "column_results": [
+                    "name"
+                ]
+            }],
+            "orders": { "columns": ["id"], "ascending": false }
+        }
+
+        const result = await axios
+            .post(MENU_SEARCH, payload, config)
+            .then(res => res)
+            .catch((error) => error.response);
+
+        if (result && result.data && result.data.code == 200) {
+            let resData = result.data.data;
+            const excelData = [];
+            resData.map((val, index) => {
+                let dataRow = {
+                    "Nama": val.name,
+                    "Url": val.url,
+                    "Icon": val.icon,
+                    "Alias Name": val.alias_name,
+                    "Urutan": val.sequence,
+                    "Parent Name": val.join_first_name ? val.join_first_name : "-"
+                }
+                excelData.push(dataRow)
+            })
+            await setDataExport(excelData);
+        } else {
+            NotificationManager.error('Gagal Export Data!!', 'Failed');
+        }
+    }
+
+    const exportExcel = () => {
+        const dataExcel = dataExport || [];
+        const fileName = `Data Master Menu.xlsx`;
+        const ws = XLSX.utils.json_to_sheet(dataExcel);
+        const wb = XLSX.utils.book_new();
+        XLSX.utils.book_append_sheet(wb, ws, `Data Master Menu`);
+        XLSX.writeFile(wb, fileName);
+        setDataExport([])
+    }
+
+    const cancelDelete = () => {
+        setAlertDelete(false)
+        setIdDelete(0)
+    }
+
+    const renderTable = useMemo(() => {
+        const columns = [
+            {
+                title: t('action'),
+                dataIndex: '',
+                key: 'x',
+                render: (text, record) => <>
+                    <Tooltip title={t('delete')}>
+                        <i id="TooltipDelete" className="fa fa-trash" style={{ color: 'red', marginRight: '10px', cursor: "pointer" }} onClick={() => handleDelete(text.id)}></i>
+                    </Tooltip>
+                    <Tooltip title={t('edit')}>
+                        <i id="TooltipEdit" className="fa fa-edit" style={{ color: 'green', cursor: "pointer" }} onClick={() => handleEdit(text)}></i>
+                    </Tooltip>
+                </>,
+            },
+            { title: t('name'), dataIndex: 'name', key: 'name' },
+            { title: 'Url', dataIndex: 'url', key: 'url' },
+            { title: t('icon'), dataIndex: 'icon', key: 'icon' },
+            { title: 'Alias', dataIndex: 'alias_name', key: 'alias_name' },
+            { title: t('order'), dataIndex: 'sequence', key: 'sequence' },
+            { title: t('parentMenu'), dataIndex: 'join_first_name', key: 'join_first_name', render: (text, record) => (text ? text : "-") }
+        ];
+        return (
+            <Table
+                rowKey="id"
+                size="small"
+                columns={columns}
+                dataSource={dataTable}
+                pagination={false}
+            />
+        )
+    }, [dataTable])
+
+    return (
+        <div>
+            <NotificationContainer />
+            <SweetAlert
+                show={alertDelete}
+                warning
+                showCancel
+                confirmBtnText="Delete"
+                confirmBtnBsStyle="danger"
+                title={t('deleteConfirm')}
+                onConfirm={onConfirmDelete}
+                onCancel={() => cancelDelete()}
+                focusCancelBtn
+            >
+                {t('deleteMsg')}
+            </SweetAlert>
+            {/* <DialogForm
+                openDialog={openDialog}
+                closeDialog={handleCloseDialog}
+                toggleDialog={() => toggleAddDialog}
+                typeDialog={typeDialog}
+                dataEdit={dataEdit}
+                clickOpenModal={clickOpenModal}
+                dataMenu={allDataMenu}
+            /> */}
+            <Modal size="xl" fullscreen="xl" scrollable={true} isOpen={openDialog} toggle={toggleDialog}>
+                <ModalHeader className="capitalize withBtn" toggle={closeDialog} style={{ width: "100%" }}>
+                    MASTER MENU
+                    <div style={{ display: 'flex' }}>
+                        <Tooltip title={t('menuAdd')}>
+                            <Button style={{ marginLeft: "5px" }} id="TooltipTambah" color="success" onClick={() => handleOpenDialog('Save')}><i className="fa fa-plus"></i></Button>
+                        </Tooltip>
+                        <Tooltip title={t('exportExcel')}>
+                            <Button style={{ marginLeft: "5px" }} id="TooltipExport" color="primary" onClick={() => handleExportExcel()}><i className="fa fa-print"></i></Button>
+                        </Tooltip>
+                    </div>
+                </ModalHeader>
+                <ModalBody>
+                    <>
+                        <Spin tip="Loading..." spinning={loading}>
+                            {renderTable}
+                            <Pagination
+                                style={{ marginTop: "25px" }}
+                                showSizeChanger
+                                onShowSizeChange={onShowSizeChange}
+                                onChange={onPagination}
+                                pageSizeOptions={["10", "25", "50"]}
+                                total={totalPage}
+                                pageSize={rowsPerPage}
+                                current={currentPage}
+                            />
+                        </Spin>
+                    </>
+
+                </ModalBody>
+                <ModalFooter>
+                    {/* {typeDialog !== "Set" && typeDialog !== "Set-Menu" && (
+                        <Button color="primary" onClick={() => handleSave()}>{typeDialog}</Button>
+                    )} */}
+                    <Button className="capitalize" color="secondary" onClick={() => handleCancel()}>cancel</Button>
+                </ModalFooter>
+            </Modal>
+            {/* <Card>
+                <CardHeader style={{ display: "flex", justifyContent: "space-between" }}>
+                    <h4 className="capitalize">{pageName}</h4>
+                    <Row>
+                        <Col>
+                            <Input onChange={handleSearch} value={search} type="text" name="search" id="search" placeholder={t('searchMenu')} />
+                        </Col>
+                        <Col>
+                            <Tooltip title={t('menuAdd')}>
+                                <Button id="TooltipTambah" color="success" onClick={() => handleOpenDialog('Save')}><i className="fa fa-plus"></i></Button>
+                            </Tooltip>
+                            <Tooltip title={t('exportExcel')}>
+                                <Button style={{ marginLeft: "5px" }} id="TooltipExport" color="primary" onClick={() => handleExportExcel()}><i className="fa fa-print"></i></Button>
+                            </Tooltip>
+                        </Col>
+                    </Row>
+                </CardHeader>
+                <CardBody>
+                    {renderTable}
+                    <Pagination
+                        style={{ marginTop: "25px" }}
+                        showSizeChanger
+                        onShowSizeChange={onShowSizeChange}
+                        onChange={onPagination}
+                        current={currentPage}
+                        pageSize={rowsPerPage}
+                        total={totalPage}
+                        pageSizeOptions={["10", "15", "20", "25", "30", "35", "40"]}
+                    />
+                </CardBody>
+            </Card> */}
+        </div>
+    )
+}
+
+export default Index;
diff --git a/src/views/Master/MasterMenu/index.js b/src/views/Master/MenuCompany/index.js
similarity index 77%
rename from src/views/Master/MasterMenu/index.js
rename to src/views/Master/MenuCompany/index.js
index 88919c4..8b177cc 100644
--- a/src/views/Master/MasterMenu/index.js
+++ b/src/views/Master/MenuCompany/index.js
@@ -1,11 +1,12 @@
 import * as XLSX from 'xlsx';
 import DialogForm from './DialogForm';
+import DialogMasterMenu from './DialogMasterMenu.js'
 import React, { useState, useEffect, useMemo } from 'react';
 import SweetAlert from 'react-bootstrap-sweetalert';
 import axios from 'axios';
 import { Button } from 'reactstrap';
 import { Card, CardBody, CardHeader, Col, Row, Input } from 'reactstrap';
-import { MENU_ADD, MENU_SEARCH, MENU_EDIT, MENU_DELETE, MENU_LIST } from '../../../const/ApiConst.js';
+import { MENU_ADD, MENU_SEARCH, MENU_EDIT, MENU_DELETE, MENU_LIST, MENU_COMPANY_SEARCH, COMPANY_MANAGEMENT_LIST } from '../../../const/ApiConst.js';
 import { NotificationContainer, NotificationManager } from 'react-notifications';
 import { Pagination, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
@@ -19,7 +20,20 @@ const column = [
   { name: "Parent" },
 ]
 
-const Index = ({ params }) => {
+const Index = ({ params, ...props }) => {
+  let role_id = 0, user_id = 0, isLogin = false, token = '', company_id = 0, all_project = null, role_name = '', hierarchy = [], user_name = '';
+  if (props && props.role_id && props.user_id) {
+    role_id = props.role_id;
+    user_id = props.user_id;
+    token = props.token;
+    isLogin = props.isLogin;
+    company_id = props.company_id;
+    all_project = props.all_project;
+    role_name = props.role_name;
+    isLogin = props.isLogin;
+    hierarchy = props.hierarchy;
+    user_name = props.user_name;
+  }
   const [alertDelete, setAlertDelete] = useState(false)
   const [allDataMenu, setAllDataMenu] = useState([])
   const [clickOpenModal, setClickOpenModal] = useState(false)
@@ -29,6 +43,7 @@ const Index = ({ params }) => {
   const [dataTable, setDatatable] = useState([])
   const [idDelete, setIdDelete] = useState(0)
   const [openDialog, setOpenDialog] = useState(false)
+  const [openDialogMasterMenu, setOpenDialogMasterMenu] = useState(false)
   const [rowsPerPage, setRowsPerPage] = useState(10)
   const [search, setSearch] = useState('')
   const [tooltipDelete, setTooltipDelete] = useState(false)
@@ -37,6 +52,7 @@ const Index = ({ params }) => {
   const [tooltipTambah, setTooltipTambah] = useState(false)
   const [totalPage, setTotalPage] = useState(0)
   const [typeDialog, setTypeDialog] = useState('Save')
+  const [listCompany, setListCompany] = useState([])
   const { t } = useTranslation()
   const pageName = params.name;
 
@@ -59,6 +75,21 @@ const Index = ({ params }) => {
     }
   }, [dataExport])
 
+  useEffect(() => {
+    getDataCompany()
+  }, [])
+
+  const getDataCompany = async () => {
+    const result = await axios
+      .get(COMPANY_MANAGEMENT_LIST, config)
+      .then(res => res)
+      .catch((error) => error.response);
+
+    if (result && result.data && result.data.code == 200) {
+      setListCompany(result.data.data);
+    }
+  }
+
   const handleSearch = e => {
     const value = e.target.value
     setSearch(value);
@@ -93,11 +124,11 @@ const Index = ({ params }) => {
     const payload = {
       "paging": { "start": start, "length": rowsPerPage },
       "columns": [
-        { "name": "name", "logic_operator": "ilike", "value": search, "operator": "AND" }
+        { "name": "alias_name", "logic_operator": "ilike", "value": search, "operator": "AND" }
       ],
       "joins": [{
         "name": "m_menu",
-        "column_join": "parent_id",
+        "column_join": "menu_id",
         "column_results": [
           "name"
         ]
@@ -105,8 +136,24 @@ const Index = ({ params }) => {
       "orders": { "columns": ["id"], "ascending": false }
     }
 
+    if (role_name !== "Super Admin") {
+      payload.columns.push(
+        { "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" },
+      )
+    } else {
+      payload.columns.push(
+        { "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" },
+      )
+      payload.joins.push(
+        { name: "m_company", column_join: "company_id", column_results: ["company_name"] }
+      )
+      payload.columns.push(
+        { name: "company_name", logic_operator: "~*", value: search, table_name: "m_company" }
+      )
+    }
+
     const result = await axios
-      .post(MENU_SEARCH, payload, config)
+      .post(MENU_COMPANY_SEARCH, payload, config)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -123,6 +170,18 @@ const Index = ({ params }) => {
     getDataAllMenu();
     setOpenDialog(true)
   }
+  const handleOpenDialogMasterMenu = async () => {
+    setOpenDialogMasterMenu(true)
+  }
+
+  const handleCloseDialogMasterMenu = () => {
+    setOpenDialogMasterMenu(false)
+  }
+
+  const toggleDialogMasterMenu = () => {
+    setOpenDialogMasterMenu(!openDialog)
+  }
+
 
   const handleCloseDialog = (type, data) => {
     if (type === "save") {
@@ -288,7 +347,10 @@ const Index = ({ params }) => {
           </Tooltip>
         </>,
       },
-      { title: t('name'), dataIndex: 'name', key: 'name' },
+      ...(role_name === 'Super Admin' ?
+        [{ title: t('company'), dataIndex: 'join_second_company_name', key: 'join_second_company_name' }]
+        : []),
+      { title: t('name'), dataIndex: 'join_first_name', key: 'join_first_name' },
       { title: 'Url', dataIndex: 'url', key: 'url' },
       { title: t('icon'), dataIndex: 'icon', key: 'icon' },
       { title: 'Alias', dataIndex: 'alias_name', key: 'alias_name' },
@@ -330,6 +392,14 @@ const Index = ({ params }) => {
         dataEdit={dataEdit}
         clickOpenModal={clickOpenModal}
         dataMenu={allDataMenu}
+        listCompany={listCompany}
+        role_name={role_name}
+        company_id={company_id}
+      />
+      <DialogMasterMenu
+        openDialog={openDialogMasterMenu}
+        closeDialog={handleCloseDialogMasterMenu}
+        toggleDialog={() => toggleDialogMasterMenu}
       />
       <Card>
         <CardHeader style={{ display: "flex", justifyContent: "space-between" }}>
@@ -339,8 +409,13 @@ const Index = ({ params }) => {
               <Input onChange={handleSearch} value={search} type="text" name="search" id="search" placeholder={t('searchMenu')} />
             </Col>
             <Col>
+              {role_name === 'Super Admin' &&
+                <Tooltip title="Master Menu">
+                  <Button id="TooltipMasterMenu" color="warning" onClick={() => handleOpenDialogMasterMenu()}><i className="fa fa-table"></i></Button>
+                </Tooltip>
+              }
               <Tooltip title={t('menuAdd')}>
-                <Button id="TooltipTambah" color="success" onClick={() => handleOpenDialog('Save')}><i className="fa fa-plus"></i></Button>
+                <Button style={{ marginLeft: "5px" }} id="TooltipTambah" color="success" onClick={() => handleOpenDialog('Save')}><i className="fa fa-plus"></i></Button>
               </Tooltip>
               <Tooltip title={t('exportExcel')}>
                 <Button style={{ marginLeft: "5px" }} id="TooltipExport" color="primary" onClick={() => handleExportExcel()}><i className="fa fa-print"></i></Button>

From 952cf58a9ae3bd81091076bff2d38ea0e5b215b8 Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Tue, 23 Jan 2024 17:31:11 +0700
Subject: [PATCH 5/5] update url

---
 src/views/SimproV2/Gantt/GanttFrame.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/SimproV2/Gantt/GanttFrame.js b/src/views/SimproV2/Gantt/GanttFrame.js
index 8c7c252..aa9f79c 100644
--- a/src/views/SimproV2/Gantt/GanttFrame.js
+++ b/src/views/SimproV2/Gantt/GanttFrame.js
@@ -6,7 +6,7 @@ const GanttFrame = React.memo((props) => {
   const history = useHistory();
   const { versionGanttId, idProject, ro, timestamp, dataViewStartDate, token, company_id, role_name } = props;
   const iframeSrc = `https://project-gantt.ospro.id/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${company_id}`;
-    // const iframeSrc = `http://localhost:8444/generic-ospro-gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${company_id}`;
+  // const iframeSrc = `http://localhost:8444/generic-ospro-gantt/edit-mode/index.html?base_url=${BASE_SIMPRO_LUMEN}&gantt_id=${versionGanttId}&proyek_id=${idProject}&token=${token}&ro=${ro}&timestamp=${timestamp}&start=${dataViewStartDate}&role_name=${role_name}&company_id=${company_id}`;
   const [batchEntityData, setBatchEntityData] = useState(null);
 
   useEffect(() => {