diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index ad1e2f86a85ee55cc537b23ad93471aa266b28e8..ea76742bbda694896d347825c34f425ea208fe03 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -41,6 +41,7 @@
<entityParameter>
<name>Country_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
@@ -65,7 +66,7 @@
</entityField>
<entityField>
<name>STATE</name>
- <title>State</title>
+ <title>${ADDRESS_STATE}</title>
</entityField>
<entityField>
<name>VALUE</name>
@@ -93,22 +94,70 @@
<entityParameter>
<name>CurrentValue_param</name>
<expose v="true" />
+ <triggerRecalculation v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityProvider>
+ <name>FullAddressValidation</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <dependencies>
+ <entityDependency>
+ <name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>FullAddressValidation</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>STREET</name>
+ <title>Street</title>
+ </entityField>
+ <entityField>
+ <name>FROM_BN</name>
+ <title>From buildingnumber</title>
+ </entityField>
+ <entityField>
+ <name>TO_BN</name>
+ <title>To buildingnumber</title>
+ </entityField>
+ <entityField>
+ <name>LON</name>
+ </entityField>
+ <entityField>
+ <name>LAT</name>
+ </entityField>
+ <entityField>
+ <name>CITYEXT</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
+ <isRequireContainerFiltering v="true" />
<contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<recordFields>
<element>UID.value</element>
<element>UID.displayValue</element>
<element>ZIP.value</element>
<element>CITY.value</element>
+ <element>CITYEXT.value</element>
<element>COUNTRY.value</element>
<element>DISTRICT.value</element>
<element>REGION.value</element>
<element>STATE.value</element>
+ <element>STREET.value</element>
+ <element>FROM_BN.value</element>
+ <element>TO_BN.value</element>
+ <element>LON.value</element>
+ <element>LAT.value</element>
<element>VALUE.value</element>
</recordFields>
</jDitoRecordContainer>
diff --git a/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a6cfed5664099791a5129bacf8e86b3949a9a2db
--- /dev/null
+++ b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_ADDRESS.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index 86d7eaab0b7d915d1209bd9215aad8f4d2626a68..f842ab3000c8d9cc56e7f0545246cf5ba2707797 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
import("WsValidation_lib");
import("system.vars");
@@ -12,14 +13,14 @@ if (vars.exists("$param.Country_param") && vars.get("$param.Country_param"))
// get the value typed by the user
var filter = "";
-var sysFilter = vars.getString("$sys.filter");
+var sysFilter = vars.get("$sys.filter");
if(sysFilter.filter != null) {
- filter = JSON.parse(sysFilter.filter).childs[0].value;
+ filter = sysFilter.filter.childs[0].value;
}
if (!filter && vars.exists("$param.CurrentValue_param") && vars.get("$param.CurrentValue_param"))
filter = vars.get("$param.CurrentValue_param");
var foundAddresses = WsValidationUtils.validate(filter, type, country);
-
+logging.log("result " + foundAddresses.toSource())
result.object(foundAddresses);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 0efcba8a073db1ae4afc80c4fa3e70c78be5ce6d..d6171984578532f260fe0be928c5c27c38a3c246 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -39,11 +39,13 @@
<entityField>
<name>CITY</name>
<title>City</title>
+ <consumer>CityValidation</consumer>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
+ <element>PROCESS</element>
</onValueChangeTypes>
</entityField>
<entityField>
@@ -75,14 +77,15 @@
<entityField>
<name>ZIP</name>
<title>postcode</title>
- <consumer></consumer>
+ <consumer>ZipValidation</consumer>
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
+ <element>PROCESS</element>
</onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
</entityField>
<entityProvider>
<name>OrganisationAddresses</name>
@@ -340,6 +343,37 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>AddressSearch</name>
+ <title>Search</title>
+ <consumer>FullAddressValidation</consumer>
+ <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Address_entity/entityfields/addresssearch/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityConsumer>
+ <name>FullAddressValidation</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>FullAddressValidation</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Country_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js b/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..de2c5e835eaf4fe6dd8b3521b3e17a39c9ac23c1
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+// needed for instant display name change if value set by neon.setFieldValue
+result.string(vars.get("$this.value"))
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addresssearch/onValueChange.js b/entity/Address_entity/entityfields/addresssearch/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..57c7beb53f9d1efaedb15b20b93902ed878cb750
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/onValueChange.js
@@ -0,0 +1,3 @@
+import("WsValidation_lib");
+
+WsValidationUtils.setAddressFields("$field.AddressSearch");
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/addresssearch/stateProcess.js b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1621c646b2fd3b8d04bb908a08c7c27acf34421e
--- /dev/null
+++ b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
@@ -0,0 +1,14 @@
+import("WsValidation_lib");
+import("system.logging");
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ADDRESS) && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
index bece889b8e3ca6d6141ac5a750d0d068b23dc85a..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8 100644
--- a/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.COUNTRY"))
\ No newline at end of file
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8
--- /dev/null
+++ b/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b51e1bdca25fd6259183417a6a823361750f2188
--- /dev/null
+++ b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+ result.string(vars.get("$field.AddressSearch"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js b/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
index bece889b8e3ca6d6141ac5a750d0d068b23dc85a..41f3b8dc1a9b50c6ae934a4fae1402d699cc87b8 100644
--- a/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.COUNTRY"))
\ No newline at end of file
+result.string(vars.get("$field.COUNTRY"));
\ No newline at end of file
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index 47567501426d89c5cc26da153922338e6df1ea2e..0ca1a9b281ec9deecb16ebb7dc0c115ceec4527e 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -14,6 +14,10 @@
<highlightingField>IS_STANDARD</highlightingField>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>dd514a8b-68b1-4fba-b84e-bc8d8ed708bc</name>
+ <entityField>AddressSearch</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>49e14587-34f7-4f09-916c-9eb4aaf55509</name>
<entityField>ADDR_TYPE</entityField>
diff --git a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
index faa59a3cf3f1d1e7cd72f5aa03a5562c6c2f1e06..ca5b096ab51c184eef02ea9f2d32a948b075b48b 100644
--- a/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
+++ b/neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod
@@ -20,10 +20,6 @@
<name>fb715731-9162-405e-b2e2-6c20921f026f</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>05bb9d3b-0e90-4a1a-bfe8-03b7dab6ed01</name>
<entityField>REGION</entityField>
@@ -32,6 +28,22 @@
<name>22779be5-4111-49c2-8821-0ec02cca40bb</name>
<entityField>STATE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>a272c3cb-7bbf-41a4-9490-884c2f449b40</name>
+ <entityField>STREET</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e842bb68-96c6-4d1f-bf44-70a29c7c7d72</name>
+ <entityField>FROM_BN</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>59162b47-ec96-4076-8e57-929fccbf133d</name>
+ <entityField>TO_BN</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index cfa861355be86b2a0fbcfec74258fb12e422aad3..e3a6e2272a5a6583fc0a1e72863b29b7e84519bb 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -12,6 +12,10 @@
<name>MultipleEdit</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>00300f6f-ac45-4daa-9693-6452da972403</name>
+ <entityField>AddressSearch</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>2aebe24e-875a-4c57-8461-16da46d6f080</name>
<entityField>ADDR_TYPE</entityField>
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 264b616f954c38665d86bb2d695df571dfe9d708..03f48c5e100800f646437603b34d8d522d76a0cd 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -35,8 +35,9 @@ WsValidationType.get = function(pKey)
if (!this._cache)
this._cache = {
// Address lookups
- TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "addressValidation", _processAddressLookup),
- TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "addressValidation", _processAddressLookup),
+ TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "search", "addressValidation", _processAllAddressLookup),
+ TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "zipCityValidation", _processAddressLookup),
+ TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "zipCityValidation", _processAddressLookup),
// Communication validation
TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
@@ -47,14 +48,77 @@ WsValidationType.get = function(pKey)
return this._cache;
- function _processAddressLookup(pWsResult, pValue)
+ /**
+ * [UID,
+ * displayName,
+ * zip,
+ * city,
+ * cityext,
+ * country,
+ * district,
+ * region,
+ * state,
+ * street,
+ * from_bn, // building number
+ * to_bn, // building number
+ * lon,
+ * lat,
+ * value // pValue
+ */
+ function _processAllAddressLookup(pWsResult, pValue)
{
+ var resultAddresses = [];
+ // if error, only add the default value else parse the body
+ if (!WsValidationUtils._isError(pWsResult))
+ {
+ resultAddresses = JSON.parse(pWsResult.body);
+ }
- // add default result consisting of pValue
- var defaultResult = [[{}, pValue]];
- defaultResult[0][0][this.paramName] = pValue;
-
+ return resultAddresses.map(function(pAddress, pIndex)
+ {
+ pAddress[0].value = pValue;
+ pAddress[0].index = pIndex;
+ var data = pAddress[0];
+
+ return [
+ JSON.stringify(data),
+ pAddress[1],
+ data.zip,
+ data.city,
+ data.cityext,
+ data.country,
+ data.district,
+ data.region,
+ data.state,
+ data.streat,
+ data.from_bn,
+ data.to_bn,
+ data.lon,
+ data.lat,
+ pValue]
+ }, this);
+ }
+
+ /**
+ * [UID,
+ * displayName,
+ * zip,
+ * city,
+ * cityext,
+ * country,
+ * district,
+ * region,
+ * state,
+ * street,
+ * from_bn, // building number
+ * to_bn, // building number
+ * lon,
+ * lat,
+ * value // (the result. e.g. if pType was ZIP, the value is the found zip)
+ */
+ function _processAddressLookup(pWsResult, pValue)
+ {
var resultAddresses = [];
// if error, only add the default value else parse the body
@@ -63,20 +127,30 @@ WsValidationType.get = function(pKey)
resultAddresses = JSON.parse(pWsResult.body);
}
+ // add default result consisting of pValue
+ var defaultResult = [[{}, pValue]];
+ defaultResult[0][0][this.paramName] = pValue;
resultAddresses = resultAddresses.concat(defaultResult);
- return resultAddresses.map(function(pAddress)
+ return resultAddresses.map(function(pAddress, pIndex)
{
+ pAddress[0].index = pIndex;
var data = pAddress[0];
return [
JSON.stringify(data),
pAddress[1],
data.zip,
data.city,
+ data.cityext,
data.country,
data.district,
data.region,
data.state,
+ data.streat,
+ data.from_bn,
+ data.to_bn,
+ data.lon,
+ data.lat,
data[this.paramName]]
}, this);
}
@@ -109,15 +183,7 @@ function WsValidationUtils() {}
* @param {WsValidationType|String} pType type used for the search. Can be an WsValidationType or the key of the WsValidationType
* @param {String} pCountry needed by the webservice e.g. "DE"
*
- * @return {String[][]} [UID,
- * displayName,
- * zip,
- * city,
- * country,
- * district,
- * region,
- * state,
- * value (the result. e.g. if pType was ZIP, the value is the found zip)
+ * @return {object} this is different, based on which webservice-type is used
*/
WsValidationUtils.validate = function(pValue, pType, pCountry)
{
@@ -165,9 +231,11 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
/**
* set all address-fields by the value of $this.value, which should contain an object of all values as JSON
+ * @param {String} [pFieldToSetToValue=undefined] the field which should be set to data.value
*/
-WsValidationUtils.setAddressFields = function()
+WsValidationUtils.setAddressFields = function(pFieldToSetToValue)
{
+ logging.log(vars.getString("$this.value"))
try
{
var data = JSON.parse(vars.getString("$this.value"));
@@ -183,7 +251,13 @@ WsValidationUtils.setAddressFields = function()
//_setField("$field.DISTRICT", data.district); not needed currently
_setField("$field.REGION", data.region);
_setField("$field.STATE", data.state);
-
+ _setField("$field.ADDRESS", data.streat);
+
+ if (pFieldToSetToValue)
+ {
+ _setField(pFieldToSetToValue, data.value)
+ }
+
function _setField(pField, pValue)
{
if (pValue)