From ae68662365b2d5e8f3f15543d27f44b47c884ede Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 21 May 2019 16:40:36 +0200
Subject: [PATCH] Kleinere Fixes
---
.../CampaignStep_entity.aod | 4 ++
.../entityfields/campaignname/valueProcess.js | 5 +++
neonContext/Campaign/Campaign.aod | 2 +-
neonContext/CampaignCost/CampaignCost.aod | 2 +-
.../CampaignCostFilter_view.aod | 18 ++++++++-
.../CampaignCost_view/CampaignCost_view.aod | 14 +++----
.../CampaignGroupedCostFilter_view.aod | 40 -------------------
.../CampaignStepsGantt_view.aod | 4 ++
neonView/testest/testest.aod | 18 ---------
9 files changed, 38 insertions(+), 69 deletions(-)
create mode 100644 entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js
delete mode 100644 neonView/CampaignGroupedCostFilter_view/CampaignGroupedCostFilter_view.aod
delete mode 100644 neonView/testest/testest.aod
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index e3c0579097b..ef624f228c4 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -342,6 +342,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>CampaignName</name>
+ <valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js b/entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js
new file mode 100644
index 00000000000..497f656394e
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("Campaign_lib");
+
+result.string(CampaignUtils.getCampaignNameById(vars.get("$field.CAMPAIGN_ID")));
\ No newline at end of file
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index adc1cf9dbf0..1cbe949d47f 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -41,7 +41,7 @@
</neonViewReference>
<neonViewReference>
<name>c32002ad-92ff-408c-a399-2998868f94d0</name>
- <view>testest</view>
+ <view>CampaignCostFix_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod
index 65fbbf22993..0e1a0721491 100644
--- a/neonContext/CampaignCost/CampaignCost.aod
+++ b/neonContext/CampaignCost/CampaignCost.aod
@@ -16,7 +16,7 @@
</neonViewReference>
<neonViewReference>
<name>01137074-b129-42bc-86b7-82afc356923b</name>
- <view>CampaignGroupedCostFilter_view</view>
+ <view>CampaignCostVariable_view</view>
</neonViewReference>
<neonViewReference>
<name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name>
diff --git a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
index 8b940f6c9f5..012a6072777 100644
--- a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
+++ b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
@@ -4,11 +4,25 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
<layout>
- <boxLayout>
+ <groupLayout>
<name>layout</name>
- </boxLayout>
+ </groupLayout>
</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/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod
index 38de61b3865..9c4f2e5543a 100644
--- a/neonView/CampaignCost_view/CampaignCost_view.aod
+++ b/neonView/CampaignCost_view/CampaignCost_view.aod
@@ -7,25 +7,25 @@
<boxLayout>
<name>layout</name>
<direction>HORIZONTAL</direction>
- <maxDirectionElements v="2" />
+ <maxDirectionElements v="3" />
</boxLayout>
</layout>
<children>
+ <neonViewReference>
+ <name>5830d1ed-c118-4a37-ab65-4727e8312c0a</name>
+ <entityField>CampaignStepCosts</entityField>
+ <view>CampaignCostVariable_view</view>
+ </neonViewReference>
<neonViewReference>
<name>c4476130-ca57-4707-9448-266138c09880</name>
<entityField>#ENTITY</entityField>
- <view>testest</view>
+ <view>CampaignCostFix_view</view>
</neonViewReference>
<neonViewReference>
<name>5d65fb20-7704-45a0-93c8-513c7b2e3f5f</name>
<entityField>CampaignAnalysisConsumer</entityField>
<view>CampaignCostAnalysis_view</view>
</neonViewReference>
- <neonViewReference>
- <name>5830d1ed-c118-4a37-ab65-4727e8312c0a</name>
- <entityField>CampaignStepCosts</entityField>
- <view>CampaignGroupedCostFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>4f5b74d6-cbae-458d-811e-4f83a65d43ad</name>
<entityField>CampaignCostsChart</entityField>
diff --git a/neonView/CampaignGroupedCostFilter_view/CampaignGroupedCostFilter_view.aod b/neonView/CampaignGroupedCostFilter_view/CampaignGroupedCostFilter_view.aod
deleted file mode 100644
index e3bce2264a0..00000000000
--- a/neonView/CampaignGroupedCostFilter_view/CampaignGroupedCostFilter_view.aod
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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>CampaignGroupedCostFilter_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/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index ab23a36c853..96ab4aaa5c1 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -17,7 +17,11 @@
<uidField>CAMPAIGNSTEPID</uidField>
<stepPredecessorIdField>PREDECESSORSTEP_ID</stepPredecessorIdField>
<groupedProjectIdField>CAMPAIGN_ID</groupedProjectIdField>
+ <groupedProjectNameField>CampaignName</groupedProjectNameField>
<entityField>#ENTITY</entityField>
+ <isCreatable v="true" />
+ <isEditable v="true" />
+ <isDeletable v="true" />
<title></title>
</ganttViewTemplate>
</children>
diff --git a/neonView/testest/testest.aod b/neonView/testest/testest.aod
deleted file mode 100644
index 226577cf2fd..00000000000
--- a/neonView/testest/testest.aod
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>testest</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <drawerLayout>
- <name>layout</name>
- <layoutCaption>teststg dfg</layoutCaption>
- </drawerLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name>
- <entityField>CampaignCosts</entityField>
- <view>CampaignCostFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
--
GitLab