From 75016a9b4e4b2eee6aef4d8e94e2e73d91c1a42d Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Thu, 2 Jul 2020 14:24:27 +0200
Subject: [PATCH] #1060731 Notifications: adjustments regarding db column
changes
---
.../_____SYSTEMALIAS/_____SYSTEMALIAS.aod | 16 +++++++--------
.../Notification_entity.aod | 20 +++++++++++--------
.../valueProcess.js | 4 ++--
.../recordcontainers/db/orderClauseProcess.js | 2 +-
.../NotificationFilter_view.aod | 6 +++---
5 files changed, 26 insertions(+), 22 deletions(-)
rename entity/Notification_entity/entityfields/{creationdate => createdate}/valueProcess.js (50%)
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index 5203479895..af693489da 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -1568,12 +1568,12 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CREATIONDATE</name>
+ <name>CREATEDATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-5" />
- <size v="19" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1582,12 +1582,12 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>LIFETIME</name>
+ <name>DELETEDATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-5" />
- <size v="19" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 3268918106..d1f4cfaea5 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -37,11 +37,11 @@
<title>title</title>
</entityField>
<entityField>
- <name>CREATIONDATE</name>
+ <name>CREATEDATE</name>
<title>Date</title>
<contentType>DATE</contentType>
<resolution>MINUTE</resolution>
- <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/createdate/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -57,7 +57,8 @@
<valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
<entityField>
- <name>LIFETIME</name>
+ <name>DELETEDATE</name>
+ <contentType>DATE</contentType>
</entityField>
<entityField>
<name>ORIGINATORNAME</name>
@@ -199,7 +200,6 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CREATIONDATE.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
<isFilterable v="true" />
<isLookupFilter v="true" />
</dbRecordFieldMapping>
@@ -213,10 +213,6 @@
<name>FORCEDPRIORITY.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LIFETIME.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORIGINATORNAME.value</name>
<recordfield>ASYS_NOTIFICATIONCONTENTS.ORIGINATORNAME</recordfield>
@@ -269,6 +265,14 @@
<name>ID.value</name>
<recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CREATEDATE.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATEDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELETEDATE.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.DELETEDATE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Notification_entity/entityfields/creationdate/valueProcess.js b/entity/Notification_entity/entityfields/createdate/valueProcess.js
similarity index 50%
rename from entity/Notification_entity/entityfields/creationdate/valueProcess.js
rename to entity/Notification_entity/entityfields/createdate/valueProcess.js
index 99a8091366..139597f9cb 100644
--- a/entity/Notification_entity/entityfields/creationdate/valueProcess.js
+++ b/entity/Notification_entity/entityfields/createdate/valueProcess.js
@@ -1,2 +1,2 @@
-
-
+
+
diff --git a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
index 15d1007bb1..86103719ab 100644
--- a/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js
@@ -3,5 +3,5 @@ import("system.db");
result.object({
"ASYS_NOTIFICATIONS.STATE": db.DESCENDING,
- "ASYS_NOTIFICATIONCONTENTS.CREATIONDATE": db.DESCENDING
+ "ASYS_NOTIFICATIONCONTENTS.CREATEDATE": db.DESCENDING
});
\ No newline at end of file
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index bb14afb0a2..455a344af5 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -28,7 +28,7 @@
<children>
<timelineViewTemplate>
<name>NotificationTimeline</name>
- <dateField>CREATIONDATE</dateField>
+ <dateField>CREATEDATE</dateField>
<titleField>CAPTION</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconIdField>ICON</iconIdField>
@@ -53,7 +53,7 @@
</neonTableColumn>
<neonTableColumn>
<name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
- <entityField>CREATIONDATE</entityField>
+ <entityField>CREATEDATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
@@ -79,7 +79,7 @@
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>2b2d8359-3746-4fa2-8f51-859e50ead9ef</name>
- <entityField>CREATIONDATE</entityField>
+ <entityField>CREATEDATE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>efefd3d9-7961-4299-aa7e-24d313ad6454</name>
--
GitLab