WorkflowActivityType icons added

.liquibase/Data_alias/basic/2020.0.3/workflow/changelog.xml

@@ -2,4 +2,5 @@
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include relativeToChangelogFile="true" file="insert_workflowActivityType_keyword.xml"/>
+    <include relativeToChangelogFile="true" file="insert_workflowActivityType_icon.xml"/>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.0.3/workflow/insert_workflowActivityType_icon.xml

+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet id="3ade84c6-40e4-4a6d-8fcf-b6cb9b3f129e" author="s.listl">
+        <insert tableName="AB_KEYWORD_ATTRIBUTE">
+            <column name="AB_KEYWORD_ATTRIBUTEID" value="8365d915-85b9-4881-9705-542c98750078"/>
+
+            <column name="NAME" value="icon"/>
+            <column name="CONTAINER" value="WorkflowActivityType"/>
+            <column name="KIND" value="CHAR_VALUE"/>
+        </insert>
+
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="bcaf485a-b0ee-437a-b830-8de153a87f0a"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="579e1798-acd0-4fa6-8dbc-02c533e741f3"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:ARROW_RIGHT"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4314b6a3-c6e2-4500-b5a6-6f3feace23cc"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="f472f6f9-d603-42d3-a413-6b549f4c2aa4"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:PLAY_CIRCLE_O"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="c503e77c-8491-4b75-8344-eeaf51702f88"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="de02cd0d-b3ab-43e0-ae2f-f1b76e2323d1"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:CLOSE_CIRCLE_O"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="978f7658-a43e-45ac-a0cc-9c297c525910"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="012f38fa-c7ee-4898-bed5-4652459dab23"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:USER"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="0142cbbc-94a4-416c-b012-c77be343db9a"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="4b9e19fb-0385-4033-8a03-6d37c43c6b01"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:COG"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4dc41be0-8183-4edb-a5af-d19194d203f3"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="7e5ab737-a3e6-463c-974e-eb6021730d4a"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:FILE_PLAY"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3261cc27-e205-46ca-8796-d081884cb605"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="5e46546a-ee2e-41a2-b87f-a55e4c88df87"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:TABLE"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b3b19d6f-2f75-4815-9802-a747adab10c1"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="ab66f18f-040d-44c1-b08c-949fa3928e37"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_O"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d3725a54-9195-4d46-9ec2-9620a22de13e"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="4eba5820-4c2d-4a77-95d2-c6f12843d02c"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:HAND"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="885830ce-dce1-4250-ba79-87c56cfa9d44"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="7fff1c17-66a0-44ec-a6f1-f0364602c0de"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:RHOMBUS"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9208f176-67e0-4bad-9287-de060150cd7a"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="7a32adf8-13ac-4943-a443-4d2f5340a8a5"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:RHOMBUS"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="efe3d891-be08-404b-9f61-f584da9062da"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="22c13c1e-1c26-42b6-8e24-c522ec7f16a9"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:RHOMBUS"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="92b9929d-e435-4712-867e-4765c19491e6"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="50cb1b5f-2215-40e8-aa1e-daf34dc8a06b"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:RHOMBUS"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="bb01c882-0047-42ba-9825-9f7b91e1d212"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="f7f73dec-b461-4bb4-8d72-4cb63909dbba"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:CIRCLE_THIN"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="e97d3d5c-ae28-41aa-bf83-63a6fd9c4962"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="bd4300ce-8e9b-4efc-b995-8477ab374fc3"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:ARROW_CIRCLE_DOWN_O"/>
+        </insert>
+        <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+            <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d9b0249b-2980-4f80-a3da-cfe08ec2e579"/>
+            <column name="AB_KEYWORD_ENTRY_ID" value="5534a8d8-da1d-4448-835a-97cdcfee8907"/>
+            <column name="AB_KEYWORD_ATTRIBUTE_ID" value="8365d915-85b9-4881-9705-542c98750078"/>
+            <column name="CHAR_VALUE" value="VAADIN:ARROW_CIRCLE_UP_O"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>

entity/WorkflowDefinition_entity/entityfields/fileupload/onValidation.js

@@ -6,5 +6,5 @@ import("MimeType_lib");
 
 var upload = new FileUpload(vars.get("$local.value"));
 
