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

src/container/RollingOutlook.js

@@ -555,15 +555,16 @@ export default class RollingOutlook extends Component {
                         } else {
                             this.setState({ loading: false })
                         }
-                        // api.create().checkApprover().then(response => {
+                        
+                        api.create().getRollingOutlookIsApprover().then(response => {
                         //     console.log(response);
-                            if (this.state.isApprover) {
+                            if (response.data.data.is_approver === true) {
                                 this.setState({ isApprover: true, checkApprover: true })
                             } else {
-                                this.setState({ isApprover: this.state.lastStatus === "SUBMITTED" ? true : false, checkApprover: false })
+                                this.setState({ isApprover: this.state.lastStatus == 'SUBMITTED'? true : false, checkApprover: false })
                             }
 
-                        // })
+                        })
                     })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {

src/container/RollingOutlook/BalanceSheetRO.js

@@ -791,7 +791,7 @@ export default class BalanceSheetRO extends Component {
                             let data = tableMeta.columnIndex - 1
                             let indexID = dataTable2.findIndex((val) => val[20] == tst)
                             if (indexID !== -1) {
-                                let valuezz = dataTable2[indexID][data].value !== undefined ? dataTable2[indexID][data].formula[0].value : dataTable2[indexID][data]
+                                let valuezz = dataTable2[indexID][data].value !== undefined ? dataTable2[indexID][data].value : dataTable2[indexID][data]
                                 anjay.push(valuezz == "" ? 0 : valuezz)
                             }
                             // console.log(tst, data, tableMeta.rowData[data]);
@@ -843,7 +843,7 @@ export default class BalanceSheetRO extends Component {
             total = R.equals(total, NaN) ? "0.0" : total
             // console.log(dataTable2[tableMeta.rowIndex][22])
             // console.log(tableMeta.rowData[5])
-            // if (tableMeta.rowData[5] == 'Beginning Balance') {
+            // if (tableMeta.rowData[5] == 'R/E (Cummulative)' && tableMeta.columnIndex == 10) {
             //     console.log(baru)
             //     console.log(anjay)
             //     console.log(total)