salesproject fixes

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>

entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js → entity/SalesprojectMember_entity/entityfields/relationship/displayValueProcess.js

+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"));
 }

entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js

-import("system.vars");
-import("system.logging");
-
-logging.log(vars.get("$field.RELATIONSHIP"))
\ No newline at end of file

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>

entity/Salesproject_entity/entityfields/volume/contentTypeProcess.js

+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

entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js

-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

entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volume.displayvalue/expression.js

+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

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>

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>