Skip to content

T
Tia-dev
Commit 2f758a59 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

approve isu

See merge request !485
parents 3685fb2d fe219011
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/container/BudgetTahunan.js
View file @ 2f758a59
...@@ -177,7 +177,7 @@ export default class BudgetTahunan extends Component { ...@@ -177,7 +177,7 @@ export default class BudgetTahunan extends Component {
item.number, item.number,
item.report_name, item.report_name,
item.revision, item.revision,
this.state.isSubmit === false ? "CLOSED" : item.current_status, this.state.lastStatus === 'APPROVE' ? 'CLOSED' : this.state.isSubmit === false ? "CLOSED" : item.current_status,
item.report_id, item.report_id,
Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload, Number(item.revision) > 0 ? (item.current_status == "not-yet" ? false : item.is_can_upload) : item.is_can_upload,
item.revision item.revision
...@@ -567,6 +567,7 @@ export default class BudgetTahunan extends Component { ...@@ -567,6 +567,7 @@ export default class BudgetTahunan extends Component {
deleteAttachment(item) { deleteAttachment(item) {
api.create().deleteAttachment(item.attachment_id).then(response => { api.create().deleteAttachment(item.attachment_id).then(response => {
console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.getSubmission() this.getSubmission()
...@@ -1079,6 +1080,9 @@ export default class BudgetTahunan extends Component { ...@@ -1079,6 +1080,9 @@ export default class BudgetTahunan extends Component {
</div> : this.state.lastStatus === 'WAITING FOR APPROVAL' ? </div> : this.state.lastStatus === 'WAITING FOR APPROVAL' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{`${this.state.lastStatus} - ${this.state.pic}`}</span> <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
</div> : this.state.lastStatus === 'APPROVED' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{`${this.state.lastStatus}`}</span>
</div> : null </div> : null
: :
this.state.lastStatus === 'SUBMITTED' ? this.state.lastStatus === 'SUBMITTED' ?
......
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