diff --git a/entity/Pers_entity/Pers_entity.aod b/entity/Pers_entity/Pers_entity.aod index 1ff1fe9806afb209ff3d03e7f217b67733b28220..fb99dad5878bdf7963090e95ee5a000cb223b94e 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 bc79c18cf384285e8c532056d3b697c2dd7b7090..73938370be41f70551e7798c299fdc48cfaf3750 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 1c524f43115d86ab9cb5af46bd26269f997b5d00..9fbba891587b6972c4dfdba2f3badfaf76752d59 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 0000000000000000000000000000000000000000..00b5fa7447a54ccd53c3125e6f9b8081f0157e90 --- /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 1c8ef81225ed1098bcc032267f05b7754f49379a..446720d67ac9402c34bd4ce59d26763688b84907 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>