Skip to content

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

Merge branch 'deni' into 'master' 

Deni

See merge request !598
parents ce7627a0 0df31886
Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 273 deletions
src/container/BudgetTahunan.js
View file @ fbcd057b
...@@ -108,6 +108,7 @@ export default class BudgetTahunan extends Component { ...@@ -108,6 +108,7 @@ export default class BudgetTahunan extends Component {
// console.log(response); // console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
if (response.data.data.length > 0) {
let data = response.data.data let data = response.data.data
let companyData = data.map((item) => { let companyData = data.map((item) => {
return { return {
...@@ -129,6 +130,9 @@ export default class BudgetTahunan extends Component { ...@@ -129,6 +130,9 @@ export default class BudgetTahunan extends Component {
} }
// //
}) })
} else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false, loading: false })
}
} else { } else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => { this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
if (response.data.message.includes("Someone Logged In")) { if (response.data.message.includes("Someone Logged In")) {
...@@ -959,7 +963,7 @@ export default class BudgetTahunan extends Component { ...@@ -959,7 +963,7 @@ export default class BudgetTahunan extends Component {
<Autocomplete <Autocomplete
{...this.state.listCompany} {...this.state.listCompany}
id="company" id="company"
disabled={this.state.intent === 'Home' ? true : false} disabled={this.state.listCompany === null ? true : this.state.intent === 'Home' ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => { onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
this.setState({ visibleTableHistory: false }) this.setState({ visibleTableHistory: false })
this.getRevision() this.getRevision()
...@@ -1135,13 +1139,15 @@ export default class BudgetTahunan extends Component { ...@@ -1135,13 +1139,15 @@ export default class BudgetTahunan extends Component {
</button> </button>
</div> : (this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' && this.state.btnApprove) ? </div> : (this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' && this.state.btnApprove) ?
<div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}> <div className="grid grid-2x" style={{ borderTop: 'solid 1px #c4c4c4', padding: 10, backgroundColor: '#f5f5f5', width: '100%', }}>
<div className="col-1"> <div className="col-1" />
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
outline: 'none', outline: 'none',
marginRight: 20
}} }}
onClick={() => this.setState({ visibleRevision: true })} onClick={() => this.setState({ visibleRevision: true })}
> >
...@@ -1149,8 +1155,6 @@ export default class BudgetTahunan extends Component { ...@@ -1149,8 +1155,6 @@ export default class BudgetTahunan extends Component {
<Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Revision</Typography> <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Revision</Typography>
</div> </div>
</button> </button>
</div>
<div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -1204,9 +1208,11 @@ export default class BudgetTahunan extends Component { ...@@ -1204,9 +1208,11 @@ export default class BudgetTahunan extends Component {
</div> </div>
</div> </div>
)} )
}
{this.state.visibleUpload && ( {
this.state.visibleUpload && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
...@@ -1238,9 +1244,11 @@ export default class BudgetTahunan extends Component { ...@@ -1238,9 +1244,11 @@ export default class BudgetTahunan extends Component {
/> />
</div> </div>
</div> </div>
)} )
}
{this.state.visibleBS && ( {
this.state.visibleBS && (
<BalanceSheet <BalanceSheet
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1258,8 +1266,10 @@ export default class BudgetTahunan extends Component { ...@@ -1258,8 +1266,10 @@ export default class BudgetTahunan extends Component {
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
status={this.state.status} status={this.state.status}
/> />
)} )
{this.state.visiblePL && ( }
{
this.state.visiblePL && (
<ProfitLoss <ProfitLoss
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1277,8 +1287,10 @@ export default class BudgetTahunan extends Component { ...@@ -1277,8 +1287,10 @@ export default class BudgetTahunan extends Component {
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )
{this.state.visibleTP && ( }
{
this.state.visibleTP && (
<TaxPlanning <TaxPlanning
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1296,8 +1308,10 @@ export default class BudgetTahunan extends Component { ...@@ -1296,8 +1308,10 @@ export default class BudgetTahunan extends Component {
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )
{this.state.visibleFAM && ( }
{
this.state.visibleFAM && (
<FixedAssetsMovement <FixedAssetsMovement
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1315,8 +1329,10 @@ export default class BudgetTahunan extends Component { ...@@ -1315,8 +1329,10 @@ export default class BudgetTahunan extends Component {
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )
{this.state.visibleCAT && ( }
{
this.state.visibleCAT && (
<CorporateAnnualTarget <CorporateAnnualTarget
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1334,8 +1350,10 @@ export default class BudgetTahunan extends Component { ...@@ -1334,8 +1350,10 @@ export default class BudgetTahunan extends Component {
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )
{this.state.visibleCF && ( }
{
this.state.visibleCF && (
<CashFlow <CashFlow
open={this.props.open} open={this.props.open}
report_id={this.state.report_id} report_id={this.state.report_id}
...@@ -1353,9 +1371,11 @@ export default class BudgetTahunan extends Component { ...@@ -1353,9 +1371,11 @@ export default class BudgetTahunan extends Component {
lastStatus={this.state.lastStatus} lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> />
)} )
}
{this.state.visibleRevision && ( {
this.state.visibleRevision && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
...@@ -1469,7 +1489,8 @@ export default class BudgetTahunan extends Component { ...@@ -1469,7 +1489,8 @@ export default class BudgetTahunan extends Component {
</div> </div>
</div> </div>
</div> </div>
)} )
}
</div > </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