From f0cda347d8897db46ce029e89e41f875ad0a46fb Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 24 Apr 2019 14:32:27 +0200
Subject: [PATCH] Activity, Task, KeywordEntry -> treetable
---
.../ActivityFilter_view.aod | 33 +++++++++++++++----
.../KeywordEntryFilter_view.aod | 18 +++++++---
neonView/TaskFilter_view/TaskFilter_view.aod | 33 +++++++++++++++----
3 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/neonView/ActivityFilter_view/ActivityFilter_view.aod b/neonView/ActivityFilter_view/ActivityFilter_view.aod
index 78a81d6893..61c9ff0d3c 100644
--- a/neonView/ActivityFilter_view/ActivityFilter_view.aod
+++ b/neonView/ActivityFilter_view/ActivityFilter_view.aod
@@ -91,12 +91,33 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeViewTemplate>
- <name>ActivitiesTreetable</name>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>INFO</descriptionField>
- <iconField>#IMAGE</iconField>
+ <treeTableViewTemplate>
+ <name>ActivitiesTreeTable</name>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>4167708f-b5a4-42ed-848a-cf9bb604f083</name>
+ <entityField>ICON</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ec8f0488-9a9f-4114-8123-1bc21b1d1f68</name>
+ <entityField>SUBJECT</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c44d54b5-00b9-4faf-9934-687e3a417b73</name>
+ <entityField>ENTRYDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f7137699-ae62-48e0-9cd6-e06d37f87f94</name>
+ <entityField>DIRECTION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>385231ab-204f-498a-8bf2-6fca3f59b7a5</name>
+ <entityField>CATEGORY</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index 80ba451c5e..e638ae7abd 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -9,15 +9,23 @@
</groupLayout>
</layout>
<children>
- <treeViewTemplate>
- <name>EntriesTreetable</name>
- <titleField>TITLE</titleField>
- <descriptionField>KEYID</descriptionField>
+ <treeTableViewTemplate>
+ <name>EntriesTreeTable</name>
<defaultGroupFields>
<element>CONTAINER</element>
</defaultGroupFields>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>aa5612b4-997e-4f0f-8fb1-91e18e32051d</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6100879d-dc6a-4c7e-b750-f5b7e627f48a</name>
+ <entityField>KEYID</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
<tableViewTemplate>
<name>EntriesTable</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 68e0e642b0..268c1b42d8 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -68,13 +68,32 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeViewTemplate>
- <name>TasksTree</name>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconField>PRIORITY_ICON</iconField>
- <defaultGroupFields />
+ <treeTableViewTemplate>
+ <name>TasksTreeTable</name>
<entityField>#ENTITY</entityField>
- </treeViewTemplate>
+ <columns>
+ <neonTableColumn>
+ <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
+ <entityField>PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
+ <entityField>SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
+ <entityField>PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>abba0283-ace9-41f2-8b98-df149c2feaf9</name>
+ <entityField>MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
--
GitLab