Skip to content

T
Tia-dev
Commit 247e6698 authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

Merging LOV

See merge request !2167
parents 73330bcf 71254cf6
Hide whitespace changes
Inline Side-by-side
Showing with 7606 additions and 1118 deletions
.env_staging
View file @ 247e6698
// 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/assets/sass/app.css
View file @ 247e6698
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
} }
/* .main-color{ /* .main-color{
background-color: #0b6b24 !important; background-color: #1474CA !important;
} */ } */
.sub-color{ .sub-color{
src/container/MonthlyReport/LOCFMR.js 0 → 100644
View file @ 247e6698
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport/LOVMR.js 0 → 100644
View file @ 247e6698
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/MonthlyReport/ListOfCreditFacilitiesMR.js
View file @ 247e6698
This source diff could not be displayed because it is too large. You can view the blob instead.
src/container/RollingOutlook/RollingOutlook.js
View file @ 247e6698
...@@ -2192,10 +2192,7 @@ export default class RollingOutlook extends Component { ...@@ -2192,10 +2192,7 @@ export default class RollingOutlook extends Component {
</div> </div>
)} )}
{this.state.checkApprover === true ? {this.state.checkApprover === true ?
this.state.lastStatus === 'SUBMITTED' ? this.state.lastStatus === 'WAITING FOR REVIEW' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{this.state.lastStatus}</span>
</div> : this.state.lastStatus === 'WAITING FOR REVIEW' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{this.state.lastStatus}</span> <span>{this.state.lastStatus}</span>
</div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ? </div> : this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ?
...@@ -2216,26 +2213,18 @@ export default class RollingOutlook extends Component { ...@@ -2216,26 +2213,18 @@ export default class RollingOutlook extends Component {
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{this.state.lastStatus}</span> <span>{this.state.lastStatus}</span>
</div> : </div> :
this.state.lastStatus === 'WAITING FOR REVIEW' ? this.state.lastStatus === 'WAITING FOR APPROVAL' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{`${this.state.lastStatus} - ${this.state.pic}`}</span> <span>{`${this.state.lastStatus} - ${this.state.pic}`}</span>
</div> : </div> :
this.state.lastStatus === 'WAITING FOR YOUR APPROVAL' ? this.state.lastStatus === 'REVISION' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{`${this.state.lastStatus} - ${this.state.pic}`}</span> <span>NEED REVISION</span>
</div> : </div> :
this.state.lastStatus === 'WAITING FOR APPROVAL' ? this.state.lastStatus === 'APPROVED' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}> <div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>{`${this.state.lastStatus} - ${this.state.pic}`}</span> <span>APPROVED</span>
</div> : </div> : null
this.state.lastStatus === 'REVISION' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>NEED REVISION</span>
</div> :
this.state.lastStatus === 'APPROVED' ?
<div style={{ width: '100%', padding: '10px 20px', backgroundColor: 'yellow', textAlign: 'center', marginTop: 20 }}>
<span>APPROVED</span>
</div> : null
} }
{this.state.visibleTableHistory && ( {this.state.visibleTableHistory && (
<div style={{ marginTop: 20 }}> <div style={{ marginTop: 20 }}>
......
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