Commit af827e20 authored by Riri Novita's avatar Riri Novita

Merge branch 'ENV-DEV' of http://103.44.149.204/d.arizona/tia-dev into dev/riri

parents 8e8e8ef6 2156322c
...@@ -79,15 +79,15 @@ export default class PopUpInformation extends Component { ...@@ -79,15 +79,15 @@ export default class PopUpInformation extends Component {
reportName(){ reportName(){
if (this.props.reportName == "MASTER_BUDGET"){ if (this.props.reportName == "MASTER_BUDGET"){
return "master budget" return "Master Budget"
} else if (this.props.reportName == "OUTLOOK_Q1"){ } else if (this.props.reportName == "OUTLOOK_Q1"){
return "rolling outlook" return "Rolling Outlook"
} else if (this.props.reportName == "OUTLOOK_Q2"){ } else if (this.props.reportName == "OUTLOOK_Q2"){
return "rolling outlook" return "Rolling Outlook"
} else if (this.props.reportName == "OUTLOOK_Q3"){ } else if (this.props.reportName == "OUTLOOK_Q3"){
return "rolling outlook" return "Rolling Outlook"
} else if (this.props.reportName == "OUTLOOK_PA"){ } else if (this.props.reportName == "OUTLOOK_PA"){
return "outlook PA" return "Outlook PA"
} }
} }
...@@ -99,12 +99,12 @@ export default class PopUpInformation extends Component { ...@@ -99,12 +99,12 @@ export default class PopUpInformation extends Component {
if (this.props.reportName == "MONTHLY_REPORT"){ if (this.props.reportName == "MONTHLY_REPORT"){
return ( return (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content border-radius" style={{ background: '#FFF27D', borderRadius: 10, width: 600, height: 550 }}> <div className="popup-content border-radius" style={{ background: '#FFF27D', borderRadius: 10, width: 530, height: 520 }}>
<div style={{ margin: 30 }}> <div style={{ margin: 30 }}>
<div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}> <div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
<span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 20, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
{this.namaJudul()} <b>Format max-min value</b> Monthly Report:
</span> </div>
</div> </div>
<div className="border-top grid grid-2x" > <div className="border-top grid grid-2x" >
<div className="column-1" style={{ alignSelf: 'center', width: 70 }}> <div className="column-1" style={{ alignSelf: 'center', width: 70 }}>
...@@ -116,16 +116,13 @@ export default class PopUpInformation extends Component { ...@@ -116,16 +116,13 @@ export default class PopUpInformation extends Component {
}}/> }}/>
</div> </div>
<div className="column-2" style={{ display: 'grid', justifyContent: 'center', marginTop: 20, marginLeft: 20, paddingBottom: 20, width: 400 }}> <div className="column-2" style={{ display: 'grid', justifyContent: 'center', marginTop: 20, marginLeft: 20, paddingBottom: 20, width: 400 }}>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
Please enter the date in the following format: <b>'dd MMM YYYY.'</b> Please enter the date in the following format: <b>'dd MMM YYYY.'</b>
</div> </div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
For example, 1 Jan 2023. For example, 1 Jan 2023.
</div> </div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div className="grid grid-3x" style={{marginTop: 10}}>
<b>format max-min value</b> Monthly Report:
</div>
<div className="grid grid-3x" >
<div className="column-1" style={{ justifyContent: 'center', fontSize: 14, width: 40, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div className="column-1" style={{ justifyContent: 'center', fontSize: 14, width: 40, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
Jan: Jan:
</div> </div>
...@@ -276,12 +273,12 @@ export default class PopUpInformation extends Component { ...@@ -276,12 +273,12 @@ export default class PopUpInformation extends Component {
}else { }else {
return ( return (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content border-radius" style={{ background: '#FFF27D', borderRadius: 10, width: 500, height: (this.props.reportName == "MASTER_BUDGET") || (this.props.reportName=="OUTLOOK_PA") ? 300 : 350 }}> <div className="popup-content border-radius" style={{ background: '#FFF27D', borderRadius: 10, width: 460, height: (this.props.reportName == "MASTER_BUDGET") || (this.props.reportName=="OUTLOOK_PA") ? 250 : 300 }}>
<div style={{ margin: 30 }}> <div style={{ margin: 15 }}>
<div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}> <div style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20 }}>
<span style={{ textAlign: 'center', fontSize: 14, fontWeight: 'bold', color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 20, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
{this.namaJudul()} <b>Format max-min value</b> <span>{this.reportName()}</span> :
</span> </div>
</div> </div>
<div className="border-top grid grid-2x" > <div className="border-top grid grid-2x" >
<div className="column-1" style={{ alignSelf: 'center', width: 70 }}> <div className="column-1" style={{ alignSelf: 'center', width: 70 }}>
...@@ -293,23 +290,20 @@ export default class PopUpInformation extends Component { ...@@ -293,23 +290,20 @@ export default class PopUpInformation extends Component {
}}/> }}/>
</div> </div>
<div className="column-2" style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20, width: 350 }}> <div className="column-2" style={{ display: 'grid', justifyContent: 'center', marginTop: 20, paddingBottom: 20, width: 350 }}>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
Please enter the date in the following format: <b>'dd MMM YYYY.'</b> Please enter the date in the following format: <b>'dd MMM YYYY.'</b>
</div> </div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
For example, 1 Jan 2023. For example, 1 Jan 2023.
</div> </div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 14, marginTop: 10, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
<b>format max-min value</b> <span>{this.reportName()}</span> :
</div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
Min Value : <span>{this.minValue()}</span> Min Value : <span>{this.minValue()}</span>
</div> </div>
<div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', paddingBottom: 5, fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 14, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}>
Max Value : <span>{this.maxValue()}</span> Max Value : <span>{this.maxValue()}</span>
</div> </div>
{this.state.notes && {this.state.notes &&
<div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', fontFamily: 'Nunito Sans, sans-serif' }}> <div style={{ justifyContent: 'center', fontSize: 12, color: '#1D2995', paddingTop: 5, fontFamily: 'Nunito Sans, sans-serif' }}>
Note: The actual maximum value <span>{this.notesMessage()}</span> Note: The actual maximum value <span>{this.notesMessage()}</span>
</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