Merge branch 'ENV-PROD' into 'ENV-DEPLOYMENT-PROD'

Issue 11 januari

See merge request !2333

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -220,7 +220,7 @@ export default class CorporateAnnualTargetMR extends Component {
                         if (indexIDzz === -1) {
                             let parentTrue = item.parent_name == 'INTERNAL BUSINESS PROCESS PERSPECTIVE' || item.parent_name == 'CUSTOMER PERSPECTIVE'
                             // let weight = String(item.weight).includes('%') ? String(item.weight).substr(0, String(item.weight).length - 1) : String(item.weight)
-                            let weightTB = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight)
+                            let weightTB = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) * 100
                             // console.log(weight)
                             dataTable.push([
                                 item.type_report_id,
@@ -284,7 +284,7 @@ export default class CorporateAnnualTargetMR extends Component {
                         }
                     }
                     res.map((item, index) => {
-                        let weightParent = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight)
+                        let weightParent = String(item.corporate_annual_target.weight).includes('%') ? String(item.corporate_annual_target.weight).substr(0, String(item.corporate_annual_target.weight).length - 1) : String(item.corporate_annual_target.weight) * 100
                         dataTable.push([
                             item.type_report_id,
                             item.id,

src/container/MonthlyReport/LOCFMR.js

@@ -149,7 +149,7 @@ export default class LOCF extends Component {
         if (this.props.dataTablelocf !== prevProps.dataTablelocf) {
             let array = this.props.dataTablelocf
             let datas = array[array.length - 1]
-            this.setState({ dataTable: this.props.dataTablelocf, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(datas[47]), 1) : datas[47], loanTotal: datas[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(datas[49]), 1) : datas[49] })
+            this.setState({ dataTable: this.props.dataTablelocf, diff: datas[47], loanTotal: datas[48], perBS: datas[49] })
         }
         if (this.props.loadingChild !== prevProps.loadingChild) {
             this.setState({ loading: this.props.loadingChild })
@@ -353,7 +353,7 @@ export default class LOCF extends Component {
                 // let sortingTable = dataTable.sort((a, b) => a[6].value - b[6].value)
                 // console.log(sortingTable);
                 let lastArray = dataTable[res.length - 1]
-                this.setState({ dataTable, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[47]), 1) : lastArray[47], loanTotal: lastArray[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[49]), 1) : lastArray[49], loading: false, visibleLOCFMR: true }, () => {
+                this.setState({ dataTable, diff: lastArray[47], loanTotal: lastArray[48], perBS: lastArray[49], loading: false, visibleLOCFMR: true }, () => {
                     this.props.sendToParent(dataTable, lastArray, 'LOCF')
                 })
             }
@@ -565,8 +565,10 @@ export default class LOCF extends Component {
                     console.log(dataTable);
 
                     let lastArray = dataTable[dataTable.length - 1]
-                    this.setState({ dataTable, diff: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[47]), 1) : lastArray[47], loanTotal: lastArray[48], perBS: this.props.defaultCurrency.id == 1 ? fixNumber(Number(lastArray[49]), 1) : lastArray[49], dataLoaded: true, loading: false, buttonError: false, dataDelete: [] }, () => {
-                        this.props.sendToParent(dataTable, lastArray, 'LOCF', 'upload', this.state.visibleLOCFMR)
+                    console.log(lastArray);
+                    this.setState({ dataTable, diff: lastArray[47], loanTotal: lastArray[48], perBS: lastArray[49], dataLoaded: true, loading: false, buttonError: false, dataDelete: [] }, () => {
+                        console.log(this.state.visibleLOCFMR);
+                        this.props.sendToParent(dataTable, lastArray , 'LOCF', 'upload', this.state.visibleLOCFMR)
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, typeAlert: 'warning', loading: false }, () => {
@@ -3617,7 +3619,7 @@ export default class LOCF extends Component {
                                     <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
                                 </div>
                                 <div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
-                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
+                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > 0 ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
                                 </div>
                             </div>
                         </div>

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()
                 })
             }
@@ -1105,7 +1108,7 @@ export default class ListOfCreditFacilities extends Component {
 
     uploadLOCF(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()