Merge branch 'staging' of https://git.oslog.id/ordo/adw-frontend into Dev-Farhan

src/views/Dashboard/DashboardProject.js

@@ -126,6 +126,7 @@ const DashboardProject = () => {
   const [isReadyGanttParents, setIsReadyGanttParents] = useState(false);
   const [calculationStatus, setCalculationStatus] = useState(false);
   const [isHierarchy, setIsHierarchy] = useState(false);
+  const [isScurve, setIsScurve] = useState(false);
   let history = useHistory();
 
   useEffect(() => {
@@ -136,6 +137,12 @@ const DashboardProject = () => {
     getComments();
     getGantt();
     getGanttParents();
+    const currentURL = window.location.href;
+    if (currentURL.includes("dashboard-project")) {
+      setIsScurve(true);
+    } else {
+      setIsScurve(false);
+    }
     return () => {
       console.log("unmount RenderMap");
     };
@@ -1018,7 +1025,7 @@ const DashboardProject = () => {
             </Col>
           </Row>
           <Row>
-            <Col span={24}>
+            <Col span={isScurve === true ? 8 : 10}>
               <div
                 style={{
                   border: "solid",
@@ -1143,7 +1150,8 @@ const DashboardProject = () => {
                 </div>
               </div>
             </Col>
-            {/* <Col span={16}>
+            {isScurve === true ? (
+              <Col span={16}>
                 <div
                   style={{
                     border: "solid",
@@ -1366,7 +1374,8 @@ const DashboardProject = () => {
                   </div>
                 </div>
               </div>
-            </Col> */}
+              </Col>
+            ) : ''}
           </Row>
           <div
             style={{
@@ -1553,7 +1562,8 @@ const DashboardProject = () => {
                 </Row>
               </Col>
             </Row>
-            {/* <Row>
+            <Row>
+              {isScurve === true ? (
                 <Col span={24}>
                   <div
                     style={{
@@ -1565,12 +1575,12 @@ const DashboardProject = () => {
                       marginBottom: 5,
                       marginRight: 2,
                     }}
-                > */}
+                  >
                     {/* <div style={{color: '#000000', textAlign: 'center', marginBottom: 10, fontWeight: 'bold', fontSize: 12}}>Health By Schedule</div>
                                   <div style={{backgroundColor: '#52AC0B', color: '#FFFFFF', padding: 5, borderRadius: 10, marginBottom: 10}}>
                                       <div style={{textAlign: 'center', fontWeight: 500, fontSize: 12}}>On Budget</div>
                                   </div> */}
-                  {/* <Row>
+                    <Row>
                       <Col span={12}>Total Invoice</Col>
                       <Col span={12} style={{ textAlign: "right" }}>
                         {isReadyIntegrationInvoice ? (
@@ -1626,7 +1636,8 @@ const DashboardProject = () => {
                     </Row>
                   </div>
                 </Col>
-            </Row> */}
+              ):''}
+            </Row>
             <Row>
               <Col span={24}>
                 <div