Skip to content
Snippets Groups Projects
Commit 5ec08d2f authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '#1059391-NotificationCenter' into '2020.1'

#1059391 notification center

See merge request xrm/basic!330
parents a3623772 e54a0720
No related branches found
No related tags found
No related merge requests found
Showing with 31 additions and 34 deletions
<?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 author="s.pongratz" id="0b393c2b-c969-41ab-9eeb-3ccaf418e069">
<delete tableName="AB_KEYWORD_ENTRY" >
<where>CONTAINER = 'NotificationType'</where>
</delete>
</changeSet>
</databaseChangeLog>
......@@ -2,6 +2,7 @@
<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 file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
<include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
<include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
......@@ -583,12 +583,6 @@
<fieldName>CategoryKeyword</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
<name>644a6101-6b11-4998-bd8d-b799c6f376fa</name>
<entityName>Notification_entity</entityName>
<fieldName>TypeKeywords</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
<children>
<entityParameter>
......
......@@ -27,6 +27,7 @@
<name>STATE</name>
<title>State</title>
<consumer>StateKeywords</consumer>
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
......@@ -68,9 +69,8 @@
<entityField>
<name>TYPECODE</name>
<title>Type</title>
<consumer>TypeKeywords</consumer>
<groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
<dropDownProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/dropDownProcess.js</dropDownProcess>
</entityField>
<entityField>
<name>VERSION</name>
......@@ -119,6 +119,10 @@
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>getNotification</name>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/getnotification/onActionProcess.js</onActionProcess>
</entityActionField>
</children>
</entityActionGroup>
<entityActionField>
......@@ -129,6 +133,7 @@
<name>RESOLVEDPRIORITY</name>
<title>Priority</title>
<consumer>PrioKeywords</consumer>
<groupable v="true" />
<textInputAllowed v="false" />
</entityField>
<entityConsumer>
......@@ -159,20 +164,6 @@
</entityParameter>
</children>
</entityConsumer>
<entityConsumer>
<name>TypeKeywords</name>
<dependency>
<name>dependency</name>
<entityName>KeywordEntry_entity</entityName>
<fieldName>SpecificContainerKeywords</fieldName>
</dependency>
<children>
<entityParameter>
<name>ContainerName_param</name>
<valueProcess>%aditoprj%/entity/Notification_entity/entityfields/typekeywords/children/containername_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
import("Keyword_lib");
import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationType(), vars.get("$field.TYPECODE")));
\ No newline at end of file
import("system.result");
import("system.logging");
import("system.notification");
var types = []
for (let property in notification.getAllTypes())
{
types.push(property);
}
result.object(types);
\ No newline at end of file
import("system.result");
import("KeywordRegistry_basic");
result.string($KeywordRegistry.notificationType());
\ No newline at end of file
......@@ -8820,6 +8820,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>New</key>
<value>Neu</value>
</entry>
<entry>
<key>Release</key>
......
......@@ -35,6 +35,7 @@
<iconIdField>ICON</iconIdField>
<entityField>#ENTITY</entityField>
<isEditable v="false" />
<informationField>STATE</informationField>
</timelineViewTemplate>
<tableViewTemplate>
<name>NotificationTable</name>
......
......@@ -294,4 +294,3 @@ $KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $Keywo
$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
$KeywordRegistry.notificationState = function () { return "NotificationState";};
$KeywordRegistry.notificationType = function () { return "NotificationType";};
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment