Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

ribet

See merge request !2330

src/container/MonthlyReport/ListOfCreditFacilitiesMR.js

@@ -287,7 +287,7 @@ export default class ListOfCreditFacilities extends Component {
 
     backToMonthlyReportLOCF(type) {
         console.log('masoook LOCF');
-        let dataTable2 = this.state.dataTablelocf == undefined || this.state.tambah == 'tambah' || this.state.tambah == 'upload' ? this.state.dataTableLOCF : this.state.dataTablelocf
+        let dataTable2 = (this.state.dataTablelocf !== undefined && this.state.tambah == 'upload') ? this.state.dataTablelocf : (this.state.dataTablelocf == undefined || this.state.tambah == 'tambah' || this.state.tambah == 'upload') ? this.state.dataTableLOCF : this.state.dataTablelocf
         let data = []
         let error = false
         // this.deleteReport()
@@ -853,6 +853,9 @@ export default class ListOfCreditFacilities extends Component {
                 })
 
                 let lastArrayLOCF = dataTablelocf[res.length - 1]
+                let roundDataDiff = fixNumber(Number(lastArrayLOCF[47]), 1)
+                let roundDataLoan = fixNumber(Number(lastArrayLOCF[48]), 1)
+                let roundDataPerBS = fixNumber(Number(lastArrayLOCF[49]), 1)
                 console.log(dataTablelocf);
                 if (bankNameEmpty) {
                     if (this.state.get_for == 'view') {
@@ -864,10 +867,10 @@ export default class ListOfCreditFacilities extends Component {
                     if (this.state.get_for == 'view') {
                         console.log("view");
                     } else {
-                        this.setState({ saveDraft: false, saveComp: lastArrayLOCF[47] == 0 || lastArrayLOCF[47] == '0.0' || lastArrayLOCF[47] == "-0.0" ? false : true })
+                        this.setState({ saveDraft: false, saveComp: roundDataDiff == 0 || roundDataDiff == '0.0' || roundDataDiff == "-0.0" ? false : true })
                     }
                 }
-                this.setState({ dataTablelocf, diffLOCF: lastArrayLOCF[47], totalLoanLOCF: lastArrayLOCF[48], perBSLOCF: lastArrayLOCF[49], loading: false }, () => {
+                this.setState({ dataTablelocf, diffLOCF: roundDataDiff, totalLoanLOCF: roundDataLoan, perBSLOCF: roundDataPerBS, loading: false }, () => {
                     this.handleCalculateLOV()
                 })
             }