Skip to content

T
Tia-dev
Commit f01c2b5f authored by ardiansyah's avatar ardiansyah
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Fix loading block

See merge request !2417
parents 9317d75a 59a43c2d
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 15 deletions
src/container/BudgetTahunan/BudgetTahunan.js
View file @ f01c2b5f
......@@ -3448,9 +3448,21 @@ export default class BudgetTahunan extends Component {
search: false
}
const loadingComponent = (
<div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<div
style={{
position: 'fixed',
zIndex: 9999,
top: 0,
left: 0,
width: '100%',
height: '100vh',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
background: 'rgba(255,255,255,0.8)',
}}
>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
......
src/container/MonthlyReport/MonthlyReport.js
View file @ f01c2b5f
......@@ -3410,9 +3410,21 @@ export default class MonthlyReport extends Component {
]
const loadingComponent = (
<div style={{ position: 'fixed', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<div
style={{
position: 'fixed',
zIndex: 9999,
top: 0,
left: 0,
width: '100%',
height: '100vh',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
background: 'rgba(255,255,255,0.8)',
}}
>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
......
src/container/OutlookPA/OutlookPA.js
View file @ f01c2b5f
......@@ -2143,7 +2143,7 @@ export default class OutlookPA extends Component {
let handleDate = Number(moment(this.state.maxDateRevision).format('YYYYMMDD')) - Number(moment(this.state.minDateRevision).format('YYYYMMDD'))
return handleDate < 0 ? moment(this.state.minDateRevision).format('YYYY/MM/DD') : moment(this.state.maxDateRevision).format('YYYY/MM/DD')
}
const columns = (tableKey) => ["#", "Report Type",
const columns = (tableKey) => ["#", "Report Type",
{
name: "Revision",
options: {
......@@ -2439,9 +2439,21 @@ export default class OutlookPA extends Component {
search: false
}
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<div
style={{
position: 'fixed',
zIndex: 9999,
top: 0,
left: 0,
width: '100%',
height: '100vh',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
background: 'rgba(255,255,255,0.8)',
}}
>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
......
src/container/RollingOutlook/RollingOutlook.js
View file @ f01c2b5f
......@@ -899,7 +899,7 @@ export default class RollingOutlook extends Component {
visibleCAT: false,
visibleTP: false,
visibleCF: false,
isApprover: _isApprover
isApprover: _isApprover
})
} else if (item === 'Profit Loss') {
this.setState({
......@@ -909,7 +909,7 @@ export default class RollingOutlook extends Component {
visibleCAT: false,
visibleTP: false,
visibleCF: false,
isApprover: _isApprover
isApprover: _isApprover
})
} else if (item === 'Cash Flow') {
this.setState({
......@@ -919,7 +919,7 @@ export default class RollingOutlook extends Component {
visibleCAT: false,
visibleTP: false,
visibleCF: true,
isApprover: _isApprover
isApprover: _isApprover
})
} else if (item === 'Tax Planning') {
this.setState({
......@@ -938,7 +938,7 @@ export default class RollingOutlook extends Component {
visibleCAT: true,
visibleTP: false,
visibleCF: false,
isApprover: _isApprover
isApprover: _isApprover
})
}
})
......@@ -1922,7 +1922,7 @@ export default class RollingOutlook extends Component {
borderColor: 'transparent',
outline: 'none'
}}
onClick={() => this.state.isSubmit === false ? null : this.setState({ visibleUpload: true, currentMasterReportTypeId: master_report_type_id }) }
onClick={() => this.state.isSubmit === false ? null : this.setState({ visibleUpload: true, currentMasterReportTypeId: master_report_type_id })}
>
<Typography style={{ fontSize: '16px', color: this.state.isSubmit === false ? 'GrayText' : '#5198ea' }}>Upload File</Typography>
</button>
......@@ -2471,9 +2471,21 @@ export default class RollingOutlook extends Component {
search: false
}
const loadingComponent = (
<div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
<div
style={{
position: 'fixed',
zIndex: 9999,
top: 0,
left: 0,
width: '100%',
height: '100vh',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
background: 'rgba(255,255,255,0.8)',
}}
>
<PropagateLoader
// css={override}
size={20}
color={"#274B80"}
loading={this.state.loading}
......@@ -2628,7 +2640,7 @@ export default class RollingOutlook extends Component {
<button
type="button"
className="btn btn-circle btn-white"
onClick={() => this.setState({ visibleUpload: false, currentMasterReportTypeId: null }) }
onClick={() => this.setState({ visibleUpload: false, currentMasterReportTypeId: null })}
>
<img src={Images.close} />
</button>
......
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