diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 55f0face8f1178221e508b900b1ec9573e5b8180..767f6addc3b9afdd7ef2474a5fd1b7ae5338ab5b 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -9022,6 +9022,21 @@
<entry>
<key>Field Type</key>
</entry>
+ <entry>
+ <key>Shows the organisations turnover, forecast and planing in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover and forecast in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Turnover, Forecast and Planning</key>
+ </entry>
+ <entry>
+ <key>Turnover and Forecast</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 a61138c9897040cb778a62c2ba6853bf3a80cb05..a22e7cd291058493927be238a3d324a40f4fe5a5 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -74,6 +74,14 @@
<key>Value is too big, the maximum is %0</key>
<value>Wert ist zu groß, das Maximum ist %0</value>
</entry>
+ <entry>
+ <key>Turnover and Forecast</key>
+ <value>Umsatz und Forecast</value>
+ </entry>
+ <entry>
+ <key>Turnover, Forecast and Planning</key>
+ <value>Umsatz, Forecast und Planung</value>
+ </entry>
<entry>
<key>Approval started</key>
<value>Freigabeprozess gestartet</value>
@@ -7166,8 +7174,16 @@
<value>Zeigt die wichtigsten Vertriebskennzahlen</value>
</entry>
<entry>
- <key>Shows the organisations turnover and forecast</key>
- <value>Zeigt den Umsatz und den Forecast der Firma für den Zeitraum von 4 Jahren</value>
+ <key>Shows the organisations turnover and forecast in a 3 year time-span</key>
+ <value>Zeigt den Umsatz und den Forecast der Firma für den Zeitraum von 3 Jahren</value>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover, forecast and planing in a 3 year time-span</key>
+ <value>Zeigt den Umsatz, den Forecast und die Planung der Firma für den Zeitraum von 3 Jahren</value>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover in a 3 year time-span</key>
+ <value>Zeigt den Umsatz der Firma für den Zeitraum von 3 Jahren</value>
</entry>
<entry>
<key>Campaign management</key>
@@ -11872,6 +11888,9 @@ Bitte Datumseingabe prüfen</value>
<key>Volume (Euro)</key>
<value>Volumes (Euro)</value>
</entry>
+ <entry>
+ <key>Shows the organisations turnover and forecast</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index c24efd611d2943e822f600ba0efefb04ff5a317f..743dd7e941a9d2c16f50b94e5b74ce4ad68ac291 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -9134,6 +9134,21 @@
<entry>
<key>No activity</key>
</entry>
+ <entry>
+ <key>Shows the organisations turnover, forecast and planing in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Shows the organisations turnover and forecast in a 3 year time-span</key>
+ </entry>
+ <entry>
+ <key>Turnover, Forecast and Planning</key>
+ </entry>
+ <entry>
+ <key>Turnover and Forecast</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
index 5922f8c6984c9a075ddbb5414b493bf800783488..03ee8dc88f7fc0092248976801cfe45301a9bd6c 100644
--- a/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
+++ b/neonView/TurnoverChartForecast_view/TurnoverChartForecast_view.aod
@@ -6,8 +6,8 @@
<dashletConfigurations>
<neonDashletConfiguration>
<name>TurnoverForecastDashlet</name>
- <title>Turnover</title>
- <description>Shows the organisations turnover and forecast</description>
+ <title>Turnover and Forecast</title>
+ <description>Shows the organisations turnover and forecast in a 3 year time-span</description>
<fragment>Turnover/full</fragment>
<singleton v="true" />
<storeRoles>
@@ -29,55 +29,159 @@
</groupLayout>
</layout>
<children>
- <multiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>ColumnChart</name>
<chartType>COLUMN</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <maxDBRow v="1000" />
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>bb143e03-4d74-4226-bf03-a7025b6c7fb4</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>98fb028a-9bc7-47d7-a38e-bfd6d3d809b1</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>2ba3d735-ffe2-4778-8c65-75ce5d52bd68</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>LineChart</name>
<chartType>LINE</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>7a469af3-ad64-4bd6-b118-e6fe8ea3b504</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>4ada6b58-7908-4b62-8d64-30f40c867ce5</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>1c66d1cd-b5ad-41e7-8621-52883fec3dc4</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>AreaChart</name>
<chartType>AREA</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>9d68643f-2ce6-492d-bbc1-0ece2bd77b00</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>9fd97825-5336-47f2-973f-1c895aad5235</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>448aeedb-fdf7-4ace-a1fc-b9682e3460e8</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>BarChart</name>
<chartType>BAR</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>229ba0be-5427-470c-9354-7546b5716334</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>10fc8e01-1732-46b0-8b92-0d9853f372fa</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>1c4ffd97-1f2b-4e1c-9d7d-43b7bbd28c54</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>SplineChart</name>
<chartType>SPLINE</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>3164b3b4-51c1-4fe0-837d-a47ec57baef6</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>d4adfa19-58ad-4fa0-88f6-47db24c34688</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ <neonDynamicMultiDataChartColumn>
+ <name>7468a919-9e52-4a52-bc4b-03f94e51f414</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <treeTableViewTemplate>
+ <name>TreeTable</name>
+ <columns>
+ <neonTreeTableColumn>
+ <name>3f8b5981-70d7-426e-ba77-0926e711fb2a</name>
+ <entityField>GroupField</entityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>6c432c7a-aea4-4f4d-8c52-60c1b0b20bae</name>
+ <entityField>FORECAST_VOLUME</entityField>
+ <aggregateEntityField>ForecastVolume_aggregate</aggregateEntityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>5aaadbfe-dbb1-498d-bf8a-09bdd2b06f9b</name>
+ <entityField>FORECAST_VOLUME_weighted</entityField>
+ <aggregateEntityField>ForecastVolumeWeighted_aggregate</aggregateEntityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>29942e7c-abda-4474-a83a-259104889171</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>0b91f028-5704-49f4-93f8-31952beb6b09</name>
+ <entityField>emptyField</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/TurnoverChart_view/TurnoverChart_view.aod b/neonView/TurnoverChart_view/TurnoverChart_view.aod
index 07cfd2bbfef91b1a3274bdacd8cffd37028df55a..de6b1feff994e30e0237865384cef7df026aa735 100644
--- a/neonView/TurnoverChart_view/TurnoverChart_view.aod
+++ b/neonView/TurnoverChart_view/TurnoverChart_view.aod
@@ -7,6 +7,7 @@
<neonDashletConfiguration>
<name>TurnoverDashlet</name>
<title>Turnover</title>
+ <description>Shows the organisations turnover in a 3 year time-span</description>
<fragment>Turnover/full</fragment>
<singleton v="true" />
<storeRoles>
@@ -28,55 +29,95 @@
</groupLayout>
</layout>
<children>
- <multiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>ColumnChart</name>
<chartType>COLUMN</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>b3cf342d-0c09-49b5-bef8-d33580ad6513</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>LineChart</name>
<chartType>LINE</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>61aac393-a81f-42ed-918e-72ae554d9680</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>AreaChart</name>
<chartType>AREA</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>58d532e8-73bc-441f-8452-129ba25b70ac</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>BarChart</name>
<chartType>BAR</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- <multiDataChartViewTemplate>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>4bfd686c-139b-4cd8-bfbd-1d61dc5e46f3</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <dynamicMultiDataChartViewTemplate>
<name>SplineChart</name>
<chartType>SPLINE</chartType>
- <xAxis>X</xAxis>
- <yAxis>Y</yAxis>
- <parentField>PARENT</parentField>
- <categoryField>CATEGORY</categoryField>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
- <neonViewReference>
- <name>d5e15acc-21a3-464f-aebc-6a11a969cf97</name>
- <entityField>Turnover_tree</entityField>
- <view>TurnoverTree_view</view>
- </neonViewReference>
+ <yAxisLabel>Volume</yAxisLabel>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <columns>
+ <neonDynamicMultiDataChartColumn>
+ <name>d4f59950-fb7f-4233-983a-64c06782f708</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ <aggregateEntityField>TurnoverVolume_aggregate</aggregateEntityField>
+ </neonDynamicMultiDataChartColumn>
+ </columns>
+ </dynamicMultiDataChartViewTemplate>
+ <treeTableViewTemplate>
+ <name>TreeTable</name>
+ <defaultGroupFields>
+ <element>TURNOVER_YEAR</element>
+ </defaultGroupFields>
+ <isCreatable v="false" />
+ <isDeletable v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonTreeTableColumn>
+ <name>12230d00-043c-4436-89bf-d274ee2ff679</name>
+ <entityField>TURNOVER_VOLUME</entityField>
+ </neonTreeTableColumn>
+ </columns>
+ </treeTableViewTemplate>
</children>
</neonView>
diff --git a/neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod b/neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod
index 37ac78294393862d6fd6f9c34c58c58d16ab3077..03da61e34d837cdb8141b684edb7f26082c4357d 100644
--- a/neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod
+++ b/neonView/TurnoverDynamicMultiDataChart_view/TurnoverDynamicMultiDataChart_view.aod
@@ -3,6 +3,26 @@
<name>TurnoverDynamicMultiDataChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>TurnoverForecastChart</name>
+ <title>Turnover, Forecast and Planning</title>
+ <description>Shows the organisations turnover, forecast and planing in a 3 year time-span</description>
+ <fragment>Turnover/full</fragment>
+ <singleton v="true" />
+ <storeRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+ </storeRoles>
+ <icon>VAADIN:CHART</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>charts</name>
+ <title>Charts</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
<layout>
<groupLayout>
<name>layout</name>