Merge branch 'rifka' into 'master'

bs

See merge request !855

src/container/MonthlyReport/BalanceSheetMR.js

@@ -303,7 +303,7 @@ export default class BalanceSheetMR extends Component {
                             orders: i[0] === undefined ? "" : String(i[0]).trim(),
                             item_report_id: i[1] === undefined ? "" : String(i[1]).trim(),
                             item_report: i[2] === undefined ? "" : String(i[2]).trim(),
-                            actual: i[3] === undefined ? "0" : reg.test(String(i[2])) === false ? "0" : String(i[3]).trim(),
+                            actual: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[3]).trim(),
                             mtd_vs_previous_month: i[4] === undefined ? "" : String(i[4]).trim(),
                             mtd_vs_mb: i[5] === undefined ? "" : String(i[5]).trim(),
                             mtd_vs_rb: i[6] === undefined ? "" : String(i[6]).trim(),
@@ -709,7 +709,7 @@ export default class BalanceSheetMR extends Component {
                             let data = tableMeta.rowData[20] == null? [] : tableMeta.rowData[20]
                             let indexID = data.findIndex((val) => val.item_formula == String(`${item}`))
                             if (indexID !== -1) {
-                                console.log(tableMeta)
+                                // console.log(tableMeta)
                                 let valuezz = data[indexID].value
                                 anjay.push(valuezz == "" ? 0 : valuezz)
                             }
@@ -1858,7 +1858,7 @@ export default class BalanceSheetMR extends Component {
                             </div>
 
                             <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                {/* {!this.state.loading && ( */}
+                                {!this.state.loading && (
                                     <MuiThemeProvider theme={getMuiTheme()}>
                                         <MUIDataTable
                                             data={dataTable2}
@@ -1866,7 +1866,7 @@ export default class BalanceSheetMR extends Component {
                                             options={options}
                                         />
                                     </MuiThemeProvider>
-                                {/* )} */}
+                                )}
                             </div>
 
                             <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
@@ -2014,7 +2014,7 @@ export default class BalanceSheetMR extends Component {
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                    {this.state.dataLoaded && (
+                                    {this.state.dataLoaded && !this.state.loading && (
                                         <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}