diff --git a/src/views/Dashboard/DashboardProjectCarousell.js b/src/views/Dashboard/DashboardProjectCarousell.js
index 64e9f94..e5b595c 100644
--- a/src/views/Dashboard/DashboardProjectCarousell.js
+++ b/src/views/Dashboard/DashboardProjectCarousell.js
@@ -104,7 +104,7 @@ const DashboardProject = (args) => {
 
   useEffect(() => {
     setLoading(true);
-    getAllData();
+    getReportDistribution();
   },[]);
 
   useEffect(() => {
@@ -145,50 +145,6 @@ const DashboardProject = (args) => {
       sourceData(dataResault);
       setIsReadyGantt(true);
       setIsReadyProjectDetail(true);
-      // // SCurve
-      // let statusHealthBySchedule = "on-schedule";
-      // let selisihProgress = 0;
-      // dataResault.map((item, idx) => {
-      //   item.SCurve.map((itemSCurve, idx) => {
-      //       let planningProgress = 0;
-      //       let actualProgress = 0;
-      //       let now = new Date().toISOString().slice(0, 10);
-      //       let  dates = itemSCurve.data?.date;
-      //       let n = dates.findIndex(
-      //         (element) => new Date(now) < new Date(element)
-      //       );
-      //     if (
-      //       itemSCurve.length > 0 &&
-      //       itemSCurve.data?.percentagePlan &&
-      //       itemSCurve.data?.percentagePlan.length > 0
-      //     ) {
-      //       planningProgress = itemSCurve.data?.percentagePlan[n];
-      //       if (n < 0) {
-      //         planningProgress = 100;
-      //       }
-      //       setPlanningProgress(planningProgress);
-      //     }
-      //     if (
-      //       itemSCurve.length > 0 &&
-      //       itemSCurve.data?.percentageReal &&
-      //       itemSCurve.data?.percentageReal.length > 0
-      //     ) {
-      //       actualProgress =
-      //         itemSCurve.data?.percentageReal[
-      //           itemSCurve.data?.percentageReal.length - 1
-      //         ];
-      //       setActualProgress(actualProgress);
-      //     }
-      //   });
-      // });
-
-      // selisihProgress = planningProgress - actualProgress;
-      // if (selisihProgress > 0 && selisihProgress <= 5) {
-      //   statusHealthBySchedule = "warning";
-      // } else if (selisihProgress > 5) {
-      //   statusHealthBySchedule = "danger";
-      // }
-      // setHealthBySchedule(statusHealthBySchedule);
       setIsReadySCurve(true);
       // setHierarchy
       setIsHierarchy(true);
@@ -202,6 +158,39 @@ 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,
@@ -217,15 +206,13 @@ const DashboardProject = (args) => {
 
   useEffect(() => {
     if (mymap) {
-      reportDistribution.map((item, idx) => {
-        if (item.report_distribution.length > 0) {
-          item.report_distribution.map((itemDistribution, idx) => {
-            L.marker([itemDistribution.lat, itemDistribution.lon])
-              .addTo(mymap)
-              .bindPopup(PopupContent(itemDistribution));
-          })
-        }
-      });
+      if (reportDistribution.length > 0) {
+        reportDistribution.map((item, idx) => {
+          L.marker([item.lat, item.lon])
+            .addTo(mymap)
+            .bindPopup(PopupContent(item));
+        });
+      }
     }
   }, [mymap, reportDistribution]);
 
@@ -253,13 +240,13 @@ const DashboardProject = (args) => {
 
     const next = () => {
       if (animating) return;
-      const nextIndex = activeIndex === allDataMaster.length - 1 ? 0 : activeIndex + 1;
+      const nextIndex = activeIndex === dummyData.length - 1 ? 0 : activeIndex + 1;
       setActiveIndex(nextIndex);
     };
 
     const previous = () => {
       if (animating) return;
-      const nextIndex = activeIndex === 0 ? allDataMaster.length - 1 : activeIndex - 1;
+      const nextIndex = activeIndex === 0 ? dummyData.length - 1 : activeIndex - 1;
       setActiveIndex(nextIndex);
     };
 
@@ -268,56 +255,756 @@ const DashboardProject = (args) => {
       setActiveIndex(newIndex);
     };
 
-  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
-          ];
+  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";
-      }
+  //     selisihProgress = SetplanningProgress - SetactualProgress;
+  //     if (selisihProgress > 0 && selisihProgress <= 5) {
+  //       statusHealthBySchedule = "warning";
+  //     } else if (selisihProgress > 5) {
+  //       statusHealthBySchedule = "danger";
+  //     }
+  //   return (
+  //     <CarouselItem
+  //       onExiting={() => setAnimating(true)}
+  //       onExited={() => setAnimating(false)}
+  //       key={parseInt(item.key)}>
+  //         <Row>
+  //           <Col span={18}>
+  //             <Row>
+  //               <Col span={8}>
+  //                 <div
+  //                   style={{
+  //                     border: "solid",
+  //                     borderWidth: 1,
+  //                     borderColor: "#DDDDDD",
+  //                     padding: 10,
+  //                     margin: 2,
+  //                   }}
+  //                 >
+  //                   <div
+  //                     style={{
+  //                       display: "flex",
+  //                       flexDirection: "row",
+  //                       marginBottom: 10,
+  //                     }}
+  //                   >
+  //                     <div
+  //                       style={{
+  //                         flex: 20,
+  //                         display: "flex",
+  //                         flexDirection: "column",
+  //                       }}
+  //                     >
+  //                       <div
+  //                         style={{
+  //                           fontSize: 16,
+  //                           fontWeight: "bold",
+  //                           marginBottom: 10,
+  //                         }}
+  //                       >
+  //                         Project
+  //                       </div>
+  //                       <div style={{ fontSize: 14 }}>
+  //                         {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
+  //                           })()
+  //                         ) : (
+  //                           <SingleTextLoader />
+  //                         )}
+  //                       </div>
+  //                     </div>
+  //                     <div>
+  //                       <i
+  //                         className="fa fa-check-square"
+  //                         style={{ fontSize: 28 }}
+  //                       ></i>
+  //                     </div>
+  //                   </div>
+  //                 </div>
+  //               </Col>
+  //               <Col span={8}>
+  //                 <div
+  //                   style={{
+  //                     border: "solid",
+  //                     borderWidth: 1,
+  //                     borderColor: "#DDDDDD",
+  //                     padding: 10,
+  //                     margin: 2,
+  //                   }}
+  //                 >
+  //                   <div
+  //                     style={{
+  //                       display: "flex",
+  //                       flexDirection: "row",
+  //                       marginBottom: 10,
+  //                     }}
+  //                   >
+  //                     <div
+  //                       style={{
+  //                         flex: 20,
+  //                         display: "flex",
+  //                         flexDirection: "column",
+  //                       }}
+  //                     >
+  //                       <div
+  //                         style={{
+  //                           fontSize: 16,
+  //                           fontWeight: "bold",
+  //                           marginBottom: 10,
+  //                         }}
+  //                       >
+  //                         Project Manager
+  //                       </div>
+  //                       <div style={{ fontSize: 14 }}>
+  //                         {isReadyProjectDetail ? (
+  //                           item.project_manager
+  //                         ) : (
+  //                           <SingleTextLoader />
+  //                         )}
+  //                       </div>
+  //                     </div>
+  //                     <div>
+  //                       <i className="fa fa-user" style={{ fontSize: 28 }}></i>
+  //                     </div>
+  //                   </div>
+  //                 </div>
+  //               </Col>
+  //               <Col span={8}>
+  //                 <div
+  //                   style={{
+  //                     border: "solid",
+  //                     borderWidth: 1,
+  //                     borderColor: "#DDDDDD",
+  //                     padding: 10,
+  //                     margin: 2,
+  //                   }}
+  //                 >
+  //                   <div
+  //                     style={{
+  //                       display: "flex",
+  //                       flexDirection: "row",
+  //                       marginBottom: 10,
+  //                     }}
+  //                   >
+  //                     <div
+  //                       style={{
+  //                         flex: 20,
+  //                         display: "flex",
+  //                         flexDirection: "column",
+  //                       }}
+  //                     >
+  //                       <div
+  //                         style={{
+  //                           fontSize: 16,
+  //                           fontWeight: "bold",
+  //                           marginBottom: 10,
+  //                         }}
+  //                       >
+  //                         Customer
+  //                       </div>
+  //                       <div style={{ fontSize: 14 }}>
+  //                         {isReadyProjectDetail ? (
+  //                           item.project.company
+  //                         ) : (
+  //                           <SingleTextLoader />
+  //                         )}
+  //                       </div>
+  //                     </div>
+  //                     <div>
+  //                       <i className="fa fa-home" style={{ fontSize: 28 }}></i>
+  //                     </div>
+  //                   </div>
+  //                 </div>
+  //               </Col>
+  //             </Row>
+  //             <Row>
+  //               <Col span={10}>
+  //                 <div
+  //                   style={{
+  //                     border: "solid",
+  //                     borderWidth: 1,
+  //                     borderColor: "#DDDDDD",
+  //                     padding: 10,
+  //                     margin: 2,
+  //                   }}
+  //                 >
+  //                   <div
+  //                     style={{
+  //                       display: "flex",
+  //                       flexDirection: "column",
+  //                       marginBottom: 10,
+  //                     }}
+  //                   >
+  //                     <div>
+  //                       <div
+  //                         style={{
+  //                           fontSize: 16,
+  //                           fontWeight: "bold",
+  //                           marginBottom: 10,
+  //                         }}
+  //                       >
+  //                         Schedule
+  //                       </div>
+  //                     </div>
+  //                     <div>
+  //                       <Row>
+  //                         <Col
+  //                           span={12}
+  //                           style={{ fontSize: 11, fontWeight: "bold" }}
+  //                         >
+  //                           <i
+  //                             className="fa fa-calendar"
+  //                             style={{ marginRight: 8 }}
+  //                           ></i>
+  //                           Planned Start
+  //                         </Col>
+  //                         <Col span={12} style={{ fontSize: 11 }}>
+  //                           {isReadyProjectDetail ? (
+  //                             item.activity.planned_start ? (
+  //                               moment(item.activity.planned_start).format("D MMMM YYYY")
+  //                             ) : (
+  //                               "-"
+  //                             )
+  //                           ) : (
+  //                             <SingleTextLoader width={100} height={10} />
+  //                           )}
+  //                         </Col>
+  //                       </Row>
+  //                       <Row>
+  //                         <Col
+  //                           span={12}
+  //                           style={{ fontSize: 11, fontWeight: "bold" }}
+  //                         >
+  //                           <i
+  //                             className="fa fa-calendar"
+  //                             style={{ marginRight: 8 }}
+  //                           ></i>
+  //                           Actual Start
+  //                         </Col>
+  //                         <Col span={12} style={{ fontSize: 11 }}>
+  //                           {isReadyProjectDetail ? (
+  //                             item.activity.start_date ? (
+  //                               moment(item.activity.start_date).format("D MMMM YYYY")
+  //                             ) : (
+  //                               "-"
+  //                             )
+  //                           ) : (
+  //                             <SingleTextLoader width={100} height={10} />
+  //                           )}
+  //                         </Col>
+  //                       </Row>
+  //                       <Row>
+  //                         <Col
+  //                           span={12}
+  //                           style={{ fontSize: 11, fontWeight: "bold" }}
+  //                         >
+  //                           <i
+  //                             className="fa fa-calendar"
+  //                             style={{ marginRight: 8 }}
+  //                           ></i>
+  //                           Planned Finish
+  //                         </Col>
+  //                         <Col span={12} style={{ fontSize: 11 }}>
+  //                           {isReadyProjectDetail ? (
+  //                             item.activity.planned_end ? (
+  //                               moment(item.activity.planned_end).format("D MMMM YYYY")
+  //                             ) : (
+  //                               "-"
+  //                             )
+  //                           ) : (
+  //                             <SingleTextLoader width={100} height={10} />
+  //                           )}
+  //                         </Col>
+  //                       </Row>
+  //                       <Row>
+  //                         <Col
+  //                           span={12}
+  //                           style={{ fontSize: 11, fontWeight: "bold" }}
+  //                         >
+  //                           <i
+  //                             className="fa fa-calendar"
+  //                             style={{ marginRight: 8 }}
+  //                           ></i>
+  //                           Estimated Finish
+  //                         </Col>
+  //                         <Col span={12} style={{ fontSize: 11 }}>
+  //                           {isReadyProjectDetail ? (
+  //                             item.activity.end_date ? (
+  //                               moment(item.activity.end_date).format("D MMMM YYYY")
+  //                             ) : (
+  //                               "-"
+  //                             )
+  //                           ) : (
+  //                             <SingleTextLoader width={100} height={10} />
+  //                           )}
+  //                         </Col>
+  //                       </Row>
+  //                     </div>
+  //                   </div>
+  //                 </div>
+  //               </Col>
+  //             </Row>
+  //             <div
+  //               style={{
+  //                 margin: 2,
+  //                 border: "solid",
+  //                 borderWidth: 1,
+  //                 borderColor: "#DDDDDD",
+  //               }}
+  //             >
+  //               <Row>
+  //                 <Col span={12}>
+  //                   <div
+  //                     style={{
+  //                       backgroundColor: activeTabIdx === 0 ? "#FFFFFF" : "#D9D9D9",
+  //                       padding: 8,
+  //                       fontWeight: "bold",
+  //                       cursor: "pointer",
+  //                       color: activeTabIdx === 0 ? "#000000" : "#4E4C4C",
+  //                     }}
+  //                     onClick={() => setActiveTabIdx(0)}
+  //                   >
+  //                     S Curve
+  //                   </div>
+  //                 </Col>
+  //                 <Col span={12}>
+  //                   <div
+  //                     style={{
+  //                       backgroundColor: activeTabIdx === 1 ? "#FFFFFF" : "#D9D9D9",
+  //                       padding: 8,
+  //                       fontWeight: "bold",
+  //                       cursor: "pointer",
+  //                       color: activeTabIdx === 1 ? "#000000" : "#4E4C4C",
+  //                     }}
+  //                     onClick={() => setActiveTabIdx(1)}
+  //                   >
+  //                     Maps
+  //                   </div>
+  //                 </Col>
+  //               </Row>
+  //               <Row>
+  //                 <Col span={24}>
+  //                   <div style={{ maxHeight: "55vh" }}>
+  //                     <div
+  //                       style={{
+  //                         height: "56vh",
+  //                         width: "100%",
+  //                         display: activeTabIdx === 0 ? "block" : "none",
+  //                       }}
+  //                     >
+  //                       <iframe
+  //                         id="frame-gantt"
+  //                         src={URL_GANTT}
+  //                         style={{
+  //                           width: "100%",
+  //                           height: "100%",
+  //                         }}
+  //                         scrolling="no"
+  //                         frameBorder="0"
+  //                         allow="fullscreen"
+  //                       ></iframe>
+  //                     </div>
+  //                     {activeTabIdx === 1 && (
+  //                       <div
+  //                         id="map-area"
+  //                         style={{ height: "56vh" }}
+  //                         ref={mapRef}
+  //                       ></div>
+  //                     )}
+  //                   </div>
+  //                 </Col>
+  //               </Row>
+  //             </div>
+  //           </Col>
+  //           <Col span={6}>
+  //             <div style={{ margin: 2 }}>
+  //               <Row>
+  //                 <Col span={24}>
+  //                   <div
+  //                     style={{
+  //                       backgroundColor: "#222222",
+  //                       padding: 10,
+  //                       marginBottom: 5,
+  //                     }}
+  //                   >
+  //                     <div
+  //                       style={{
+  //                         color: "#FFFFFF",
+  //                         textAlign: "center",
+  //                         marginBottom: 10,
+  //                         fontWeight: "bold",
+  //                       }}
+  //                     >
+  //                       Progress
+  //                     </div>
+  //                     {isReadySCurve ? (
+  //                       <ProgressPlanningBar
+  //                         progress={SetplanningProgress > 100 ? 100 : SetplanningProgress}
+  //                       />
+  //                     ) : (
+  //                       <SingleTextLoader width={"100%"} height={30} />
+  //                     )}
+  //                     <div style={{ marginTop: 10, marginBottom: 10 }}></div>
+  //                     {isReadySCurve ? (
+  //                       <ProgressActualBar
+  //                         progress={
+  //                           SetplanningProgress > 100 || SetactualProgress > 100
+  //                             ? parseFloat(
+  //                                 (SetactualProgress / SetplanningProgress) * 100
+  //                               ).toFixed(0)
+  //                             : SetactualProgress
+  //                           }
+  //                       />
+  //                     ) : (
+  //                       <SingleTextLoader width={"100%"} height={30} />
+  //                     )}
+  //                   </div>
+  //                 </Col>
+  //               </Row>
+  //               <Row>
+  //                 <Col span={12}>
+  //                   <div
+  //                     style={{
+  //                       background: "#FFF",
+  //                       padding: 10,
+  //                       border: "1px solid #DDD",
+  //                       marginRight: 2,
+  //                     }}
+  //                   >
+  //                     {isReadyOverdueActivities && (
+  //                       <HealthByBudget status={item.project.budget_health} />
+  //                     )}
+  //                     {isReadySCurve && (
+  //                       <HealthBySchedule status={statusHealthBySchedule} />
+  //                     )}
+  //                   </div>
+  //                 </Col>
+  //                 <Col span={12}>
+  //                   <Row style={{ height: "50%" }}>
+  //                     <Col span={24}>
+  //                       <div
+  //                         style={{
+  //                           display: "flex",
+  //                           alignItems: "center",
+  //                           justifyContent: "center",
+  //                           height: "100%",
+  //                           background: "#FFF",
+  //                           padding: 10,
+  //                           border: "1px solid #DDD",
+  //                           marginBottom: 5,
+  //                           marginRight: 2,
+  //                         }}
+  //                       >
+  //                         Manpower : {item.manpower}
+  //                       </div>
+  //                     </Col>
+  //                   </Row>
+  //                   <Row style={{ height: "50%" }}>
+  //                     <Col span={12}>
+  //                       <div
+  //                         style={{
+  //                           display: "flex",
+  //                           alignItems: "center",
+  //                           justifyContent: "center",
+  //                           height: "100%",
+  //                           background: "#FFF",
+  //                           padding: 10,
+  //                           border: "1px solid #DDD",
+  //                           marginBottom: 5,
+  //                           marginRight: 2,
+  //                         }}
+  //                       >
+  //                         Assigned: {item.assigned && assignedList.length}
+  //                       </div>
+  //                     </Col>
+  //                     <Col span={12}>
+  //                       <div
+  //                         style={{
+  //                           display: "flex",
+  //                           alignItems: "center",
+  //                           justifyContent: "center",
+  //                           height: "100%",
+  //                           background: "#FFF",
+  //                           padding: 10,
+  //                           border: "1px solid #DDD",
+  //                           marginBottom: 5,
+  //                           marginRight: 2,
+  //                         }}
+  //                       >
+  //                         Actual : {item.actual}
+  //                       </div>
+  //                     </Col>
+  //                   </Row>
+  //                 </Col>
+  //               </Row>
+  //               <Row>
+  //                 <Col span={24}>
+  //                   <div
+  //                     style={{
+  //                       border: "solid",
+  //                       borderWidth: 1,
+  //                       borderColor: "#DDDDDD",
+  //                     }}
+  //                   >
+  //                     <Row style={{ alignItems: "center", marginBottom: 5 }}>
+  //                       <Col span={12}>
+  //                         <div
+  //                           style={{
+  //                             backgroundColor:
+  //                               activeTabCommentIdx === 0 ? "#FFFFFF" : "#D9D9D9",
+  //                             fontWeight: 500,
+  //                             textAlign: "center",
+  //                             fontSize: 12,
+  //                             padding: 2,
+  //                             cursor: "pointer",
+  //                             color:
+  //                               activeTabCommentIdx === 0 ? "#000000" : "#4E4C4C",
+  //                           }}
+  //                           onClick={() => setActiveTabCommentIdx(0)}
+  //                         >
+  //                           Behind Task
+  //                         </div>
+  //                       </Col>
+  //                       <Col span={12}>
+  //                         <div
+  //                           style={{
+  //                             backgroundColor:
+  //                               activeTabCommentIdx === 1 ? "#FFFFFF" : "#D9D9D9",
+  //                             fontWeight: 500,
+  //                             textAlign: "center",
+  //                             fontSize: 12,
+  //                             padding: 2,
+  //                             cursor: "pointer",
+  //                             color:
+  //                               activeTabCommentIdx === 1 ? "#000000" : "#4E4C4C",
+  //                           }}
+  //                           onClick={() => setActiveTabCommentIdx(1)}
+  //                         >
+  //                           Comment From Customer
+  //                         </div>
+  //                       </Col>
+  //                     </Row>
+  //                     <div
+  //                       className="custom-scroll"
+  //                       style={{ maxHeight: "37vh", overflow: "auto" }}
+  //                     >
+  //                       {activeTabCommentIdx === 0 && (
+  //                         <div>
+  //                           {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");
+
+  //                                 if (isNaN(diffDays)) {
+  //                                   return null;
+  //                                 } else {
+  //                                   if (diffDays > 0) {
+  //                                     message = `Overdue by ${diffDays + 1} days`;
+  //                                   } else {
+  //                                     return null;
+  //                                   }
+  //                                 }
+  //                               }
+
+  //                               return <BehindTaskItem key={idx} name={overdueItem.name} message={message} />;
+  //                             })
+  //                           ) : (
+  //                             <div
+  //                               style={{
+  //                                 flex: 1,
+  //                                 textAlign: "center",
+  //                                 color: "#E80053",
+  //                                 marginTop: 50,
+  //                                 marginBottom: 50,
+  //                               }}
+  //                             >
+  //                               No overdue activity found.
+  //                             </div>
+  //                           )}
+  //                         </div>
+  //                       )}
+  //                       {activeTabCommentIdx === 1 &&(
+  //                       <div>
+  //                         {item.project_comment && item.project_comment != [] ? (
+  //                           item.project_comment.map((commentItem, idx) => {
+
+  //                             return <Comment
+  //                             key={idx}
+  //                             name={""}
+  //                             comment={commentItem.comment}
+  //                             created_at={commentItem.created_at}
+  //                           />
+  //                           })
+  //                         ) : (
+  //                             <div
+  //                               style={{
+  //                                 flex: 1,
+  //                                 textAlign: "center",
+  //                                 color: "#E80053",
+  //                                 marginTop: 50,
+  //                                 marginBottom: 50,
+  //                               }}
+  //                             >
+  //                               No comments found.
+  //                             </div>
+  //                           )}
+  //                         </div>
+  //                       )}
+  //                     </div>
+  //                   </div>
+  //                 </Col>
+  //               </Row>
+  //             </div>
+  //           </Col>
+  //         </Row>
+  //       <CarouselCaption/>
+  //     </CarouselItem>
+  //   );
+  // });
+  const slides = dummyData.map((item, index) => {
+    const URL_GANTT = `http://localhost:8444/adw-gantt/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`;
     return (
       <CarouselItem
         onExiting={() => setAnimating(true)}
@@ -360,22 +1047,8 @@ const DashboardProject = (args) => {
                           Project
                         </div>
                         <div style={{ fontSize: 14 }}>
-                          {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
-                            })()
+                          {item.project ? (
+                            item.project.nama + "-" + item.project.gantt.name_version
                           ) : (
                             <SingleTextLoader />
                           )}
@@ -424,7 +1097,7 @@ const DashboardProject = (args) => {
                           Project Manager
                         </div>
                         <div style={{ fontSize: 14 }}>
-                          {isReadyProjectDetail ? (
+                          {item.project_manager ? (
                             item.project_manager
                           ) : (
                             <SingleTextLoader />
@@ -471,7 +1144,7 @@ const DashboardProject = (args) => {
                           Customer
                         </div>
                         <div style={{ fontSize: 14 }}>
-                          {isReadyProjectDetail ? (
+                          {item.project ? (
                             item.project.company
                           ) : (
                             <SingleTextLoader />
@@ -527,12 +1200,8 @@ const DashboardProject = (args) => {
                             Planned Start
                           </Col>
                           <Col span={12} style={{ fontSize: 11 }}>
-                            {isReadyProjectDetail ? (
-                              item.activity.planned_start ? (
-                                moment(item.activity.planned_start).format("D MMMM YYYY")
-                              ) : (
-                                "-"
-                              )
+                            {item.activity ? (
+                              item.activity.planned_start
                             ) : (
                               <SingleTextLoader width={100} height={10} />
                             )}
@@ -550,12 +1219,8 @@ const DashboardProject = (args) => {
                             Actual Start
                           </Col>
                           <Col span={12} style={{ fontSize: 11 }}>
-                            {isReadyProjectDetail ? (
-                              item.activity.start_date ? (
-                                moment(item.activity.start_date).format("D MMMM YYYY")
-                              ) : (
-                                "-"
-                              )
+                          {item.activity ? (
+                            item.activity.start_date
                             ) : (
                               <SingleTextLoader width={100} height={10} />
                             )}
@@ -573,12 +1238,8 @@ const DashboardProject = (args) => {
                             Planned Finish
                           </Col>
                           <Col span={12} style={{ fontSize: 11 }}>
-                            {isReadyProjectDetail ? (
-                              item.activity.planned_end ? (
-                                moment(item.activity.planned_end).format("D MMMM YYYY")
-                              ) : (
-                                "-"
-                              )
+                            {item.activity ? (
+                              item.activity.planned_end
                             ) : (
                               <SingleTextLoader width={100} height={10} />
                             )}
@@ -596,12 +1257,8 @@ const DashboardProject = (args) => {
                             Estimated Finish
                           </Col>
                           <Col span={12} style={{ fontSize: 11 }}>
-                            {isReadyProjectDetail ? (
-                              item.activity.end_date ? (
-                                moment(item.activity.end_date).format("D MMMM YYYY")
-                              ) : (
-                                "-"
-                              )
+                            {item.activity ? (
+                              item.activity.end_date
                             ) : (
                               <SingleTextLoader width={100} height={10} />
                             )}
@@ -705,22 +1362,22 @@ const DashboardProject = (args) => {
                       >
                         Progress
                       </div>
-                      {isReadySCurve ? (
+                      {item.activity ? (
                         <ProgressPlanningBar
-                          progress={SetplanningProgress > 100 ? 100 : SetplanningProgress}
+                          progress={item.activity.planning > 100 ? 100 : item.activity.planning}
                         />
                       ) : (
                         <SingleTextLoader width={"100%"} height={30} />
                       )}
                       <div style={{ marginTop: 10, marginBottom: 10 }}></div>
-                      {isReadySCurve ? (
+                      {item.activity ? (
                         <ProgressActualBar
                           progress={
-                            SetplanningProgress > 100 || SetactualProgress > 100
+                            item.activity.planning > 100 || item.activity.actual > 100
                               ? parseFloat(
-                                  (SetactualProgress / SetplanningProgress) * 100
+                                  (item.activity.actual / item.activity.planning) * 100
                                 ).toFixed(0)
-                              : SetactualProgress
+                              : item.activity.actual
                             }
                         />
                       ) : (
@@ -739,11 +1396,11 @@ const DashboardProject = (args) => {
                         marginRight: 2,
                       }}
                     >
-                      {isReadyOverdueActivities && (
+                      {item.project.budget_health && (
                         <HealthByBudget status={item.project.budget_health} />
                       )}
-                      {isReadySCurve && (
-                        <HealthBySchedule status={statusHealthBySchedule} />
+                      {item.project.schedule_health && (
+                        <HealthBySchedule status={item.project.schedule_health} />
                       )}
                     </div>
                   </Col>
@@ -782,7 +1439,7 @@ const DashboardProject = (args) => {
                             marginRight: 2,
                           }}
                         >
-                          Assigned: {item.assigned && assignedList.length}
+                          Assigned: {item.assigned}
                         </div>
                       </Col>
                       <Col span={12}>
@@ -856,74 +1513,50 @@ const DashboardProject = (args) => {
                         className="custom-scroll"
                         style={{ maxHeight: "37vh", overflow: "auto" }}
                       >
-                        {activeTabCommentIdx === 0 && (
-                          <div>
-                            {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");
-
-                                  if (isNaN(diffDays)) {
-                                    return null;
-                                  } else {
-                                    if (diffDays > 0) {
-                                      message = `Overdue by ${diffDays + 1} days`;
-                                    } else {
-                                      return null;
-                                    }
-                                  }
-                                }
-
-                                return <BehindTaskItem key={idx} name={overdueItem.name} message={message} />;
-                              })
-                            ) : (
-                              <div
-                                style={{
-                                  flex: 1,
-                                  textAlign: "center",
-                                  color: "#E80053",
-                                  marginTop: 50,
-                                  marginBottom: 50,
-                                }}
-                              >
-                                No overdue activity found.
-                              </div>
-                            )}
-                          </div>
+                      {activeTabCommentIdx === 0 && (
+                          <div
+                          style={{
+                            flex: 1,
+                            textAlign: "center",
+                            color: "#E80053",
+                            marginTop: 50,
+                            marginBottom: 50,
+                          }}
+                        >
+                          No overdue activity found.
+                        </div>
                         )}
-                        {activeTabCommentIdx === 1 &&(
-                        <div>
-                          {item.project_comment && item.project_comment != [] ? (
-                            item.project_comment.map((commentItem, idx) => {
-
-                              return <Comment
-                              key={idx}
-                              name={""}
-                              comment={commentItem.comment}
-                              created_at={commentItem.created_at}
-                            />
-                            })
-                          ) : (
-                              <div
-                                style={{
-                                  flex: 1,
-                                  textAlign: "center",
-                                  color: "#E80053",
-                                  marginTop: 50,
-                                  marginBottom: 50,
-                                }}
-                              >
-                                No comments found.
-                              </div>
-                            )}
-                          </div>
+                      {activeTabCommentIdx === 1 && (
+                        <>
+                        <div
+                        style={{ padding: 5, marginBottom: 5, marginRight: 2, marginLeft: 2 }}
+                      >
+                        <TextArea
+                          rows={3}
+                          placeholder="Write comment here"
+                          disabled={isSendingComment}
+                        />
+                        <div style={{ float: "right", marginTop: -40, marginRight: 10 }}>
+                          <Button
+                            title="Send"
+                            type="primary"
+                            shape="circle"
+                            size={20}
+                          />
+                        </div>
+                      </div>
+                          <div
+                          style={{
+                            flex: 1,
+                            textAlign: "center",
+                            color: "#E80053",
+                            marginTop: 50,
+                            marginBottom: 50,
+                          }}
+                        >
+                          No comments found.
+                        </div>
+                        </>
                         )}
                       </div>
                     </div>
@@ -950,7 +1583,7 @@ const DashboardProject = (args) => {
               {...args}
             >
               <CarouselIndicators
-                items={allDataMaster}
+                items={dummyData}
                 activeIndex={activeIndex}
                 onClickHandler={goToIndex}
               />
diff --git a/src/views/Master/MasterRoles/DialogForm.js b/src/views/Master/MasterRoles/DialogForm.js
index 4bc3ab1..fab37b4 100644
--- a/src/views/Master/MasterRoles/DialogForm.js
+++ b/src/views/Master/MasterRoles/DialogForm.js
@@ -37,7 +37,6 @@ class DialogForm extends Component {
     this.props.showDialog(this.showDialog);
     this.getAllMenu();
   }
-
   async componentDidUpdate() {
     if (this.state.isParentClick === true) {
       if (this.props.typeDialog === "Edit") {
diff --git a/src/views/Master/MasterRoles/index.js b/src/views/Master/MasterRoles/index.js
index af94704..243519f 100644
--- a/src/views/Master/MasterRoles/index.js
+++ b/src/views/Master/MasterRoles/index.js
@@ -11,28 +11,33 @@ import { Pagination, Tooltip, Table } from 'antd';
 import { ROLE_ADD, ROLE_SEARCH, ROLE_EDIT, ROLE_DELETE, ROLEMENU_ADD, ROLEMENU_SEARCH, ROLEMENU_DELETE_ROLE } from '../../../const/ApiConst.js';
 import { withTranslation } from 'react-i18next';
 
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-
-
-const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
-
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
-
-const momentFormat = 'HH:mm';
 
 const LENGTH_DATA = 10
 
 class index extends Component {
 	constructor(props) {
+		let role_id = '', user_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+		if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+			role_id = props.location.state.role_id;
+			user_id = props.location.state.user_id;
+			token = props.location.state.token;
+			isLogin = props.location.state.isLogin;
+			company_id = props.location.state.company_id;
+			role_name = props.location.state.role_name;
+
+
+		} else {
+			token = window.localStorage.getItem('token');
+			role_name = window.localStorage.getItem('role_name');
+			company_id = window.localStorage.getItem('company_id');
+		}
 		super(props)
+		this.config = {
+			headers: {
+				Authorization: `Bearer ${token}`,
+				"Content-type": "application/json"
+			}
+		};
 		this.state = {
 			alertDelete: false,
 			alertNotDelete: false,
@@ -58,9 +63,9 @@ class index extends Component {
 			tooltipTambah: false,
 			totalPage: 0,
 			typeDialog: 'Save',
-			company_id: company_id
+			company_id: company_id,
+			role_name: role_name
 		}
-
 		this.columns = [
 			{
 				title: this.props.t('action'),
@@ -117,7 +122,7 @@ class index extends Component {
 			"joins": [],
 			"orders": { "columns": ["id"], "ascending": false }
 		}
-		if (role_name !== "Super Admin") {
+		if (this.state.role_name !== "Super Admin") {
 			formData.columns.push(
 				{ "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" },
 			)
@@ -127,7 +132,7 @@ class index extends Component {
 			)
 		}
 		const result = await axios
-			.post(ROLE_SEARCH, formData, config)
+			.post(ROLE_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -172,7 +177,7 @@ class index extends Component {
 		const { idDelete } = this.state
 		const url = ROLE_DELETE(idDelete)
 
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -193,10 +198,10 @@ class index extends Component {
 			name: data.name,
 			description: data.description,
 			default_page: data.selectedMenu,
-			company_id: company_id
+			company_id: this.company_id
 		}
 
-		const result = await axios.post(ROLE_ADD, formData, config)
+		const result = await axios.post(ROLE_ADD, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -216,7 +221,7 @@ class index extends Component {
 			default_page: data.selectedMenu
 		}
 		const url = ROLE_EDIT(data.id)
-		const result = await axios.put(url, formData, config)
+		const result = await axios.put(url, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -285,7 +290,7 @@ class index extends Component {
 		}
 
 		const result = await axios
-			.post(ROLEMENU_SEARCH, formData, config)
+			.post(ROLEMENU_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -309,7 +314,7 @@ class index extends Component {
 					menu_id: val.menu_id,
 					role_id: val.roles_id
 				}
-				promises.push(axios.post(ROLEMENU_ADD, formData, config)
+				promises.push(axios.post(ROLEMENU_ADD, formData, this.config)
 					.then(res => result.push(res)))
 			}
 		})
@@ -329,7 +334,7 @@ class index extends Component {
 
 	deleteCurrentRoleMenu = async (id) => {
 		let urlDel = ROLEMENU_DELETE_ROLE(id)
-		const result = await axios.delete(urlDel, config)
+		const result = await axios.delete(urlDel, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code === 200) {
@@ -352,7 +357,7 @@ class index extends Component {
 		}
 
 		const result = await axios
-			.post(ROLE_SEARCH, formData, config)
+			.post(ROLE_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
diff --git a/src/views/Master/ProjectPhase/index.js b/src/views/Master/ProjectPhase/index.js
index 56a3821..8d80b93 100644
--- a/src/views/Master/ProjectPhase/index.js
+++ b/src/views/Master/ProjectPhase/index.js
@@ -9,27 +9,27 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { PROJECT_PHASE_ADD, PROJECT_PHASE_EDIT, PROJECT_PHASE_DELETE, PROJECT_PHASE_SEARCH, PROJECT_PHASE_LIST, BASE_OSPRO } from '../../../const/ApiConst';
 import { Pagination, Button, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+
+
+const ProjectPhase = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
   }
-};
 
-const ProjectPhase = ({ params }) => {
-  const token = localStorage.getItem("token")
-  const company_id = localStorage.getItem("company_id")
-  /*const HEADER = {
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-      "Access-Control-Allow-Origin": "*",
-      "Authorization": `Bearer ${token}`
-    }
-  }*/
+  console.log('company_id', company_id);
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -257,7 +257,7 @@ const ProjectPhase = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = PROJECT_PHASE_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/Master/RoleProject/index.js b/src/views/Master/RoleProject/index.js
index d96c1d7..1a91e10 100644
--- a/src/views/Master/RoleProject/index.js
+++ b/src/views/Master/RoleProject/index.js
@@ -35,6 +35,19 @@ const LENGTH_DATA = 10
 
 class index extends Component {
   constructor(props) {
+    let role_id = '', user_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+    if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+      role_id = props.location.state.role_id;
+      user_id = props.location.state.user_id;
+      token = props.location.state.token;
+      isLogin = props.location.state.isLogin;
+      company_id = props.location.state.company_id;
+      role_name = props.location.state.role_name;
+    } else {
+      token = window.localStorage.getItem('token');
+      role_name = window.localStorage.getItem('role_name');
+      company_id = window.localStorage.getItem('company_id');
+    }
     super(props)
     this.state = {
       alertDelete: false,
@@ -61,7 +74,8 @@ class index extends Component {
       tooltipTambah: false,
       totalPage: 0,
       typeDialog: 'Save',
-      company_id
+      company_id: company_id,
+      role_name: role_name
     }
     this.columns = [
       {
@@ -115,7 +129,7 @@ class index extends Component {
       "joins": [],
       "orders": { "columns": ["id"], "ascending": false }
     }
-    if (role_name !== "Super Admin") {
+    if (this.state.role_name !== "Super Admin") {
       formData.columns.push(
         { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" },
       )
diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js
index 9b64976..f3c7379 100644
--- a/src/views/Pages/Login/Login.js
+++ b/src/views/Pages/Login/Login.js
@@ -133,7 +133,7 @@ class Login extends Component {
 		}
 	}
 
-	getDataMenu = async (token, role_id, user_id) => {
+	getDataMenu = async (token, role_id, user_id, company_id, role_name) => {
 		const config = {
 			headers:
 			{
@@ -159,14 +159,14 @@ class Login extends Component {
 			else {
 				this.props.history.push({
 					pathname: "/dashboard",
-					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 				});
 			}
 			if (this.state.defaultPage) {
 				if (role_id === 44) {
 					this.props.history.push({
 						pathname: this.state.defaultPage,
-						state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+						state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 					});
 				} else {
 					this.props.history.push(this.state.defaultPage);
@@ -177,7 +177,7 @@ class Login extends Component {
 			else {
 				this.props.history.push({
 					pathname: "/dashboard",
-					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 				});
 			}
 		} else {
@@ -222,7 +222,7 @@ class Login extends Component {
 		if (doLogin && doLogin.data && doLogin.data.code === 200) {
 			const { access_token, data_user } = doLogin.data.data
 			this.getDataRole(access_token, data_user.role_id)
-			this.getDataMenu(access_token, data_user.role_id, data_user.id)
+			this.getDataMenu(access_token, data_user.role_id, data_user.id, data_user.company_id, data_user.role.name)
 			window.localStorage.setItem('isLogin', true);
 			window.localStorage.setItem('token', access_token);
 			window.localStorage.setItem('user_id', data_user.id);
diff --git a/src/views/SimproV2/Divisi/index.js b/src/views/SimproV2/Divisi/index.js
index 89b0b79..08a4d0d 100644
--- a/src/views/SimproV2/Divisi/index.js
+++ b/src/views/SimproV2/Divisi/index.js
@@ -9,20 +9,6 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { Pagination, Button, Tooltip } from 'antd';
 import { useTranslation } from 'react-i18next';
 
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const company_id = localStorage.getItem("company_id")
-const role_name = window.localStorage.getItem('role_name');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
 
 const column = [
 	{ name: "Nama" },
@@ -30,8 +16,23 @@ const column = [
 	{ name: "Color" },
 ]
 
-const ProjectType = ({ params }) => {
-	const token = localStorage.getItem("token")
+const ProjectType = ({ params, ...props }) => {
+	let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+	if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+		role_id = props.location.state.role_id;
+		user_id = props.location.state.user_id;
+		token = props.location.state.token;
+		isLogin = props.location.state.isLogin;
+		role_name = props.location.state.role_name;
+	} else {
+		role_id = localStorage.getItem("role_id");
+		proyek_id = localStorage.getItem("proyek_id");
+		user_id = localStorage.getItem("user_id");
+		token = localStorage.getItem("token");
+		isLogin = localStorage.getItem("isLogin");
+		company_id = localStorage.getItem('company_id');
+		role_name = localStorage.getItem('role_name');
+	}
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -256,7 +257,7 @@ const ProjectType = ({ params }) => {
 
 	const onConfirmDelete = async () => {
 		let url = DIVISI_DELETE(idDelete);
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 
diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js
index b46b34d..4693f66 100644
--- a/src/views/SimproV2/Gantt/index.js
+++ b/src/views/SimproV2/Gantt/index.js
@@ -15,7 +15,7 @@ import GanttFrame from "./GanttFrame";
 let roCount = 0;
 
 const Gantt = (props) => {
-  let role_id = '', userId='',isLogin='',token='';
+  let role_id = '', userId = '', isLogin = '', token = '';
   if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
     role_id = props.location.state.role_id;
     userId = props.location.state.user_id;
@@ -56,7 +56,7 @@ const Gantt = (props) => {
     cekPermission();
   }, [listUserGant]);
 
-  useEffect(() => {}, [ro]);
+  useEffect(() => { }, [ro]);
 
   const getDataUserGantt = async () => {
     const payload = {
@@ -94,7 +94,7 @@ const Gantt = (props) => {
   };
 
   const cekPermission = () => {
-    let check = listUserGant.includes(userId);
+    let check = listUserGant.includes(parseInt(userId));
     if (check) {
       setRo(0);
     } else {
diff --git a/src/views/SimproV2/ProjectType/index.js b/src/views/SimproV2/ProjectType/index.js
index 408fb93..9ca0621 100644
--- a/src/views/SimproV2/ProjectType/index.js
+++ b/src/views/SimproV2/ProjectType/index.js
@@ -11,28 +11,24 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { PROJECT_TYPE_ADD, PROJECT_TYPE_EDIT, PROJECT_TYPE_DELETE, PROJECT_TYPE_SEARCH } from '../../../const/ApiConst';
 import { Pagination, Button, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-type": `application/json`
-  }
-};
-
-const column = [
-  { name: "Nama" },
-  { name: "Deskripsi" },
-]
 
-const ProjectType = ({ params }) => {
-  const token = localStorage.getItem("token")
+const ProjectType = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
+  }
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -106,7 +102,7 @@ const ProjectType = ({ params }) => {
       )
     }
     const result = await axios
-      .post(PROJECT_TYPE_SEARCH, payload, config, HEADER)
+      .post(PROJECT_TYPE_SEARCH, payload, HEADER, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -263,7 +259,7 @@ const ProjectType = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = PROJECT_TYPE_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js
index a466811..e7e9c78 100644
--- a/src/views/SimproV2/ResourceWorker/index.js
+++ b/src/views/SimproV2/ResourceWorker/index.js
@@ -13,24 +13,25 @@ import {
   PROYEK_SEARCH, USER_ADD, USER_SEARCH, USER_EDIT, USER_DELETE, ROLE_SEARCH, DIVISI_SEARCH, USER_SHIFT_ADD, USER_SYNC
 } from '../../../const/ApiConst';
 import { useTranslation } from 'react-i18next';
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-type": `application/json`
+
+const ResourceWorker = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
   }
-};
-const role_name = window.localStorage.getItem('role_name');
-const company_id = window.localStorage.getItem('company_id');
-const ResourceWorker = ({ params }) => {
-  const token = localStorage.getItem("token")
-  const company_id = localStorage.getItem("company_id")
+
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -90,7 +91,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(ROLE_SEARCH, formData, config)
+      .post(ROLE_SEARCH, formData, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -106,7 +107,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(DIVISI_SEARCH, formData, config)
+      .post(DIVISI_SEARCH, formData, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -215,7 +216,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(USER_SEARCH, payload, config)
+      .post(USER_SEARCH, payload, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -468,7 +469,7 @@ const ResourceWorker = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = USER_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/SimproV2/Satuan/index.js b/src/views/SimproV2/Satuan/index.js
index 6db7072..f849360 100644
--- a/src/views/SimproV2/Satuan/index.js
+++ b/src/views/SimproV2/Satuan/index.js
@@ -9,20 +9,24 @@ import { Pagination, Button, Tooltip } from 'antd';
 import { SATUAN_ADD, SATUAN_EDIT, SATUAN_DELETE, SATUAN_SEARCH } from '../../../const/ApiConst';
 import { useTranslation } from 'react-i18next';
 
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
 
-const Satuan = ({ params }) => {
-	const token = localStorage.getItem("token")
-	const company_id = localStorage.getItem("company_id")
+const Satuan = ({ params, ...props }) => {
+	let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+	if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+		role_id = props.location.state.role_id;
+		user_id = props.location.state.user_id;
+		token = props.location.state.token;
+		isLogin = props.location.state.isLogin;
+		role_name = props.location.state.role_name;
+	} else {
+		role_id = localStorage.getItem("role_id");
+		proyek_id = localStorage.getItem("proyek_id");
+		user_id = localStorage.getItem("user_id");
+		token = localStorage.getItem("token");
+		isLogin = localStorage.getItem("isLogin");
+		company_id = localStorage.getItem('company_id');
+		role_name = localStorage.getItem('role_name');
+	}
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -101,7 +105,7 @@ const Satuan = ({ params }) => {
 
 
 		const result = await axios
-			.post(SATUAN_SEARCH, payload, config)
+			.post(SATUAN_SEARCH, payload, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -132,7 +136,7 @@ const Satuan = ({ params }) => {
 			"orders": { "columns": ["id"], "ascending": false }
 		}
 		const result = await axios
-			.post(SATUAN_SEARCH, payload, config)
+			.post(SATUAN_SEARCH, payload, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -218,7 +222,7 @@ const Satuan = ({ params }) => {
 	const onConfirmDelete = async () => {
 		let url = SATUAN_DELETE(idDelete);
 
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);