financial

src/views/Dashboard/DashboardProject.js

@@ -175,7 +175,6 @@ const DashboardProject = () => {
             }
 
             selisihProgress = planningProgress - actualProgress;
-			console.log("QWE", [planningProgress, actualProgress]);
             if (selisihProgress > 0 && selisihProgress <= 5) {
                 statusHealthBySchedule = 'warning'
             }
@@ -248,6 +247,7 @@ 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);
 		}
@@ -573,7 +573,7 @@ const DashboardProject = () => {
                                             <Col span={7} style={{fontSize: 11, fontWeight: 'bold'}}><i className="fa fa-calendar" style={{marginRight:8}}></i>Est. at Completion</Col>
                                             <Col span={5} style={{fontSize: 11}}>
                                                 {isReadySCurve ?
-                                                    estAtCompletion ? renderFormatRupiah("168.000.000.000", 'Rp.') : '-'
+														estAtCompletion > plannedCost ? renderFormatRupiah(estAtCompletion, 'Rp.') : renderFormatRupiah(plannedCost, 'Rp.')
                                                     : <SingleTextLoader width={100} height={10} />
                                                 }
                                             </Col>
@@ -598,7 +598,7 @@ const DashboardProject = () => {
                                             <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 ?
-                                                    remToComplete ? renderFormatRupiah("19050674292", 'Rp.') : '-'
+                                                    remToComplete ? renderFormatRupiah(plannedCost - totalCost, 'Rp.') : '-'
                                                     : <SingleTextLoader width={100} height={10} />
                                                 }
                                             </Col>