From f64dabdf4d2b212642d23637914e1f0dbd7c1ce8 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 21 May 2019 16:52:43 +0200
Subject: [PATCH] Neu Anordnung Kostenreiter
---
.../CampaignCostFilter_view.aod | 18 +--------
.../CampaignCostFix_view.aod | 17 ++++++++
.../CampaignCostVariable_view.aod | 40 +++++++++++++++++++
.../CampaignCost_view/CampaignCost_view.aod | 12 +++---
4 files changed, 65 insertions(+), 22 deletions(-)
create mode 100644 neonView/CampaignCostFix_view/CampaignCostFix_view.aod
create mode 100644 neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
diff --git a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
index 012a607277..8b940f6c9f 100644
--- a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
+++ b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
@@ -4,25 +4,11 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
- <genericMultipleViewTemplate>
- <name>CampaignCostGenericMultiple</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>3bd51d9a-4674-4489-bbd3-e368d44f47cc</name>
- <entityField>CATEGORY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>cf773f39-bcbf-4114-909e-c47b3e5a4538</name>
- <entityField>NET</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
<tableViewTemplate>
<name>CampaignCost</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
new file mode 100644
index 0000000000..29c66f487f
--- /dev/null
+++ b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod
@@ -0,0 +1,17 @@
+<?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>CampaignCostFix_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name>
+ <entityField>CampaignCosts</entityField>
+ <view>CampaignCostFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
new file mode 100644
index 0000000000..6d55df0e18
--- /dev/null
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -0,0 +1,40 @@
+<?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>CampaignCostVariable_view</name>
+ <title>Step costs</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>CostTreeTable</name>
+ <favoriteActionGroup1>alter</favoriteActionGroup1>
+ <defaultGroupFields>
+ <element>CAMPAIGNSTEP_ID</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>457caff8-0403-425f-839c-62e5d05fe3a1</name>
+ <entityField>CATEGORY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2adbd887-f1df-43ff-bde9-12c8273af7a9</name>
+ <entityField>NET</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f8c6439c-9536-477b-af19-26719902e12e</name>
+ <entityField>netPerParticipant</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>8239e81b-d69c-4ea9-b55d-83e79d1693cf</name>
+ <entityField>countParticipants</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod
index 9c4f2e5543..03e35dd8f0 100644
--- a/neonView/CampaignCost_view/CampaignCost_view.aod
+++ b/neonView/CampaignCost_view/CampaignCost_view.aod
@@ -7,7 +7,7 @@
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
- <maxDirectionElements v="3" />
+ <maxDirectionElements v="2" />
</boxLayout>
</layout>
<children>
@@ -21,15 +21,15 @@
<entityField>#ENTITY</entityField>
<view>CampaignCostFix_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5d65fb20-7704-45a0-93c8-513c7b2e3f5f</name>
- <entityField>CampaignAnalysisConsumer</entityField>
- <view>CampaignCostAnalysis_view</view>
- </neonViewReference>
<neonViewReference>
<name>4f5b74d6-cbae-458d-811e-4f83a65d43ad</name>
<entityField>CampaignCostsChart</entityField>
<view>CampaignCostChart_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>5d65fb20-7704-45a0-93c8-513c7b2e3f5f</name>
+ <entityField>CampaignAnalysisConsumer</entityField>
+ <view>CampaignCostAnalysis_view</view>
+ </neonViewReference>
</children>
</neonView>
--
GitLab