From 6a216eda4a665743968a0cee8b2a5460d399ca6b Mon Sep 17 00:00:00 2001
From: "S.Leierseder" <S.Leierseder@SLeierseder.aditosoftware.local>
Date: Wed, 17 Jul 2019 16:39:47 +0200
Subject: [PATCH] Saleproject mainview tabs add drawers
---
.../_____LANGUAGE_EXTRA.aod | 15 +++++++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 7 +++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 15 +++++++++++++++
neonContext/Salesproject/Salesproject.aod | 8 ++++++++
neonContext/Turnover/Turnover.aod | 4 ++++
.../AttributeRelationPreviewList.aod | 1 +
.../ClassificationGroupAnalysesChart_view.aod | 8 +++++---
.../OrganisationCondition_view.aod | 2 +-
.../SaleprojectOverviewCharts_view.aod | 4 ++--
...lesprojectClassificationAttribute_view.aod | 4 ++--
.../SalesprojectClassificationDrawer_view.aod | 19 +++++++++++++++++++
.../SalesprojectForecastDrawer_view.aod | 18 ++++++++++++++++++
.../SalesprojectMilestoneChart_view.aod | 6 ++++--
.../SalesprojectMilestoneInfo_view.aod | 5 +++--
.../SalesprojectOfferForecast_view.aod | 2 +-
.../TurnoverChartForcastDrawer_view.aod | 19 +++++++++++++++++++
.../TurnoverChartForecast_view.aod | 10 +++++-----
17 files changed, 129 insertions(+), 18 deletions(-)
create mode 100644 neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
create mode 100644 neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod
create mode 100644 neonView/TurnoverChartForcastDrawer_view/TurnoverChartForcastDrawer_view.aod
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 3df6bb579f8..24cd67570e9 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4968,6 +4968,21 @@
<entry>
<key>Sufficient guarantees</key>
</entry>
+ <entry>
+ <key>HIGH</key>
+ </entry>
+ <entry>
+ <key>NONE</key>
+ </entry>
+ <entry>
+ <key>LOW</key>
+ </entry>
+ <entry>
+ <key>MAX</key>
+ </entry>
+ <entry>
+ <key>NORMAL</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index ed9b16adbd4..ecef5fda9f2 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -70,6 +70,9 @@
<key>Update campaign step</key>
<value>Aktualisieren des Kampagnenschrittes</value>
</entry>
+ <entry>
+ <key>Categorization</key>
+ </entry>
<entry>
<key>Names</key>
<value>Namen</value>
@@ -106,6 +109,10 @@
<key>consent</key>
<value>Zustimmung</value>
</entry>
+ <entry>
+ <key>Phase progression</key>
+ <value>Phasenverlauf</value>
+ </entry>
<entry>
<key>Information Report</key>
<value>Informationsbericht</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 45eb7437e82..330e6745358 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5017,6 +5017,21 @@
<entry>
<key>Sufficient guarantees</key>
</entry>
+ <entry>
+ <key>HIGH</key>
+ </entry>
+ <entry>
+ <key>NONE</key>
+ </entry>
+ <entry>
+ <key>LOW</key>
+ </entry>
+ <entry>
+ <key>MAX</key>
+ </entry>
+ <entry>
+ <key>NORMAL</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 93eddff1386..26e1a368de5 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -75,5 +75,13 @@
<name>1c957028-bf6b-4b9c-9b46-60f8b53f9edd</name>
<view>SaleprojectOverviewCharts_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>42bc01e0-ba80-4e7f-bcf9-30b3d647f565</name>
+ <view>SalesprojectClassificationDrawer_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8db978be-4362-48e2-9cc9-6b6774d92f5a</name>
+ <view>SalesprojectForecastDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Turnover/Turnover.aod b/neonContext/Turnover/Turnover.aod
index bcc760c0b99..4c52db361dd 100644
--- a/neonContext/Turnover/Turnover.aod
+++ b/neonContext/Turnover/Turnover.aod
@@ -14,5 +14,9 @@
<name>539f403e-f2c2-4459-9193-fefc236204ad</name>
<view>TurnoverChartForecast_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>29a44f69-d9a5-4916-8242-4ba470506d92</name>
+ <view>TurnoverChartForcastDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
index dc6e152af08..75db72b1ad7 100644
--- a/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
+++ b/neonView/AttributeRelationPreviewList/AttributeRelationPreviewList.aod
@@ -11,6 +11,7 @@
<titledListViewTemplate>
<name>Relations</name>
<titleField>AB_ATTRIBUTE_ID</titleField>
+ <fixedDrawer v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
index a234557476f..95f4188f091 100644
--- a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
+++ b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
@@ -3,18 +3,20 @@
<name>ClassificationGroupAnalysesChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Classification</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<singleDataChartViewTemplate>
<name>Groups</name>
- <chartTitle>Classification</chartTitle>
<chartType>PIE</chartType>
<xAxis>GROUP</xAxis>
<yAxis>SCORE</yAxis>
<entityField>#ENTITY</entityField>
+ <title></title>
</singleDataChartViewTemplate>
</children>
</neonView>
diff --git a/neonView/OrganisationCondition_view/OrganisationCondition_view.aod b/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
index 3c6069f4de3..551bdaa1fac 100644
--- a/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
+++ b/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
@@ -21,7 +21,7 @@
<name>Information</name>
<showDrawer v="true" />
<drawerCaption>Information</drawerCaption>
- <fixedDrawer v="false" />
+ <fixedDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
index c5b0f0e1769..009b76b70df 100644
--- a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
+++ b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
@@ -16,9 +16,9 @@
<view>ClassificationGroupAnalysesChart_view</view>
</neonViewReference>
<neonViewReference>
- <name>5cb29574-2cca-44da-a987-a2be76032b27</name>
+ <name>a5583507-7e5a-40dd-9af8-a227b6be5af3</name>
<entityField>SalesprojectForecastCharts</entityField>
- <view>TurnoverChartForecast_view</view>
+ <view>TurnoverChartForcastDrawer_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index 3437a1f9869..337b97ad1f1 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -12,9 +12,9 @@
</layout>
<children>
<neonViewReference>
- <name>1af0e58c-db49-41c3-b7ce-d69498070699</name>
+ <name>2cb777a4-cf46-4337-9b17-fc8b6026209b</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAndChart_view</view>
+ <view>SalesprojectClassificationDrawer_view</view>
</neonViewReference>
<neonViewReference>
<name>523e3855-eade-4cce-842d-9b272b028cbb</name>
diff --git a/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod b/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
new file mode 100644
index 00000000000..1ea958aa184
--- /dev/null
+++ b/neonView/SalesprojectClassificationDrawer_view/SalesprojectClassificationDrawer_view.aod
@@ -0,0 +1,19 @@
+<?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>SalesprojectClassificationDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Classification</layoutCaption>
+ <fixedDrawer v="false" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>8cec9c22-7304-47f3-9d46-909dec12ca2a</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectClassificationAndChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod b/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod
new file mode 100644
index 00000000000..ca358412769
--- /dev/null
+++ b/neonView/SalesprojectForecastDrawer_view/SalesprojectForecastDrawer_view.aod
@@ -0,0 +1,18 @@
+<?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>SalesprojectForecastDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Forecast</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>427414e0-f179-48cc-ae21-dc7a9d66d7b2</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectOfferForecast_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
index 4f2896e3c76..c109bafcabf 100644
--- a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
+++ b/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
@@ -3,9 +3,11 @@
<name>SalesprojectMilestoneChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Milestone</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<multiDataChartViewTemplate>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
index 6d883a47a3b..9c68c279394 100644
--- a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -3,9 +3,10 @@
<name>SalesprojectMilestoneInfo_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Phase progression</layoutCaption>
+ </drawerLayout>
</layout>
<children>
<ganttViewTemplate>
diff --git a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
index ffb635e5338..f334d45c0d3 100644
--- a/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
+++ b/neonView/SalesprojectOfferForecast_view/SalesprojectOfferForecast_view.aod
@@ -1,7 +1,7 @@
<?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>SalesprojectOfferForecast_view</name>
- <title>Forecast</title>
+ <title></title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<boxLayout>
diff --git a/neonView/TurnoverChartForcastDrawer_view/TurnoverChartForcastDrawer_view.aod b/neonView/TurnoverChartForcastDrawer_view/TurnoverChartForcastDrawer_view.aod
new file mode 100644
index 00000000000..02670304e59
--- /dev/null
+++ b/neonView/TurnoverChartForcastDrawer_view/TurnoverChartForcastDrawer_view.aod
@@ -0,0 +1,19 @@
+<?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>TurnoverChartForcastDrawer_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Forecast</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b7fd781d-9f52-413c-a993-20760985bc9c</name>
+ <entityField>#ENTITY</entityField>
+ <view>TurnoverChartForecast_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
index 74c5cec33d2..b9ec76fea98 100644
--- a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
+++ b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
@@ -36,7 +36,7 @@
<parentField>PARENT</parentField>
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
- <title>Forecast</title>
+ <title></title>
</multiDataChartViewTemplate>
<multiDataChartViewTemplate>
<name>LineChart</name>
@@ -46,7 +46,7 @@
<parentField>PARENT</parentField>
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
- <title>Forecast</title>
+ <title></title>
</multiDataChartViewTemplate>
<multiDataChartViewTemplate>
<name>AreaChart</name>
@@ -56,7 +56,7 @@
<parentField>PARENT</parentField>
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
- <title>Forecast</title>
+ <title></title>
</multiDataChartViewTemplate>
<multiDataChartViewTemplate>
<name>BarChart</name>
@@ -66,7 +66,7 @@
<parentField>PARENT</parentField>
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
- <title>Forecast</title>
+ <title></title>
</multiDataChartViewTemplate>
<multiDataChartViewTemplate>
<name>SplineChart</name>
@@ -76,7 +76,7 @@
<parentField>PARENT</parentField>
<categoryField>CATEGORY</categoryField>
<entityField>#ENTITY</entityField>
- <title>Forecast</title>
+ <title></title>
</multiDataChartViewTemplate>
</children>
</neonView>
--
GitLab