Skip to content

T
Tia-dev
Commit 6f82702d authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev/riri-staging' into 'ENV-STAGING' 

Button Upload

See merge request !1868
parents 0cd90651 4b4692cf
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 40 deletions
.env_staging
View file @ 6f82702d
// contents of .env // contents of .env
REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
REACT_APP_URL_MAIN_FE=/web-staging REACT_APP_URL_MAIN_FE=/web
\ No newline at end of file \ No newline at end of file
src/container/BudgetTahunan/CorporateAnnualTarget.js
View file @ 6f82702d
...@@ -428,7 +428,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -428,7 +428,7 @@ export default class CorporateAnnualTarget extends Component {
report_id: this.props.report_id, report_id: this.props.report_id,
status: '', status: '',
cat: payload, cat: payload,
status: 'submitted' status: 'submitted'
} }
// // // // console.log(body) // // // // console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0] }) this.setState({ payload: body, judul: resp.rows[1][0] })
...@@ -3945,11 +3945,27 @@ export default class CorporateAnnualTarget extends Component { ...@@ -3945,11 +3945,27 @@ export default class CorporateAnnualTarget extends Component {
} }
</div> </div>
<div style={{ width: '50%' }}> <div style={{ width: '50%' }}>
{this.state.dataTable.length == 0 ? null : this.props.isApprover == true ? <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
null <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
: <a data-tip={'Upload Simulasi'} data-for="upload">
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}> <button
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" /> style={{
backgroundColor: 'transparent',
cursor: 'pointer',
borderColor: 'transparent',
margin: 5
}}
onClick={() => this.setState({ visibleUploadSimulasi: true, buttonDraft: true })}
>
<img src={Images.simulasiUpload} style={{ width: 40, height: 40, marginRight: 3 }} />
</button>
</a>
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
{this.state.dataTable.length == 0 ? null : this.props.isApprover == true ?
null
:
<div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
{/* <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
<a data-tip={'Upload Simulasi'} data-for="upload"> <a data-tip={'Upload Simulasi'} data-for="upload">
<button <button
style={{ style={{
...@@ -3960,39 +3976,39 @@ export default class CorporateAnnualTarget extends Component { ...@@ -3960,39 +3976,39 @@ export default class CorporateAnnualTarget extends Component {
}} }}
onClick={() => this.setState({ visibleUploadSimulasi: true, buttonDraft: true })} onClick={() => this.setState({ visibleUploadSimulasi: true, buttonDraft: true })}
> >
<img src={Images.simulasiUpload} style={{ width: 40, height: 40, marginRight: 3}} /> <img src={Images.simulasiUpload} style={{ width: 40, height: 40, marginRight: 3 }} />
</button> </button>
</a> </a>
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" /> */}
{((!this.props.truelyApprover) && (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Download Template'} data-for="template"> {((!this.props.truelyApprover) && (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Download Template'} data-for="template">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => this.downloadTemplate()} onClick={() => this.downloadTemplate()}
> >
<img src={Images.template} /> <img src={Images.template} />
</button> </button>
</a>} </a>}
<ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
{((!this.props.truelyApprover) && (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Upload'} data-for="upload"> {((!this.props.truelyApprover) && (this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && <a data-tip={'Upload'} data-for="upload">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
cursor: 'pointer', cursor: 'pointer',
borderColor: 'transparent', borderColor: 'transparent',
margin: 5 margin: 5
}} }}
onClick={() => this.setState({ visibleUpload: true, buttonDraft: true })} onClick={() => this.setState({ visibleUpload: true, buttonDraft: true })}
> >
<img src={Images.upload} /> <img src={Images.upload} />
</button> </button>
</a>} </a>}
<ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" /> <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
{/* <a data-tip={'Download'} data-for="download"> {/* <a data-tip={'Download'} data-for="download">
<button <button
style={{ style={{
backgroundColor: 'transparent', backgroundColor: 'transparent',
...@@ -4011,8 +4027,9 @@ export default class CorporateAnnualTarget extends Component { ...@@ -4011,8 +4027,9 @@ export default class CorporateAnnualTarget extends Component {
</button> </button>
</a> </a>
<ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> */} <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" /> */}
</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