From 744b85bf8cab2af229643d1cc82cdbb5844b4792 Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 9 May 2019 14:37:05 +0200
Subject: [PATCH] Notifications: Anpassungen Icon + Filterview
---
entity/Notification_entity/Notification_entity.aod | 2 ++
.../entityfields/typecode/displayValueProcess.js | 13 +++++++++++++
.../AndisNotification.aod => Andis/Andis.aod} | 6 +++---
.../{AndisNotification => Andis}/onResultOpen.js | 0
.../NotificationFilter_view.aod | 4 ++++
5 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 entity/Notification_entity/entityfields/typecode/displayValueProcess.js
rename neonNotificationType/{AndisNotification/AndisNotification.aod => Andis/Andis.aod} (71%)
rename neonNotificationType/{AndisNotification => Andis}/onResultOpen.js (100%)
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index a90f3b45db7..e4fa3a3e3d1 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -64,6 +64,8 @@
</entityField>
<entityField>
<name>TYPECODE</name>
+ <title>Type</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>VERSION</name>
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
new file mode 100644
index 00000000000..2aa58acb449
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+var PREFIX = "_____SYSTEM_";
+var typecode = vars.get("$field.TYPECODE");
+
+switch(typecode)
+{
+ case PREFIX + "NOTIFICATION_APPOINTMENT":
+ result.string(translate.text("Appointment"));
+ break;
+}
\ No newline at end of file
diff --git a/neonNotificationType/AndisNotification/AndisNotification.aod b/neonNotificationType/Andis/Andis.aod
similarity index 71%
rename from neonNotificationType/AndisNotification/AndisNotification.aod
rename to neonNotificationType/Andis/Andis.aod
index 3c43805abbd..fb057616030 100644
--- a/neonNotificationType/AndisNotification/AndisNotification.aod
+++ b/neonNotificationType/Andis/Andis.aod
@@ -1,9 +1,9 @@
<?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>AndisNotification</name>
+ <name>Andis</name>
<title>Andis Noti</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:ASTERISK</icon>
+ <icon>VAADIN:COMMENT_ELLIPSIS_O</icon>
<resultFrameNeon></resultFrameNeon>
- <onResultOpen>%aditoprj%/neonNotificationType/AndisNotification/onResultOpen.js</onResultOpen>
+ <onResultOpen>%aditoprj%/neonNotificationType/Andis/onResultOpen.js</onResultOpen>
</neonNotificationType>
diff --git a/neonNotificationType/AndisNotification/onResultOpen.js b/neonNotificationType/Andis/onResultOpen.js
similarity index 100%
rename from neonNotificationType/AndisNotification/onResultOpen.js
rename to neonNotificationType/Andis/onResultOpen.js
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 9ff898ddb00..3c4e94ad0b0 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -22,6 +22,10 @@
<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>
--
GitLab