From a6b60aca5fe0314532f8bf2ec57a4eceabe3cec1 Mon Sep 17 00:00:00 2001
From: "b.ulrich" <b.ulrich@adito.de>
Date: Tue, 24 Nov 2020 10:04:56 +0100
Subject: [PATCH] [Projekt: Entwicklung - xRM][TicketNr.: 1063066][Adressen -
Entfernen des Felds "Gebiet"]
---
.../AddressValidation_entity.aod | 59 +++++++++----------
.../recordcontainers/jdito/contentProcess.js | 1 -
.../AddressList_view/AddressList_view.aod | 4 --
process/DataPrivacy_lib/process.js | 2 +-
process/WsValidation_lib/process.js | 3 -
5 files changed, 29 insertions(+), 40 deletions(-)
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 4f1ed59385..28904169c4 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -17,6 +17,13 @@
<entityProvider>
<name>ZipValidaton</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>fcfcbebe-260a-4773-a874-9791b4887ae2</name>
@@ -25,13 +32,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>Type_param</name>
@@ -75,6 +75,13 @@
<entityProvider>
<name>CityValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>27114db7-8562-43b2-87d8-fa605bbf2319</name>
@@ -83,13 +90,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>CurrentValue_param</name>
@@ -99,6 +99,13 @@
<entityProvider>
<name>FullAddressValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>10f700b5-1ac6-4d50-bcb8-aae55714fb43</name>
@@ -107,13 +114,6 @@
<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>
@@ -135,6 +135,13 @@
<entityProvider>
<name>StreetValidation</name>
<documentation>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
<dependencies>
<entityDependency>
<name>3211d147-0867-4fc1-8640-34a1b8fdcf18</name>
@@ -143,13 +150,6 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/AddressValidation_entity/entityfields/streetvalidation/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
</entityProvider>
<entityParameter>
<name>City_param</name>
@@ -194,9 +194,6 @@
<jDitoRecordFieldMapping>
<name>DISTRICT.value</name>
</jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>REGION.value</name>
- </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>STATE.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
index e92fed1fd8..506f8a365a 100644
--- a/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js
@@ -49,7 +49,6 @@ else
row.cityExt,
row.country,
row.district,
- row.region,
row.state,
row.road,
row.buildingNo,
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index a9f9b3c6b8..409bae01d2 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -62,10 +62,6 @@
<name>aafc58cf-7dbb-42cb-b04c-d0869e58d09a</name>
<entityField>STATE</entityField>
</neonTitledListTableColumn>
- <neonTitledListTableColumn>
- <name>29dbb3f5-6f80-4100-aed3-334ac0b9cc48</name>
- <entityField>REGION</entityField>
- </neonTitledListTableColumn>
<neonTitledListTableColumn>
<name>6e369a01-965f-41d9-9b0a-6128a3827e47</name>
<entityField>ADDRESSADDITION</entityField>
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index da986784dd..009bd8c7c5 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -200,7 +200,7 @@ DataPrivacyType.get = function(pKey)
// TODO: update and fix Address_lib and use it (and remove format-functions in PostalAddress_lib)
var entityConfig = entities.createConfigForLoadingRows()
.entity("Address_entity")
- .fields(["ADDRESSID", "ADDRESS", "ADDRESSADDITION", "ADDRIDENTIFIER", "BUILDINGNO", "ZIP", "CITY", "COUNTRY", "DISTRICT", "REGION", "PROVINCE"]);
+ .fields(["ADDRESSID", "ADDRESS", "ADDRESSADDITION", "ADDRIDENTIFIER", "BUILDINGNO", "ZIP", "CITY", "COUNTRY", "DISTRICT", "PROVINCE"]);
if (pAddressId)
{
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 03bccc71e6..df45171957 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -108,8 +108,6 @@ WsValidationType.get = function(pKey)
city: city,
cityExt: cityext,
country: pPlaceData.address.country_code.toUpperCase(), //4
- district: pPlaceData.address.district,
- region: pPlaceData.address.state_district,
state: pPlaceData.address.state,
road: road, //8
buildingNo: pPlaceData.address.house_number,
@@ -361,7 +359,6 @@ WsValidationUtils.setAddressFields = function(pJSON)
"$field.CITY": data.city,
"$field.COUNTRY": data.country,
//"$field.DISTRICT": data.district, not needed currently
- "$field.REGION": data.region,
"$field.STATE": data.state,
"$field.ADDRESS": data.road,
"$field.BUILDINGNO": data.buildingNo
--
GitLab