Merge pull request 'Dev-Farhan' (#26) from Dev-Farhan into staging

Reviewed-on: ibnu/generic-ospro-frontend#26

src/views/Dashboard/DashboardProjectCarousell.js

@@ -70,7 +70,15 @@ const center = {
 };
 
 const DashboardProject = (args) => {
-  const token = localStorage.getItem("token");
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, all_project = '', hierarchy = [];
+  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');
+  all_project = localStorage.getItem('all_project');
+  hierarchy.push(JSON.parse(localStorage.getItem("hierarchy")));
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -116,7 +124,7 @@ const DashboardProject = (args) => {
     setIsReadyProjectDetail(false);
     setIsReadySCurve(false)
     setIsReadySCurve(false);
-    const URL = `${BASE_OSPRO}/api/project-carausell`;
+    const URL = `${BASE_OSPRO}/api/project-carausell/${company_id}/${all_project}/${hierarchy}`;
     const result = await axios
       .get(URL, HEADER)
       .then((res) => res)

src/views/SimproV2/CreatedProyek/index.js

@@ -142,7 +142,7 @@ const CreatedProyek = ({ params, ...props }) => {
   const [userProyek, setUserProyek] = useState([]);
   const [materialProyek, setMaterialProyek] = useState([]);
   const [dataCharter, setDataCharter] = useState(null);
-  const [dataViewStartDate, setDataViewStartDate] = useState([]);
+  const [dataViewStartDate, setDataViewStartDate] = useState("");
   const [materialResource, setMaterialResource] = useState([]);
   const [toolsResource, setToolsResource] = useState([]);
   const [dataTypeProyek, setDataTypeProyek] = useState([]);
@@ -376,7 +376,7 @@ const CreatedProyek = ({ params, ...props }) => {
       paging: { start: start, length: rowsPerPage },
     };
 
-    if (all_project) {
+    if (all_project !== null && all_project === true) {
       payload["columns"] = [
         { name: "company_id", logic_operator: "like", value: company_id, operator: "AND" }
       ];
@@ -512,6 +512,7 @@ const CreatedProyek = ({ params, ...props }) => {
   };
 
   const handleOpenDialogGantt = (data) => {
+    console.log('data.mulai_proyek', data.mulai_proyek);
     setDataViewStartDate(data.mulai_proyek)
     setidTask(data.id);
     setProyekName(data.nama);
@@ -1534,32 +1535,12 @@ const CreatedProyek = ({ params, ...props }) => {
           </span>
           <span className="menu-text">Assign Checklist K3</span>
         </div>
-        {/* <div
+        <div className="menu-list" onClick={() => handleOpenDialogGantt(text)}>
-					className="menu-list"
+          <span className="menu-icon">
-					onClick={() => handleOpenDialogMaterial(text)}
+            <i className="fa fa-bars"></i>
-				>
+          </span>
-					<span className="menu-icon">
+          <span className="menu-text">Gantt</span>
-						<i className="fa fa-cube"></i>
+        </div>
-					</span>
-					<span className="menu-text">Request Material Resource</span>
-				</div> */}
-        {/* <div className="menu-list" onClick={() => handleOpenDialogTools(text)}>
-					<span className="menu-icon">
-						<i className="fa fa-cog"></i>
-					</span>
-					<span className="menu-text">Request Tools</span>
-				</div> */}
-        {/* <Link to={`/project-charter/${text.id}/gantt`}> */}
-        {
-          /*text.type_proyek_id != 9 ?*/
-          <div className="menu-list" onClick={() => handleOpenDialogGantt(text)}>
-            <span className="menu-icon">
-              <i className="fa fa-bars"></i>
-            </span>
-            <span className="menu-text">Gantt</span>
-          </div>
-          /*: null*/
-        }
         <div className="menu-list" onClick={() => handleSCurve(text)}>
           <span className="menu-icon">
             <i className="fa fa-line-chart"></i>
@@ -1572,7 +1553,6 @@ const CreatedProyek = ({ params, ...props }) => {
           </span>
           <span className="menu-text">Report Analysis</span>
         </div>
-        {/* </Link> */}
         <div
           className="menu-list"
           onClick={() => handleOpenDialogProyek(text.id)}
@@ -1995,6 +1975,7 @@ const CreatedProyek = ({ params, ...props }) => {
         toggleDialog={toggleDialogHierarchy}
         idTask={idTask}
         proyekName={proyekName}
+        dataViewStartDate={dataViewStartDate}
       />
     ),
     [openDialogHierarchy]