Merge origin/master

39b2777e · S.Listl · 9efa178c · 9b88b3e7 · 39b2777e · 39b2777e
Commit 39b2777e authored 6 years ago by S.Listl
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -246,6 +246,26 @@
      <mandatory v="false" />
      <description>PARAMETER</description>
    </entityParameter>
+    <entityOutgoingField>
+      <name>ActivityObjectRelation_dfo</name>
+      <title>Relations</title>
+      <fieldType>DEPENDENCY_OUT</fieldType>
+      <dependency>
+        <name>dependency</name>
+        <entityName>ObjectRelation_entity</entityName>
+        <fieldName>ObjectRelationByObject1_dfi</fieldName>
+      </dependency>
+      <children>
+        <entityParameter>
+          <name>Object1Rowid_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js</code>
+        </entityParameter>
+        <entityParameter>
+          <name>Object1Type_param</name>
+          <code>%aditoprj%/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js</code>
+        </entityParameter>
+      </children>
+    </entityOutgoingField>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>

--- a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
+++ b/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1rowid_param/code.js
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.ACTIVITYID"));
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
+++ b/entity/Activity_entity/entityfields/activityobjectrelation_dfo/children/object1type_param/code.js
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
--- a/entity/Activity_entity/entityfields/icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/icon/valueProcess.js
@@ -7,4 +7,4 @@ var category = vars.getString("$field.CATEGORY");
 var kwd = KeywordUtils.createKeyword("ACTIVITY.CATEGORY");
 var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);

-result.string(icon || "NEON:HISTORY");
\ No newline at end of file
+result.string(icon || "NEON:HISTORY");
--- a/entity/ObjectRelation_entity/ObjectRelation_entity.aod
+++ b/entity/ObjectRelation_entity/ObjectRelation_entity.aod
@@ -46,6 +46,7 @@
    <entityField>
      <name>OBJECT2_ROWID</name>
      <title>Object 2</title>
+      <linkedContextProcess>%aditoprj%/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js</linkedContextProcess>
    </entityField>
    <entityField>
      <name>OBJECT2_TYPE</name>
@@ -61,13 +62,54 @@
    <entityIncomingField>
      <name>ObjectRelationById_dfi</name>
      <fieldType>DEPENDENCY_IN</fieldType>
+      <title>Relations</title>
      <recordContainer>db</recordContainer>
+      <children>
+        <entityParameter>
+          <name>Object1Type_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Object1Rowid_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
    </entityIncomingField>
+    <entityParameter>
+      <name>Object1Type_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
+    <entityIncomingField>
+      <name>ObjectRelationByObject1_dfi</name>
+      <fieldType>DEPENDENCY_IN</fieldType>
+      <recordContainer>db</recordContainer>
+      <dependencies>
+        <entityDependency>
+          <name>8eb3187c-07cb-4b51-8b7e-d63e83959bdb</name>
+          <entityName>Activity_entity</entityName>
+          <fieldName>ActivityObjectRelation_dfo</fieldName>
+          <isOutgoing v="false" />
+        </entityDependency>
+      </dependencies>
+      <children>
+        <entityParameter>
+          <name>ObjectRelatonId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityIncomingField>
+    <entityParameter>
+      <name>Object1Rowid_param</name>
+      <expose v="true" />
+      <triggerRecalculation v="true" />
+      <description>PARAMETER</description>
+    </entityParameter>
  </entityFields>
  <recordContainers>
    <dbRecordContainer>
      <name>db</name>
-      <title></title>
      <description>&amp;lt;null value&amp;gt;</description>
      <alias>Data_alias</alias>
      <conditionProcess>%aditoprj%/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
@@ -113,6 +155,14 @@
          <name>USER_NEW.value</name>
          <recordfield>AB_OBJECTRELATION.USER_NEW</recordfield>
        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>DATE_NEW.value</name>
+          <recordfield>AB_OBJECTRELATION.DATE_NEW</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>OBJECT2_ROWID.displayValue</name>
+          <recordfield>AB_OBJECTRELATION.OBJECT2_TYPE</recordfield>
+        </dbRecordFieldMapping>
      </recordFieldMappings>
    </dbRecordContainer>
  </recordContainers>

--- a/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js
+++ b/entity/ObjectRelation_entity/entityfields/object2_rowid/linkedContextProcess.js
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.OBJECT2_TYPE"))
\ No newline at end of file
--- a/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/ObjectRelation_entity/recordcontainers/db/conditionProcess.js
@@ -4,11 +4,16 @@ import("system.result");
 import("system.db");
 import("Sql_lib");

