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
Hide whitespace changes
Inline Side-by-side
Showing with 294 additions and 273 deletions
src/container/BudgetTahunan.js
View file @ fbcd057b
...@@ -108,27 +108,31 @@ export default class BudgetTahunan extends Component { ...@@ -108,27 +108,31 @@ 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') {
let data = response.data.data if (response.data.data.length > 0) {
let companyData = data.map((item) => { let data = response.data.data
return { let companyData = data.map((item) => {
company_id: item.company_id, return {
company_name: item.company_name, company_id: item.company_id,
} company_name: item.company_name,
}) }
})
let defaultProps = { let defaultProps = {
options: companyData, options: companyData,
getOptionLabel: (option) => titleCase(option.company_name), getOptionLabel: (option) => titleCase(option.company_name),
}; };
this.setState({ listCompany: defaultProps, company: companyData[0] }, () => { this.setState({ listCompany: defaultProps, company: companyData[0] }, () => {
// console.log(response.data.data); // console.log(response.data.data);
if (response.data.data.length > 0) { if (response.data.data.length > 0) {
this.getRevision() this.getRevision()
} else { } else {
this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false }) this.setState({ listRevision: null, revision: null, dataTable: [], checkApprover: false, lastRevision: "", visibleTableHistory: false })
} }
// //
}) })
} 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,272 +1208,289 @@ export default class BudgetTahunan extends Component { ...@@ -1204,272 +1208,289 @@ export default class BudgetTahunan extends Component {
</div> </div>
</div> </div>
)} )
}
{this.state.visibleUpload && ( {
<div className="test app-popup-show"> this.state.visibleUpload && (
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="test app-popup-show">
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="popup-title"> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Upload File</span> <div className="popup-title">
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Upload File</span>
</div>
</div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
<button
type="button"
className="btn btn-circle btn-white"
onClick={() => this.setState({ visibleUpload: false })}
>
<img src={Images.close} />
</button>
</div> </div>
</div> </div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}> <UploadFile
<button type={this.state.uploadStatus}
type="button" percentage={this.state.percentage}
className="btn btn-circle btn-white" result={this.state.result}
onClick={() => this.setState({ visibleUpload: false })} acceptedFiles={["xlsx"]}
> onHandle={(dt) => {
<img src={Images.close} /> this.fileHandler(dt)
</button> this.setState({ uploadStatus: 'idle', percentage: '0' })
</div> }}
onUpload={() => this.uploadAttachment(this.state.formData)}
/>
</div> </div>
<UploadFile
type={this.state.uploadStatus}
percentage={this.state.percentage}
result={this.state.result}
acceptedFiles={["xlsx"]}
onHandle={(dt) => {
this.fileHandler(dt)
this.setState({ uploadStatus: 'idle', percentage: '0' })
}}
onUpload={() => this.uploadAttachment(this.state.formData)}
/>
</div> </div>
</div> )
)} }
{this.state.visibleBS && ( {
<BalanceSheet this.state.visibleBS && (
open={this.props.open} <BalanceSheet
report_id={this.state.report_id} open={this.props.open}
height={this.props.height} report_id={this.state.report_id}
width={this.props.width} height={this.props.height}
company={this.state.company} width={this.props.width}
revision={this.state.revisionTable} company={this.state.company}
periode={this.state.periode.periode} revision={this.state.revisionTable}
submissionID={this.state.submissionID} periode={this.state.periode.periode}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} submissionID={this.state.submissionID}
onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
getReport={this.getSubmission.bind(this)} onClickClose={() => this.setState({ visibleBS: false, visibleBudgetTahunan: true })}
isApprover={this.state.isApprover} getReport={this.getSubmission.bind(this)}
lastStatus={this.state.lastStatus} isApprover={this.state.isApprover}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} lastStatus={this.state.lastStatus}
status={this.state.status} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/> status={this.state.status}
)} />
{this.state.visiblePL && ( )
<ProfitLoss }
open={this.props.open} {
report_id={this.state.report_id} this.state.visiblePL && (
height={this.props.height} <ProfitLoss
width={this.props.width} open={this.props.open}
company={this.state.company} report_id={this.state.report_id}
revision={this.state.revisionTable} height={this.props.height}
periode={this.state.periode.periode} width={this.props.width}
submissionID={this.state.submissionID} company={this.state.company}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} revision={this.state.revisionTable}
onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })} periode={this.state.periode.periode}
getReport={this.getSubmission.bind(this)} submissionID={this.state.submissionID}
status={this.state.status} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
isApprover={this.state.isApprover} onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })}
lastStatus={this.state.lastStatus} getReport={this.getSubmission.bind(this)}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} status={this.state.status}
/> isApprover={this.state.isApprover}
)} lastStatus={this.state.lastStatus}
{this.state.visibleTP && ( prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
<TaxPlanning />
open={this.props.open} )
report_id={this.state.report_id} }
height={this.props.height} {
width={this.props.width} this.state.visibleTP && (
company={this.state.company} <TaxPlanning
revision={this.state.revisionTable} open={this.props.open}
periode={this.state.periode.periode} report_id={this.state.report_id}
submissionID={this.state.submissionID} height={this.props.height}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} width={this.props.width}
onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })} company={this.state.company}
getReport={this.getSubmission.bind(this)} revision={this.state.revisionTable}
status={this.state.status} periode={this.state.periode.periode}
isApprover={this.state.isApprover} submissionID={this.state.submissionID}
lastStatus={this.state.lastStatus} saveToMasterBudget={this.saveToMasterBudget.bind(this)}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
/> getReport={this.getSubmission.bind(this)}
)} status={this.state.status}
{this.state.visibleFAM && ( isApprover={this.state.isApprover}
<FixedAssetsMovement lastStatus={this.state.lastStatus}
open={this.props.open} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
report_id={this.state.report_id} />
height={this.props.height} )
width={this.props.width} }
company={this.state.company} {
revision={this.state.revisionTable} this.state.visibleFAM && (
periode={this.state.periode.periode} <FixedAssetsMovement
submissionID={this.state.submissionID} open={this.props.open}
saveToMasterBudget={this.saveToMasterBudget.bind(this)} report_id={this.state.report_id}
onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })} height={this.props.height}
getReport={this.getSubmission.bind(this)} width={this.props.width}
status={this.state.status} company={this.state.company}
isApprover={this.state.isApprover} revision={this.state.revisionTable}
lastStatus={this.state.lastStatus} periode={this.state.periode.periode}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} submissionID={this.state.submissionID}
/> saveToMasterBudget={this.saveToMasterBudget.bind(this)}
)} onClickClose={() => this.setState({ visibleFAM: false, visibleBudgetTahunan: true })}
{this.state.visibleCAT && ( getReport={this.getSubmission.bind(this)}
<CorporateAnnualTarget status={this.state.status}
open={this.props.open} isApprover={this.state.isApprover}
report_id={this.state.report_id} lastStatus={this.state.lastStatus}
height={this.props.height} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
width={this.props.width} />
company={this.state.company} )
revision={this.state.revisionTable} }
periode={this.state.periode.periode} {
submissionID={this.state.submissionID} this.state.visibleCAT && (
saveToMasterBudget={this.saveToMasterBudget.bind(this)} <CorporateAnnualTarget
onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })} open={this.props.open}
getReport={this.getSubmission.bind(this)} report_id={this.state.report_id}
isApprover={this.state.isApprover} height={this.props.height}
status={this.state.status} width={this.props.width}
lastStatus={this.state.lastStatus} company={this.state.company}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} revision={this.state.revisionTable}
/> periode={this.state.periode.periode}
)} submissionID={this.state.submissionID}
{this.state.visibleCF && ( saveToMasterBudget={this.saveToMasterBudget.bind(this)}
<CashFlow onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
open={this.props.open} getReport={this.getSubmission.bind(this)}
report_id={this.state.report_id} isApprover={this.state.isApprover}
height={this.props.height} status={this.state.status}
width={this.props.width} lastStatus={this.state.lastStatus}
company={this.state.company} prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
revision={this.state.revisionTable} />
periode={this.state.periode.periode} )
submissionID={this.state.submissionID} }
saveToMasterBudget={this.saveToMasterBudget.bind(this)} {
onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })} this.state.visibleCF && (
getReport={this.getSubmission.bind(this)} <CashFlow
isApprover={this.state.isApprover} open={this.props.open}
status={this.state.status} report_id={this.state.report_id}
lastStatus={this.state.lastStatus} height={this.props.height}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true} width={this.props.width}
/> company={this.state.company}
)} revision={this.state.revisionTable}
periode={this.state.periode.periode}
submissionID={this.state.submissionID}
saveToMasterBudget={this.saveToMasterBudget.bind(this)}
onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
getReport={this.getSubmission.bind(this)}
isApprover={this.state.isApprover}
status={this.state.status}
lastStatus={this.state.lastStatus}
prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
/>
)
}
{this.state.visibleRevision && ( {
<div className="test app-popup-show"> this.state.visibleRevision && (
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="test app-popup-show">
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="popup-title"> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Revision</span> <div className="popup-title">
<span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Revision</span>
</div>
</div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}>
<button
type="button"
className="btn btn-circle btn-white"
onClick={() => this.setState({ visibleRevision: false })}
>
<img src={Images.close} />
</button>
</div> </div>
</div> </div>
<div className="col-2 content-right" style={{ maxWidth: "inherit", alignSelf: 'center' }}> <div className="border-bottom" style={{ padding: 20 }}>
<button <span>You ask your subsidiary to make a revision</span>
type="button" <div style={{ marginTop: 20 }}>
className="btn btn-circle btn-white" <MuiThemeProvider theme={getMuiTheme()}>
onClick={() => this.setState({ visibleRevision: false })} <MUIDataTable
> data={this.state.dataTableRevision}
<img src={Images.close} /> columns={columnRevisi}
</button> options={optionsRevision}
</div>
</div>
<div className="border-bottom" style={{ padding: 20 }}>
<span>You ask your subsidiary to make a revision</span>
<div style={{ marginTop: 20 }}>
<MuiThemeProvider theme={getMuiTheme()}>
<MUIDataTable
data={this.state.dataTableRevision}
columns={columnRevisi}
options={optionsRevision}
/>
</MuiThemeProvider>
</div>
<div style={{ marginTop: 20 }}>
<span>Timing duration you give for revision:</span>
<div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 20 }}>
<div>
<DatePicker
margin="normal"
id="startDate"
label="Valid From"
format="dd-MM-yyyy"
onChange={(e) => this.setState({ minDateRevision: moment(e).format('YYYY/MM/DD') }, () => this.setState({ maxDateRevision: handleMaxDate() }))}
value={moment(this.state.minDateRevision).format('YYYY/MM/DD')}
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085'
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/> />
</div> </MuiThemeProvider>
<span style={{ alignSelf: 'center' }}>Until</span> </div>
<div> <div style={{ marginTop: 20 }}>
<DatePicker <span>Timing duration you give for revision:</span>
margin="normal" <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 20 }}>
id="startDate" <div>
label="Valid To" <DatePicker
format="dd-MM-yyyy" margin="normal"
onChange={(e) => this.setState({ maxDateRevision: moment(e).format('YYYY/MM/DD') })} id="startDate"
minDate={moment(this.state.minDateRevision).format('YYYY/MM/DD')} label="Valid From"
value={moment(this.state.maxDateRevision).format('YYYY/MM/DD')} format="dd-MM-yyyy"
KeyboardButtonProps={{ onChange={(e) => this.setState({ minDateRevision: moment(e).format('YYYY/MM/DD') }, () => this.setState({ maxDateRevision: handleMaxDate() }))}
'aria-label': 'change date', value={moment(this.state.minDateRevision).format('YYYY/MM/DD')}
}} KeyboardButtonProps={{
inputProps={{ 'aria-label': 'change date',
style: { }}
fontSize: 11 inputProps={{
} style: {
}} fontSize: 11
InputLabelProps={{ }
style: { }}
fontSize: 11, InputLabelProps={{
color: '#7e8085' style: {
} fontSize: 11,
}} color: '#7e8085'
}
}}
style={{ padding: 0, margin: 0, width: '100%' }} style={{ padding: 0, margin: 0, width: '100%' }}
/> />
</div>
<span style={{ alignSelf: 'center' }}>Until</span>
<div>
<DatePicker
margin="normal"
id="startDate"
label="Valid To"
format="dd-MM-yyyy"
onChange={(e) => this.setState({ maxDateRevision: moment(e).format('YYYY/MM/DD') })}
minDate={moment(this.state.minDateRevision).format('YYYY/MM/DD')}
value={moment(this.state.maxDateRevision).format('YYYY/MM/DD')}
KeyboardButtonProps={{
'aria-label': 'change date',
}}
inputProps={{
style: {
fontSize: 11
}
}}
InputLabelProps={{
style: {
fontSize: 11,
color: '#7e8085'
}
}}
style={{ padding: 0, margin: 0, width: '100%' }}
/>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> <div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}>
<div className="border-top grid grid-2x" style={{ height: 56, backgroundColor: '#f5f5f5', paddingLeft: 20, paddingRight: 20 }}> <div className="column-1" style={{ alignSelf: 'center' }}>
<div className="column-1" style={{ alignSelf: 'center' }}> <button
<button type="button"
type="button" onClick={() => this.setState({ visibleRevision: false })}
onClick={() => this.setState({ visibleRevision: false })} >
> <div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<div style={{ width: 102, height: 30, border: 'solid 1px #354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}> <span style={{ color: '#354960', fontSize: 11 }}>Cancel</span>
<span style={{ color: '#354960', fontSize: 11 }}>Cancel</span> </div>
</div> </button>
</button> </div>
</div> <div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}>
<div className="column-2" style={{ display: 'flex', justifyContent: 'flex-end', alignItems: 'center' }}> <button
<button type="button"
type="button" onClick={() => this.validateRevision()}
onClick={() => this.validateRevision()} >
> <div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}>
<div style={{ width: 102, height: 30, backgroundColor: '#354960', borderRadius: 5, alignItems: 'center', display: 'flex', justifyContent: 'center' }}> <span style={{ color: '#fff', fontSize: 11 }}>Revision</span>
<span style={{ color: '#fff', fontSize: 11 }}>Revision</span> </div>
</div> </button>
</button> </div>
</div> </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