[Projekt: Entwicklung - Neon][TicketNr.: 1061095][Aktivität - Registerreiter...

[Projekt: Entwicklung - Neon][TicketNr.: 1061095][Aktivität - Registerreiter Verlauf - Icons der Aktvivtäten]

entity/Activity_entity/Activity_entity.aod

@@ -626,6 +626,72 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>ActivityChildren</name>
+      <documentation>%aditoprj%/entity/Activity_entity/entityfields/activitychildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ActivityIDs_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>InsertLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Entrydate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Info_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Direction_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetDocuments_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Subject_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>VisitPlanEntryId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>Category_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>OnlyInnate_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Activity_entity/entityfields/activitychildren/documentation.adoc

+Provides Activities that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file

entity/Activity_entity/recordcontainers/db/conditionProcess.js

@@ -56,5 +56,8 @@ if (Utils.toBoolean(vars.get("$param.OnlyInnate_param")))
         condition.noResult();
 }
 
+condition.andIfSet("ACTIVITY.PARENT_ID", "$param.ParentId_param");
+condition.andIfSet("ACTIVITY.PARENT_CONTEXT", "$param.ParentContext_param");
+
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(condition.toString());
\ No newline at end of file

entity/ModuleTree_entity/ModuleTree_entity.aod

@@ -18,12 +18,13 @@
     </entityField>
     <entityField>
       <name>ICON</name>
+      <colorProcess>%aditoprj%/entity/ModuleTree_entity/entityfields/icon/colorProcess.js</colorProcess>
       <contentType>IMAGE</contentType>
     </entityField>
     <entityProvider>
       <name>TreeProviders</name>
       <targetContextField>TYPE</targetContextField>
-      <targetIdField>UID</targetIdField>
+      <targetIdField>ROW_ID</targetIdField>
       <recordContainer>jdito</recordContainer>
       <dependencies>
         <entityDependency>
@@ -58,9 +59,11 @@
     </entityProvider>
     <entityField>
       <name>PARENT_ID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc</documentation>
     </entityField>
     <entityField>
       <name>UID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/uid/documentation.adoc</documentation>
     </entityField>
     <entityField>
       <name>PARENT_CONTEXT</name>
@@ -84,6 +87,16 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityField>
+      <name>ICON_COLOR</name>
+    </entityField>
+    <entityField>
+      <name>ROW_ID</name>
+    </entityField>
+    <entityField>
+      <name>PARENT_ROW_ID</name>
+      <documentation>%aditoprj%/entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc</documentation>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>
@@ -94,12 +107,18 @@
         <jDitoRecordFieldMapping>
           <name>UID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ROW_ID.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>TYPE.value</name>
         </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>PARENT_ID.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>PARENT_ROW_ID.value</name>
+        </jDitoRecordFieldMapping>
         <jDitoRecordFieldMapping>
           <name>PARENT_CONTEXT.value</name>
         </jDitoRecordFieldMapping>
@@ -112,6 +131,9 @@
         <jDitoRecordFieldMapping>
           <name>ICON.value</name>
         </jDitoRecordFieldMapping>
+        <jDitoRecordFieldMapping>
+          <name>ICON_COLOR.value</name>
+        </jDitoRecordFieldMapping>
       </recordFieldMappings>
     </jDitoRecordContainer>
   </recordContainers>

entity/ModuleTree_entity/entityfields/icon/colorProcess.js

+import("system.vars");
+import("system.result");
+
+var color = vars.get("$field.ICON_COLOR");
+//only return a value if there is acutally one because otherwise (if giving null for exmaple) the records would inherit the color of the previous record
+if (color)
+    result.string(color);

entity/ModuleTree_entity/entityfields/parent_id/documentation.adoc

