Commit 786f93d5 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 9438424c 03adb3b3
......@@ -615,6 +615,8 @@ export default class CreateParameter extends Component {
errorEndDate: false,
errorGroup: false,
errorPerusahaan: false,
errorThresholdCurrency: false,
msgErrorThresholdCurrency: '',
msgErrorPerusahaan: '',
msgErrorGroup: '',
msgErrorParameter: '',
......@@ -643,6 +645,8 @@ export default class CreateParameter extends Component {
errorEndDate: false,
errorGroup: false,
errorPerusahaan: false,
errorThresholdCurrency: false,
msgErrorThresholdCurrency: '',
msgErrorPerusahaan: '',
msgErrorGroup: '',
msgErrorParameter: '',
......@@ -672,6 +676,8 @@ export default class CreateParameter extends Component {
errorEndDate: false,
errorGroup: false,
errorPerusahaan: false,
errorThresholdCurrency: false,
msgErrorThresholdCurrency: '',
msgErrorPerusahaan: '',
msgErrorGroup: '',
msgErrorParameter: '',
......@@ -702,6 +708,8 @@ export default class CreateParameter extends Component {
errorEndDate: false,
errorGroup: false,
errorPerusahaan: false,
errorThresholdCurrency: false,
msgErrorThresholdCurrency: '',
msgErrorPerusahaan: '',
msgErrorGroup: '',
msgErrorParameter: '',
......@@ -1202,15 +1210,36 @@ export default class CreateParameter extends Component {
return obj;
}
validasiCurrencyTC(){
console.log(this.state.getThresholdCurrency)
console.log(this.state.errorThresholdCurrency)
console.log(this.state.msgErrorThresholdCurrency)
if (R.isNil(this.state.getThresholdCurrency)){
this.setState({ errorThresholdCurrency: true, msgErrorThresholdCurrency: 'Currency Cannot be Empty' })
}
}
async validasiMaxValue() {
let data = await this.validasiValueData()
let minMaxValidasi = await this.validasiMinMaxValue()
if (R.isEmpty(data.maxValue)) {
this.validasiMaxResponse()
this.validasiCurrencyTC()
} else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0, 1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
if (R.isNil(this.state.getTypes)){
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && data.maxValue.substring(0,1) != "0" && data.maxValue.length <= minMaxValidasi.maxLength) {
this.validasiCurrencyTC()
} else {
this.validasiMaxResponse()
this.validasiCurrencyTC()
}
}else {
if (data.maxValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.maxValue.substring(0,1) != "0" : true ) && data.maxValue.length <= minMaxValidasi.maxLength) {
this.validasiCurrencyTC()
} else {
this.validasiMaxResponse()
this.validasiCurrencyTC()
}
}
}
}
......@@ -1231,12 +1260,21 @@ export default class CreateParameter extends Component {
this.validasiMinResponse()
this.validasiFormatData()
} else {
if (data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0, 1) != "0" && data.minValue.length <= minMaxValidasi.minLength) {
if (R.isNil(this.state.getTypes)){
if(data.minValue.match(minMaxValidasi.minMaxRegex) && data.minValue.substring(0,1) != "0" && data.minValue.length <= minMaxValidasi.minLength){
this.validasiFormatData()
} else {
this.validasiMinResponse()
this.validasiFormatData()
}
}else {
if(data.minValue.match(minMaxValidasi.minMaxRegex) && (this.state.getTypes.setting_group_name != "THRESHOLD_CONTROL" ? data.minValue.substring(0,1) != "0" : true ) && data.minValue.length <= minMaxValidasi.minLength){
this.validasiFormatData()
} else {
this.validasiMinResponse()
this.validasiFormatData()
}
}
}
}
......
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