diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index 73938370be41f70551e7798c299fdc48cfaf3750..c93b59eb9895ea879c0c6b5e6c8d862f87c37061 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -125,9 +125,11 @@
<entityField>
<name>RELATIONSHIP</name>
<title>Relationship</title>
- <description>Overrules RELATION_RELATIONSHIP</description>
+ <description>Overrules RELATION_RELATIONSHIP
+
+TODO: intuitive möglichkeit, auf dend Stand aus Relation zurückzusetzen... aktuell im edit mode auf leeres Feld, dann wird das aus relation angezeigt</description>
<contentType>NUMBER</contentType>
- <onValueChange>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js</onValueChange>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js</displayValueProcess>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
@@ -139,15 +141,6 @@
<description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
<contentType>NUMBER</contentType>
</entityField>
- <entityFieldGroup>
- <name>resultingRelation_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js</valueProcess>
- <title>Relationship</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>RELATIONSHIP</element>
- </fields>
- </entityFieldGroup>
<entityOutgoingField>
<name>PersLookup_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
diff --git a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js b/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
similarity index 52%
rename from entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
rename to entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
index 9fbba891587b6972c4dfdba2f3badfaf76752d59..15f3d68ca45227a8ecfaf2ed3ec301ad18c4c83e 100644
--- a/entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js
+++ b/entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js
@@ -1,12 +1,14 @@
+import("system.logging");
import("system.result");
import("system.vars");
var localRelationship = vars.get("$field.RELATIONSHIP");
+
if (localRelationship)
{
- result.string("loc" + alRelationship);
+ result.string(localRelationship);
}
else
{
- result.string("rem" + vars.get("$field.RELATION_RELATIONSHIP"));
+ result.string(vars.get("$field.RELATION_RELATIONSHIP"));
}
diff --git a/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js b/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js
deleted file mode 100644
index cc3f4f7c331d448abe1663adbfff4247c20ad71c..0000000000000000000000000000000000000000
--- a/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.logging");
-
-logging.log(vars.get("$field.RELATIONSHIP"))
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 3e43eb36fbc8e9e77a53e502ef552b8b230ac41c..15e361722c0ab9045b78a7fc8fb4fe99c87e2bbd 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -115,6 +115,8 @@
<entityField>
<name>VOLUME</name>
<title>Volume</title>
+ <description>The displayValue from the recoord container adds T € (translated)</description>
+ <contentTypeProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js</contentTypeProcess>
</entityField>
<entityOutgoingField>
<name>SalesprojectOrg_dfo</name>
@@ -130,15 +132,6 @@
<title>Probability</title>
<possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
- <entityFieldGroup>
- <name>VOLUME_DISPLAY_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js</valueProcess>
- <title>Volume</title>
- <description>FIELDGROUP</description>
- <fields>
- <element>VOLUME</element>
- </fields>
- </entityFieldGroup>
<entityOutgoingField>
<name>SalesprojectSource_dfo</name>
<title>Source</title>
@@ -411,6 +404,10 @@
<name>RELATION_ID.displayValue</name>
<recordfield>ORG.NAME</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VOLUME.displayValue</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js b/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce76b0444f1f77a3b3c25eab41c4940feb10702f
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+var recordState = vars.get("$sys.recordstate");
+if (recordState == neon.OPERATINGSTATE_EDIT || recordState == neon.OPERATINGSTATE_NEW)
+{
+ result.string("NUMBER");
+}
+else
+{
+ result.string("TEXT");
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js b/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js
deleted file mode 100644
index eee86d7eef08aa2a0a16e7665d539f12a193c9ec..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-
-result.string(vars.get("$field.VOLUME") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..542d45f41cf7db2349f5a6908b87813c5565f725
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+
+var maskingUtils = new SqlMaskingUtils();
+result.string(maskingUtils.concat(["char(SALESPROJECT.VOLUME)", "'" + translate.text("${THOUSAND_SHORT}") + "'", "'" + translate.text("${EURO_SIGN}") + "'"], " ", true))
\ No newline at end of file
diff --git a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
index 446720d67ac9402c34bd4ce59d26763688b84907..f89b89ba2b942d623634d6a7e082996077d0b32a 100644
--- a/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
+++ b/neonView/SalesprojectMemberPreview_view/SalesprojectMemberPreview_view.aod
@@ -21,8 +21,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>c5957f1f-253f-4941-b7db-8b6b438f2ad7</name>
- <entityField>resultingRelation_fieldGroup</entityField>
+ <name>9eafb9df-5b00-4e1f-aacf-04c62cfaddf0</name>
+ <entityField>RELATIONSHIP</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 22341863c9bb9aca35324959ff83f5d7f74ea86c..dfa8042e8af3a5ac06c7ee43b87aee9fb7a62b10 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -45,8 +45,8 @@
<entityField>PROBABILITY</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>fbd92799-b2e9-40e9-8700-f95765befa55</name>
- <entityField>VOLUME_DISPLAY_fieldGroup</entityField>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
</entityFieldLink>
<entityFieldLink>
<name>774ab565-a5e0-4b31-a77a-39143534f9a8</name>