Skip to content

T
Tia-dev
Commit 066aae28 authored by qorri_di's avatar qorri_di
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT' 

Rollback buttom download

See merge request !1643
parents 55f59a71 ab284960
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 52 deletions
src/container/OutlookPA/ProfitLossOLPA.js
View file @ 066aae28
......@@ -510,40 +510,6 @@ export default class ProfitLossOLPA extends Component {
a.click();
}
}
async downloadAllData2() {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa2/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
let sub_null = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa2/export_outlook_pa?outlook_pa_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
console.log(url);
let res = await fetch(
this.props.outlook_pa_id == null ? sub_null : url
)
res = await res.blob()
this.setState({ loading: false })
if (res.size > 0) {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Outlook Performance Appraisal Profit & Loss.xlsx';
a.click();
}
}
async downloadAllData3() {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa3/export_outlook_pa?outlook_pa_id=${this.props.outlook_pa_id}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
let sub_null = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/outlook_pa3/export_outlook_pa?outlook_pa_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
console.log(url);
let res = await fetch(
this.props.outlook_pa_id == null ? sub_null : url
)
res = await res.blob()
this.setState({ loading: false })
if (res.size > 0) {
let url = window.URL.createObjectURL(res);
let a = document.createElement('a');
a.href = url;
a.download = 'Outlook Performance Appraisal Profit & Loss.xlsx';
a.click();
}
}
handleValidate() {
let data = []
......@@ -1798,7 +1764,7 @@ export default class ProfitLossOLPA extends Component {
<div style={{ width: '50%' }}>
{this.props.isApprover == true || this.state.get_for == 'view' ?
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download V1'} data-for="download">
<a data-tip={'Download'} data-for="download">
<button
style={{
backgroundColor: 'transparent',
......@@ -1817,7 +1783,9 @@ export default class ProfitLossOLPA extends Component {
</button>
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
<a data-tip={'Download V2'} data-for="download">
</div> :
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
<a data-tip={'Download Template'} data-for="template">
<button
style={{
backgroundColor: 'transparent',
......@@ -1825,18 +1793,27 @@ export default class ProfitLossOLPA extends Component {
borderColor: 'transparent',
margin: 5
}}
onClick={() =>
this.setState({ loading: true }, () => {
setTimeout(() => {
this.downloadAllData2()
}, 100);
})}
onClick={() => this.downloadTemplate()}
>
<img src={Images.download} />
<img src={Images.template} />
</button>
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
<a data-tip={'Download V3'} data-for="download">
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
<a data-tip={'Upload'} data-for="upload">
<button
style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
margin: 5
}}
onClick={() => this.setState({ visibleUpload: true })}
>
<img src={Images.upload} />
</button>
</a>
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
<a data-tip={'Download'} data-for="download">
<button
style={{
backgroundColor: 'transparent',
......@@ -1847,7 +1824,7 @@ export default class ProfitLossOLPA extends Component {
onClick={() =>
this.setState({ loading: true }, () => {
setTimeout(() => {
this.downloadAllData3()
this.downloadAllData()
}, 100);
})}
>
......@@ -1856,8 +1833,6 @@ export default class ProfitLossOLPA extends Component {
</a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
</div>
:
null
}
</div>
</div>
......@@ -1878,10 +1853,10 @@ export default class ProfitLossOLPA extends Component {
<div style={{ marginLeft: 10, overflowY: 'scroll', height: this.state.updateBy.length < 2 ? 25 : 75, marginTop: 10 }}>
{
this.state.updateBy.length > 0 ? this.state.updateBy.reverse().map((item, index) => {
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
return (
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>{item.latest_update}</Typography>
)
}) :
<Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 10, marginRight: 5 }}>-</Typography>
}
</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