Commit 21cfc6bc authored by Deni Rinaldi's avatar Deni Rinaldi

Merge branch 'riri' into 'master'

loading report item

See merge request !446
parents bcff32c3 1ed47489
......@@ -1170,6 +1170,7 @@ export default class ReportItems extends Component {
buttonEdit={this.state.buttonEdit}
onClickClose={() => this.setState({ visualisasi: false, itemReport: true }, () => this.getData())}
height={this.props.height}
handleLoading={() => this.setState({ loading: true })}
/>
:
<div>
......
......@@ -334,7 +334,9 @@ export default class VisualReportItems extends Component {
<div onClick={() => this.props.onClickClose()} style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center', cursor: "pointer" }}>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
</div>
<button onClick={() => this.handleSave()}>
<button onClick={() => {
this.props.handleLoading()
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>
</div>
......
......@@ -315,10 +315,20 @@ export default class OperatingIndicator extends Component {
return (
<div style={{ display: 'flex' }}>
{val === "submitted" || val === "approved" ?
<img src={Images.ceklis} style={{ width: 31, height: 24 }} /> :
val === "revision" ?
<span>Revisi</span> :
null
<span>COMPLETED</span> :
val === "draft" ?
<span>DRAFT</span> :
val === "revision" ?
<span>REVISION</span> :
val === "approval_proccess" ?
<span>APPROVAL PROCCESS</span> :
val === "approval_review" ?
<span>APPROVAL REVIEW</span> :
val === "not-yet" ?
<span>OPEN</span> :
val === "CLOSED" ?
<span>CLOSED</span> :
<img src={Images.cross} style={{ width: 31, height: 24 }} />
}
</div >
);
......
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