diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod index 352cfe78a0c3d0c7b8475fb3d6c4f8b4b1e90bf4..71ce2c0cd127943df5f658c170a930a2ca11ca07 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/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod index ea83367ce74f1c84953417cd890ccbc478f98711..3a754cdb58b33ee3c98c2e2e277719f675006c28 100644 --- a/entity/QuickEntry_entity/QuickEntry_entity.aod +++ b/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> diff --git a/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js b/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..46000731125e26321ec3f999ce0a1ed25a488019 --- /dev/null +++ b/entity/QuickEntry_entity/entityfields/organisation_name/mandatoryProcess.js @@ -0,0 +1,8 @@ +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 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 833426c9c2ed19e1a8809bb56f3f92fc8e019ae8..bb14afb0a269a9c52da65d1333fc78f34be935ee 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