From b4a051060beac5cc6d1e1f1152b02740107b60fc Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 9 May 2019 15:35:32 +0200
Subject: [PATCH] Overview uses the new Dynamic Boxlayout!
---
neonContext/Campaign/Campaign.aod | 4 ++++
neonContext/CampaignStep/CampaignStep.aod | 4 ++++
.../CampaignCharts_view.aod | 12 ++++++----
.../CampaignMain_view/CampaignMain_view.aod | 4 ++--
.../CampaignOverview_view.aod | 23 +++++++++++++++++++
.../CampaignStepsGantt_view.aod | 22 ++++++++++++++++++
6 files changed, 62 insertions(+), 7 deletions(-)
create mode 100644 neonView/CampaignOverview_view/CampaignOverview_view.aod
create mode 100644 neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 9d15d6f3ac..9bbb8efab3 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -35,5 +35,9 @@
<name>484d39ea-5135-4bb2-a12d-cb7114e2981c</name>
<view>CampaignCharts_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
+ <view>CampaignOverview_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 4347dcf41d..2c6cb5f3c0 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -38,5 +38,9 @@
<name>ad879f25-4659-49d0-81ed-2e09c8b11ac1</name>
<view>CampaignStepParticipnatsPerStep_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>99367402-93e6-49d4-b60c-143b6e71df00</name>
+ <view>CampaignStepsGantt_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/CampaignCharts_view/CampaignCharts_view.aod b/neonView/CampaignCharts_view/CampaignCharts_view.aod
index bb0f266e21..3345cfa4a6 100644
--- a/neonView/CampaignCharts_view/CampaignCharts_view.aod
+++ b/neonView/CampaignCharts_view/CampaignCharts_view.aod
@@ -6,18 +6,20 @@
<layout>
<boxLayout>
<name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
- <neonViewReference>
- <name>e96b6827-e47e-4d85-a1fd-b1b52f36fe31</name>
- <entityField>CampaignCostsChart</entityField>
- <view>CampaignCostChart_view</view>
- </neonViewReference>
<neonViewReference>
<name>e6d6c775-3d85-4a59-8df0-d57e7174ed90</name>
<entityField>CampaignParticipantsChart</entityField>
<view>CampaignParticipantChart_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e96b6827-e47e-4d85-a1fd-b1b52f36fe31</name>
+ <entityField>CampaignCostsChart</entityField>
+ <view>CampaignCostChart_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/CampaignMain_view/CampaignMain_view.aod b/neonView/CampaignMain_view/CampaignMain_view.aod
index c9465927c5..331f79dcdf 100644
--- a/neonView/CampaignMain_view/CampaignMain_view.aod
+++ b/neonView/CampaignMain_view/CampaignMain_view.aod
@@ -16,9 +16,9 @@
<view>CampaignPreview_view</view>
</neonViewReference>
<neonViewReference>
- <name>400f5a85-2691-47f6-9cc0-e7635828c5a5</name>
+ <name>e1d2a77b-136d-4602-a8cd-e77ccb2f6f60</name>
<entityField>#ENTITY</entityField>
- <view>CampaignCharts_view</view>
+ <view>CampaignOverview_view</view>
</neonViewReference>
<neonViewReference>
<name>ad66a5a6-65fb-45d5-bf62-45661fc16e30</name>
diff --git a/neonView/CampaignOverview_view/CampaignOverview_view.aod b/neonView/CampaignOverview_view/CampaignOverview_view.aod
new file mode 100644
index 0000000000..75a8350648
--- /dev/null
+++ b/neonView/CampaignOverview_view/CampaignOverview_view.aod
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>CampaignOverview_view</name>
+ <title>Overview</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>490ad26b-5857-4e27-92c3-0bd527b5f083</name>
+ <entityField>CampaignSteps</entityField>
+ <view>CampaignStepsGantt_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>845cee42-0844-43b2-b2fa-f91b5a10d7ac</name>
+ <entityField>#ENTITY</entityField>
+ <view>CampaignCharts_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
new file mode 100644
index 0000000000..d1aca8f45e
--- /dev/null
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>CampaignStepsGantt_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <ganttViewTemplate>
+ <name>StepsGantt</name>
+ <beginDateField>DATE_START</beginDateField>
+ <endDateField>DATE_END</endDateField>
+ <titleField>NAME</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <uidField>CAMPAIGNSTEPID</uidField>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ </ganttViewTemplate>
+ </children>
+</neonView>
--
GitLab