From 325292a47d550a4388b366e3cb044490924c49e7 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 12 Mar 2019 13:47:11 +0100
Subject: [PATCH] Address added into Organisation and Person views
---
entity/Address_entity/Address_entity.aod | 1 +
.../entityfields/country/valueProcess.js | 9 +++++++
.../AnyContact_entity/AnyContact_entity.aod | 7 +++++
.../address_id/displayValueProcess.js | 8 ++++++
.../person_full_name/valueProcess.js | 14 ++++++++++
entity/Countries_Entity/Countries_Entity.aod | 2 +-
.../recordcontainers/db/orderClauseProcess.js | 5 ++++
entity/Countries_Entity/titleProcess.js | 2 +-
.../address_id/displayValueProcess.js | 13 +---------
.../address_id/displayValueProcess.js | 13 +---------
.../_____LANGUAGE_EXTRA.aod | 6 +++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 5 +++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 5 +++-
.../AddressEdit_view/AddressEdit_view.aod | 8 +++---
.../AddressFilter_view/AddressFilter_view.aod | 8 +++---
.../AddressList_view/AddressList_view.aod | 8 +++---
.../AdressMultiEdit_view.aod | 8 +++---
.../AnyContactLookup_view.aod | 10 +++----
.../OrganisationFilter_view.aod | 4 +++
.../OrganisationLookup_view.aod | 4 +++
.../PersonFilter_view/PersonFilter_view.aod | 4 +++
.../PersonLookup_view/PersonLookup_view.aod | 4 +++
process/PostalAddress_lib/process.js | 26 +++++++++++++++++++
23 files changed, 125 insertions(+), 49 deletions(-)
create mode 100644 entity/Address_entity/entityfields/country/valueProcess.js
create mode 100644 entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js
create mode 100644 entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js
create mode 100644 entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index e1dd74e5b3c..5abe042e6df 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -42,6 +42,7 @@
<title>Country</title>
<consumer>Countries</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/Address_entity/entityfields/country/valueProcess.js b/entity/Address_entity/entityfields/country/valueProcess.js
new file mode 100644
index 00000000000..0bbec92588a
--- /dev/null
+++ b/entity/Address_entity/entityfields/country/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string("DE");
+}
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 179c872d486..6ae1f0a13f3 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -30,7 +30,9 @@
</entityProvider>
<entityField>
<name>ADDRESS_ID</name>
+ <title>standard address</title>
<searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>LANGUAGE</name>
@@ -160,6 +162,11 @@ See ContactUtils.getRelationTypeByPersOrg for possible values</description>
<entityField>
<name>PERSON_SALUTATION</name>
</entityField>
+ <entityField>
+ <name>PERSON_FULL_NAME</name>
+ <title>Person</title>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js b/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js
new file mode 100644
index 00000000000..f212ec24e70
--- /dev/null
+++ b/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.db");
+import("system.vars");
+import("system.result");
+import("PostalAddress_lib");
+
+var addrId = vars.get("$field.ADDRESS_ID");
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
+result.string(addr);
\ No newline at end of file
diff --git a/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js b/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js
new file mode 100644
index 00000000000..682dadd6b41
--- /dev/null
+++ b/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js
@@ -0,0 +1,14 @@
+import("system.vars");
+import("system.result");
+import("Util_lib");
+import("Contact_lib");
+
+var contact = new Contact();
+contact.salutation = vars.get("$field.PERSON_SALUTATION");
+contact.title = vars.get("$field.PERSON_TITLE");
+contact.firstname = vars.get("$field.PERSON_FIRSTNAME");
+contact.middlename = vars.get("$field.PERSON_MIDDLENAME");
+contact.lastname = vars.get("$field.PERSON_LASTNAME");
+
+var renderer = new ContactTitleRenderer(contact, null);
+result.string(renderer.asString());
\ No newline at end of file
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 105481d3361..6af3461072f 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -15,7 +15,6 @@
<entityProvider>
<name>ISO2_NAME</name>
<fieldType>DEPENDENCY_IN</fieldType>
- <recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
@@ -108,6 +107,7 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
<name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
diff --git a/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js b/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 00000000000..9537434d695
--- /dev/null
+++ b/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.db");
+
+result.object({"case AB_COUNTRYINFO.ISO2 when 'DE' then 2500 when 'AT' then 2490 when 'CH' then 2480 else 100 end": db.DESCENDING
+ ,"AB_COUNTRYINFO.NAME_LATIN": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/Countries_Entity/titleProcess.js b/entity/Countries_Entity/titleProcess.js
index 0410b3c2056..6a135783542 100644
--- a/entity/Countries_Entity/titleProcess.js
+++ b/entity/Countries_Entity/titleProcess.js
@@ -1,3 +1,3 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.NAME"))
\ No newline at end of file
+result.string(vars.get("$field.NAME_TRANSLATED"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js b/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
index ad0d57c1054..f212ec24e70 100644
--- a/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
+++ b/entity/Organisation_entity/entityfields/address_id/displayValueProcess.js
@@ -2,18 +2,7 @@ import("system.db");
import("system.vars");
import("system.result");
import("PostalAddress_lib");
-import("Sql_lib");
var addrId = vars.get("$field.ADDRESS_ID");
-var addr = "";
-if (addrId)
-{
- var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
- var addrData = db.array(db.ROW,
- SqlCondition.begin()
- .andPrepare("ADDRESS.ADDRESSID", addrId)
- .buildSql(select));
-
- addr = AddressUtils.formatOneline.apply(this, addrData);
-}
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
result.string(addr);
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/address_id/displayValueProcess.js b/entity/Person_entity/entityfields/address_id/displayValueProcess.js
index ad0d57c1054..f212ec24e70 100644
--- a/entity/Person_entity/entityfields/address_id/displayValueProcess.js
+++ b/entity/Person_entity/entityfields/address_id/displayValueProcess.js
@@ -2,18 +2,7 @@ import("system.db");
import("system.vars");
import("system.result");
import("PostalAddress_lib");
-import("Sql_lib");
var addrId = vars.get("$field.ADDRESS_ID");
-var addr = "";
-if (addrId)
-{
- var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
- var addrData = db.array(db.ROW,
- SqlCondition.begin()
- .andPrepare("ADDRESS.ADDRESSID", addrId)
- .buildSql(select));
-
- addr = AddressUtils.formatOneline.apply(this, addrData);
-}
+var addr = AddressUtils.getFormattedOnlineAddressById(addrId);
result.string(addr);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 84ba642f70c..333f1811e09 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2550,6 +2550,12 @@
<entry>
<key>Filetype</key>
</entry>
+ <entry>
+ <key>Special price list</key>
+ </entry>
+ <entry>
+ <key>New attribute</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 66a7a690183..794fae92df8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -370,7 +370,7 @@
</entry>
<entry>
<key>standard address</key>
- <value>Standardadresse</value>
+ <value>Standard-Adresse</value>
</entry>
<entry>
<key>Create receipt</key>
@@ -2994,6 +2994,9 @@
<entry>
<key>Parent Attribute</key>
</entry>
+ <entry>
+ <key>Special price list1</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c572b4d55ac..abbf572093d 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2578,7 +2578,10 @@
<key>Filetype</key>
</entry>
<entry>
- <key>Entrydate (Month)</key>
+ <key>Special price list</key>
+ </entry>
+ <entry>
+ <key>New attribute</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonView/AddressEdit_view/AddressEdit_view.aod b/neonView/AddressEdit_view/AddressEdit_view.aod
index 60a769bd9d3..74be2469441 100644
--- a/neonView/AddressEdit_view/AddressEdit_view.aod
+++ b/neonView/AddressEdit_view/AddressEdit_view.aod
@@ -21,10 +21,6 @@
<name>d8a7a16b-9d7f-44d7-bbb1-b0404d5b8b8f</name>
<entityField>COUNTRY</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>c70668f3-6722-4a90-86d6-0d89be06dbe1</name>
<entityField>ADDRESS</entityField>
@@ -41,6 +37,10 @@
<name>fafca9d6-c6dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>e7804363-405d-429d-91c9-23de9685cc9a</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/AddressFilter_view/AddressFilter_view.aod b/neonView/AddressFilter_view/AddressFilter_view.aod
index 78f5d08807b..4c33eb1e108 100644
--- a/neonView/AddressFilter_view/AddressFilter_view.aod
+++ b/neonView/AddressFilter_view/AddressFilter_view.aod
@@ -17,6 +17,10 @@
<name>852583d4-1883-4b36-963f-6f3a4df63a89</name>
<entityField>ADDR_TYPE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>32b8b6f0-bdbc-4a4b-b98c-0a22861b0e6c</name>
<entityField>ADDRESS</entityField>
@@ -33,10 +37,6 @@
<name>57247c5c-6498-420b-b288-68ca316cf7f2</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>10e9e08f-db9b-4789-a4b4-b2a0a750b069</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>9a965a25-a8aa-4777-865e-138624f2d848</name>
<entityField>STATE</entityField>
diff --git a/neonView/AddressList_view/AddressList_view.aod b/neonView/AddressList_view/AddressList_view.aod
index ab275f2b133..ab11f3f168a 100644
--- a/neonView/AddressList_view/AddressList_view.aod
+++ b/neonView/AddressList_view/AddressList_view.aod
@@ -22,10 +22,6 @@
<name>dfaa01a1-0b11-4f92-aa18-89f12ebb2db5</name>
<entityField>COUNTRY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>4e5e6a4f-f43e-4861-a912-fb05e576f960</name>
<entityField>ADDRESS</entityField>
@@ -42,6 +38,10 @@
<name>12727b21-0359-4430-a9c2-54eb48e2e864</name>
<entityField>CITY</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>17039f2e-4253-4242-bcc4-b75483adfbd0</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
</columns>
</titledListViewTemplate>
</children>
diff --git a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
index 4192daba616..e343aeea66d 100644
--- a/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
+++ b/neonView/AdressMultiEdit_view/AdressMultiEdit_view.aod
@@ -16,6 +16,10 @@
<name>b210372e-dfd3-4cec-bc2e-84b72aebb2b6</name>
<entityField>ADDR_TYPE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
+ <entityField>COUNTRY</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>c20668f3-6722-4a90-86d6-0d29be06dbe1</name>
<entityField>ADDRESS</entityField>
@@ -32,10 +36,6 @@
<name>fafca2d6-c2dd-4b66-b1ff-1d6ba451827b</name>
<entityField>CITY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>d8a7a26b-9d7f-44d7-bbb1-b0404d5b8b2f</name>
- <entityField>COUNTRY</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>945bd8e7-9d0d-4e32-8908-24d8dfb74463</name>
<entityField>STATE</entityField>
diff --git a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
index 38784a6ed13..c6ca766c71d 100644
--- a/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
+++ b/neonView/AnyContactLookup_view/AnyContactLookup_view.aod
@@ -20,13 +20,9 @@
<name>ca59a64a-adce-49c3-93ad-2978c81809f8</name>
<entityField>ORGANISATION_NAME</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>814b3f18-106a-443e-8415-762669f862e6</name>
- <entityField>PERSON_FIRSTNAME</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>4b05d812-aa6c-49a5-afa3-ea5cd99560ef</name>
- <entityField>PERSON_LASTNAME</entityField>
+ <entityField>PERSON_FULL_NAME</entityField>
<width v="75" />
<expandRatio v="100" />
</neonTableColumn>
@@ -38,6 +34,10 @@
<name>16174be3-c8fb-46a8-8f73-f6b8d8fad963</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>c7d50d7a-11da-491c-a4be-7d5f75d335f0</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 42815a374b9..a8f5cd47c2d 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -63,6 +63,10 @@
<name>213d7434-cac6-42d8-aa3a-d893dc77b7b3</name>
<entityField>STANDARD_PHONE_COMMUNICATION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>067eeef9-9a98-483b-9b4f-67bcc46eca3a</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index a491b144cdd..d51544e0e9e 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -28,6 +28,10 @@
<name>44f2a229-3288-448e-9f74-b29751ab3c49</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>6e0191b5-468b-41f6-b87e-732bb1c0ded8</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index b465bc58f7e..3ae4694d9b2 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -69,6 +69,10 @@
<name>1b99eaf7-7ce7-4b7d-bb71-f21e6cae4417</name>
<entityField>STANDARD_PHONE_COMMUNICATION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>4e9d69fc-a072-41b9-a089-0a9c5c1e37c2</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/PersonLookup_view/PersonLookup_view.aod b/neonView/PersonLookup_view/PersonLookup_view.aod
index f93afb3fdd6..4c71e4b72b2 100644
--- a/neonView/PersonLookup_view/PersonLookup_view.aod
+++ b/neonView/PersonLookup_view/PersonLookup_view.aod
@@ -32,6 +32,10 @@
<name>eb778e57-1f2d-436e-b22a-e92f7a190606</name>
<entityField>STANDARD_EMAIL_COMMUNICATION</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>27d03313-3ec6-438f-b79b-724369316ef3</name>
+ <entityField>ADDRESS_ID</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/process/PostalAddress_lib/process.js b/process/PostalAddress_lib/process.js
index 2a57f0955fb..40445e11ecb 100644
--- a/process/PostalAddress_lib/process.js
+++ b/process/PostalAddress_lib/process.js
@@ -30,6 +30,32 @@ AddressUtils.formatOneline = function (pCountry, pAddressLine, pBuildingNo, pZip
return StringUtils.concat(", ", [pCountry, pAddressLine, pBuildingNo, pZipCode, pCity]);
};
+/**
+ * returns the formatted address by the ADDRESSID as one line
+ *
+ * TODO: Dummy method! Ãœbernahme der Adresslib aus altem Basic
+ *
+ * @params {String} pAddressId ADDRESSID of the address which shall be loaded
+ *
+ * @return {String} formatted address
+ */
+AddressUtils.getFormattedOnlineAddressById = function(pAddressId)
+{
+ var addrId = pAddressId;
+ var addr = "";
+ if (addrId)
+ {
+ var select = "select ADDRESS.COUNTRY, ADDRESS.ADDRESS, ADDRESS.BUILDINGNO, ADDRESS.ZIP, ADDRESS.CITY from ADDRESS ";
+ var addrData = db.array(db.ROW,
+ SqlCondition.begin()
+ .andPrepare("ADDRESS.ADDRESSID", addrId)
+ .buildSql(select));
+
+ addr = AddressUtils.formatOneline.apply(this, addrData);
+ }
+ return addr;
+}
+
/**
* Returns the formatted standard address for the contact.
*
--
GitLab