Merge origin/master

entity/Offer_entity/Offer_entity.aod

@@ -253,9 +253,11 @@
     </entityActionField>
     <entityField>
       <name>RELATION_ORG_ID</name>
+      <searchable v="false" />
     </entityField>
     <entityField>
       <name>RELATION_PERS_ID</name>
+      <searchable v="false" />
     </entityField>
     <entityOutgoingField>
       <name>OfferRelation_dfo</name>

entity/Offer_entity/entityfields/probability/possibleItemsProcess.js

 import("system.result");
 import("Keyword_lib");
 
-var kwdUtils, items;
-
-items = KeywordUtils.getStandardArray("OFFER.PROBABILITY");
-result.object(items);
\ No newline at end of file
+result.object(KeywordUtils.getStandardArray("OFFER.PROBABILITY"));
\ No newline at end of file

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>

entity/SalesprojectMember_entity/SalesprojectMember_entity.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.1.1">
   <name>SalesprojectMember_entity</name>
-  <title>Member</title>
+  <title>${SALESPROJECT_MEMBER}</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -10,14 +10,20 @@
     </entityIncomingField>
     <entityField>
       <name>DATE_EDIT</name>
+      <contentType>DATE</contentType>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DATE_NEW</name>
+      <contentType>DATE</contentType>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>RELATION_ID</name>
-      <title>Member</title>
-      <state>READONLY</state>
+      <title>Person</title>
+      <linkedContext>Pers_context</linkedContext>
+      <outgoingField>PersLookup_dfo</outgoingField>
     </entityField>
     <entityField>
       <name>SALESPROJECT_ID</name>
@@ -34,9 +40,12 @@
     </entityField>
     <entityField>
       <name>USER_EDIT</name>
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>USER_NEW</name>
+      <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityIncomingField>
       <name>SalesprojectMember_dfi</name>
@@ -91,7 +100,7 @@
       <state>READONLY</state>
     </entityField>
     <entityOutgoingField>
-      <name>PersSalesprojectMember_dfo</name>
+      <name>SalesprojectMemberPers_dfo</name>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
@@ -115,11 +124,20 @@
     </entityField>
     <entityField>
       <name>RELATIONSHIP</name>
+      <title>Relationship</title>
+      <description>Overrules RELATION_RELATIONSHIP</description>
+      <contentType>NUMBER</contentType>
       <onValueChange>%aditoprj%/entity/SalesprojectMember_entity/entityfields/relationship/onValueChange.js</onValueChange>
+      <onValueChangeTypes>
+        <element>MASK</element>
+        <element>PROCESS</element>
+      </onValueChangeTypes>
     </entityField>
     <entityField>
       <name>RELATION_RELATIONSHIP</name>
+      <title>Relationship</title>
       <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+      <contentType>NUMBER</contentType>
     </entityField>
     <entityFieldGroup>
       <name>resultingRelation_fieldGroup</name>
@@ -130,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>
@@ -236,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>

entity/SalesprojectMember_entity/entityfields/date_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file

entity/SalesprojectMember_entity/entityfields/date_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file

entity/SalesprojectMember_entity/entityfields/resultingrelation_fieldgroup/valueProcess.js

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

entity/SalesprojectMember_entity/entityfields/user_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file

entity/SalesprojectMember_entity/recordcontainers/db/recordfieldmappings/relation_id.displayvalue/expression.js

+import("system.result");
+import("Pers_lib");
+
+result.string(PersUtils.getResolvingDisplaySubSql("RELATION_ID"))
\ No newline at end of file

entity/Salesproject_entity/Salesproject_entity.aod

@@ -52,6 +52,7 @@
     </entityField>
     <entityField>
       <name>ESTIMATIONVALUE</name>
+      <searchable v="false" />
     </entityField>
     <entityField>
       <name>INFO</name>
@@ -127,16 +128,8 @@
     <entityField>
       <name>PROBABILITY</name>
       <title>Probability</title>
+      <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
     </entityField>
-    <entityFieldGroup>
-      <name>PROBABILITY_DISPLAY_fieldGroup</name>
-      <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js</valueProcess>
-      <title>Probability</title>
-      <description>FIELDGROUP</description>
-      <fields>
-        <element>PROBABILITY</element>
-      </fields>
-    </entityFieldGroup>
     <entityFieldGroup>
       <name>VOLUME_DISPLAY_fieldGroup</name>
       <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js</valueProcess>
