diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 3df6bb579f80cece5b2d50d38c5b779c1d72d8f4..24cd67570e9b352eb7e6adfe41cbe64c3b7c9748 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 ed9b16adbd4a6a5361b38e1a2ee167cc07ec50f2..ecef5fda9f29e4f4499d39d853710217c8f76d80 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 45eb7437e82a6e7763dae0c2d613e63bbf46c6f9..330e674535891a6f1029ce368893ee35db6e6087 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 93eddff13862c77ac7d29a6470c8d70a519099e6..26e1a368de5c2bd997096b394ebac3ea0c7c6038 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 bcc760c0b99eb813dd254fcb9eff490bf394e2e4..4c52db361ddbf3d941e4f35b1993db729225fa5a 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 dc6e152af0822ef4bc26facf6a3966982983b422..75db72b1ad7098b5eeeea08afa9900416f0a6074 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 a234557476f7d217ec99210b6841fa28ca4f0474..95f4188f0918981eca03fd55dd8280e47269dd27 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 3c6069f4de3be1822458a2a4f20ef16f4d856aa3..551bdaa1facc542448219e9e16db17339cd30c15 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 c5b0f0e17690f5630ad5886a2643880316303b20..009b76b70df024412713574572bacf86c74c8f91 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 3437a1f9869dfcc937983a122184f5dd85882d1f..337b97ad1f12f98b8bd900a39be7960e032fa1d2 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 0000000000000000000000000000000000000000..1ea958aa18430d83b1acc58b7c0d3a8047889050 --- /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 0000000000000000000000000000000000000000..ca3584127697839e2a0658c17ef53366b5360505 --- /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 4f2896e3c76acb8de54f27688c188c2bee670d70..c109bafcabf431074ca8af24053bcfb11a8897bd 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 6d883a47a3bb5e745d94afdb9d8aaf2cdea6a087..9c68c279394305f4d27de32fb281915fdf93170d 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 ffb635e533832e66346cb7a0fe688178db687a10..f334d45c0d38156cbfeefacb588bc576845c951d 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 0000000000000000000000000000000000000000..02670304e59ea15fe904ab2e13582b77889280ad --- /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 74c5cec33d23158da119ab53cfd640e59276df66..b9ec76fea9860442383b2ceaff6ba17bf83ed387 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>