merged origin/2020.0 into master

entity/Notification_entity/Notification_entity.aod

@@ -68,6 +68,7 @@
     <entityField>
       <name>TYPECODE</name>
       <title>Type</title>
+      <groupable v="true" />
       <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>
@@ -89,7 +90,7 @@
       <children>
         <entityActionField>
           <name>archive</name>
-          <title>archive</title>
+          <title>Archive</title>
           <description></description>
           <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archive/onActionProcess.js</onActionProcess>
           <isSelectionAction v="true" />

entity/QuickEntry_entity/QuickEntry_entity.aod

@@ -18,6 +18,7 @@
       <name>ORGANISATION_NAME</name>
       <title>Company</title>
       <contentType>LONG_TEXT</contentType>
+      <mandatoryProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js</mandatoryProcess>
     </entityField>
     <entityConsumer>
       <name>Adresses</name>
@@ -31,6 +32,10 @@
           <name>ContactId_param</name>
           <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contactid_param/valueProcess.js</valueProcess>
         </entityParameter>
+        <entityParameter>
+          <name>ContactType_param</name>
+          <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contacttype_param/valueProcess.js</valueProcess>
+        </entityParameter>
       </children>
     </entityConsumer>
     <entityConsumer>

entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js

+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var address = vars.get("$field.OrgAddresses.insertedRows");
+var isMandatory = address[0] != null || "" ? true : false;
+
+result.string(isMandatory);
\ No newline at end of file

neonNotificationType/Geburtstag/Geburtstag.aod

-<?xml version="1.0" encoding="UTF-8"?>
-<neonNotificationType xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonNotificationType/1.1.0">
-  <name>Geburtstag</name>
-  <title>Geburtstag</title>
-  <majorModelMode>DISTRIBUTED</majorModelMode>
-  <icon>VAADIN:COFFEE</icon>
-  <defaultPriority>LOW</defaultPriority>
-</neonNotificationType>

neonNotificationType/WorkflowsStarted/WorkflowsStarted.aod

 <?xml version="1.0" encoding="UTF-8"?>
 <neonNotificationType xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonNotificationType/1.1.0">
   <name>WorkflowsStarted</name>
+  <title>Worklow started</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
 </neonNotificationType>

neonView/NotificationFilter_view/NotificationFilter_view.aod

@@ -21,13 +21,21 @@
     </neonDashletConfiguration>
   </dashletConfigurations>
   <layout>
-    <boxLayout>
+    <groupLayout>
       <name>layout</name>
-    </boxLayout>
+    </groupLayout>
   </layout>
   <children>
+    <timelineViewTemplate>
+      <name>NotificationTimeline</name>
+      <dateField>CREATIONDATE</dateField>
+      <titleField>CAPTION</titleField>
+      <descriptionField>DESCRIPTION</descriptionField>
+      <iconIdField>ICON</iconIdField>
+      <entityField>#ENTITY</entityField>
+    </timelineViewTemplate>
     <tableViewTemplate>
-      <name>Table</name>
+      <name>NotificationTable</name>
       <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
       <inlineEdit v="true" />
       <entryAction>rowClickAction</entryAction>
@@ -43,10 +51,6 @@
           <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
           <entityField>ICON</entityField>
         </neonTableColumn>
-        <neonTableColumn>
-          <name>ebf8b6d5-1057-425d-a57b-d02e25dbd2a4</name>
-          <entityField>TYPECODE</entityField>
-        </neonTableColumn>
         <neonTableColumn>
           <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
           <entityField>CREATIONDATE</entityField>
@@ -65,5 +69,31 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
+    <treeTableViewTemplate>
+      <name>NotificationTreeTable</name>
+      <entityField>#ENTITY</entityField>
+      <columns>
+        <neonTreeTableColumn>
+          <name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
+          <entityField>ICON</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
+          <entityField>CREATIONDATE</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>efefd3d9-7961-4299-aa7e-24d313ad6454</name>
+          <entityField>CAPTION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>446c3d62-efa4-4f1a-85d4-e4f6a45019c7</name>
+          <entityField>DESCRIPTION</entityField>
+        </neonTreeTableColumn>
+        <neonTreeTableColumn>
+          <name>4c82b79e-4c15-4298-bfbb-186c76fc5189</name>
+          <entityField>STATE</entityField>
+        </neonTreeTableColumn>
+      </columns>
+    </treeTableViewTemplate>
   </children>
 </neonView>

process/_test_clientProcess/process.js

-throw new Error("proccess not defined")
+throw new Error("proccess not defined")throw new Error("proccess not defined")
\ No newline at end of file