+This field containts the parents UID (if existant) or `null` (if it's a root element).
+The field is needed to build a tree/treeTable.
+
+Do not confuse this with the `PARENT_ROW_ID`-field.
\ No newline at end of file

entity/ModuleTree_entity/entityfields/parent_row_id/documentation.adoc

+This field contains the actual rowId of the record, which is dependent on the `TYPE`-field.
+So for example if the TYPE is `Activity` this field contains the Activities UID (`ACTIVITYID`). 
+If the TYPE is `Task` this field containst the Tasks UID (`TASKID`) and so on.
+
+Do not confuse this with the `PARENT_ID`-field.

entity/ModuleTree_entity/entityfields/uid/documentation.adoc

+The UID is composed of some other data:
+
+* `ROW_ID` of the actual record
+* `OBJECT_TYPE` of the actual record (=the contextid)
+
+The ID is encoded as json string of an object with the following properties:
+
+* `id` which is the `ROW_ID`
+* `type` which is the `OBJECT_TYPE`
+
+See these examples of uids: 
+
+* `{"id":"634ad7a8-9c68-4ea4-8385-f5bb37224482","type":"SupportTicket"}`
+* `{"id":"b8067a42-d059-4d86-88b0-485a194faa36","type":"Activity"}`
+* `{"id":"ccdea060-a151-44b2-b7ff-74fdcd0ce333","type":"Task"}`
+* `{"id":"453ff4dd-ffa1-4bb0-a5dc-45b9d333a853","type":"Task"}`
+
+The *reason* for this encoding is to grant better performance when data is requested from the kernel 
+while giving the `$local.idvalues`-Variable.
+
+When we know the objectType and the rowId we can directly load data with the given rowId from 
+the objectTypes entity.
+If we only had the rowId it would be necessary to try all possible entities (objectTypes) for a match 
+in the worst cases.
+
+The information of `ROW_ID` and `OBJECT_TYPE` cannot change during runtime, so this cannot lead to errors.
\ No newline at end of file

entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js

+import("system.logging");
+import("system.neon");
 import("system.entities");
 import("Keyword_lib");
 import("KeywordRegistry_basic");
@@ -6,28 +8,59 @@ import("Sql_lib")
 import("system.result");
 import("system.db");
 
-var fixedContextName = vars.get("$param.ContextName_param");
-var fixedID = vars.get("$param.ID_param");
+var resArray = [];
 
-let resArray = [];
+var idValues;
+if (vars.exists("$local.idvalues") )
+    idValues = vars.get("$local.idvalues");
 
-// Query root element
-var root = queryRootElement(fixedContextName, fixedID, true);
+if (idValues)
+{
+    /* Currently there is no known use case for the ModuleTree_entity where the idValues is actually more than one.
+     * Every uid contains:
+     * a) the row_id of the record
+     * b) the type (contextid) of the record
+     * 
+     * The process loads at the moment for every idValue in idValues the record.
+     * From a perfromance perspective it would be probably better to:
+     * - collect the row_id values of every type
+     * - request for that type all the data at once
+     * - augment all the data and prepare it for returning to this jditoRC
+     * 
+     **/
+    if (idValues.length > 15)
+        logging.log("[ModuleTree_entity]Performance warning: The ModuleTree_entity has received an request for " + idValues.length + " ids, "
+            + "but it is not optimized for such requests. See the ModuleTree_entity.contentProcess and this message.", logging.WARNING);
+    idValues.forEach(function (uid){
+        uid = JSON.parse(uid);
+        var singleElement = queryRootElement(uid.type, uid.id, true);
+        if (singleElement)
+            resArray.push(singleElement);
+    });
+}
+else
+{
+    var fixedContextName = vars.get("$param.ContextName_param");
+    var fixedID = vars.get("$param.ID_param");
 
-if (root !== null) {
-    // Push root element
-    resArray.push(root);
+    // Query root element
+    var root = queryRootElement(fixedContextName, fixedID, true);
 
-    // Query children of root
-    var children = queryChildrenElements(fixedContextName, fixedID);
-    
-    if (children !== null) {
-     
-       // Push each children
-       resArray = resArray.concat(children);
-       result.object(resArray);
+    if (root !== null) {
+        // Push root element
+        resArray.push(root);
+
+        // Query children of root
+        var children = queryChildrenElements(fixedContextName, fixedID);
+
+        if (children !== null) {
+
+           // Push each children
+           resArray = resArray.concat(children);
+        }
     }
 }
+result.object(resArray);
 
 /**
  * Queries the children of the given parent element.
@@ -36,27 +69,40 @@ if (root !== null) {
  * @param pContextName Context name of the parent element.
  * @param pID ID of the parent element.
  */
-function queryChildrenElements (pContextName, pID) {
-    
-    var taskResult = newSelect("TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TASK")
-                        .where("TASK.PARENT_ID", pID)
-                        .and("TASK.PARENT_CONTEXT", pContextName)
-                        .and("TASK.KIND", $KeywordRegistry.taskType$task())
-                        .table();
-    
-    var ticketResult = newSelect("TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION")
-                        .from("TICKET")
-                        .leftJoin("TASK", "TASK_ID = TASKID")
-                        .where("TASK.PARENT_ID", pID)
-                        .and("TASK.PARENT_CONTEXT", pContextName)
-                        .table();
+function queryChildrenElements (pContextName, pID) 
+{
+    //Tasks:
+    var taskConf = _getConfigForLoadingTaskRows()
+        .provider("TaskChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var taskRows = entities.getRows(taskConf);
+    //remap the data to the format like the augmentdata function needs it
+    var taskResult = taskRows.map(function (rowValues){
+        return _mapTaskRow(rowValues);
+    });
+
+    //Tickets:
+    var supportTicketConf = _getConfigForLoadingSupportTicketRows()
+        .provider("SupportTicketChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var supportTicketRows = entities.getRows(supportTicketConf);
+    //remap the data to the format like the augmentdata function needs it
+    var ticketResult = supportTicketRows.map(function (rowValues){
+        return _mapSupportTicketRow(rowValues);
+    });
     
-    var activityResult = newSelect("ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO")
-                        .from("ACTIVITY")
-                        .where("ACTIVITY.PARENT_ID", pID)
-                        .and("ACTIVITY.PARENT_CONTEXT", pContextName)
-                        .table();
+    //Activities:
+    var activityConf = _getConfigForLoadingActivityRows()
+        .provider("ActivityChildren")
+        .addParameter("ParentId_param", pID)
+        .addParameter("ParentContext_param", pContextName);
+    var activityRows = entities.getRows(activityConf);
+    //remap the data to the format like the augmentdata function needs it
+    var activityResult = activityRows.map(function (rowValues){
+        return _mapActivityRow(rowValues);
+    });
     
     var res = []
   
@@ -66,7 +112,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(taskResult[i]);
         
         // Query children
-        let children = queryChildrenElements("Task", taskResult[i][0]);
+        let children = queryChildrenElements("Task", taskResult[i][1]);
         res = res.concat(children);
     }
     
@@ -76,7 +122,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(activityResult[i]);
         
         // Query children
-        let children = queryChildrenElements("Activity", activityResult[i][0]);
+        let children = queryChildrenElements("Activity", activityResult[i][1]);
         res = res.concat(children);
     }
     
@@ -86,7 +132,7 @@ function queryChildrenElements (pContextName, pID) {
         res.push(ticketResult[i]);
         
         // Query children
-        let children = queryChildrenElements("SupportTicket", ticketResult[i][0]);
+        let children = queryChildrenElements("SupportTicket", ticketResult[i][1]);
         res = res.concat(children);
     }
       
@@ -100,23 +146,15 @@ function queryChildrenElements (pContextName, pID) {
  * @param pID ID of the root element.
  * @param pGetFirst start from the first element
  */
-function queryRootElement (pContextName, pID, pGetFirst) {
-    var resultArray, rowValues, conf, icon;
+function queryRootElement (pContextName, pID, pGetFirst) 
+{
+    var resultArray, rowValues, conf;
     
-    if (pContextName === "Task") {
-        
-        conf = entities.createConfigForLoadingRows()
-                        .entity("Task_entity")
-                        .fields(["TASKID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "DESCRIPTION"])
-                        .uid(pID);
-                                
+    if (pContextName === "Task") 
+    {
+        conf = _getConfigForLoadingTaskRows().uid(pID);
         rowValues = entities.getRow(conf);
-        
-        resultArray = [rowValues["TASKID"],
-                        rowValues["PARENT_ID"],
-                        rowValues["PARENT_CONTEXT"],
-                        rowValues["SUBJECT"],
-                        rowValues["DESCRIPTION"]];
+        resultArray = _mapTaskRow(rowValues);
                         
         if (resultArray.length === 0) {
             return null;
@@ -130,20 +168,9 @@ function queryRootElement (pContextName, pID, pGetFirst) {
         }
         return augmentData(resultArray, "Task");
     } else if (pContextName === "Activity") {
-        conf = entities.createConfigForLoadingRows()
-                        .entity("Activity_entity")
-                        .fields(["ACTIVITYID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "INFO", "#IMAGE"])
-                        .uid(pID);
-                                
+        conf = _getConfigForLoadingActivityRows().uid(pID);
         rowValues = entities.getRow(conf);
-        
-        resultArray = [rowValues["ACTIVITYID"],
-                        rowValues["PARENT_ID"],
-                        rowValues["PARENT_CONTEXT"],
-                        rowValues["SUBJECT"],
-                        rowValues["INFO"]];
-        
-        icon = rowValues["#IMAGE"];
+        resultArray = _mapActivityRow(rowValues);
         
         if (resultArray.length === 0) {
             return null;
@@ -155,22 +182,13 @@ function queryRootElement (pContextName, pID, pGetFirst) {
             fixedContextName = "Activity";
             fixedID = resultArray[0];
         }
-        return augmentData(resultArray, "Activity", icon);
+        return augmentData(resultArray, "Activity");
     }
     else if (pContextName === "SupportTicket") {
 
-        conf = entities.createConfigForLoadingRows()
-                        .entity("SupportTicket_entity")
-                        .fields(["TICKETID", "TASK_PARENT_ID", "TASK_PARENT_CONTEXT", "TASK_SUBJECT", "TASK_DESCRIPTION"])
-                        .uid(pID);
-                                
+        conf = _getConfigForLoadingSupportTicketRows().uid(pID);
         rowValues = entities.getRow(conf);
-        
-        resultArray = [rowValues["TICKETID"],
-                        rowValues["TASK_PARENT_ID"],
-                        rowValues["TASK_PARENT_CONTEXT"],
-                        rowValues["TASK_SUBJECT"],
-                        rowValues["TASK_DESCRIPTION"]];
+        resultArray = _mapSupportTicketRow(rowValues);
                         
         if (resultArray.length === 0) {
             return null;
@@ -192,14 +210,12 @@ function queryRootElement (pContextName, pID, pGetFirst) {
  * Augments the given row to match the required result signature.
  * 
  * @param pDataRow Requires the following format:
- *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION
+ *                 UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION, ICON, ICON_COLOR
  * @param pType The type of the row which needs adjustment.
- * @param pIcon The Icon (only needed for activities)
- * @return Returns the following format:
- *         UID, KIND, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
+ * @return Returns the data in the form how the record container requests it
  * 
  */
-function augmentData (pDataRow, pType, pIcon) {
+function augmentData (pDataRow, pType) {
     if (pDataRow === null || pDataRow === undefined)
         return null;
     
@@ -209,19 +225,118 @@ function augmentData (pDataRow, pType, pIcon) {
     if (pType !== "Task" && pType !== "Activity" && pType !="SupportTicket")
         return null;
     
+    var rowId, parentId, parentContext, title, description, icon, iconColor;
+    [rowId, parentId, parentContext, title, description, icon, iconColor] = pDataRow;
+
     // PARENT_ID check
-    if (pDataRow[2] === "")
-        pDataRow[2] = null;
+    if (parentId === "")
+        parentId = null;
     
     // PARENT_CONTEXT check
-    if (pDataRow[3] === "")
-        pDataRow[3] = null;
-    
-    // Insert type
-    pDataRow.splice(1, 0, pType);
-    
-    // Insert icon
-    pDataRow.splice(6, 0, pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? pIcon : pType ==="SupportTicket" ? "VAADIN:chat": null);
-    
-    return pDataRow;
+    if (parentId === "")
+        parentId = null;
+
+    if (!iconColor)
+        iconColor = "";
+
+    var uid = JSON.stringify({id: rowId, type: pType});
+    var parentUid = null;
+    if (parentId && parentContext)
+        parentUid = JSON.stringify({id: parentId, type: parentContext});
+    //we have no access to the datamodels iconId here, so therefor the icon values are hardcoded //TODO: optimize and load automatically
+    var resIcon = icon || (pType === "Task" ? "VAADIN:TASKS" : pType === "Activity" ? "VAADIN:HOURGLASS_END" : pType ==="SupportTicket" ? "VAADIN:chat" : null);
+    var res = [uid, rowId, pType, parentUid, parentId, parentContext, title, description, resIcon, iconColor];
+    return res;
+}
+
+/*
+ * private helper function for creating the base config for loading TASKS 
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingTaskRows()
+{
+    var res = entities.createConfigForLoadingRows()
+        .entity("Task_entity")
+        .fields(["TASKID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "DESCRIPTION", "PRIORITY_ICON", "ICON_COLOR"]);
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingTaskRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapTaskRow(pRowValues)
+{
+    return [
+         pRowValues["TASKID"]
+        ,pRowValues["PARENT_ID"]
+        ,pRowValues["PARENT_CONTEXT"]
+        ,pRowValues["SUBJECT"]
+        ,pRowValues["DESCRIPTION"]
+        ,pRowValues["PRIORITY_ICON"]
+        ,pRowValues["ICON_COLOR"]
+    ];
+}
+
+/*
+ * private helper function for creating the base config for loading SUPPORT TICKETS 
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingSupportTicketRows()
+{
+    var res = entities.createConfigForLoadingRows()
+        .entity("SupportTicket_entity")
+        .fields(["TICKETID", "TASK_PARENT_ID", "TASK_PARENT_CONTEXT", "TASK_SUBJECT", "TASK_DESCRIPTION", "TASK_PRIORITY_ICON", "TASK_ICON_COLOR"])
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingSupportTicketRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapSupportTicketRow(pRowValues)
+{
+    return [
+         pRowValues["TICKETID"]
+        ,pRowValues["TASK_PARENT_ID"]
+        ,pRowValues["TASK_PARENT_CONTEXT"]
+        ,pRowValues["TASK_SUBJECT"]
+        ,pRowValues["TASK_DESCRIPTION"]
+        ,pRowValues["TASK_PRIORITY_ICON"]
+        ,pRowValues["TASK_ICON_COLOR"]
+    ];
+}
+
+
+/*
+ * private helper function for creating the base config for loading ACTIVITES
+ * You need to extend it for example with uids or parameters to limit the data
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _getConfigForLoadingActivityRows()
+{
+    //activity has currently no icon color, therefor nothing to specify here
+    var res = entities.createConfigForLoadingRows()
+        .entity("Activity_entity")
+        .fields(["ACTIVITYID", "PARENT_ID", "PARENT_CONTEXT", "SUBJECT", "INFO", "#IMAGE"]);
+    return res;
+}
+
+/*
+ * private helper function for mapping the result of entities.getRows where the given config was created by _getConfigForLoadingActivityRows(...)
+ * This is used for the root and the child items, so if you want to change it you have only to change it once
+ */
+function _mapActivityRow(pRowValues)
+{
+    return [
+         pRowValues["ACTIVITYID"]
+        ,pRowValues["PARENT_ID"]
+        ,pRowValues["PARENT_CONTEXT"]
+        ,pRowValues["SUBJECT"]
+        ,pRowValues["INFO"]
+        ,pRowValues["#IMAGE"]
+        ,null //activity has currently no icon color, therefor give a placeholder value
+    ];
 }
\ No newline at end of file

entity/SupportTicket_entity/SupportTicket_entity.aod

@@ -421,6 +421,44 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>SupportTicketChildren</name>
+      <documentation>%aditoprj%/entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>TicketType_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterOnlyOwnTicket_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>TASK_ICON_COLOR</name>
+      <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/SupportTicket_entity/afterUiInit.js

@@ -8,16 +8,6 @@ import("ActivityTask_lib");
 
 if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
-    var presetLinks = JSON.parse(vars.getString("$param.PresetLinks_param"));
-        if(presetLinks[0][0] == "Person")
-        {
-            var contactId = presetLinks[0][1];
-
-            var orgContactId = ContactUtils.getOrganisationContactId(contactId);
-            
-            presetLinks[1] =  ["Organisation", orgContactId];
-        }
-    
-    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", presetLinks, "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
+    TaskUtils.addLinkRecords("$param.ObjectId_param", "$param.RowId_param", "$param.PresetLinks_param", "$field.TASK_PARENT_CONTEXT", "$field.TASK_PARENT_ID");
     AttributeRelationUtils.presetMandatoryAttributes(ContextUtils.getCurrentContextId(), "Attributes", TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
 }
\ No newline at end of file

entity/SupportTicket_entity/entityfields/supportticketchildren/documentation.adoc

+Provides SupportTickets that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file

entity/SupportTicket_entity/entityfields/task_icon_color/valueProcess.js

+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+
+switch(vars.getString("$field.TASK_PRIORITY"))
+{
+    case $KeywordRegistry.taskPriority$none():
+        result.string(neon.PRIORITY_NONE_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$low():
+        result.string(neon.PRIORITY_LOW_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$medium():
+        result.string(neon.PRIORITY_MEDIUM_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$high():
+        result.string(neon.PRIORITY_HIGH_COLOR);
+        break;
+}
+

entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js

 import("system.vars");
-import("KeywordRegistry_basic");
 import("system.result");
-import("system.neon");
-
-switch(vars.getString("$field.TASK_PRIORITY"))
-{
-    case $KeywordRegistry.taskPriority$none():
-        result.string(neon.PRIORITY_NONE_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$low():
-        result.string(neon.PRIORITY_LOW_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$medium():
-        result.string(neon.PRIORITY_MEDIUM_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$high():
-        result.string(neon.PRIORITY_HIGH_COLOR);
-        break;
-}
 
+result.string(vars.get("$field.TASK_ICON_COLOR"))
\ No newline at end of file

entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js

@@ -28,5 +28,8 @@ if (vars.get("$param.RowId_param") && vars.get("$param.ObjectId_param"))
                             , SqlBuilder.IN());
 }
 
+cond.andIfSet("TASK.PARENT_ID", "$param.ParentId_param");
+cond.andIfSet("TASK.PARENT_CONTEXT", "$param.ParentContext_param");
+
 //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
 result.string(cond.toString());
\ No newline at end of file

entity/Task_entity/Task_entity.aod

@@ -469,6 +469,40 @@
       <name>#PROVIDER_AGGREGATES</name>
       <useAggregates v="true" />
     </entityProvider>
+    <entityProvider>
+      <name>TaskChildren</name>
+      <documentation>%aditoprj%/entity/Task_entity/entityfields/taskchildren/documentation.adoc</documentation>
+      <children>
+        <entityParameter>
+          <name>ObjectId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentContext_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>FilterOnlyOwnTask_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>ParentId_param</name>
+          <expose v="true" />
+        </entityParameter>
+        <entityParameter>
+          <name>RowId_param</name>
+          <expose v="false" />
+        </entityParameter>
+        <entityParameter>
+          <name>PresetLinks_param</name>
+          <expose v="false" />
+        </entityParameter>
+      </children>
+    </entityProvider>
+    <entityField>
+      <name>ICON_COLOR</name>
+      <valueProcess>%aditoprj%/entity/Task_entity/entityfields/icon_color/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>

entity/Task_entity/entityfields/icon_color/valueProcess.js

+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+
+switch(vars.getString("$field.PRIORITY"))
+{
+    case $KeywordRegistry.taskPriority$none():
+        result.string(neon.PRIORITY_NONE_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$low():
+        result.string(neon.PRIORITY_LOW_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$medium():
+        result.string(neon.PRIORITY_MEDIUM_COLOR);
+        break;
+    case $KeywordRegistry.taskPriority$high():
+        result.string(neon.PRIORITY_HIGH_COLOR);
+        break;
+}
+

entity/Task_entity/entityfields/priority_icon/colorProcess.js

 import("system.vars");
-import("KeywordRegistry_basic");
 import("system.result");
-import("system.neon");
-
-switch(vars.getString("$field.PRIORITY"))
-{
-    case $KeywordRegistry.taskPriority$none():
-        result.string(neon.PRIORITY_NONE_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$low():
-        result.string(neon.PRIORITY_LOW_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$medium():
-        result.string(neon.PRIORITY_MEDIUM_COLOR);
-        break;
-    case $KeywordRegistry.taskPriority$high():
-        result.string(neon.PRIORITY_HIGH_COLOR);
-        break;
-}
 
+result.string(vars.get("$field.ICON_COLOR"));
\ No newline at end of file

entity/Task_entity/entityfields/taskchildren/documentation.adoc

+Provides Tasks that are children of a given record.
+
+The recordContainer filters for data where the stored parent-fields have values dependent on the given parameters.
+
+This is useful for building the `ModuleTree_entity` for example. 
\ No newline at end of file

entity/Task_entity/recordcontainers/db/conditionProcess.js

@@ -26,6 +26,8 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
                                 .and("TASKLINK.OBJECT_TYPE", "$param.ObjectId_param")
                             , SqlBuilder.IN());
 }
+cond.andIfSet("TASK.PARENT_ID", "$param.ParentId_param");
+cond.andIfSet("TASK.PARENT_CONTEXT", "$param.ParentContext_param");
 
 if (loadNothing)
 {
@@ -44,7 +46,7 @@ else
                 )
         );
     }
-    cond.and(protectionLevelCondition)
+    cond.and(protectionLevelCondition);
   
     //TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
     result.string(cond.toString());