From 2e16341deb307123b701f262ebff935c4cf7b5dd Mon Sep 17 00:00:00 2001
From: wahyuun <wahyumind01@gmail.com>
Date: Fri, 20 Oct 2023 10:29:22 +0700
Subject: [PATCH 1/2] update col Schedule

---
 src/views/Dashboard/DashboardProject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js
index 2cf31c8..5d60e01 100644
--- a/src/views/Dashboard/DashboardProject.js
+++ b/src/views/Dashboard/DashboardProject.js
@@ -1018,7 +1018,7 @@ const DashboardProject = () => {
             </Col>
           </Row>
           <Row>
-            <Col span={24}>
+            <Col span={10}>
               <div
                 style={{
                   border: "solid",

From 3ceeeeb1d8619430d5508f9aaa53ea7ac74fbf15 Mon Sep 17 00:00:00 2001
From: wahyuun <wahyumind01@gmail.com>
Date: Fri, 20 Oct 2023 12:55:10 +0700
Subject: [PATCH 2/2] add condition is Scurve

---
 src/views/Dashboard/DashboardProject.js | 177 +++++++++++++-----------
 1 file changed, 94 insertions(+), 83 deletions(-)

diff --git a/src/views/Dashboard/DashboardProject.js b/src/views/Dashboard/DashboardProject.js
index 5d60e01..b9a0fd8 100644
--- a/src/views/Dashboard/DashboardProject.js
+++ b/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={10}>
+            <Col span={isScurve === true ? 8 : 10}>
               <div
                 style={{
                   border: "solid",
@@ -1143,16 +1150,17 @@ const DashboardProject = () => {
                 </div>
               </div>
             </Col>
-            {/* <Col span={16}>
-              <div
-                style={{
-                  border: "solid",
-                  borderWidth: 1,
-                  borderColor: "#DDDDDD",
-                  padding: 10,
-                  margin: 2,
-                }}
-              >
+            {isScurve === true ? (
+              <Col span={16}>
+                <div
+                  style={{
+                    border: "solid",
+                    borderWidth: 1,
+                    borderColor: "#DDDDDD",
+                    padding: 10,
+                    margin: 2,
+                  }}
+                >
                 <div
                   style={{
                     display: "flex",
@@ -1366,7 +1374,8 @@ const DashboardProject = () => {
                   </div>
                 </div>
               </div>
-            </Col> */}
+              </Col>
+            ) : ''}
           </Row>
           <div
             style={{
@@ -1553,80 +1562,82 @@ const DashboardProject = () => {
                 </Row>
               </Col>
             </Row>
-            {/* <Row>
-              <Col span={24}>
-                <div
-                  style={{
-                    backgroundColor: "#FFFFFF",
-                    padding: 10,
-                    border: "solid",
-                    borderWidth: 1,
-                    borderColor: "#DDDDDD",
-                    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>
-                    <Col span={12}>Total Invoice</Col>
-                    <Col span={12} style={{ textAlign: "right" }}>
-                      {isReadyIntegrationInvoice ? (
-                        totalInvoice ? (
-                          renderFormatRupiah(totalInvoice, "Rp.")
+            <Row>
+              {isScurve === true ? (
+                <Col span={24}>
+                  <div
+                    style={{
+                      backgroundColor: "#FFFFFF",
+                      padding: 10,
+                      border: "solid",
+                      borderWidth: 1,
+                      borderColor: "#DDDDDD",
+                      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>
+                      <Col span={12}>Total Invoice</Col>
+                      <Col span={12} style={{ textAlign: "right" }}>
+                        {isReadyIntegrationInvoice ? (
+                          totalInvoice ? (
+                            renderFormatRupiah(totalInvoice, "Rp.")
+                          ) : (
+                            "-"
+                          )
                         ) : (
-                          "-"
-                        )
-                      ) : (
-                        <SingleTextLoader width={100} height={10} />
-                      )}
-                    </Col>
-                  </Row>
-                  <Row>
-                    <Col span={12}>Cash In</Col>
-                    <Col span={12} style={{ textAlign: "right" }}>
-                      {isReadyIntegrationInvoice ? (
-                        cashIn ? (
-                          renderFormatRupiah(cashIn, "Rp.")
+                          <SingleTextLoader width={100} height={10} />
+                        )}
+                      </Col>
+                    </Row>
+                    <Row>
+                      <Col span={12}>Cash In</Col>
+                      <Col span={12} style={{ textAlign: "right" }}>
+                        {isReadyIntegrationInvoice ? (
+                          cashIn ? (
+                            renderFormatRupiah(cashIn, "Rp.")
+                          ) : (
+                            "-"
+                          )
                         ) : (
-                          "-"
-                        )
-                      ) : (
-                        <SingleTextLoader width={100} height={10} />
-                      )}
-                    </Col>
-                  </Row>
-                  <Row>
-                    <Col span={24}>
-                      <hr style={{ margin: 2 }} />
-                    </Col>
-                  </Row>
-                  <Row>
-                    <Col span={12}>Outstanding Balance</Col>
-                    <Col
-                      span={12}
-                      style={{
-                        textAlign: "right",
-                        color: "#E80053",
-                        fontWeight: 500,
-                      }}
-                    >
-                      {isReadyIntegrationInvoice ? (
-                        outstandingBalance ? (
-                          renderFormatRupiah(outstandingBalance, "Rp.")
+                          <SingleTextLoader width={100} height={10} />
+                        )}
+                      </Col>
+                    </Row>
+                    <Row>
+                      <Col span={24}>
+                        <hr style={{ margin: 2 }} />
+                      </Col>
+                    </Row>
+                    <Row>
+                      <Col span={12}>Outstanding Balance</Col>
+                      <Col
+                        span={12}
+                        style={{
+                          textAlign: "right",
+                          color: "#E80053",
+                          fontWeight: 500,
+                        }}
+                      >
+                        {isReadyIntegrationInvoice ? (
+                          outstandingBalance ? (
+                            renderFormatRupiah(outstandingBalance, "Rp.")
+                          ) : (
+                            "-"
+                          )
                         ) : (
-                          "-"
-                        )
-                      ) : (
-                        <SingleTextLoader width={100} height={10} />
-                      )}
-                    </Col>
-                  </Row>
-                </div>
-              </Col>
-            </Row> */}
+                          <SingleTextLoader width={100} height={10} />
+                        )}
+                      </Col>
+                    </Row>
+                  </div>
+                </Col>
+              ):''}
+            </Row>
             <Row>
               <Col span={24}>
                 <div