Merge branch 'GGMAC' into 'master'

Ggmac

See merge request !1448

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -860,9 +860,9 @@ export default class CorporateAnnualTarget extends Component {
                 "october": i[22].value != undefined? String(Number(i[22].value).toFixed(1)) : String(i[22]),
                 "november": i[23].value != undefined? String(Number(i[23].value).toFixed(1)) : String(i[23]),
                 "december": i[24].value != undefined? String(Number(i[24].value).toFixed(1)) : String(i[24]),
-                "total_current_year": i[6] === String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
-                "total_next_year": i[6] === String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
-                "total_more_year": i[6] === String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
+                "total_current_year": String(Number(i[25]).toFixed(1)) == "" ? "0.0" : String(Number(i[25]).toFixed(1)),
+                "total_next_year": String(Number(i[26]).toFixed(1)) == "" ? "0.0" : String(Number(i[26]).toFixed(1)),
+                "total_more_year": String(Number(i[27]).toFixed(1)) == "" ? "0.0" : String(Number(i[27]).toFixed(1)),
                 "strategic": String(i[28]),
                 "pic": String(i[29])
             })
@@ -1140,8 +1140,11 @@ export default class CorporateAnnualTarget extends Component {
                                 let valuezz = value.formula[indexID].value
                                 anjay.push(valuezz == "" || valuezz == null ? "0" : valuezz)
                             }
+                        } else {
+                            let array = dataTable2[tableMeta.rowIndex][30].filter((val) => val.periode == Number(column))
+                            let valuezz = array[0].value
+                            anjay.push(valuezz == "" ? 0 : valuezz)
                         }
-
                     } else {
                         let convertID = -1
                         if (tableMeta.rowData[11].value == 'FORMULA') {
@@ -1325,6 +1328,7 @@ export default class CorporateAnnualTarget extends Component {
         const handleValueForecast = (value, tableMeta, periode) => {
             return handleValueFormula(value, tableMeta, periode, periode, 'forecast')
         }
+
         const handleChangeDropdown = (value, tableMeta) => {
             dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = value
             let valz = value.value

src/container/RollingOutlook/CashFlowRO.js

@@ -388,6 +388,7 @@ export default class CashFlow extends Component {
         const handleValueFormula = (value, tableMeta, column, periode, forecast) => {
             // console.log(tableMeta.rowData[5])
             // console.log(column)
+            
             loading = true
             let splitFormula = String(tableMeta.rowData[3]).split(/([()@])/)
             let baru = []
@@ -504,10 +505,10 @@ export default class CashFlow extends Component {
                             }
                         }
                     } else {
-                        let indexID = dataTable2.findIndex((val) => val[22] == item)
+                        let indexID = dataTable2.findIndex((val) => val[18] == item)
                         if (indexID !== -1) {
                             let valuezz = dataTable2[indexID][column].value == undefined ? dataTable2[indexID][column] : dataTable2[indexID][column].value
-                            if (item == dataTable2[tableMeta.rowIndex][22]) {
+                            if (item == dataTable2[tableMeta.rowIndex][18]) {
                                 anjay.push(0)
                             } else {
                                 anjay.push(valuezz == "" ? 0 : valuezz)
@@ -517,6 +518,7 @@ export default class CashFlow extends Component {
                                 anjay.push(-1)
                             }
                         }
+                        
                     }
                 }
             })
@@ -678,15 +680,23 @@ export default class CashFlow extends Component {
 
             total = R.equals(total, NaN) ? "0.0" : total
 
+            // if (column == 9 && tableMeta.rowData[1] == 3243762) {
+            //     console.log(tableMeta.rowData)
+            //     console.log(splitFormula)
+            //     console.log(baru)
+            //     console.log(anjay)
+            //     console.log(anjay2)
+            //     console.log(total)
+            // }
 
-            if (tableMeta.rowData[5] == '2.1 Additional fixed assets and CIP' && column == 7) {
-                console.log(tableMeta.rowData)
-                console.log(splitFormula)
-                console.log(baru)
-                console.log(anjay)
-                console.log(anjay2)
-                console.log(total)
-            }
+            // if (tableMeta.rowData[5] == '2.1 Additional fixed assets and CIP' && column == 7) {
+            //     console.log(tableMeta.rowData)
+            //     console.log(splitFormula)
+            //     console.log(baru)
+            //     console.log(anjay)
+            //     console.log(anjay2)
+            //     console.log(total)
+            // }
 
             if (dataTable2[tableMeta.rowIndex][column].value == undefined) {
                 dataTable2[tableMeta.rowIndex][column] = total