From 19f4667936d944547b0989c071ee3647b2877366 Mon Sep 17 00:00:00 2001
From: "d.lechner" <d.lechner@adito.de>
Date: Tue, 4 Jun 2019 12:56:51 +0200
Subject: [PATCH] Changes in Activity after Review
---
entity/Activity_entity/Activity_entity.aod | 26 ++++++++++++---
.../subject_details/valueProcess.js | 4 +--
.../ActivityFilter_view.aod | 32 +++++++++----------
3 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 4bf659bffc..2b4e0ee93f 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -15,16 +15,17 @@
<name>DIRECTION</name>
<title>Direction</title>
<consumer>KeywordDirections</consumer>
- <mandatory v="true" />
<groupable v="true" />
+ <mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/direction/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ENTRYDATE</name>
<title>Entrydate</title>
<contentType>DATE</contentType>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
+ <resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+ <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/entrydate/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Activity_entity/entityfields/entrydate/onValidation.js</onValidation>
@@ -43,15 +44,15 @@
<name>CATEGORY</name>
<title>Category</title>
<consumer>KeywordCategories</consumer>
- <mandatory v="false" />
<groupable v="true" />
+ <mandatory v="false" />
<displayValueProcess>%aditoprj%/entity/Activity_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SUBJECT</name>
<title>Subject</title>
- <mandatory v="true" />
<groupable v="false" />
+ <mandatory v="true" />
</entityField>
<entityParameter>
<name>RowId_param</name>
@@ -427,6 +428,13 @@
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>entryDateDateFormat</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -509,6 +517,14 @@
<name>RESPONSIBLE.value</name>
<recordfield>ACTIVITY.RESPONSIBLE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>entryDateTimelineDate.value</name>
+ <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>entryDateDateFormat.value</name>
+ <recordfield>ACTIVITY.ENTRYDATE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Activity_entity/entityfields/subject_details/valueProcess.js b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
index db1ed69d22..db5a8afcc7 100644
--- a/entity/Activity_entity/entityfields/subject_details/valueProcess.js
+++ b/entity/Activity_entity/entityfields/subject_details/valueProcess.js
@@ -1,5 +1,5 @@
import("system.vars");
import("system.result");
-var category = vars.get("$field.CATEGORY.displayValue");
-result.string(vars.get("$field.SUBJECT") + (category ? " (" + category + ")" : ""));
\ No newline at end of file
+var responsible = vars.get("$field.RESPONSIBLE.displayValue");
+result.string(vars.get("$field.SUBJECT") + (responsible ? " (" + responsible + ")" : ""));
\ No newline at end of file
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 42dd805060..6b29d5877a 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -57,10 +57,10 @@
<children>
<timelineViewTemplate>
<name>ActivitiesTimeline</name>
- <dateField>ENTRYDATE</dateField>
+ <dateField>entryDateDateFormat</dateField>
<titleField>SUBJECT_DETAILS</titleField>
<descriptionField>INFO</descriptionField>
- <iconIdField>DIRECTION_ICON</iconIdField>
+ <iconIdField>#IMAGE</iconIdField>
<hideTime v="true" />
<entityField>#ENTITY</entityField>
<maxDBRow v="400" />
@@ -69,25 +69,25 @@
<name>ActivitiesTable</name>
<entityField>#ENTITY</entityField>
<columns>
+ <neonTableColumn>
+ <name>56f0d70a-04de-4acf-b7f6-08414ab5e7ce</name>
+ <entityField>entryDateDateFormat</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>c1ff85eb-dde9-4362-82bc-8be6e3346b1c</name>
<entityField>#IMAGE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>c8fc85eb-dde9-4362-82bc-8be6e3346b1c</name>
- <entityField>SUBJECT</entityField>
+ <name>aafb6ac4-a584-48c4-9355-630bfd4579d3</name>
+ <entityField>RESPONSIBLE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>56f0d70a-04de-4acf-b7f6-08414ab5e7ce</name>
- <entityField>ENTRYDATE</entityField>
+ <name>c8fc85eb-dde9-4362-82bc-8be6e3346b1c</name>
+ <entityField>SUBJECT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>692a655b-18f5-4323-8d87-ee42726bed38</name>
- <entityField>DIRECTION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>37a279c7-be95-4d40-a355-ea2595e36bf2</name>
- <entityField>CATEGORY</entityField>
+ <entityField>INFO</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
@@ -97,25 +97,25 @@
<columns>
<neonTableColumn>
<name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
- <entityField>ICON</entityField>
+ <entityField>entryDateDateFormat</entityField>
<width v="75" />
</neonTableColumn>
<neonTableColumn>
<name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
- <entityField>SUBJECT</entityField>
+ <entityField>#IMAGE</entityField>
<width v="75" />
</neonTableColumn>
<neonTableColumn>
<name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
- <entityField>ENTRYDATE</entityField>
+ <entityField>RESPONSIBLE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
- <entityField>DIRECTION</entityField>
+ <entityField>SUBJECT</entityField>
</neonTableColumn>
<neonTableColumn>
<name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
- <entityField>CATEGORY</entityField>
+ <entityField>INFO</entityField>
</neonTableColumn>
</columns>
</treeTableViewTemplate>
--
GitLab