From d9afcc546f4ba73072aa4d15d07cd7e5922cd977 Mon Sep 17 00:00:00 2001 From: Tobias Feldmann <t.feldmann@adito.de> Date: Wed, 31 Jul 2019 11:38:51 +0200 Subject: [PATCH] Address webservice code in fields deactivated --- entity/Address_entity/Address_entity.aod | 3 --- .../Address_entity/entityfields/address/displayValueProcess.js | 3 ++- entity/Address_entity/entityfields/address/onValueChange.js | 3 ++- entity/Address_entity/entityfields/address/valueProcess.js | 3 ++- entity/Address_entity/entityfields/city/displayValueProcess.js | 3 ++- entity/Address_entity/entityfields/city/onValueChange.js | 3 ++- entity/Address_entity/entityfields/city/valueProcess.js | 3 ++- entity/Address_entity/entityfields/zip/displayValueProcess.js | 3 ++- entity/Address_entity/entityfields/zip/onValueChange.js | 3 ++- entity/Address_entity/entityfields/zip/valueProcess.js | 3 ++- 10 files changed, 18 insertions(+), 12 deletions(-) diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod index 4394a1da2d..d7bb675f8b 100644 --- a/entity/Address_entity/Address_entity.aod +++ b/entity/Address_entity/Address_entity.aod @@ -12,7 +12,6 @@ <entityField> <name>ADDRESS</name> <title>Street</title> - <consumer>StreetValidation</consumer> <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess> <textInputAllowed v="true" /> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess> @@ -48,7 +47,6 @@ <entityField> <name>CITY</name> <title>City</title> - <consumer>CityValidation</consumer> <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess> <textInputAllowed v="true" /> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/city/valueProcess.js</valueProcess> @@ -86,7 +84,6 @@ <entityField> <name>ZIP</name> <title>Postcode</title> - <consumer>ZipValidation</consumer> <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess> <textInputAllowed v="true" /> <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/valueProcess.js</valueProcess> diff --git a/entity/Address_entity/entityfields/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js index 10012b6d85..18985f7a00 100644 --- a/entity/Address_entity/entityfields/address/displayValueProcess.js +++ b/entity/Address_entity/entityfields/address/displayValueProcess.js @@ -2,4 +2,5 @@ import("system.vars"); import("system.result"); // Needed for instant refresh if set by neon.setFieldValue -result.string(vars.get("$field.ADDRESS")); \ No newline at end of file +// use the code if address webservice is active +//result.string(vars.get("$field.ADDRESS")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/address/onValueChange.js b/entity/Address_entity/entityfields/address/onValueChange.js index c19e660f10..abec5ca7ea 100644 --- a/entity/Address_entity/entityfields/address/onValueChange.js +++ b/entity/Address_entity/entityfields/address/onValueChange.js @@ -1,4 +1,5 @@ import("system.vars"); import("WsValidation_lib"); -WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file +// use the code if address webservice is active +//WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js index e5e514c908..2c9d496185 100644 --- a/entity/Address_entity/entityfields/address/valueProcess.js +++ b/entity/Address_entity/entityfields/address/valueProcess.js @@ -2,4 +2,5 @@ import("system.result"); import("WsValidation_lib"); import("system.vars"); -result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file +// use the code if address webservice is active +//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/city/displayValueProcess.js b/entity/Address_entity/entityfields/city/displayValueProcess.js index 60c162e202..0738ded179 100644 --- a/entity/Address_entity/entityfields/city/displayValueProcess.js +++ b/entity/Address_entity/entityfields/city/displayValueProcess.js @@ -2,4 +2,5 @@ import("system.vars"); import("system.result"); // Needed for instant refresh if set by neon.setFieldValue -result.string(vars.get("$field.CITY")); \ No newline at end of file +// use the code if address webservice is active +//result.string(vars.get("$field.CITY")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/city/onValueChange.js b/entity/Address_entity/entityfields/city/onValueChange.js index c19e660f10..abec5ca7ea 100644 --- a/entity/Address_entity/entityfields/city/onValueChange.js +++ b/entity/Address_entity/entityfields/city/onValueChange.js @@ -1,4 +1,5 @@ import("system.vars"); import("WsValidation_lib"); -WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file +// use the code if address webservice is active +//WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/city/valueProcess.js b/entity/Address_entity/entityfields/city/valueProcess.js index e5e514c908..2c9d496185 100644 --- a/entity/Address_entity/entityfields/city/valueProcess.js +++ b/entity/Address_entity/entityfields/city/valueProcess.js @@ -2,4 +2,5 @@ import("system.result"); import("WsValidation_lib"); import("system.vars"); -result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file +// use the code if address webservice is active +//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/zip/displayValueProcess.js b/entity/Address_entity/entityfields/zip/displayValueProcess.js index bb62a2e6ba..219ae2ffc0 100644 --- a/entity/Address_entity/entityfields/zip/displayValueProcess.js +++ b/entity/Address_entity/entityfields/zip/displayValueProcess.js @@ -2,4 +2,5 @@ import("system.vars"); import("system.result"); // Needed for instant refresh if set by neon.setFieldValue -result.string(vars.get("$field.ZIP")); \ No newline at end of file +// use the code if address webservice is active +//result.string(vars.get("$field.ZIP")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/zip/onValueChange.js b/entity/Address_entity/entityfields/zip/onValueChange.js index c19e660f10..abec5ca7ea 100644 --- a/entity/Address_entity/entityfields/zip/onValueChange.js +++ b/entity/Address_entity/entityfields/zip/onValueChange.js @@ -1,4 +1,5 @@ import("system.vars"); import("WsValidation_lib"); -WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file +// use the code if address webservice is active +//WsValidationUtils.setAddressFields(vars.get("$local.value")); \ No newline at end of file diff --git a/entity/Address_entity/entityfields/zip/valueProcess.js b/entity/Address_entity/entityfields/zip/valueProcess.js index 86705dc473..92c7fae75d 100644 --- a/entity/Address_entity/entityfields/zip/valueProcess.js +++ b/entity/Address_entity/entityfields/zip/valueProcess.js @@ -2,4 +2,5 @@ import("system.vars"); import("system.result"); import("WsValidation_lib"); -result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file +// use the code if address webservice is active +//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value"))); \ No newline at end of file -- GitLab