Merge branch 'dev-riri' into 'ENV-DEV'

masih issue weight

See merge request !2331

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/ListOfCreditFacilitiesMR.js

@@ -1108,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()