Merge pull request 'staging' (#121) from staging into master

Reviewed-on: ordo/adw-frontend#121

src/views/Dashboard/DashboardProject.js

@@ -1244,15 +1244,17 @@ const DashboardProject = () => {
                         Est. at Completion
                       </Col>
                       <Col span={5} style={{ fontSize: 11 }}>
-                        {isReadySCurve ? (
-                          plannedCost !== null && bcwp !== null ? (
-                            plannedCost > bcwp ? (
-                              renderFormatRupiah(plannedCost, "Rp.")
-                            ) : (
-                              renderFormatRupiah(bcwp, "Rp.")
+                        {isReadyProjectDetail && isReadyGantt ? (
+                          dataGantt.data.data.cost_to_complete ? (
+                            renderFormatRupiah(
+                              (parseInt(plannedCost) + dataGantt.data.data.cost_to_complete).toString(),
+                              "Rp."
                             )
                           ) : (
-                            "-"
+                            renderFormatRupiah(
+                              parseInt(plannedCost).toString(),
+                              "Rp."
+                            )
                           )
                         ) : (
                           <SingleTextLoader width={100} height={10} />
@@ -1292,10 +1294,10 @@ const DashboardProject = () => {
                         Cost Deviation
                       </Col>
                       <Col span={5} style={{ fontSize: 11 }}>
-                        {isReadyProjectDetail && isReadyIntegrationInvoice ? (
-                          totalCost > plannedCost ? (
+                        {isReadyProjectDetail && isReadyGantt ? (
+                           dataGantt.data.data.cost_to_complete ? (
                             renderFormatRupiah(
-                              (totalCost - plannedCost).toString(),
+                              (dataGantt.data.data.cost_to_complete).toString(),
                               "Rp."
                             )
                           ) : (