Skip to content

T
Tia-dev
Commit 3e5a52dc authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'ENV-DEV' into 'ENV-STAGING' 

Fixing Issue UAT

See merge request !2054
parents d7682f72 d1a2556f
Show whitespace changes
Inline Side-by-side
Showing with 183 additions and 109 deletions
src/container/MasterData/Parameter/CreateParameter.js
View file @ 3e5a52dc
...@@ -690,39 +690,45 @@ export default class CreateParameter extends Component { ...@@ -690,39 +690,45 @@ export default class CreateParameter extends Component {
}else { }else {
if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") { if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") {
if (R.isEmpty(data.value)) { if (R.isEmpty(data.value)) {
if (R.isNil(this.state.getPerusahaan)){
}else {
if (this.state.getPerusahaan.company_name == "Default"){
}else {
this.setState({errorValue: true, msgErrorValue: 'Value Cannot be Empty'}) this.setState({errorValue: true, msgErrorValue: 'Value Cannot be Empty'})
}
}
} else { } else {
if (R.isNil(this.state.getParameter)) { if (R.isNil(this.state.getParameter)) {
} else { } else {
switch (this.state.getParameter.setting_type_name) { switch (this.state.getParameter.setting_type_name) {
case "MASTER_BUDGET": case "MASTER_BUDGET":
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : 2023'})
break break
case "MONTHLY_REPORT": case "MONTHLY_REPORT":
this.setState({ this.setState({
errorValue: true, errorValue: true,
msgErrorValue: 'format value salah, contoh : Jan 2023' msgErrorValue: 'Incorrect value format, example : Jan 2023'
}) })
break break
case "OUTLOOK_Q1": case "OUTLOOK_Q1":
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : Q1 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : Q1 2023'})
break break
case "OUTLOOK_Q2": case "OUTLOOK_Q2":
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : Q2 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : Q2 2023'})
break break
case "OUTLOOK_Q3": case "OUTLOOK_Q3":
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : Q3 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : Q3 2023'})
break break
case "OUTLOOK_PA": case "OUTLOOK_PA":
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : 2023'})
break break
default: default:
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : 2023'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : 2023'})
} }
} }
} }
} else if (this.state.getTypes.setting_group_name == "CURRENCY") { } else if (this.state.getTypes.setting_group_name == "CURRENCY") {
this.setState({errorValue: true, msgErrorValue: 'format value salah, contoh : 15000'}) this.setState({errorValue: true, msgErrorValue: 'Incorrect value format, example : 15000'})
} }
} }
} }
...@@ -731,12 +737,22 @@ export default class CreateParameter extends Component { ...@@ -731,12 +737,22 @@ export default class CreateParameter extends Component {
let data = await this.validasiValueData() let data = await this.validasiValueData()
let response = await this.validasiRegexValue() let response = await this.validasiRegexValue()
let minMaxValidasi = await this.validasiMinMaxValue() let minMaxValidasi = await this.validasiMinMaxValue()
console.log("Masuk ke menu creat : " + R.isNil(this.state.getFormatData))
if (this.props.type === "edit"){ if (this.props.type === "edit"){
if (R.isNil(this.state.getTypes)) { if (R.isNil(this.state.getTypes)) {
} else { } else {
if (this.state.getTypes.setting_group_name == "CURRENCY_MONEY_FORMAT") { if (this.state.getTypes.setting_group_name == "CURRENCY_MONEY_FORMAT") {
if (R.isNil(this.state.getParameter)){
}else {
if (R.isNil(this.state.getPerusahaan)){
}else {
if (R.isNil(this.state.getFormatData)){
}else {
this.updateParameterCurrebcyMoneyFormat() this.updateParameterCurrebcyMoneyFormat()
} else if (this.state.getTypes.setting_group_name == "CURRENCY") { }
}
}
} else if (this.state.getTypes.setticonng_group_name == "CURRENCY") {
if (R.isNil(this.state.getReportName)) { if (R.isNil(this.state.getReportName)) {
} else { } else {
if (R.isEmpty(data.value)) { if (R.isEmpty(data.value)) {
...@@ -756,8 +772,33 @@ export default class CreateParameter extends Component { ...@@ -756,8 +772,33 @@ export default class CreateParameter extends Component {
} }
} }
} }
} else if (this.state.getTypes.setting_group_name == "THRESHOLD_VARIANCE" || this.state.getTypes.setting_group_name == "THRESHOLD_CONTROL" ) {
if (R.isEmpty(data.minValue)) {
} else {
if (data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0, 1) != "0" && data.minValue.length <= minMaxValidasi.minLength) {
if (R.isEmpty(data.maxValue)) {
} else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0, 1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
this.updateParameter()
}
}
}
}
} else if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") { } else if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") {
if (R.isEmpty(data.value)) { if (R.isEmpty(data.value)) {
if (this.state.getPerusahaan.company_name == "Default"){
if (R.isEmpty(data.minValue)) {
} else {
if(data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0,1) != "0" && data.minValue.length <= minMaxValidasi.minLength){
if (R.isEmpty(data.maxValue)) {
} else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0, 1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
this.updateParameter()
}
}
}
}
}
} else { } else {
if (data.value.match(response.regexValue) && data.value.length <= response.valueLength) { if (data.value.match(response.regexValue) && data.value.length <= response.valueLength) {
if (R.isEmpty(data.minValue)) { if (R.isEmpty(data.minValue)) {
...@@ -773,15 +814,31 @@ export default class CreateParameter extends Component { ...@@ -773,15 +814,31 @@ export default class CreateParameter extends Component {
} }
} }
} }
}else {
if (R.isNil(this.state.getParameter)){
}else {
if (R.isNil(this.state.getPerusahaan)){
}else { }else {
this.updateParameter() this.updateParameter()
} }
} }
}
}
}else { }else {
if (R.isNil(this.state.getTypes)) { if (R.isNil(this.state.getTypes)) {
} else { } else {
if (this.state.getTypes.setting_group_name == "CURRENCY_MONEY_FORMAT") { if (this.state.getTypes.setting_group_name == "CURRENCY_MONEY_FORMAT") {
if (R.isNil(this.state.getParameter)){
}else {
if (R.isNil(this.state.getPerusahaan)){
}else {
console.log()
if (R.isNil(this.state.getFormatData)){
}else {
this.createParameterCurrebcyMoneyFormat() this.createParameterCurrebcyMoneyFormat()
}
}
}
} else if (this.state.getTypes.setting_group_name == "CURRENCY") { } else if (this.state.getTypes.setting_group_name == "CURRENCY") {
if (R.isNil(this.state.getReportName)) { if (R.isNil(this.state.getReportName)) {
} else { } else {
...@@ -802,8 +859,33 @@ export default class CreateParameter extends Component { ...@@ -802,8 +859,33 @@ export default class CreateParameter extends Component {
} }
} }
} }
} else if (this.state.getTypes.setting_group_name == "THRESHOLD_VARIANCE" || this.state.getTypes.setting_group_name == "THRESHOLD_CONTROL" ) {
if (R.isEmpty(data.minValue)) {
} else {
if (data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0, 1) != "0" && data.minValue.length <= minMaxValidasi.minLength) {
if (R.isEmpty(data.maxValue)) {
} else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0, 1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
this.createParameter()
}
}
}
}
} else if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") { } else if (this.state.getTypes.setting_group_name == "REPORT_SUBMIT_PERIOD") {
if (R.isEmpty(data.value)) { if (R.isEmpty(data.value)) {
if (this.state.getPerusahaan.company_name == "Default"){
if (R.isEmpty(data.minValue)) {
} else {
if(data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0,1) != "0" && data.minValue.length <= minMaxValidasi.minLength) {
if (R.isEmpty(data.maxValue)) {
} else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0,1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
this.createParameter()
}
}
}
}
}
} else { } else {
if (data.value.match(response.regexValue) && data.value.length <= response.valueLength) { if (data.value.match(response.regexValue) && data.value.length <= response.valueLength) {
if (R.isEmpty(data.minValue)) { if (R.isEmpty(data.minValue)) {
...@@ -819,12 +901,18 @@ export default class CreateParameter extends Component { ...@@ -819,12 +901,18 @@ export default class CreateParameter extends Component {
} }
} }
} }
}else {
if (R.isNil(this.state.getParameter)){
}else {
if (R.isNil(this.state.getPerusahaan)){
}else { }else {
this.createParameter() this.createParameter()
} }
} }
} }
} }
}
}
validasiFormatResponse(){ validasiFormatResponse(){
if (R.isNil(this.state.getTypes)){ if (R.isNil(this.state.getTypes)){
...@@ -848,34 +936,27 @@ export default class CreateParameter extends Component { ...@@ -848,34 +936,27 @@ export default class CreateParameter extends Component {
if (R.isNil(this.state.getParameter)) { if (R.isNil(this.state.getParameter)) {
obj = { regexValue: (/\b\d{4}\b/), valueLength: 4 } obj = { regexValue: (/\b\d{4}\b/), valueLength: 4 }
} else { } else {
console.log(this.state.getParameter.setting_type_name);
switch (this.state.getParameter.setting_type_name) { switch (this.state.getParameter.setting_type_name) {
case "MASTER_BUDGET": case "MASTER_BUDGET":
obj = { regexValue: (/\b\d{4}\b/), valueLength: 4 } obj = { regexValue: (/\b\d{4}\b/), valueLength: 4 }
console.log("masuk MB" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
case "MONTHLY_REPORT": case "MONTHLY_REPORT":
obj = { obj = {
regexValue: (/^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}$/), regexValue: (/^(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}$/),
valueLength: 8 valueLength: 8
} }
console.log("masuk MR" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
case "OUTLOOK_Q1": case "OUTLOOK_Q1":
obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 } obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 }
console.log("masuk Q1" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
case "OUTLOOK_Q2": case "OUTLOOK_Q2":
obj = { regexValue: (/Q2\s\d{4}/), valueLength: 7 } obj = { regexValue: (/Q2\s\d{4}/), valueLength: 7 }
console.log("masuk Q2" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
case "OUTLOOK_Q3": case "OUTLOOK_Q3":
obj = { regexValue: (/Q3\s\d{4}/), valueLength: 7 } obj = { regexValue: (/Q3\s\d{4}/), valueLength: 7 }
console.log("masuk Q3" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
case "OUTLOOK_PA": case "OUTLOOK_PA":
obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 } obj = { regexValue: (/\b\d{4}\b/), valueLength: 4 }
console.log("masuk PA" + this.state.regexValue + " panjang" + this.state.valueLength);
break break
default: default:
obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 } obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 }
...@@ -893,20 +974,20 @@ export default class CreateParameter extends Component { ...@@ -893,20 +974,20 @@ export default class CreateParameter extends Component {
case "REPORT_SUBMIT_PERIOD": case "REPORT_SUBMIT_PERIOD":
this.setState({ this.setState({
errorMaxValue: true, errorMaxValue: true,
msgErrorMaxValue: 'format max value salah, contoh : 31 Jan 2023' msgErrorMaxValue: 'Incorrect max value format, example : 31 Jan 2023'
}) })
break break
case "CURRENCY": case "CURRENCY":
this.setState({ this.setState({
errorMaxValue: true, errorMaxValue: true,
msgErrorMaxValue: 'format max value salah, contoh : 31 Jan 2023' msgErrorMaxValue: 'Incorrect max value format, example : 31 Jan 2023'
}) })
break break
case "THRESHOLD_CONTROL": case "THRESHOLD_CONTROL":
this.setState({ errorMaxValue: true, msgErrorMaxValue: 'format max value salah, contoh : 99999999' }) this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Incorrect max value format, example : 99999999' })
break break
case "THRESHOLD_VARIANCE": case "THRESHOLD_VARIANCE":
this.setState({ errorMaxValue: true, msgErrorMaxValue: 'format max value salah, contoh : 99999999' }) this.setState({ errorMaxValue: true, msgErrorMaxValue: 'Incorrect max value format, example : 99999999' })
break break
default: default:
this.setState({ errorMaxValue: false, msgErrorMaxValue: '' }) this.setState({ errorMaxValue: false, msgErrorMaxValue: '' })
...@@ -921,20 +1002,20 @@ export default class CreateParameter extends Component { ...@@ -921,20 +1002,20 @@ export default class CreateParameter extends Component {
case "REPORT_SUBMIT_PERIOD": case "REPORT_SUBMIT_PERIOD":
this.setState({ this.setState({
errorMinValue: true, errorMinValue: true,
msgErrorMinValue: 'format min value salah, contoh : 1 Jan 2023' msgErrorMinValue: 'Incorrect min value format, example : 1 Jan 2023'
}) })
break break
case "CURRENCY": case "CURRENCY":
this.setState({ this.setState({
errorMinValue: true, errorMinValue: true,
msgErrorMinValue: 'format min value salah, contoh : 1 Jan 2023' msgErrorMinValue: 'Incorrect min value format, example : 1 Jan 2023'
}) })
break break
case "THRESHOLD_CONTROL": case "THRESHOLD_CONTROL":
this.setState({ errorMinValue: true, msgErrorMinValue: 'format min value salah, contoh : 99999999' }) this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : 99999999' })
break break
case "THRESHOLD_VARIANCE": case "THRESHOLD_VARIANCE":
this.setState({ errorMinValue: true, msgErrorMinValue: 'format min value salah, contoh : 99999999' }) this.setState({ errorMinValue: true, msgErrorMinValue: 'Incorrect min value format, example : 99999999' })
break break
default: default:
this.setState({ errorMinValue: false, msgErrorMinValue: '' }) this.setState({ errorMinValue: false, msgErrorMinValue: '' })
...@@ -947,7 +1028,6 @@ export default class CreateParameter extends Component { ...@@ -947,7 +1028,6 @@ export default class CreateParameter extends Component {
if (R.isNil(this.state.getTypes)) { if (R.isNil(this.state.getTypes)) {
obj = { minMaxRegex: (/^-?\d+\.?\d+$/), minLength: this.state.minValue.length, maxLength: this.state.maxValue.length } obj = { minMaxRegex: (/^-?\d+\.?\d+$/), minLength: this.state.minValue.length, maxLength: this.state.maxValue.length }
} else { } else {
console.log(this.state.getTypes.setting_group_name);
switch (this.state.getTypes.setting_group_name) { switch (this.state.getTypes.setting_group_name) {
case "CURRENCY": case "CURRENCY":
obj = { minMaxRegex: (/\b\d{1,2}\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\b/), minLength: 11, maxLength: 11, regexValue: (/^\d+$/)} obj = { minMaxRegex: (/\b\d{1,2}\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s\d{4}\b/), minLength: 11, maxLength: 11, regexValue: (/^\d+$/)}
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 3e5a52dc
...@@ -1129,7 +1129,7 @@ export default class ProfitLossMR extends Component { ...@@ -1129,7 +1129,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[7]), 1)} value={fixNumber(Number(tableMeta.rowData[7]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[7]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1163,7 +1163,7 @@ export default class ProfitLossMR extends Component { ...@@ -1163,7 +1163,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7]) == 0 ? "0.0" : Number(tableMeta.rowData[7])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1219,7 +1219,7 @@ export default class ProfitLossMR extends Component { ...@@ -1219,7 +1219,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[8]), 1)} value={fixNumber(Number(tableMeta.rowData[8]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[8]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1234,7 +1234,7 @@ export default class ProfitLossMR extends Component { ...@@ -1234,7 +1234,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[8]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : Number(tableMeta.rowData[8])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[8]), 1) : Number(tableMeta.rowData[8]) == 0 ? "0.0" : Number(tableMeta.rowData[8])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1254,7 +1254,7 @@ export default class ProfitLossMR extends Component { ...@@ -1254,7 +1254,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[9]), 1)} value={fixNumber(Number(tableMeta.rowData[9]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[9]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1269,7 +1269,7 @@ export default class ProfitLossMR extends Component { ...@@ -1269,7 +1269,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[9]), 1) : Number(tableMeta.rowData[9])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[9]), 1) : Number(tableMeta.rowData[9]) == 0 ? "0.0" : Number(tableMeta.rowData[9])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1290,7 +1290,7 @@ export default class ProfitLossMR extends Component { ...@@ -1290,7 +1290,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[10]), 1)} value={fixNumber(Number(tableMeta.rowData[10]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[10]), 1)}
// decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} // decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1306,7 +1306,7 @@ export default class ProfitLossMR extends Component { ...@@ -1306,7 +1306,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10]) == 0 ? "0.0" : Number(tableMeta.rowData[10])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, "actual") handleChange(event.target.value, tableMeta, "actual")
...@@ -1324,7 +1324,7 @@ export default class ProfitLossMR extends Component { ...@@ -1324,7 +1324,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValue(value, tableMeta)), 1) : Number(handleValue(value, tableMeta))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValue(value, tableMeta)), 1) : Number(handleValue(value, tableMeta)) == 0 ? "0.0" : Number(handleValue(value, tableMeta))}
// value={Number(handleValue(tableMeta, 2)).toFixed(1)} // value={Number(handleValue(tableMeta, 2)).toFixed(1)}
/> />
</span> : </span> :
...@@ -1341,7 +1341,7 @@ export default class ProfitLossMR extends Component { ...@@ -1341,7 +1341,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormula(value, tableMeta, 2)), 1) : Number(handleFormula(value, tableMeta, 2))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleFormula(value, tableMeta, 2)), 1) : Number(handleFormula(value, tableMeta, 2)) == 0 ? "0.0" : Number(handleFormula(value, tableMeta, 2))}
/> />
} }
/> />
...@@ -1357,7 +1357,7 @@ export default class ProfitLossMR extends Component { ...@@ -1357,7 +1357,7 @@ export default class ProfitLossMR extends Component {
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={Number(tableMeta.rowData[10]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[10]), 1) : Number(tableMeta.rowData[10]) == 0 ? "0.0" : Number(tableMeta.rowData[10])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1405,7 +1405,7 @@ export default class ProfitLossMR extends Component { ...@@ -1405,7 +1405,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[23]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[23]), 1)} value={fixNumber(Number(tableMeta.rowData[23]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[23]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1420,7 +1420,7 @@ export default class ProfitLossMR extends Component { ...@@ -1420,7 +1420,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTotal(tableMeta.rowData[11], tableMeta)) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleTotal(tableMeta.rowData[11], tableMeta)), 1) : Number(handleTotal(tableMeta.rowData[11], tableMeta))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleTotal(tableMeta.rowData[11], tableMeta)), 1) : Number(handleTotal(tableMeta.rowData[11], tableMeta)) == 0 ? "0.0" : Number(handleTotal(tableMeta.rowData[11], tableMeta))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1453,7 +1453,7 @@ export default class ProfitLossMR extends Component { ...@@ -1453,7 +1453,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[12]), 1)} value={fixNumber(Number(tableMeta.rowData[12]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[12]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1468,7 +1468,7 @@ export default class ProfitLossMR extends Component { ...@@ -1468,7 +1468,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[12]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[12]), 1) : Number(tableMeta.rowData[12])} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[12]), 1) : Number(tableMeta.rowData[12]) == 0 ? "0.0" : Number(tableMeta.rowData[12])}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1554,7 +1554,7 @@ export default class ProfitLossMR extends Component { ...@@ -1554,7 +1554,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[13]), 1)} value={fixNumber(Number(tableMeta.rowData[13]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[13]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1569,7 +1569,7 @@ export default class ProfitLossMR extends Component { ...@@ -1569,7 +1569,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1) : Number(handleVariance(tableMeta, 1, 0))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1) : Number(handleVariance(tableMeta, 1, 0)) == 0 ? "0.0" : Number(handleVariance(tableMeta, 1, 0))}
// value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1) : Number(handleVariance(tableMeta, 1, 0))} // value={Number(tableMeta.rowData[13]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 1, 0)), 1) : Number(handleVariance(tableMeta, 1, 0))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
...@@ -1592,7 +1592,7 @@ export default class ProfitLossMR extends Component { ...@@ -1592,7 +1592,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[14]), 1)} value={fixNumber(Number(tableMeta.rowData[14]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[14]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1608,7 +1608,7 @@ export default class ProfitLossMR extends Component { ...@@ -1608,7 +1608,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[14]) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1)} value={fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1)}
// value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1) : Number(handleVariancePercent(tableMeta, 1, 1))} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 1, 1)), 1) : Number(handleVariancePercent(tableMeta, 1, 1))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
// value={11} // value={11}
...@@ -1635,7 +1635,7 @@ export default class ProfitLossMR extends Component { ...@@ -1635,7 +1635,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[15]), 1)} value={fixNumber(Number(tableMeta.rowData[15]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[15]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1650,7 +1650,7 @@ export default class ProfitLossMR extends Component { ...@@ -1650,7 +1650,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2)) == 0 ? "0.0" : Number(handleVariance(tableMeta, 2, 2))}
// value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2))} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 2, 2)), 1) : Number(handleVariance(tableMeta, 2, 2))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
...@@ -1673,7 +1673,7 @@ export default class ProfitLossMR extends Component { ...@@ -1673,7 +1673,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[16]), 1)} value={fixNumber(Number(tableMeta.rowData[16]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[16]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1689,7 +1689,7 @@ export default class ProfitLossMR extends Component { ...@@ -1689,7 +1689,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1)} value={fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1)}
// value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1) : Number(handleVariancePercent(tableMeta, 2, 3))} // value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariancePercent(tableMeta, 2, 3)), 1) : Number(handleVariancePercent(tableMeta, 2, 3))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
...@@ -1715,7 +1715,7 @@ export default class ProfitLossMR extends Component { ...@@ -1715,7 +1715,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[17]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[17]), 1)} value={fixNumber(Number(tableMeta.rowData[17]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[17]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1730,7 +1730,7 @@ export default class ProfitLossMR extends Component { ...@@ -1730,7 +1730,7 @@ export default class ProfitLossMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 3, 4)), 1) : Number(handleVariance(tableMeta, 3, 4))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleVariance(tableMeta, 3, 4)), 1) : Number(handleVariance(tableMeta, 3, 4)) == 0 ? "0.0" : Number(handleVariance(tableMeta, 3, 4))}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
...@@ -1752,7 +1752,7 @@ export default class ProfitLossMR extends Component { ...@@ -1752,7 +1752,7 @@ export default class ProfitLossMR extends Component {
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[18]), 1)} value={fixNumber(Number(tableMeta.rowData[18]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[18]), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
: :
...@@ -1769,7 +1769,7 @@ export default class ProfitLossMR extends Component { ...@@ -1769,7 +1769,7 @@ export default class ProfitLossMR extends Component {
style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[18]) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 3, 5)), 1)} value={fixNumber(Number(handleVariancePercent(tableMeta, 3, 5)), 1) == 0 ? "0.0" : fixNumber(Number(handleVariancePercent(tableMeta, 3, 5)), 1)}
decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16} decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
/> />
} }
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ 3e5a52dc
...@@ -1055,7 +1055,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1055,7 +1055,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbc) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbc), 2) : fixNumber(Number(value.tbc), 1)} value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (fixNumber(Number(value.tbc), 2) == 0 ? "0.0" : fixNumber(Number(value.tbc), 2)) : (fixNumber(Number(value.tbc), 1) == 0 ? "0.0" : fixNumber(Number(value.tbc), 1))}
/> />
} }
/> />
...@@ -1069,7 +1069,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1069,7 +1069,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 1)), 1) : Number(handleParent(tableMeta, 1))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 1)), 1) : Number(handleParent(tableMeta, 1)) == 0 ? "0.0" : Number(handleParent(tableMeta, 1))}
/> />
</span> </span>
: :
...@@ -1086,7 +1086,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1086,7 +1086,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="input" placeholder="input"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value.tbc), 1) : Number(value.tbc)} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(value.tbc), 1) : Number(value.tbc) == 0 ? "0.0" : Number(value.tbc)}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 0) handleChange(event.target.value, tableMeta, 0)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1108,7 +1108,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1108,7 +1108,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbc) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 1)), 1) : Number(handleValueFormula(value, tableMeta, 1))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 1)), 1) : Number(handleValueFormula(value, tableMeta, 1)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 1))}
/> />
} }
/> />
...@@ -1135,7 +1135,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1135,7 +1135,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.fcp) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.fcp), 2) : fixNumber(Number(value.fcp), 1)} value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (fixNumber(Number(value.fcp), 2) == 0 ? "0.0" : fixNumber(Number(value.fcp), 2)) : (fixNumber(Number(value.fcp), 1) == 0 ? "0.0" : fixNumber(Number(value.fcp), 1))}
/> />
} }
/> />
...@@ -1149,7 +1149,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1149,7 +1149,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 2)), 1) : Number(handleParent(tableMeta, 2))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 2)), 1) : Number(handleParent(tableMeta, 2)) == 0 ? "0.0" : Number(handleParent(tableMeta, 2))}
/> />
</span> </span>
: :
...@@ -1165,7 +1165,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1165,7 +1165,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
placeholder="input" placeholder="input"
value={Number(value.fcp) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.fcp), 2) : fixNumber(Number(value.fcp), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.fcp) : Number(value.fcp))} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.fcp), 2) : fixNumber(Number(value.fcp), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (Number(value.fcp) == 0 ? "0.0" : Number(value.fcp)) : (Number(value.fcp) == 0 ? "0.0" : Number(value.fcp)))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 1) handleChange(event.target.value, tableMeta, 1)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1187,7 +1187,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1187,7 +1187,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.fcp) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 2)), 1) : Number(handleValueFormula(value, tableMeta, 2))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 2)), 1) : Number(handleValueFormula(value, tableMeta, 2)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 2))}
/> />
} }
/> />
...@@ -1213,7 +1213,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1213,7 +1213,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbf), 2) : fixNumber(Number(value.tbf), 1)} value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (fixNumber(Number(value.tbf), 2) == 0 ? "0.0" : fixNumber(Number(value.tbf), 2)) : (fixNumber(Number(value.tbf), 1) == 0 ? "0.0" : fixNumber(Number(value.tbf), 1))}
/> />
} }
/> />
...@@ -1227,7 +1227,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1227,7 +1227,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 3)), 1) : Number(handleParent(tableMeta, 3))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 3)), 1) : Number(handleParent(tableMeta, 3)) == 0 ? "0.0" : Number(handleParent(tableMeta, 3))}
/> />
</span> </span>
: :
...@@ -1243,7 +1243,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1243,7 +1243,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)} disabled={this.props.isApprover ? true : (this.state.get_for == 'view' ? true : false)}
placeholder="input" placeholder="input"
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbf), 2) : fixNumber(Number(value.tbf), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value.tbf) : Number(value.tbf))} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value.tbf), 2) : fixNumber(Number(value.tbf), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (Number(value.tbf) == 0 ? "0.0" : Number(value.tbf)) : (Number(value.tbf) == 0 ? "0.0" : Number(value.tbf)))}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta, 2) handleChange(event.target.value, tableMeta, 2)
// console.log(dataTable2) // console.log(dataTable2)
...@@ -1265,7 +1265,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1265,7 +1265,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 2) : fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleValueFormula(value, tableMeta, 3)) : Number(handleValueFormula(value, tableMeta, 3)))} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 2) : fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))) : (Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))))}
/> />
} }
/> />
...@@ -1288,7 +1288,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1288,7 +1288,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1305,7 +1305,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1305,7 +1305,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1324,7 +1324,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1324,7 +1324,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))}
/> : /> :
<LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow> <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[14].tbf}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat <NumberFormat
...@@ -1341,7 +1341,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1341,7 +1341,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(value.tbf) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleValueFormula(value, tableMeta, 3)), 1) : Number(handleValueFormula(value, tableMeta, 3)) == 0 ? "0.0" : Number(handleValueFormula(value, tableMeta, 3))}
/> />
</LightTooltip> </LightTooltip>
: :
...@@ -1386,7 +1386,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1386,7 +1386,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(tableMeta.rowData[16]), 2) : fixNumber(Number(tableMeta.rowData[16]), 1)} value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (fixNumber(Number(tableMeta.rowData[16]), 2) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[16]), 2)) : (fixNumber(Number(tableMeta.rowData[16]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[16]), 1))}
/> />
} }
/> />
...@@ -1400,7 +1400,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1400,7 +1400,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[16]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4)) == 0 ? "0.0" : Number(handleParent(tableMeta, 4))}
/> />
</span> </span>
: :
...@@ -1455,7 +1455,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1455,7 +1455,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(handleTotal(value, tableMeta, 4)) : Number(handleTotal(value, tableMeta, 4)))} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(handleTotal(value, tableMeta, 4)), 2) : fixNumber(Number(handleTotal(value, tableMeta, 4)), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (Number(handleTotal(value, tableMeta, 4)) == 0 ? "0.0" : Number(handleTotal(value, tableMeta, 4))) : (Number(handleTotal(value, tableMeta, 4)) == 0 ? "0.0" : Number(handleTotal(value, tableMeta, 4))))}
/> />
} }
/> />
...@@ -1499,7 +1499,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1499,7 +1499,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(tableMeta.rowData[11]), 2) : fixNumber(Number(tableMeta.rowData[11]), 1)} value={String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (fixNumber(Number(tableMeta.rowData[11]), 2) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[11]), 2)) : (fixNumber(Number(tableMeta.rowData[11]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[11]), 1))}
/> />
} }
/> />
...@@ -1513,7 +1513,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1513,7 +1513,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4))} value={this.props.defaultCurrency.id == 1 ? fixNumber(Number(handleParent(tableMeta, 4)), 1) : Number(handleParent(tableMeta, 4)) == 0 ? "0.0" : Number(handleParent(tableMeta, 4))}
/> />
</span> </span>
: :
...@@ -1528,7 +1528,7 @@ export default class TaxPlanningMR extends Component { ...@@ -1528,7 +1528,7 @@ export default class TaxPlanningMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value), 2) : fixNumber(Number(value), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? Number(value) : Number(value))} value={this.props.defaultCurrency.id == 1 ? (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? fixNumber(Number(value), 2) : fixNumber(Number(value), 1)) : (String(tableMeta.rowData[8]).toLocaleUpperCase() == "CORPORATE INCOME TAX" ? (Number(value) == 0 ? "0.0" : Number(value)) : (Number(value) == 0 ? "0.0" : Number(value)))}
/> />
} }
/> />
......
src/library/PopUpInformation.js
View file @ 3e5a52dc
...@@ -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