Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/BudgetTahunan/BalanceSheet.js

@@ -623,18 +623,18 @@ export default class BalanceSheet extends Component {
                         }
                     } else if (String(item).includes('[M-1]')) {
                         let tst = String(item).replace('[M-1]', '')
-                        if (tableMeta.columnIndex === 7) {
+                        if (tableMeta.columnIndex === 7 || tableMeta.columnIndex === 19) {
                             let indexID = dataTable2.findIndex((val) => val[22] == tst)
                             if (indexID !== -1) {
                                 let valuezz = dataTable2[indexID][6]
                                 anjay.push(valuezz == "" ? 0 : valuezz)
                             }
-                        } else if (tableMeta.columnIndex === 19) {
-                            let indexID = dataTable2.findIndex((val) => val[22] == tst)
-                            if (indexID !== -1) {
-                                let valuezz = dataTable2[indexID][18].value !== undefined ? dataTable2[indexID][18].value : dataTable2[indexID][18]
-                                anjay.push(valuezz == "" ? 0 : valuezz)
-                            }
+                        // } else if (tableMeta.columnIndex === 19) {
+                        //     let indexID = dataTable2.findIndex((val) => val[22] == tst)
+                        //     if (indexID !== -1) {
+                        //         let valuezz = dataTable2[indexID][7].value !== undefined ? dataTable2[indexID][7].value : dataTable2[indexID][7]
+                        //         anjay.push(valuezz == "" ? 0 : valuezz)
+                        //     }
                         } else {
                             let data = tableMeta.columnIndex - 1
                             let indexID = dataTable2.findIndex((val) => val[22] == tst)

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -516,15 +516,19 @@ export default class BalanceSheet extends Component {
                     arrayFormulaConvert.push(item)
                 } else {
                     let indexID = dataTable2.findIndex((val) => val[21] == item)
+                    // console.log(item)
+                    // console.log(indexID)
                     if (indexID !== -1) {
                         let valuezz = dataTable2[indexID][tableMeta.columnIndex]
                         // // console.log(dataTable2[indexID])
                         arrayFormulaConvert.push(valuezz == "" ? 0 : valuezz)
+                    } else {
+                        arrayFormulaConvert.push(Number(item))
                     }
                 }
             })
-            // // console.log(arrayFormula)
-            // // console.log(arrayFormulaConvert)
+            // console.log(arrayFormula)
+            // console.log(arrayFormulaConvert)
             let array = arrayFormulaConvert
             let total = 0
             let opt = ""
@@ -547,7 +551,7 @@ export default class BalanceSheet extends Component {
                     } else if (opt == "bagi") {
                         total = Number(total) / Number(item)
                     } else {
-                        total += item
+                        total += Number(item)
                     }
                 }
             })