Commit 2c1142fb authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

deps

See merge request !450
parents b1adec00 ca711eb6
......@@ -696,6 +696,7 @@ export default class Perusahaan extends Component {
{this.state.messageAlert}
</Alert>
</Snackbar>
{this.state.loading && loadingComponent}
{this.state.visiblePerusahaan === true ?
this.state.load && (
<div>
......@@ -790,7 +791,6 @@ export default class Perusahaan extends Component {
</div>
</div>
<div style={{ padding: 25 }}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
theme={getMuiTheme()}
......@@ -811,7 +811,7 @@ export default class Perusahaan extends Component {
onClickClose={() => this.setState({ visibleVisual: false, visiblePerusahaan: true })}
height={this.props.height}
updateHierarchy={this.updateHierarchy.bind(this)}
handleLoading={() => this.setState({loading: true})}
handleLoading={() => this.setState({loading: true}, () => console.log('aksdkas'))}
/>
:
<div>
......
......@@ -63,7 +63,7 @@ export default class ReportItems extends Component {
invalidTemplate: false,
loading: false
}
this.myRef = React.createRef()
this.fileHandler = this.fileHandler.bind(this);
}
......@@ -824,6 +824,8 @@ export default class ReportItems extends Component {
this.setState({ alert: false })
}
scrollToMyRef = () => window.scrollTo(0, this.myRef.current.offsetTop)
render() {
const columns = [{
name: "Action",
......@@ -1049,7 +1051,7 @@ export default class ReportItems extends Component {
</div>
);
return (
<div style={{ height: this.props.height }}>
<div style={{ height: this.props.height }} ref={this.myRef}>
{/* <Row> */}
<div className={"main-color"} style={{ height: 195, width: '100%' }} />
<Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
......@@ -1057,6 +1059,7 @@ export default class ReportItems extends Component {
{this.state.messageAlert}
</Alert>
</Snackbar>
{this.state.loading && loadingComponent}
{this.state.itemReport === true ?
this.state.load && (
<div>
......@@ -1150,7 +1153,6 @@ export default class ReportItems extends Component {
</div>
</div>
<div style={{ padding: 25 }}>
{this.state.loading && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
theme={getMuiTheme()}
......@@ -1171,6 +1173,7 @@ export default class ReportItems extends Component {
onClickClose={() => this.setState({ visualisasi: false, itemReport: true }, () => this.getData())}
height={this.props.height}
handleLoading={() => this.setState({ loading: true })}
scrollToTop={() => this.scrollToMyRef()}
/>
:
<div>
......
......@@ -336,6 +336,7 @@ export default class VisualReportItems extends Component {
</div>
<button onClick={() => {
this.props.handleLoading()
this.props.scrollToTop()
this.handleSave()}}>
<div style={{ width: 102, height: 30, marginLeft: 25, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
<span style={{ color: '#fff', fontSize: 11 }}>Save</span>
......
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