From 3a7f0dc7e4c5e5370ba23dd8cb6d67d7817c3e21 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 24 Jan 2019 16:14:15 +0100
Subject: [PATCH] salesproject fixes
---
entity/Pers_entity/Pers_entity.aod | 6 ++++++
.../SalesprojectMember_entity.aod | 15 ++++++++++++++-
.../resultingrelation_fieldgroup/valueProcess.js | 5 ++---
.../relation_id.displayvalue/expression.js | 4 ++++
.../SalesprojectMemberPreview_view.aod | 4 +++-
5 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod
index 1ff1fe9806a..fb99dad5878 100644
--- a/entity/Pers_entity/Pers_entity.aod
+++ b/entity/Pers_entity/Pers_entity.aod
@@ -296,6 +296,12 @@
<fieldName>PersEditor_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
+ <entityDependency>
+ <name>b72f99e9-0c8d-4b54-863b-b47eafbb0189</name>
+ <entityName>SalesprojectMember_entity</entityName>
+ <fieldName>PersLookup_dfo</fieldName>
+ <isOutgoing v="false" />
+ </entityDependency>
</dependencies>
</entityIncomingField>
<entityField>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index bc79c18cf38..73938370be4 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -23,7 +23,7 @@
<name>RELATION_ID</name>
<title>Person</title>
<linkedContext>Pers_context</linkedContext>
- <outgoingField>SalesprojectMemberPers_dfo</outgoingField>
+ <outgoingField>PersLookup_dfo</outgoingField>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
@@ -148,6 +148,15 @@
<element>RELATIONSHIP</element>
</fields>
</entityFieldGroup>
+ <entityOutgoingField>
+ <name>PersLookup_dfo</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Pers_entity</entityName>
+ <fieldName>#INCOMING</fieldName>
+ </dependency>
+ </entityOutgoingField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -254,6 +263,10 @@
<name>RELATION_RELATIONSHIP.value</name>
<recordfield>RELATION.RELATIONSHIP</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATION_ID.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
index 1c524f43115..9fbba891587 100644
--- a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
@@ -1,13 +1,12 @@
import("system.result");
import("system.vars");
-// TODO: auf displayValue umbauen statt fieldGroup
var localRelationship = vars.get("$field.RELATIONSHIP");
if (localRelationship)
{
- result.string(localRelationship);
+ result.string("loc" + alRelationship);
}
else
{
- result.string(vars.get("$field.RELATION_RELATIONSHIP"));
+ result.string("rem" + vars.get("$field.RELATION_RELATIONSHIP"));
}
diff --git a/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
new file mode 100644
index 00000000000..00b5fa7447a
--- /dev/null
+++ b/entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Pers_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("RELATION_ID"))
\ No newline at end of file
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index 1c8ef81225e..446720d67ac 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -10,12 +10,14 @@
<children>
<cardViewTemplate>
<name>SalesprojectMemberHeader_template</name>
- <titleField>PERS_FULL_NAME</titleField>
+ <titleField>RELATION_ID</titleField>
<descriptionField>SALESPROJECT_ROLE</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>SalesprojectMemberInfo_template</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
--
GitLab