@@ -254,7 +247,7 @@
     </entityOutgoingField>
     <entityOutgoingField>
       <name>SalesprojectMember_dfo</name>
-      <title>Member</title>
+      <title>${SALESPROJECT_MEMBER}</title>
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>

entity/Salesproject_entity/entityfields/probability/possibleItemsProcess.js

+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("SALESPROJECT.PROBABILITY"));
\ No newline at end of file

entity/Salesproject_entity/entityfields/probability_display_fieldgroup/valueProcess.js

-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.PROBABILITY") + "%");
\ No newline at end of file

entity/Salesproject_entity/entityfields/volume_display_fieldgroup/valueProcess.js

@@ -2,4 +2,4 @@ import("system.result");
 import("system.vars");
 import("system.translate");
 
-result.string(vars.get("$field.PROBABILITY") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file
+result.string(vars.get("$field.VOLUME") + " " + translate.text("${THOUSAND_SHORT}") + " " + translate.text("${EURO_SIGN}"));
\ No newline at end of file

entity/Task_entity/Task_entity.aod

@@ -5,6 +5,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
   <icon>VAADIN:TASKS</icon>
+  <onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
   <iconId>VAADIN:TASKS</iconId>
   <recordContainer>db</recordContainer>
   <entityFields>
@@ -13,11 +14,13 @@
     </entityIncomingField>
     <entityField>
       <name>CODE</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/code/documentation.adoc</documentation>
       <title>task number</title>
       <contentType>NUMBER</contentType>
       <outputFormat>0000000</outputFormat>
       <state>READONLY</state>
       <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/code/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>SUBJECT</name>
@@ -75,7 +78,7 @@
     <entityField>
       <name>DESCRIPTION</name>
       <title>description</title>
-      <contentType>HTML</contentType>
+      <contentType>LONG_TEXT</contentType>
     </entityField>
     <entityField>
       <name>PROTECTIONLEVEL</name>
@@ -88,25 +91,34 @@
     <entityField>
       <name>TASKID</name>
       <mandatory v="true" />
+      <searchable v="false" />
       <valueProcess>%aditoprj%/entity/Task_entity/entityfields/taskid/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DATE_NEW</name>
+      <title>{$DATE_NEW}</title>
       <contentType>DATE</contentType>
       <resolution>SECOND</resolution>
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/date_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>USER_NEW</name>
+      <title>{$USER_NEW}</title>
       <mandatory v="true" />
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/user_new/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>DATE_EDIT</name>
+      <title>{$DATE_EDIT}</title>
       <contentType>DATE</contentType>
       <resolution>SECOND</resolution>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/date_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>USER_EDIT</name>
+      <title>{$USER_EDIT}</title>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/user_edit/valueProcess.js</valueProcess>
     </entityField>
     <entityOutgoingField>
       <name>PersEditor_dfo</name>

entity/Task_entity/entityfields/code/documentation.adoc

+The `CODE` field is a automatically increased sequential number. 
+It cannot be set by the user.
+Therefore it's only visible after creation of a `TASK` record.
\ No newline at end of file

entity/Task_entity/entityfields/code/valueProcess.js

+import("system.logging");
+import("system.neon");
+import("system.db");
+import("system.vars");
+import("Sql_lib");
+
+
+//if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+//{
+//    var maskingHelper = new SqlMaskingUtils();
+//    var newCodeNumber = db.cell("select " + maskingHelper.max("TASK.CODE") + " from TASK");
+//    newCodeNumber = Number(newCodeNumber);//if no number exists till no, start value will be 1 (due to: ++0)
+//    if (isNaN(newCodeNumber))
+//        throw new TypeError();//TODO:add Message
+//    ++newCodeNumber;
+//    logging.log("newCodeNumber: " + newCodeNumber)
+//    vars.set("$field.CODE", newCodeNumber);
+//}
\ No newline at end of file

entity/Task_entity/entityfields/date_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.date"));
\ No newline at end of file

entity/Task_entity/entityfields/date_new/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+    result.string(vars.getString("$sys.date"));
+

entity/Task_entity/entityfields/user_edit/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+    result.string(vars.getString("$sys.user"));
\ No newline at end of file