#1064320 Address search fix for street

entity/AddressValidation_entity/AddressValidation_entity.aod

@@ -130,6 +130,7 @@
     </entityField>
     <entityField>
       <name>BUILDINGNO</name>
+      <title>Nr</title>
     </entityField>
     <entityProvider>
       <name>StreetValidation</name>
@@ -154,6 +155,10 @@
       <name>City_param</name>
       <expose v="true" />
     </entityParameter>
+    <entityField>
+      <name>STREET_AND_BUILDINGNO</name>
+      <title>Street</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -206,6 +211,9 @@
         <jDitoRecordFieldMapping>
           <name>VALUE.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>STREET_AND_BUILDINGNO.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>

entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js

@@ -55,7 +55,8 @@ else
             row.buildingNo,
             row.lat,
             row.lon,
-            row.value
+            row.value,
+            row.road && row.buildingNo ? row.road + " " + row.buildingNo : row.road
         ];
     }));
 }

entity/Address_entity/entityfields/address_ws/valueProcess.js

 import("system.vars");
 import("WsValidation_lib");
 
-if(!vars.get("$this.value"))
-    WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
+WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file

neonView/AddressValidationLookup_view/AddressValidationLookup_view.aod

@@ -30,15 +30,7 @@
         </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>
+          <entityField>STREET_AND_BUILDINGNO</entityField>
         </neonTableColumn>
         <neonTableColumn>
           <name>d32d92bf-db7d-443f-b911-6731ea89cf3b</name>

neonView/EmployeeRoleEdit_view/EmployeeRoleEdit_view.aod

@@ -17,10 +17,6 @@
           <entityField>ROLE</entityField>
           <fullWidth v="true" />
         </neonGenericMultipleTableColumn>
-        <neonGenericMultipleTableColumn>
-          <name>a67f3020-1438-483a-9897-647336002618</name>
-          <entityField>UID</entityField>
-        </neonGenericMultipleTableColumn>
       </columns>
     </genericMultipleViewTemplate>
   </children>

process/WsValidation_lib/process.js

@@ -354,16 +354,12 @@ WsValidationUtils.setAddressFields = function(pJSON)
         "$field.REGION": data.region,
         "$field.STATE": data.state,
         "$field.ADDRESS": data.road,
-        "$field.LAT": data.lat,
-        "$field.LON": data.lon
+        "$field.BUILDINGNO": data.buildingNo
     }
     
     for (let field in toSet) 
     {
-        let value = toSet[field];
-        if (!value)
-            value = "";
-
+        let value = toSet[field] || "";
         neon.setFieldValue(field, value);
     }