Commit 8fff5844 authored by Faisal Hamdi's avatar Faisal Hamdi

Merge branch 'faisal' into 'master'

again!

See merge request !1304
parents 6c96458c aa5eba5d
...@@ -1318,10 +1318,11 @@ export default class RollingOutlook extends Component { ...@@ -1318,10 +1318,11 @@ export default class RollingOutlook extends Component {
revision={this.state.revisionTable} revision={this.state.revisionTable}
periode={this.state.periode.periode} periode={this.state.periode.periode}
rollingOutlookID={this.state.rollingOutlookID} rollingOutlookID={this.state.rollingOutlookID}
refresh={this.getRollingOutlookID.bind(this)}
onClickClose={() => this.setState({ visibleCAT: false, visibleRollingOutlook: true })} onClickClose={() => this.setState({ visibleCAT: false, visibleRollingOutlook: true })}
isApprover={'false'} refresh={this.getRollingOutlookID.bind(this)}
quarter={this.state.quarter.value} quarter={this.state.quarter.value}
isApprover={this.state.isApprover}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )}
......
...@@ -2350,6 +2350,17 @@ export default class CatRevision extends Component { ...@@ -2350,6 +2350,17 @@ export default class CatRevision extends Component {
} }
}, },
] ]
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 1500, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
/>
</div>
);
return ( return (
<div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}> <div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
<div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}> <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
...@@ -2369,6 +2380,7 @@ export default class CatRevision extends Component { ...@@ -2369,6 +2380,7 @@ export default class CatRevision extends Component {
</div> </div>
</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 && loadingComponent}
<MuiThemeProvider theme={getMuiTheme()}> <MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable <MUIDataTable
data={dataTable2} data={dataTable2}
...@@ -2377,6 +2389,7 @@ export default class CatRevision extends Component { ...@@ -2377,6 +2389,7 @@ export default class CatRevision extends Component {
/> />
</MuiThemeProvider> </MuiThemeProvider>
</div> </div>
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
</div> </div>
<div className="grid grid-2x" style={{ marginTop: 20 }}> <div className="grid grid-2x" style={{ marginTop: 20 }}>
<div className="col-1"> <div className="col-1">
......
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