From 4d5639d6043431af8c8afbe50fb5650855d49725 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Mon, 4 Mar 2019 16:42:57 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
 1033742][Vertriebsprojekt - Projektteam - Abteilung, Funtkion und Position
 mitaufnehmen]

---
 aliasDefinition/Data_alias/Data_alias.aod     | 42 +++++++++++++++++++
 .../SalesprojectMember_entity.aod             | 24 +++++++++++
 .../SalesprojectMemberFilter_view.aod         | 12 ++++++
 .../basic/2019.2/Contact_add_columns.xml      | 14 +++++++
 .../data_alias/basic/2019.2/changelog.xml     |  1 +
 5 files changed, 93 insertions(+)
 create mode 100644 others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml

diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 1a81dac355..0418326a53 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -257,6 +257,48 @@
                 <title></title>
                 <description></description>
               </entityFieldDb>
+              <entityFieldDb>
+                <name>CONTACTROLE</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>DEPARTMENT</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
+              <entityFieldDb>
+                <name>POSTITION</name>
+                <dbName></dbName>
+                <primaryKey v="false" />
+                <columnType v="12" />
+                <size v="50" />
+                <scale v="0" />
+                <notNull v="false" />
+                <isUnique v="false" />
+                <index v="false" />
+                <documentation></documentation>
+                <title></title>
+                <description></description>
+              </entityFieldDb>
             </entityFields>
           </entityDb>
           <entityDb>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 78e5cabbaa..a87a38eb3e 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -155,6 +155,18 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
       <name>TARGETCONTEXT</name>
       <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
     </entityField>
+    <entityField>
+      <name>CONTACTROLE</name>
+      <title>Function</title>
+    </entityField>
+    <entityField>
+      <name>DEPARTMENT</name>
+      <title>Department</title>
+    </entityField>
+    <entityField>
+      <name>POSITION</name>
+      <title>Position</title>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
@@ -253,6 +265,18 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
           <name>SALESPROJECT_ROLE.displayValue</name>
           <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/salesproject_role.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DEPARTMENT.value</name>
+          <recordfield>CONTACT.DEPARTMENT</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>CONTACTROLE.value</name>
+          <recordfield>CONTACT.CONTACTROLE</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>POSITION.value</name>
+          <recordfield>CONTACT.POSTITION</recordfield>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
     </dbRecordContainer>
   </recordContainers>
diff --git a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
index 92f1ceaef8..bd7d56408d 100644
--- a/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
+++ b/neonView/SalesprojectMemberFilter_view/SalesprojectMemberFilter_view.aod
@@ -25,6 +25,18 @@
           <name>bea82980-0639-405a-ab3f-92e45f97090e</name>
           <entityField>SALESPROJECT_ROLE</entityField>
         </neonTableColumn>
+        <neonTableColumn>
+          <name>a30a083a-be66-4690-a7b6-19860a9bc72e</name>
+          <entityField>DEPARTMENT</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>f02ac764-56a9-4f96-816e-37caa7854ac2</name>
+          <entityField>CONTACTROLE</entityField>
+        </neonTableColumn>
+        <neonTableColumn>
+          <name>c23f4e8b-87a1-4535-b2d1-f6c97d6bfe0b</name>
+          <entityField>POSITION</entityField>
+        </neonTableColumn>
       </columns>
     </tableViewTemplate>
   </children>
diff --git a/others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml b/others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml
new file mode 100644
index 0000000000..545d958d08
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/Contact_add_columns.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="s.listl" id="77bf2086-3eac-4a21-bb03-768140477e19">
+        <addColumn tableName="CONTACT">
+            <column name="DEPARTMENT" type="NVARCHAR(50)"/>
+        </addColumn>
+        <addColumn tableName="CONTACT">
+            <column name="CONTACTROLE" type="NVARCHAR(50)"/>
+        </addColumn>
+        <addColumn tableName="CONTACT">
+            <column name="POSTITION" type="NVARCHAR(50)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 0b97c5bf74..140a9af7be 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -79,4 +79,5 @@
     <include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
     <include relativeToChangelogFile="true" file="SalesProjectCompetitionPhase.xml"/>
     <include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
+    <include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
 </databaseChangeLog>
-- 
GitLab