Skip to content
Snippets Groups Projects
Commit ae686623 authored by David Büchler's avatar David Büchler
Browse files

Kleinere Fixes

parent f2c94207
No related branches found
No related tags found
No related merge requests found
...@@ -342,6 +342,10 @@ ...@@ -342,6 +342,10 @@
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityField>
<name>CampaignName</name>
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/campaignname/valueProcess.js</valueProcess>
</entityField>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<dbRecordContainer> <dbRecordContainer>
......
import("system.result");
import("system.vars");
import("Campaign_lib");
result.string(CampaignUtils.getCampaignNameById(vars.get("$field.CAMPAIGN_ID")));
\ No newline at end of file
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</neonViewReference> </neonViewReference>
<neonViewReference> <neonViewReference>
<name>c32002ad-92ff-408c-a399-2998868f94d0</name> <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
<view>testest</view> <view>CampaignCostFix_view</view>
</neonViewReference> </neonViewReference>
</references> </references>
</neonContext> </neonContext>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
</neonViewReference> </neonViewReference>
<neonViewReference> <neonViewReference>
<name>01137074-b129-42bc-86b7-82afc356923b</name> <name>01137074-b129-42bc-86b7-82afc356923b</name>
<view>CampaignGroupedCostFilter_view</view> <view>CampaignCostVariable_view</view>
</neonViewReference> </neonViewReference>
<neonViewReference> <neonViewReference>
<name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name> <name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name>
......
...@@ -4,11 +4,25 @@ ...@@ -4,11 +4,25 @@
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" /> <filterable v="true" />
<layout> <layout>
<boxLayout> <groupLayout>
<name>layout</name> <name>layout</name>
</boxLayout> </groupLayout>
</layout> </layout>
<children> <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> <tableViewTemplate>
<name>CampaignCost</name> <name>CampaignCost</name>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
......
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
<boxLayout> <boxLayout>
<name>layout</name> <name>layout</name>
<direction>HORIZONTAL</direction> <direction>HORIZONTAL</direction>
<maxDirectionElements v="2" /> <maxDirectionElements v="3" />
</boxLayout> </boxLayout>
</layout> </layout>
<children> <children>
<neonViewReference>
<name>5830d1ed-c118-4a37-ab65-4727e8312c0a</name>
<entityField>CampaignStepCosts</entityField>
<view>CampaignCostVariable_view</view>
</neonViewReference>
<neonViewReference> <neonViewReference>
<name>c4476130-ca57-4707-9448-266138c09880</name> <name>c4476130-ca57-4707-9448-266138c09880</name>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
<view>testest</view> <view>CampaignCostFix_view</view>
</neonViewReference> </neonViewReference>
<neonViewReference> <neonViewReference>
<name>5d65fb20-7704-45a0-93c8-513c7b2e3f5f</name> <name>5d65fb20-7704-45a0-93c8-513c7b2e3f5f</name>
<entityField>CampaignAnalysisConsumer</entityField> <entityField>CampaignAnalysisConsumer</entityField>
<view>CampaignCostAnalysis_view</view> <view>CampaignCostAnalysis_view</view>
</neonViewReference> </neonViewReference>
<neonViewReference>
<name>5830d1ed-c118-4a37-ab65-4727e8312c0a</name>
<entityField>CampaignStepCosts</entityField>
<view>CampaignGroupedCostFilter_view</view>
</neonViewReference>
<neonViewReference> <neonViewReference>
<name>4f5b74d6-cbae-458d-811e-4f83a65d43ad</name> <name>4f5b74d6-cbae-458d-811e-4f83a65d43ad</name>
<entityField>CampaignCostsChart</entityField> <entityField>CampaignCostsChart</entityField>
......
<?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>
...@@ -17,7 +17,11 @@ ...@@ -17,7 +17,11 @@
<uidField>CAMPAIGNSTEPID</uidField> <uidField>CAMPAIGNSTEPID</uidField>
<stepPredecessorIdField>PREDECESSORSTEP_ID</stepPredecessorIdField> <stepPredecessorIdField>PREDECESSORSTEP_ID</stepPredecessorIdField>
<groupedProjectIdField>CAMPAIGN_ID</groupedProjectIdField> <groupedProjectIdField>CAMPAIGN_ID</groupedProjectIdField>
<groupedProjectNameField>CampaignName</groupedProjectNameField>
<entityField>#ENTITY</entityField> <entityField>#ENTITY</entityField>
<isCreatable v="true" />
<isEditable v="true" />
<isDeletable v="true" />
<title></title> <title></title>
</ganttViewTemplate> </ganttViewTemplate>
</children> </children>
......
<?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>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment