From 8b5011112201160ad1112948eaa0f0c1efdb1be2 Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 15 Feb 2019 10:42:05 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1033741][Vertriebsprojekt - Projektteam - In Preview soll die Preview einer
Person angezeigt werden]
---
entity/Attribute_entity/Attribute_entity.aod | 4 ++++
.../attribute_type.displayvalue/expression.js | 5 +++++
.../SalesprojectMember_entity/SalesprojectMember_entity.aod | 6 ++++++
.../entityfields/targetcontext/valueProcess.js | 2 ++
.../data/AditoBasic/ab_keyword_entry/init_AttributeType.xml | 4 ++--
5 files changed, 19 insertions(+), 2 deletions(-)
create mode 100644 entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
create mode 100644 entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index c9bad862b06..e95bbe7da57 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -124,6 +124,10 @@
<name>ATTRIBUTE_ACTIVE.value</name>
<recordfield>AB_ATTRIBUTE.ATTRIBUTE_ACTIVE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ATTRIBUTE_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
new file mode 100644
index 00000000000..8c745d3aa36
--- /dev/null
+++ b/entity/Attribute_entity/recordcontainers/db/recordfieldmappings/attribute_type.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.get.AttributeType, "AB_ATTRIBUTE.ATTRIBUTE_TYPE");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 9b412db0ba3..d82728e21c7 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -30,6 +30,8 @@
<entityProvider>
<name>SalesprojectMembers</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <targetContextField>TARGETCONTEXT</targetContextField>
+ <targetIdField>CONTACT_ID</targetIdField>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
@@ -145,6 +147,10 @@ TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... akt
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>TARGETCONTEXT</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
new file mode 100644
index 00000000000..b8a7cf8b360
--- /dev/null
+++ b/entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
@@ -0,0 +1,2 @@
+import("system.result");
+result.string("Person_context"); //to show the preview of the person
\ No newline at end of file
diff --git a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
index af039c84bed..958ebbabbff 100644
--- a/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
+++ b/others/db_changes/data_alias/data/AditoBasic/ab_keyword_entry/init_AttributeType.xml
@@ -42,7 +42,7 @@
<column name="KEYID" value="COMBO"/>
<column name="TITLE" value="Combobox"/>
<column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="3"/>
+ <column name="SORTING" valueNumeric="4"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
@@ -51,7 +51,7 @@
<column name="KEYID" value="GROUP"/>
<column name="TITLE" value="Group"/>
<column name="CONTAINER" value="AttributeType"/>
- <column name="SORTING" valueNumeric="3"/>
+ <column name="SORTING" valueNumeric="5"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
--
GitLab