-if (upload.mimeType != MimeTypes.XML())
+if (!MimeTypes.isXML(upload.mimeType))
     result.string(translate.text("The file must be a XML"));
\ No newline at end of file

entity/WorkflowDefinition_entity/entityfields/key/valueProcess.js

@@ -9,7 +9,7 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
 {
     var upload = new FileUpload(vars.get("$field.FILEUPLOAD"));
 
-    if (upload.isFilled() && upload.mimeType == MimeTypes.XML())
+    if (upload.isFilled() && MimeTypes.isXML(upload.mimeType))
     {
         var ids = workflow.getProcessIds(upload.getBase64DecodedData());
         if (ids != null)

entity/WorkflowInstanceHistory_entity/recordcontainers/jdito/contentProcess.js

+import("Keyword_lib");
 import("KeywordData_lib");
 import("KeywordRegistry_basic");
 import("Util_lib");
@@ -12,27 +13,19 @@ var historicActivities = JSON.parse(workflow.getFinishedActivities(instanceId));
 var history = [];
 
 var typeNameMap = KeywordData.getKeyIdMap($KeywordRegistry.workflowActivityType());
+var typeIconMap = KeywordData.getKeywordAttributeRelations($KeywordRegistry.workflowActivityType());
 
 var _isRelevant = function (pActivity)
 {
     return pActivity.activityType != $KeywordRegistry.workflowActivityType$sequenceFlow();
 }
 
-var _getIcon = function (pType)
-{
-    var typeIconMap = {
-        startEvent : "VAADIN:PLAY_CIRCLE_O",
-        userTask : "VAADIN:USER",
-        serviceTask : "VAADIN:AUTOMATION"
-    };
-    return typeIconMap[pType] || "";
-}
-
 historicActivities.forEach(function (activity)
 {
     if (_isRelevant(activity))
     {
         var activityTypeName = typeNameMap[activity.activityType] || activity.activityType;
+        var activityTypeIcon = typeIconMap[activity.activityType] && typeIconMap[activity.activityType].icon || "";
         
         history.push([
             activity.id,
@@ -43,7 +36,7 @@ historicActivities.forEach(function (activity)
             activity.durationInMillis,
             activity.activityType,
             activity.activityName ? activityTypeName : "",
-            _getIcon(activity.activityType),
+            activityTypeIcon,
             activity.activityName || activityTypeName,
             activity.taskId || "",
             activity.taskId ? "WorkflowTask" : ""
@@ -54,6 +47,7 @@ historicActivities.forEach(function (activity)
 history = JditoFilterUtils.filterRecords(["UID", "END_TIME", "START_TIME", "PROCESSDEFINITION_ID", "PROCESSINSTANCE_ID", "DURATION", "ACTIVITY_TYPE", 
     "ICON", "ACTIVITY_NAME", "TASK_ID", "TARGET_CONTEXT"], history, vars.get("$local.filter").filter)
 
-ArrayUtils.sort2d(history, 1, false, true);
+//sort by end time desc and start time desc
+ArrayUtils.sortMulti(history, [1, true, 2, true]);
 
 result.object(history);
\ No newline at end of file

entity/WorkflowInstance_entity/WorkflowInstance_entity.aod

@@ -186,6 +186,11 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityField>
+      <name>DIAGRAM</name>
+      <contentType>IMAGE</contentType>
+      <valueProcess>%aditoprj%/entity/WorkflowInstance_entity/entityfields/diagram/valueProcess.js</valueProcess>
+    </entityField>
   </entityFields>
   <recordContainers>
     <jDitoRecordContainer>

entity/WorkflowInstance_entity/entityfields/diagram/valueProcess.js

+import("system.vars");
+import("system.result");
+import("system.neon");
+import("system.workflow");
+
+if (vars.get("$sys.viewmode") == neon.FRAME_VIEWMODE_DATASET && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && vars.get("$field.PROCESSDEFINITION_ID"))
+    result.string(workflow.getProcessDiagram(vars.get("$field.PROCESSDEFINITION_ID")));
\ No newline at end of file

entity/WorkflowInstance_entity/recordcontainers/jdito/onDelete.js

 import("system.vars");
 import("system.workflow");
 
-workflow.deleteProcessInstance(vars.get("$local.uid"), "");
\ No newline at end of file
+workflow.deleteProcessInstance(vars.get("$local.uid"), "deletion");
\ No newline at end of file

neonContext/WorkflowInstance/WorkflowInstance.aod

@@ -32,5 +32,9 @@
       <name>98e9064c-466c-43eb-a72a-c369e7eb28a4</name>
       <view>WorkflowInstanceTasks_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>dbb901d1-daca-4922-969e-fee394c7b742</name>
+      <view>WorkflowInstanceDiagram_view</view>
+    </neonViewReference>
   </references>
 </neonContext>

neonView/WorkflowInstanceDiagram_view/WorkflowInstanceDiagram_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+  <name>WorkflowInstanceDiagram_view</name>
+  <title>Diagram</title>
+  <majorModelMode>DISTRIBUTED</majorModelMode>
+  <layout>
+    <noneLayout>
+      <name>layout</name>
+    </noneLayout>
+  </layout>
+  <children>
+    <pictureViewTemplate>
+      <name>Picture</name>
+      <pictureField>DIAGRAM</pictureField>
+      <entityField>#ENTITY</entityField>
+    </pictureViewTemplate>
+  </children>
+</neonView>

neonView/WorkflowInstanceHistoryFilter_view/WorkflowInstanceHistoryFilter_view.aod

@@ -15,6 +15,7 @@
       <titleField>ACTIVITY_NAME</titleField>
       <descriptionField>ACTIVITY_TYPE</descriptionField>
       <iconIdField>ICON</iconIdField>
+      <orderByDate v="false" />
       <entityField>#ENTITY</entityField>
     </timelineViewTemplate>
     <tableViewTemplate>

neonView/WorkflowInstanceMain_view/WorkflowInstanceMain_view.aod

@@ -19,6 +19,11 @@
       <entityField>History</entityField>
       <view>WorkflowInstanceHistoryFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>a4a2889b-97bf-4c48-9ca4-f3fdbcf8f793</name>
+      <entityField>#ENTITY</entityField>
+      <view>WorkflowInstanceDiagram_view</view>
+    </neonViewReference>
     <neonViewReference>
       <name>785ccba6-b9ac-4a03-983c-574ac28c5f1a</name>
       <entityField>#ENTITY</entityField>

neonView/WorkflowTaskPreview_view/WorkflowTaskPreview_view.aod

@@ -24,6 +24,10 @@
       <drawerCaption>Further informations</drawerCaption>
       <entityField>#ENTITY</entityField>
       <fields>
+        <entityFieldLink>
+          <name>1fd3edeb-a553-4270-adcc-48faa462294a</name>
+          <entityField>PROCESSINSTANCE_ID</entityField>
+        </entityFieldLink>
         <entityFieldLink>
           <name>9d441df3-beff-41e9-85f5-29c94f50e040</name>
           <entityField>CATEGORY</entityField>

process/MimeType_lib/process.js

@@ -22,6 +22,7 @@ MimeTypes.ZIP = function () {return "application/zip";};
 MimeTypes.MSG = function () {return "application/vnd.ms-outlook";};
 MimeTypes.TAR = function () {return "application/x-tar";};
 MimeTypes.XHTML = function() {return "application/xhtml+xml";};
+MimeTypes.XML_APP = function () {return "application/xml";};
 
 /* text */
 MimeTypes.TXT = function () {return "text/plain";};
@@ -57,3 +58,14 @@ MimeTypes.MP4 = function () {return "video/mp4";};
 MimeTypes.AVI = function () {return "video/x-msvideo";};
 MimeTypes.OGV = function () {return "video/ogg";};
 MimeTypes.WEBM = function() {return "video/webm";};
+
+/**
+ * tests if the given mime type is a xml type (application/xml or text/xml)
+ * 
+ * @param {String} pMimeType mime type
+ * @return {Boolean} if it's a xml type
+ */
+MimeTypes.isXML = function (pMimeType)
+{
+    return pMimeType == MimeTypes.XML() || pMimeType == MimeTypes.XML_APP();
+}
\ No newline at end of file