financial

src/views/Dashboard/DashboardProject.js

@@ -247,7 +247,6 @@ const DashboardProject = () => {
 				total_cost = total_cost.toString().split('.')[0]
                 setTotalCost(total_cost? total_cost.toString() : null)
                 setOutstandingBalance(outstanding_balance ? outstanding_balance.toString() : null);
-                setRemToComplete(plannedCost - total_cost);
             }
             setIsReadyIntegrationInvoice(true);
 		}
@@ -588,8 +587,8 @@ const DashboardProject = () => {
                                             </Col>
                                             <Col span={7} style={{fontSize: 11, fontWeight: 'bold'}}><i className="fa fa-calendar" style={{marginRight:8}}></i>Cost Deviation</Col>
                                             <Col span={5} style={{fontSize: 11}}>
-                                                {isReadySCurve ?
-                                                    costDeviation ? renderFormatRupiah("0", 'Rp.') : '-'
+                                                {isReadyProjectDetail && isReadyIntegrationInvoice ?
+														totalCost > plannedCost ? renderFormatRupiah(totalCost-plannedCost, 'Rp.') : 'Rp. 0'
                                                     : <SingleTextLoader width={100} height={10} />
                                                 }
                                             </Col>
@@ -597,7 +596,7 @@ const DashboardProject = () => {
                                         <Row>
                                             <Col span={7} style={{fontSize: 11, fontWeight: 'bold'}}><i className="fa fa-calendar" style={{marginRight:8}}></i>Rem. to Complete</Col>
                                             <Col span={5} style={{fontSize: 11}}>
-                                                {isReadySCurve ?
+                                                {isReadyProjectDetail && isReadyIntegrationInvoice ?
                                                     remToComplete ? renderFormatRupiah(plannedCost - totalCost, 'Rp.') : '-'
                                                     : <SingleTextLoader width={100} height={10} />
                                                 }