-logging.log("objectid: " + vars.get("$param.ObjectRelatonId_param"))
+logging.log("rowid: " + vars.get("$param.Object1Rowid_param"))
+logging.log("type: " + vars.get("$param.Object1Type_param"))
 logging.log(SqlCondition.begin()
+                .andPrepareVars("AB_OBJECTRELATION.OBJECT1_TYPE", "$param.Object1Type_param")
+                .andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$param.Object1Rowid_param")
                .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONID", "$param.ObjectRelatonId_param")
                .build("1=2").toSource())

 result.string(db.translateCondition(SqlCondition.begin()
+                .andPrepareVars("AB_OBJECTRELATION.OBJECT1_TYPE", "$param.Object1Type_param")
+                .andPrepareVars("AB_OBJECTRELATION.OBJECT1_ROWID", "$param.Object1Rowid_param")
                .andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONID", "$param.ObjectRelatonId_param")
                .build("1=2")));
\ No newline at end of file
--- a/entity/Offeritem_entity/onDBDelete.js
+++ b/entity/Offeritem_entity/onDBDelete.js
@@ -17,5 +17,5 @@ if(oid != "")
    
    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
    
-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Offeritem_entity/onDBInsert.js
+++ b/entity/Offeritem_entity/onDBInsert.js
@@ -22,5 +22,5 @@ if(oid != "")
    
    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
    
-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Offeritem_entity/onDBUpdate.js
+++ b/entity/Offeritem_entity/onDBUpdate.js
@@ -12,5 +12,5 @@ if(oid != "")
    
    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
    
-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
@@ -19,5 +19,5 @@ if(oid != "")

    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
    
-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -23,5 +23,5 @@ if(oid != "")

    db.updateData("OFFER", cols, null, vals, SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));
    
-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
@@ -12,5 +12,5 @@ if(oid != "")
    
    db.updateData("OFFER", cols, null, oiUtils.getNetAndVat(), SqlCondition.equals("OFFER.OFFERID", oid, "1 = 2"));

-    neon.refresh("Offer_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
@@ -18,5 +18,5 @@ if(oid != "")
    
    db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", oid, "1 = 2"));

-    neon.refresh("Order_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
@@ -23,5 +23,5 @@ if(oid != "")
    
    db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", oid, "1 = 2"));
    
-    neon.refresh("Order_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
@@ -13,5 +13,5 @@ if(oid != "")
    
    db.updateData("SALESORDER", cols, null, vals, SqlCondition.equals("SALESORDER.SALESORDERID", oid, "1 = 2"));
    
-    neon.refresh("Order_entity");
+    neon.refresh();
 }
\ No newline at end of file
--- a/entity/SalesprojectClassification_entity/contentProcess.js
+++ b/entity/SalesprojectClassification_entity/contentProcess.js
@@ -5,7 +5,7 @@ import("Keyword_lib");

 var keyword = KeywordUtils.createKeyword("SALESPROJECT.CLASS");

-if (vars.exists("$local.idvalues")) {
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
    var idValues = vars.get("$local.idvalues");
    
    if (idValues.length > 0) {

--- a/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/SalesprojectClassification_entity/recordcontainers/jdito/contentProcess.js
@@ -5,7 +5,7 @@ import("Keyword_lib");

 var keyword = KeywordUtils.createKeyword("SALESPROJECT.CLASS");

-if (vars.exists("$local.idvalues")) {
+if (vars.exists("$local.idvalues") && vars.get("$local.idvalues")) {
    var idValues = vars.get("$local.idvalues");
    
    if (idValues.length > 0) {

--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_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>SalesprojectForecast_entity</name>
-  <title>Forecast</title>
+  <title>${FORECAST_ENGLISH}</title>
  <majorModelMode>DISTRIBUTED</majorModelMode>
  <recordContainer>db</recordContainer>
  <entityFields>

--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -4,9 +4,9 @@
  <title>Task</title>
  <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>
+  <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
  <recordContainer>db</recordContainer>
  <entityFields>
    <entityIncomingField>
@@ -32,6 +32,7 @@
      <title>{$TASK_STATUS}</title>
      <mandatory v="true" />
      <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
    </entityField>
    <entityField>
@@ -39,6 +40,7 @@
      <title>priority</title>
      <mandatory v="true" />
      <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/priority/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
    </entityField>
    <entityField>
@@ -59,6 +61,7 @@
      <title>start date</title>
      <contentType>DATE</contentType>
      <resolution>DAY</resolution>
+      <groupable v="true" />
      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
      <onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
    </entityField>
@@ -74,6 +77,7 @@
      <name>TYPE</name>
      <title>type</title>
      <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
+      <groupable v="true" />
    </entityField>
    <entityField>
      <name>DESCRIPTION</name>