Skip to content

T
Tia-dev
Commit 1f563577 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'riri' into 'master' 

loding aplod

See merge request !416
parents a45e0661 6810bbc2
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 28 deletions
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 1f563577
...@@ -2255,13 +2255,14 @@ export default class CorporateAnnualTarget extends Component { ...@@ -2255,13 +2255,14 @@ export default class CorporateAnnualTarget extends Component {
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.state.editable === true ? onClick={() => this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadCAT("draft") this.uploadCAT("draft")
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
...@@ -2278,13 +2279,14 @@ export default class CorporateAnnualTarget extends Component { ...@@ -2278,13 +2279,14 @@ export default class CorporateAnnualTarget extends Component {
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadCAT("submitted") this.uploadCAT("submitted")
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
......
src/container/BudgetTahunan/FixedAssetsMovement.js
View file @ 1f563577
...@@ -2261,13 +2261,13 @@ export default class FixedAssetsMovement extends Component { ...@@ -2261,13 +2261,13 @@ export default class FixedAssetsMovement extends Component {
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.state.editable === true ? onClick={() => this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadFAM('draft') this.uploadFAM('draft')
}, 100); }, 100);
})} }))}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
...@@ -2283,13 +2283,14 @@ export default class FixedAssetsMovement extends Component { ...@@ -2283,13 +2283,14 @@ export default class FixedAssetsMovement extends Component {
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({handleTekTekTek: 1}, () => { this.setState({handleTekTekTek: 1}, () => {
setTimeout(() => { setTimeout(() => {
this.uploadFAM('submitted') this.uploadFAM('submitted')
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
......
src/container/BudgetTahunan/ProfitLoss.js
View file @ 1f563577
...@@ -2184,13 +2184,6 @@ export default class ProfitLoss extends Component { ...@@ -2184,13 +2184,6 @@ export default class ProfitLoss extends Component {
this.backToMasterBudget('draft') this.backToMasterBudget('draft')
}) })
} }
// onClick={() => this.state.editable === true ?
// null :
// this.setState({ loading: true }, () => {
// setTimeout(() => {
// this.backToMasterBudget('draft')
// }, 100);
// })}
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Save as Draft</Typography>
...@@ -2199,17 +2192,6 @@ export default class ProfitLoss extends Component { ...@@ -2199,17 +2192,6 @@ export default class ProfitLoss extends Component {
<button <button
type="button" type="button"
disabled={this.state.buttonError} disabled={this.state.buttonError}
// onClick={() => {
// this.state.buttonError ?
// this.setState({ loading: true }, () => {
// setTimeout(() => {
// this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning', loading: false })
// }, 100);
// })
// : this.setState({ loading: true }, () => {
// this.backToMasterBudget('submitted')
// })
// }}
onClick={() => this.state.buttonError? onClick={() => this.state.buttonError?
this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' }) this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
: :
...@@ -2304,15 +2286,16 @@ export default class ProfitLoss extends Component { ...@@ -2304,15 +2286,16 @@ export default class ProfitLoss extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadProfitLoss('draft') this.uploadProfitLoss('draft')
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
...@@ -2329,13 +2312,14 @@ export default class ProfitLoss extends Component { ...@@ -2329,13 +2312,14 @@ export default class ProfitLoss extends Component {
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadProfitLoss('submitted') this.uploadProfitLoss('submitted')
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ 1f563577
...@@ -5135,13 +5135,14 @@ export default class TaxPlanning extends Component { ...@@ -5135,13 +5135,14 @@ export default class TaxPlanning extends Component {
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadTP('draft') this.uploadTP('draft')
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
...@@ -5159,13 +5160,14 @@ export default class TaxPlanning extends Component { ...@@ -5159,13 +5160,14 @@ export default class TaxPlanning extends Component {
}} }}
onClick={() => onClick={() =>
this.state.editable === true ? this.state.editable === true ?
null : null : this.setState({ loading: true}, () =>
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
this.setState({ handleTekTekTek: 1 }, () => { this.setState({ handleTekTekTek: 1 }, () => {
setTimeout(() => { setTimeout(() => {
this.uploadTP('submitted') this.uploadTP('submitted')
}, 100); }, 100);
}) })
)
} }
> >
<div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}> <div style={{ backgroundColor: '#354960', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
......
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