From dd0b8c0a1941167b005a34b4923bb07bb83448b3 Mon Sep 17 00:00:00 2001
From: Tobias Feldmann <t.feldmann@adito.de>
Date: Fri, 7 Sep 2018 17:09:10 +0200
Subject: [PATCH] GroupLayout in HistoryFilter_view (timeline and table)
---
neonView/HistoryFilter_view/HistoryFilter_view.aod | 12 ++++++++++--
neonView/OrgMain_view/OrgMain_view.aod | 2 +-
neonView/PersMain_view/PersMain_view.aod | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/neonView/HistoryFilter_view/HistoryFilter_view.aod b/neonView/HistoryFilter_view/HistoryFilter_view.aod
index e57d605c9d..fe3eedea99 100644
--- a/neonView/HistoryFilter_view/HistoryFilter_view.aod
+++ b/neonView/HistoryFilter_view/HistoryFilter_view.aod
@@ -3,9 +3,9 @@
<name>HistoryFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</layout>
<children>
<tableViewTemplate>
@@ -38,5 +38,13 @@
</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>
</children>
</neonView>
diff --git a/neonView/OrgMain_view/OrgMain_view.aod b/neonView/OrgMain_view/OrgMain_view.aod
index f8eb790346..edb4bb4693 100644
--- a/neonView/OrgMain_view/OrgMain_view.aod
+++ b/neonView/OrgMain_view/OrgMain_view.aod
@@ -18,7 +18,7 @@
<neonViewReference>
<name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
<entityField>OrgHistory_dfo</entityField>
- <view>HistoryTimeline_view</view>
+ <view>HistoryFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>3a211f9c-48b5-4568-b3d4-5f413eb56253</name>
diff --git a/neonView/PersMain_view/PersMain_view.aod b/neonView/PersMain_view/PersMain_view.aod
index 85a233a6bc..5f77bdaab1 100644
--- a/neonView/PersMain_view/PersMain_view.aod
+++ b/neonView/PersMain_view/PersMain_view.aod
@@ -17,7 +17,7 @@
<neonViewReference>
<name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
<entityField>PersHistory_dfo</entityField>
- <view>HistoryTimeline_view</view>
+ <view>HistoryFilter_view</view>
</neonViewReference>
</children>
</neonView>
--
GitLab