Workflow improvements

neonView/WorkflowInstanceMain_view/WorkflowInstanceMain_view.aod

@@ -14,5 +14,15 @@
       <entityField>#ENTITY</entityField>
       <view>WorkflowInstancePreview_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>f7d21117-8664-49f1-b1d1-eb46ad989271</name>
+      <entityField>History</entityField>
+      <view>WorkflowInstanceHistoryFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>785ccba6-b9ac-4a03-983c-574ac28c5f1a</name>
+      <entityField>#ENTITY</entityField>
+      <view>WorkflowInstanceTasks_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/WorkflowInstancePreview_view/WorkflowInstancePreview_view.aod

@@ -44,10 +44,5 @@
       <entityField>Tasks</entityField>
       <view>WorkflowTaskList_view</view>
     </neonViewReference>
-    <neonViewReference>
-      <name>908012ad-82d7-45c0-9a4b-ba6e00cc1e8c</name>
-      <entityField>FinishedTasks</entityField>
-      <view>WorkflowTaskFinishedList_view</view>
-    </neonViewReference>
   </children>
 </neonView>

neonView/WorkflowInstanceTasks_view/WorkflowInstanceTasks_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.5">
+  <name>WorkflowInstanceTasks_view</name>
+  <title>Tasks</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <boxLayout>
+      <name>layout</name>
+    </boxLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>608add51-09cc-4c94-a7b1-8bb23f4c1a07</name>
+      <entityField>Tasks</entityField>
+      <view>WorkflowTaskFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>0e5efa21-ee28-4256-9722-e01d3329db48</name>
+      <entityField>FinishedTasks</entityField>
+      <view>WorkflowTaskFinishedDrawer_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/WorkflowTaskFilter_view/WorkflowTaskFilter_view.aod

@@ -4,11 +4,19 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterable v="true" />
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
+    <timelineViewTemplate>
+      <name>Timeline</name>
+      <dateField>CREATE_TIME</dateField>
+      <titleField>NAME</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconIdField>ICON</iconIdField>
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
     <tableViewTemplate>
       <name>Table</name>
       <iconField>#IMAGE</iconField>

neonView/WorkflowTaskFinishedDrawer_view/WorkflowTaskFinishedDrawer_view.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.5">
+  <name>WorkflowTaskFinishedDrawer_view</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <drawerLayout>
+      <name>layout</name>
+      <layoutCaption>Finished tasks</layoutCaption>
+      <fixedDrawer v="true" />
+    </drawerLayout>
+  </layout>
+  <children>
+    <neonViewReference>
+      <name>f05af6b0-7e2c-4578-b99b-5c35a6c162be</name>
+      <entityField>#ENTITY</entityField>
+      <view>WorkflowTaskFilter_view</view>
+    </neonViewReference>
+  </children>
+</neonView>

neonView/WorkflowTaskOwn_view/WorkflowTaskOwn_view.aod

@@ -32,6 +32,7 @@
   <children>
     <timelineViewTemplate>
       <name>Timeline</name>
+      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <dateField>CREATE_TIME</dateField>
       <titleField>NAME</titleField>
       <descriptionField>DESCRIPTION</descriptionField>
@@ -40,6 +41,7 @@
     </timelineViewTemplate>
     <tableViewTemplate>
       <name>Table</name>
+      <favoriteActionGroup1>tableActions</favoriteActionGroup1>
       <iconField>#IMAGE</iconField>
       <entityField>#ENTITY</entityField>
       <linkedColumns>

process/KeywordRegistry_basic/process.js

@@ -157,8 +157,6 @@ $KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1";};
 $KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2";};
 $KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "7";};
 
-$KeywordRegistry.documentTemplatePlaceOfUse = function(){return "DocumentTemplatePlaceOfUse";};
-
 $KeywordRegistry.classificationType = function(){return "ClassificationType";};
 $KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
 
@@ -184,6 +182,8 @@ $KeywordRegistry.dsgvoDeadline$complex = function(){return "DSGVODEADLINECOMPLEX
 $KeywordRegistry.dsgvoDeadline$count = function(){return "DSGVODEADLINECOUNT";};
 $KeywordRegistry.dsgvoGuarantee = function() {return "DSGVOGuarantee";};
 
+$KeywordRegistry.textPlaceholder = function(){return "textPlaceholder";};
+
 $KeywordRegistry.communicationMediumCampaign = function(){return "CommunicationMediumCampaign";};
 $KeywordRegistry.communicationMediumCampaign$mail = function(){return "CAMPAIGNEMAIL";};
 $KeywordRegistry.communicationMediumCampaign$letter = function(){return "CAMPAIGNLETTER";};

process/Placeholder_lib/process.js

@@ -127,7 +127,7 @@ PlaceholderUtils.getRegexpMatchAll = function (pSpecialCharFilterRegexpPart)
         pSpecialCharFilterRegexpPart = "";
     }
     
