From 9228e6b2ba95909b1e93a14fb106a0e94de5cc3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20V=C3=B6gl?= <a.voegl@adito.de>
Date: Fri, 8 May 2020 07:27:47 +0000
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.: 1057491][Korrekte
 Anzeige der Abteilung, Position und Rolle]

---
 entity/Contact_entity/Contact_entity.aod             | 12 ++++++++++++
 .../contactrole.displayvalue/expression.js           |  2 ++
 .../department.displayvalue/expression.js            |  2 ++
 .../position.displayvalue/expression.js              |  2 ++
 entity/Person_entity/Person_entity.aod               | 12 ++++++++++++
 .../contactrole.displayvalue/expression.js           |  2 ++
 .../department.displayvalue/expression.js            |  2 ++
 .../position.displayvalue/expression.js              |  2 ++
 8 files changed, 36 insertions(+)
 create mode 100644 entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
 create mode 100644 entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
 create mode 100644 entity/Contact_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js
 create mode 100644 entity/Person_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
 create mode 100644 entity/Person_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
 create mode 100644 entity/Person_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js

diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index d4f33e27fc..6a95fa2e17 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -347,6 +347,18 @@
           <name>CONTACTID.displayValue</name>
           <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactid.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.displayValue</name>
+          <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.displayValue</name>
+          <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.displayValue</name>
+          <expression>%aditoprj%/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
new file mode 100644
index 0000000000..588a1897cf
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("CONTACTROLE");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
new file mode 100644
index 0000000000..40d0a55997
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("DEPARTMENT");
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js
new file mode 100644
index 0000000000..33b955e1e7
--- /dev/null
+++ b/entity/Contact_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("CONTACTPOSITION");
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index cf377afffe..b50490a599 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1533,6 +1533,18 @@
           <name>ORGANISATION_CONTACTID.displayValue</name>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisation_contactid.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
new file mode 100644
index 0000000000..588a1897cf
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/contactrole.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("CONTACTROLE");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
new file mode 100644
index 0000000000..40d0a55997
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/department.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("DEPARTMENT");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js
new file mode 100644
index 0000000000..33b955e1e7
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/position.displayvalue/expression.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("CONTACTPOSITION");
\ No newline at end of file
-- 
GitLab