Skip to content

T
Tia-dev
Commit 38f11939 authored by Faisal Hamdi's avatar Faisal Hamdi
Browse files
Options

Merge branch 'faisal' into 'master' 

!

See merge request !950
parents 24a3175c 4204e5ee
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ 38f11939
...@@ -1314,7 +1314,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1314,7 +1314,7 @@ export default class FixedAssetsMovementMR extends Component {
</div> </div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{!this.state.refresh && ( {!this.state.loading && !this.state.refresh && (
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
...@@ -1455,7 +1455,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1455,7 +1455,7 @@ export default class FixedAssetsMovementMR extends Component {
<Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography> <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
</div> </div>
<div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}> <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
{!this.state.loading && !this.state.refresh && ( {!this.state.loading && (
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment