Commit 69f25b30 authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

loading

See merge request !947
parents 255d1d0f 5131d366
...@@ -201,7 +201,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -201,7 +201,7 @@ export default class FixedAssetsMovementMR extends Component {
} }
}) })
console.log(dataTable); console.log(dataTable);
this.setState({ dataTable, loading: false, refresh: false }) this.setState({ dataTable, loading: false })
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
...@@ -213,7 +213,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -213,7 +213,7 @@ export default class FixedAssetsMovementMR extends Component {
}) })
} }
} else { } else {
this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false, refresh: false }) this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
} }
}) })
} }
...@@ -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 && (
<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