Commit 58116afd authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

complete

See merge request !743
parents f5eef496 2f2005bf
......@@ -47,12 +47,12 @@ export default class TaxPlanningMR extends Component {
visibleTP: true,
disabledSave: true,
editable: false,
buttonError: false,
judulColumn: null,
updateBy: '-',
buttonDraft: true,
handleTekTekTek: 0,
saveDraft: true
saveDraft: true,
buttonError: true
}
this.fileHandler = this.fileHandler.bind(this);
......@@ -181,7 +181,7 @@ export default class TaxPlanningMR extends Component {
}
}
})
this.setState({ dataTable, loading: false, buttonError: true, editable: true })
this.setState({ dataTable, loading: false, editable: true })
} else {
this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) {
......@@ -193,7 +193,7 @@ export default class TaxPlanningMR extends Component {
})
}
} else {
this.setState({ dataTable, loading: false, buttonError: true, editable: true })
this.setState({ dataTable, loading: false, editable: true })
}
console.log(this.state.dataTable)
})
......@@ -425,7 +425,7 @@ export default class TaxPlanningMR extends Component {
// this.setState({ loading: false, buttonError: false, editable: false, saveDraft: false })
// // alert("Type Input Can't be Empty")
// } else {
this.setState({ loading: false, buttonError: true, editable: true, saveDraft: false })
this.setState({ loading: false, editable: true, saveDraft: false, buttonError: false })
// }
// })
}
......@@ -1563,9 +1563,8 @@ export default class TaxPlanningMR extends Component {
className="button"
type="button"
onClick={() =>
// null
// this.state.saveDraft === true ?
// null :
this.state.saveDraft === true ?
null :
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => {
setTimeout(() => {
......@@ -1589,9 +1588,9 @@ export default class TaxPlanningMR extends Component {
type="button"
// disabled={this.state.buttonError}
onClick={() =>
// this.state.buttonError ?
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
// :
this.state.buttonError ?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
:
this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1, loading: true }, () => {
setTimeout(() => {
......@@ -1601,7 +1600,7 @@ export default class TaxPlanningMR extends Component {
}
style={{
backgroundColor: 'transparent',
cursor: this.state.saveDraft === true ? 'default' : 'pointer',
cursor: this.state.buttonError === true ? 'default' : 'pointer',
borderColor: 'transparent',
outline: 'none'
}}
......
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