From db4e1d84245988053b3a4dc82b8f277c4e7062d7 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 17 Jul 2019 15:17:50 +0200
Subject: [PATCH] =?UTF-8?q?Notifications:=20Keywords=20f=C3=BCr=20Filter?=
=?UTF-8?q?=20(Prio=20+=20Status)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AditoBasic/init_NotificationPriority.xml | 47 +++++++++++++++
.../AditoBasic/init_NotificationState.xml | 57 +++++++++++++++++++
.../Data_alias/basic/2019.1.4/changelog.xml | 5 +-
.../KeywordEntry_entity.aod | 14 +++++
.../Notification_entity.aod | 37 ++++++++++++
.../containername_param/valueProcess.js | 4 ++
.../containername_param/valueProcess.js | 4 ++
.../_____LANGUAGE_EXTRA.aod | 12 ++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 23 ++++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 ++++
10 files changed, 213 insertions(+), 2 deletions(-)
create mode 100644 .liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationPriority.xml
create mode 100644 .liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationState.xml
create mode 100644 entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js
create mode 100644 entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationPriority.xml
new file mode 100644
index 0000000000..a717fd622a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationPriority.xml
@@ -0,0 +1,47 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="a.schindlbeck" id="127c4edc-1f86-4329-a907-bff3f6bf211e">
+
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="678f61e5-ef27-4e1c-b52b-0e19188b038d"/>
+ <column name="KEYID" value="UNSEEN"/>
+ <column name="TITLE" value="UNSEEN"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f568c222-7ac5-475e-b916-cea0e0e8612a"/>
+ <column name="KEYID" value="SEEN"/>
+ <column name="TITLE" value="SEEN"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b5f402a0-29a0-43e9-8db3-454fdbcfc9d1"/>
+ <column name="KEYID" value="CONFIRMED"/>
+ <column name="TITLE" value="CONFIRMED"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="1c40a2de-e6c1-469b-b324-d7089893ca5c"/>
+ <column name="KEYID" value="ARCHIVE"/>
+ <column name="TITLE" value="ARCHIVE"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationState.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationState.xml
new file mode 100644
index 0000000000..715074d354
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_NotificationState.xml
@@ -0,0 +1,57 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="a.schindlbeck" id="8ddce9af-b5ae-422f-8dda-5191723e867b">
+
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="0fdcfc0f-ba82-4881-813d-9f169339ab57"/>
+ <column name="KEYID" value="NONE"/>
+ <column name="TITLE" value="NONE"/>
+ <column name="CONTAINER" value="NotificationPriority"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6aaddcc6-a94e-4267-a52e-f0dd1df62023"/>
+ <column name="KEYID" value="LOW"/>
+ <column name="TITLE" value="LOW"/>
+ <column name="CONTAINER" value="NotificationPriority"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="1290323b-82d4-4f34-95d7-44c453eef3bb"/>
+ <column name="KEYID" value="NORMAL"/>
+ <column name="TITLE" value="NORMAL"/>
+ <column name="CONTAINER" value="NotificationPriority"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6f35ab82-7905-472a-b635-954bd5fac1e5"/>
+ <column name="KEYID" value="HIGH"/>
+ <column name="TITLE" value="HIGH"/>
+ <column name="CONTAINER" value="NotificationPriority"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="faa99798-c68f-435a-95d5-77bcd2bbabef"/>
+ <column name="KEYID" value="MAX"/>
+ <column name="TITLE" value="MAX"/>
+ <column name="CONTAINER" value="NotificationPriority"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index 181fad0014..0fcebf1bb9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -182,6 +182,7 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_CallAnswerMode.xml"/>
<include relativeToChangelogFile="true" file="alter_appointmentlink.xml"/>
- <include relativeToChangelogFile="true" file="DuplicateScan/create_duplicateScanner.xml"/>
- <include relativeToChangelogFile="true" file="DuplicateScan/create_duplicateScanConditionConfig.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/init_NotificationPriority.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_NotificationState.xml"/>
</databaseChangeLog>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index b09f1a65d8..5131c43f17 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -18,6 +18,20 @@
<name>#PROVIDER</name>
<lookupIdfield>KEYID</lookupIdfield>
<recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>ce10e4d3-7799-4473-a681-a3c6d9f93b02</name>
+ <entityName>Notification_entity</entityName>
+ <fieldName>StateKeywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0015f4fa-9f54-4d99-8e23-92e36a614d7a</name>
+ <entityName>Notification_entity</entityName>
+ <fieldName>PrioKeywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>CONTAINER</name>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 497ecaae67..91310f5bfb 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -25,6 +25,7 @@
<entityField>
<name>STATE</name>
<title>State</title>
+ <consumer>StateKeywords</consumer>
<displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -124,8 +125,37 @@
<entityField>
<name>RESOLVEDPRIORITY</name>
<title>priority</title>
+ <consumer>PrioKeywords</consumer>
<textInputAllowed v="false" />
</entityField>
+ <entityConsumer>
+ <name>StateKeywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>PrioKeywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -158,6 +188,7 @@
<dbRecordFieldMapping>
<name>CAPTION.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.CAPTION</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTENTID.value</name>
@@ -166,10 +197,12 @@
<dbRecordFieldMapping>
<name>CREATIONDATE.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DESCRIPTION.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FORCEDPRIORITY.value</name>
@@ -190,10 +223,12 @@
<dbRecordFieldMapping>
<name>STATE.value</name>
<recordfield>ASYS_NOTIFICATIONS.STATE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPECODE.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UID.value</name>
@@ -218,10 +253,12 @@
<dbRecordFieldMapping>
<name>CALCULATEDPRIORITY.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RESOLVEDPRIORITY.value</name>
<recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..1a1a50c90c
--- /dev/null
+++ b/entity/Notification_entity/entityfields/priokeywords/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string("NotificationPriority");
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000..a5407effb7
--- /dev/null
+++ b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+
+
+result.string("NotificationState");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 3c24e652a4..3df6bb579f 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4956,6 +4956,18 @@
<entry>
<key>Configuration name</key>
</entry>
+ <entry>
+ <key>Export letter for selection</key>
+ </entry>
+ <entry>
+ <key>Export letter</key>
+ </entry>
+ <entry>
+ <key>Privacy agreement</key>
+ </entry>
+ <entry>
+ <key>Sufficient guarantees</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 fca114325e..ed9b16adbd 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -34,10 +34,30 @@
<key>The following data has been anonymised: %0</key>
<value>Die folgenden Daten wurden anonymisiert: %0</value>
</entry>
+ <entry>
+ <key>MAX</key>
+ <value>maximal</value>
+ </entry>
<entry>
<key>Your changes have an impact on the data privacy information (DSGVO).</key>
<value>Ihre Änderungen haben Auswirkungen auf den Datenschutz (DSGVO).</value>
</entry>
+ <entry>
+ <key>NONE</key>
+ <value>keine</value>
+ </entry>
+ <entry>
+ <key>LOW</key>
+ <value>gering</value>
+ </entry>
+ <entry>
+ <key>NORMAL</key>
+ <value>normal</value>
+ </entry>
+ <entry>
+ <key>HIGH</key>
+ <value>hoch</value>
+ </entry>
<entry>
<key>Data Privacies</key>
<value>Datenprivilegien</value>
@@ -6254,6 +6274,9 @@
<key>Configuration name</key>
<value>Konfigurationsname</value>
</entry>
+ <entry>
+ <key>Download letter</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 7feec0afc7..45eb7437e8 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5005,6 +5005,18 @@
<entry>
<key>Characters to use</key>
</entry>
+ <entry>
+ <key>Export letter for selection</key>
+ </entry>
+ <entry>
+ <key>Export letter</key>
+ </entry>
+ <entry>
+ <key>Privacy agreement</key>
+ </entry>
+ <entry>
+ <key>Sufficient guarantees</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
--
GitLab