-    return "{" + pSpecialCharFilterRegexpPart + "@(.|(\\r?\\n))+?@" + pSpecialCharFilterRegexpPart + "}";
+    return "{" + pSpecialCharFilterRegexpPart + "@(.(?!{@)|(\\r?\\n))+?@" + pSpecialCharFilterRegexpPart + "}";
 }
 
 /**

process/workflowServiceTaskParams_rest/process.js

+import("system.tools");
+import("system.logging");
+import("Attribute_lib");
+import("system.entities");
+import("Sql_lib");
+import("system.project");
+import("system.process");
+
+function restget (pRequest)
+{
+    var request = JSON.parse(pRequest);
+    var jditoProcess = request.header.Jditoprocess;
+    
+    /* this is an object containing the values currently set in the modeler, it looks like this:
+     * {
+     *     myParam1 : {value : "paramValue"},
+     *     myParam2 : {value : 420}
+     * }
+     */
+    var currentValues = JSON.parse(request.header.Currentvalues);
+    
+    /**
+     * Object representing a parameter
+     * 
+     * @param {String} pId id of the parameter, this is the name of the variable in the serviceTask-jDitoProcess
+     * @param {String} pName name of the parameter that is displayed in the modeler
+     * @param {String} pType type of the parameter, refer to the "Types" object below
+     * @param {Object[]} [pItems] items that can be selected if the type is "enum", each row looks like this: {id : "iWillBeStored", name : "iWillBeDisplayed"}
+     * @param {Boolean} [pRelational] if set to true, a change of the parameter value will cause a re-load of all parameters
+     *                                -> use this if a parameter depends on the value of another parameter (see "currentValues")
+     */
+    function Parameter (pId, pName, pType, pItems, pRelational)
+    {
+        this.id = pId;
+        this.name = pName;
+        this.type = pType;
+        this.items = pItems;
+        this.relational = pRelational;
+    }
+    
+    /**
+     * enum containing all possible parameter types
+     */
+    var Types = {
+        STRING : "string",
+        BOOLEAN : "boolean",
+        NUMBER : "number",
+        DATE : "date",
+        ENUM : "enum"
+    };
+    
+    function _mapToItemArray (pData, pIdIndex, pNameIndex)
+    {
+        if (pIdIndex == undefined)
+            pIdIndex = 0;
+        if (pNameIndex == undefined)
+            pNameIndex = 1;
+        return pData.map(function (item)
+        {
+            return {id : item[pIdIndex], name : item[pNameIndex]};
+        });
+    }
+    
+    var parameterConfiguration = {
+        CreateActivity_workflowService : function (pCurrentValues)
+        {
+            return [
+                new Parameter("activityResponsible", "Responsible", Types.STRING),
+                new Parameter("activityDirection", "Direction", Types.STRING),
+                new Parameter("activityCategory", "Category", Types.STRING),
+                new Parameter("activityEntryDate", "Entry date", Types.DATE),
+                new Parameter("activityContent", "Content", Types.STRING),
+                new Parameter("activityTitle", "Title", Types.STRING)
+            ];
+        },
+        CreateNotification_workflowService : function (pCurrentValues)
+        {
+            return [
+                new Parameter("notificationCaption", "Caption", Types.STRING),
+                new Parameter("notificationDescription", "Description", Types.STRING),
+                new Parameter("notificationUser", "User", Types.STRING)
+            ];
+        },
+        SendEmail_workflowService : function (pCurrentValues)
+        {
+            var templates = newSelect("DOCUMENTTEMPLATEID, NAME")
+                .from("DOCUMENTTEMPLATE")
+                .table();
+            return [
+                new Parameter("documentTemplateId", "Document template", Types.ENUM, _mapToItemArray(templates)),
+                new Parameter("recipientContactId", "Recipient", Types.ENUM)
+            ];
+        },
+        SetAttribute_workflowService : function (pCurrentValues)
+        {
+//            var attrLoadConfig = entities.createConfigForLoadingRows().entity("Attribute_entity").fields(["#UID", "#CONTENTTITLE"]);
+//            var attributes = entities.getRows(attrLoadConfig).map(function (attribute)
+//            {
+//                return {id : attribute["#UID"], name : attribute["#CONTENTTITLE"]};
+//            });
+            return [
+                new Parameter("attributeId", "Attribute", Types.ENUM)
+            ];
+        },
+        UpdateOffer_workflowService : function (pCurrentValues)
+        {
+            return [];
+        }
+    };
+    
+    var parameters;
+    if (jditoProcess in parameterConfiguration && typeof parameterConfiguration[jditoProcess] === "function")
+        parameters = parameterConfiguration[jditoProcess]();
+    
+    if (!parameters)
+        parameters = [];
+    
+    request.response.body = JSON.stringify(parameters);
+
+    return JSON.stringify(request);
+}

process/workflowServiceTaskParams_rest/workflowServiceTaskParams_rest.aod

+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+  <name>workflowServiceTaskParams_rest</name>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <process>%aditoprj%/process/workflowServiceTaskParams_rest/process.js</process>
+  <publishAsWebservice v="true" />
+  <style>REST</style>
+  <restAcceptedMimeType>application/json</restAcceptedMimeType>
+  <restDeliveredMimeType>application/json</restDeliveredMimeType>
+  <jditoWebserviceUser>flowableIdmService</jditoWebserviceUser>
+  <alias>Data_alias</alias>
+  <variants>
+    <element>EXECUTABLE</element>
+  </variants>
+</process>