From d060bdbab96917eddecac9348d79b78b2b4c000e Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Tue, 29 Jan 2019 09:20:05 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201032517][Bei=20den=20Aktivit=C3=A4ten=20=20Timeline=20als=20?=
=?UTF-8?q?Standardansicht=20setzen]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entityfields/icon/valueProcess.js | 2 +-
entity/Task_entity/Task_entity.aod | 6 +++++-
entity/Task_entity/iconIdProcess.js | 10 ++++++++++
neonContext/Task_context/Task_context.aod | 1 -
.../ActivityFilter_view.aod | 16 ++++++++--------
neonView/TaskFilter_view/TaskFilter_view.aod | 19 +++++++++++++++++--
6 files changed, 41 insertions(+), 13 deletions(-)
create mode 100644 entity/Task_entity/iconIdProcess.js
diff --git a/entity/Activity_entity/entityfields/icon/valueProcess.js b/entity/Activity_entity/entityfields/icon/valueProcess.js
index 6f78dfcee1f..b77beeec115 100644
--- a/entity/Activity_entity/entityfields/icon/valueProcess.js
+++ b/entity/Activity_entity/entityfields/icon/valueProcess.js
@@ -7,4 +7,4 @@ var category = vars.getString("$field.CATEGORY");
var kwd = KeywordUtils.createKeyword("ACTIVITY.CATEGORY");
var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
-result.string(icon || "NEON:HISTORY");
\ No newline at end of file
+result.string(icon || "NEON:HISTORY");
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 2b839216346..837d6c806ec 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -4,9 +4,9 @@
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
- <icon>VAADIN:TASKS</icon>
<onValidation>%aditoprj%/entity/Task_entity/onValidation.js</onValidation>
<iconId>VAADIN:TASKS</iconId>
+ <iconIdProcess>%aditoprj%/entity/Task_entity/iconIdProcess.js</iconIdProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityIncomingField>
@@ -32,6 +32,7 @@
<title>{$TASK_STATUS}</title>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/status/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -39,6 +40,7 @@
<title>priority</title>
<mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/priority/possibleItemsProcess.js</possibleItemsProcess>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -59,6 +61,7 @@
<title>start date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/start_date/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/Task_entity/entityfields/start_date/onValidation.js</onValidation>
</entityField>
@@ -74,6 +77,7 @@
<name>TYPE</name>
<title>type</title>
<possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/type/possibleItemsProcess.js</possibleItemsProcess>
+ <groupable v="true" />
</entityField>
<entityField>
<name>DESCRIPTION</name>
diff --git a/entity/Task_entity/iconIdProcess.js b/entity/Task_entity/iconIdProcess.js
new file mode 100644
index 00000000000..d65e648d412
--- /dev/null
+++ b/entity/Task_entity/iconIdProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Keyword_lib");
+
+var category = vars.getString("$field.PRIORITY");
+var kwd = KeywordUtils.createKeyword("TASK.PRIORITY");
+var icon = kwd.getPropForKey(category, "defaultAvatarRepresentation", true);
+
+result.string(icon || "VAADIN:TASKS");
\ No newline at end of file
diff --git a/neonContext/Task_context/Task_context.aod b/neonContext/Task_context/Task_context.aod
index d6459a17b6e..ecc29110ce8 100644
--- a/neonContext/Task_context/Task_context.aod
+++ b/neonContext/Task_context/Task_context.aod
@@ -4,7 +4,6 @@
<title>Task</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonContext/Task_context/documentation.adoc</documentation>
- <icon>VAADIN:TASKS</icon>
<mainview>TaskMain_view</mainview>
<filterview>TaskFilter_view</filterview>
<editview>TaskEdit_view</editview>
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 1b59c632c44..0c14d5e456e 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -55,6 +55,14 @@
</groupLayout>
</layout>
<children>
+ <timelineViewTemplate>
+ <name>TimelineFilter_template</name>
+ <dateField>ENTRYDATE</dateField>
+ <titleField>SUBJECT_DETAILS</titleField>
+ <descriptionField>INFO</descriptionField>
+ <iconIdField>DIRECTION_ICON</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
<tableViewTemplate>
<name>table_template</name>
<entityField>#ENTITY</entityField>
@@ -81,14 +89,6 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <timelineViewTemplate>
- <name>TimelineFilter_template</name>
- <dateField>ENTRYDATE</dateField>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>INFO</descriptionField>
- <iconIdField>DIRECTION_ICON</iconIdField>
- <entityField>#ENTITY</entityField>
- </timelineViewTemplate>
<treetableViewTemplate>
<name>Treetable_template</name>
<titleField>SUBJECT</titleField>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 01dc1876945..7218b02bd50 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -4,11 +4,19 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</layout>
<children>
+ <timelineViewTemplate>
+ <name>mainTimeline</name>
+ <dateField>START_DATE</dateField>
+ <titleField>SUBJECT</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconIdField>#ICON</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
<tableViewTemplate>
<name>mainTable</name>
<entityField>#ENTITY</entityField>
@@ -41,5 +49,12 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
+ <treetableViewTemplate>
+ <name>mainTreetable</name>
+ <titleField>SUBJECT</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconField>#ICON</iconField>
+ <entityField>#ENTITY</entityField>
+ </treetableViewTemplate>
</children>
</neonView>
--
GitLab