diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 350794d7be9fa05a0e8eb7d99213a62286229a16..6183f98143c084daa5c20072bdbd48cc4a99ec22 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/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" />
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9af68e0fe3a5f443180b9f37d889e5c599472b1d..1fe4494d93465ce71f418a0290edeaaf27232e42 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6110,6 +6110,132 @@
<entry>
<key>Variables</key>
</entry>
+ <entry>
+ <key>Invalid file type; only .html, .eml and .txt are allowed</key>
+ </entry>
+ <entry>
+ <key>Event gateway</key>
+ </entry>
+ <entry>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>Parallel gateway</key>
+ </entry>
+ <entry>
+ <key>Intermediate throwing event</key>
+ </entry>
+ <entry>
+ <key>End event</key>
+ </entry>
+ <entry>
+ <key>Start time</key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The pagesize is not set or is not a number.</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Receive task</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Create notification</key>
+ </entry>
+ <entry>
+ <key>Set attribute</key>
+ </entry>
+ <entry>
+ <key>Inclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Exclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Service task</key>
+ </entry>
+ <entry>
+ <key>End time</key>
+ </entry>
+ <entry>
+ <key>User task</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The provided callback function is not a function.</key>
+ </entry>
+ <entry>
+ <key>Intermediate catching event</key>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Workflow management</key>
+ </entry>
+ <entry>
+ <key>Business rule task</key>
+ </entry>
+ <entry>
+ <key>Update offer</key>
+ </entry>
+ <entry>
+ <key>Set salesproject phase</key>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Sequence flow</key>
+ </entry>
+ <entry>
+ <key>Manual task</key>
+ </entry>
+ <entry>
+ <key>Create salesproject</key>
+ </entry>
+ <entry>
+ <key>Duration</key>
+ </entry>
+ <entry>
+ <key>Create salesproject touchpoint</key>
+ </entry>
+ <entry>
+ <key>Start event</key>
+ </entry>
+ <entry>
+ <key>Boundary event</key>
+ </entry>
+ <entry>
+ <key>Archive</key>
+ </entry>
+ <entry>
+ <key>Script task</key>
+ </entry>
+ <entry>
+ <key>Send email</key>
+ </entry>
+ <entry>
+ <key>Activites</key>
+ </entry>
+ <entry>
+ <key>Variable</key>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index fdc9f7bd28c51d7138e5d74870b7fd5bc1498374..9a2ca336ca648fa2e6ef85d2ec0d5a73ab47f51f 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -7846,6 +7846,130 @@ Bitte Datumseingabe prüfen</value>
<entry>
<key>Export process</key>
</entry>
+ <entry>
+ <key>Event gateway</key>
+ </entry>
+ <entry>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>Parallel gateway</key>
+ </entry>
+ <entry>
+ <key>Intermediate throwing event</key>
+ </entry>
+ <entry>
+ <key>End event</key>
+ </entry>
+ <entry>
+ <key>Start time</key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The pagesize is not set or is not a number.</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Receive task</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Create notification</key>
+ </entry>
+ <entry>
+ <key>Set attribute</key>
+ </entry>
+ <entry>
+ <key>Inclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Exclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Service task</key>
+ </entry>
+ <entry>
+ <key>End time</key>
+ </entry>
+ <entry>
+ <key>User task</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The provided callback function is not a function.</key>
+ </entry>
+ <entry>
+ <key>Intermediate catching event</key>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Workflow management</key>
+ </entry>
+ <entry>
+ <key>Business rule task</key>
+ </entry>
+ <entry>
+ <key>Update offer</key>
+ </entry>
+ <entry>
+ <key>Set salesproject phase</key>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Sequence flow</key>
+ </entry>
+ <entry>
+ <key>Manual task</key>
+ </entry>
+ <entry>
+ <key>Create salesproject</key>
+ </entry>
+ <entry>
+ <key>Duration</key>
+ </entry>
+ <entry>
+ <key>Create salesproject touchpoint</key>
+ </entry>
+ <entry>
+ <key>Start event</key>
+ </entry>
+ <entry>
+ <key>Boundary event</key>
+ </entry>
+ <entry>
+ <key>Archive</key>
+ <value>Archivieren</value>
+ </entry>
+ <entry>
+ <key>Script task</key>
+ </entry>
+ <entry>
+ <key>Send email</key>
+ </entry>
+ <entry>
+ <key>Activites</key>
+ </entry>
+ <entry>
+ <key>Variable</key>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index f370da9e284961f21497697052e56208b8899840..362bad5b9c8e98264052b019747c718345757470 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6168,6 +6168,132 @@
<entry>
<key>Variables</key>
</entry>
+ <entry>
+ <key>Invalid file type; only .html, .eml and .txt are allowed</key>
+ </entry>
+ <entry>
+ <key>Event gateway</key>
+ </entry>
+ <entry>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>Parallel gateway</key>
+ </entry>
+ <entry>
+ <key>Intermediate throwing event</key>
+ </entry>
+ <entry>
+ <key>End event</key>
+ </entry>
+ <entry>
+ <key>Start time</key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The pagesize is not set or is not a number.</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Receive task</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>Create notification</key>
+ </entry>
+ <entry>
+ <key>Set attribute</key>
+ </entry>
+ <entry>
+ <key>Inclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Exclusive gateway</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Service task</key>
+ </entry>
+ <entry>
+ <key>End time</key>
+ </entry>
+ <entry>
+ <key>User task</key>
+ </entry>
+ <entry>
+ <key>SqlBuilder: The provided callback function is not a function.</key>
+ </entry>
+ <entry>
+ <key>Intermediate catching event</key>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Workflow management</key>
+ </entry>
+ <entry>
+ <key>Business rule task</key>
+ </entry>
+ <entry>
+ <key>Update offer</key>
+ </entry>
+ <entry>
+ <key>Set salesproject phase</key>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Sequence flow</key>
+ </entry>
+ <entry>
+ <key>Manual task</key>
+ </entry>
+ <entry>
+ <key>Create salesproject</key>
+ </entry>
+ <entry>
+ <key>Duration</key>
+ </entry>
+ <entry>
+ <key>Create salesproject touchpoint</key>
+ </entry>
+ <entry>
+ <key>Start event</key>
+ </entry>
+ <entry>
+ <key>Boundary event</key>
+ </entry>
+ <entry>
+ <key>Archive</key>
+ </entry>
+ <entry>
+ <key>Script task</key>
+ </entry>
+ <entry>
+ <key>Send email</key>
+ </entry>
+ <entry>
+ <key>Activites</key>
+ </entry>
+ <entry>
+ <key>Variable</key>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonNotificationType/Geburtstag/Geburtstag.aod b/neonNotificationType/Geburtstag/Geburtstag.aod
deleted file mode 100644
index bc107def870703fb536efd35a56fa5e6b0f2836b..0000000000000000000000000000000000000000
--- a/neonNotificationType/Geburtstag/Geburtstag.aod
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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>
diff --git a/neonNotificationType/WorkflowsStarted/WorkflowsStarted.aod b/neonNotificationType/WorkflowsStarted/WorkflowsStarted.aod
index a4104e98672a86f9cdc603aa66ac55af4307082d..df4da9f8072ebf7d5ac8da98b9c9066738c33734 100644
--- a/neonNotificationType/WorkflowsStarted/WorkflowsStarted.aod
+++ b/neonNotificationType/WorkflowsStarted/WorkflowsStarted.aod
@@ -1,5 +1,6 @@
<?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>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 861f0b08da774c12ec131de6ec2617b9ef491a4b..e157987a87bbf56c3a55d763c68dd157e32cb93e 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/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>
diff --git a/process/_test_clientProcess/process.js b/process/_test_clientProcess/process.js
index 45a99f31db517376f49a73ed8a132b8d55c7ac18..69c8a127ca7561d158d3d268d54e5ce54db75c97 100644
--- a/process/_test_clientProcess/process.js
+++ b/process/_test_clientProcess/process.js
@@ -1 +1 @@
-throw new Error("proccess not defined")
\ No newline at end of file
+throw new Error("proccess not defined")throw new Error("proccess not defined")
\ No newline at end of file