diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index 888a3255461f5235c7831b6ef1c5d91add35b037..2d89021babdf84f4782431a98828644b40ec85ec 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -1292,13 +1292,17 @@ </aggregateFieldDbMapping> <aggregateFieldDbMapping> <name>COUNT_aggregate.value</name> - <recordfield>OFFER.OFFER_ID</recordfield> + <recordfield>OFFER.OFFERID</recordfield> <aggregateType>COUNT</aggregateType> </aggregateFieldDbMapping> <aggregateFieldDbMapping> <name>PROBABILITY_aggregate.value</name> <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability_aggregate.value/expression.js</expression> </aggregateFieldDbMapping> + <dbRecordFieldMapping> + <name>OFFER_ID.value</name> + <recordfield>OFFER.OFFER_ID</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> <filterExtensions> <filterExtensionSet> diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 5e056b9be76761e3e2a61835ef47c8d3e761ad3d..4b8de349b34ec740cb7538887c5b54263c4bd04c 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -7269,6 +7269,15 @@ <entry> <key>Favoritegroup</key> </entry> + <entry> + <key>Count Chart</key> + </entry> + <entry> + <key>Sum Chart</key> + </entry> + <entry> + <key>Probability Chart</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 e65b895509e9ced245bbfda2736f56742b573897..c6a2a8294f3e1a54940025ec4a0ff9c3c59e0a94 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -9642,6 +9642,18 @@ Bitte Datumseingabe prüfen</value> <entry> <key>FavoriteGroup</key> </entry> + <entry> + <key>Count Chart</key> + <value>Anzahl Diagramm</value> + </entry> + <entry> + <key>Sum Chart</key> + <value>Summen Diagramm</value> + </entry> + <entry> + <key>Probability Chart</key> + <value>Wahrscheinlichkeit Diagramm</value> + </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 8347bc106bd7e417f278268297161df07529049f..a3cc7bb726250087e08242695dd1be2a0ba2d6a1 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -7350,6 +7350,15 @@ <entry> <key>Favoritegroup</key> </entry> + <entry> + <key>Count Chart</key> + </entry> + <entry> + <key>Sum Chart</key> + </entry> + <entry> + <key>Probability Chart</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod index 0a1ab5740c5a8ae675bc91f798159175c3fdee75..eca4858eaa32551a02e284a5706c5f52628ffb04 100644 --- a/neonView/OfferFilter_view/OfferFilter_view.aod +++ b/neonView/OfferFilter_view/OfferFilter_view.aod @@ -140,7 +140,12 @@ <name>DynamicMultiDataChartCount</name> <chartType>COLUMN</chartType> <yAxisLabel>Count</yAxisLabel> + <shareParent v="false" /> <entityField>#ENTITY</entityField> + <defaultGroupFields> + <element>STATUS</element> + </defaultGroupFields> + <title>Count Chart</title> <columns> <neonDynamicMultiDataChartColumn> <name>4bbc9650-47fd-4a59-8e1e-bb60ceb85795</name> @@ -153,7 +158,12 @@ <name>DynamicMultiDataChartSum</name> <chartType>COLUMN</chartType> <yAxisLabel>Total in euros</yAxisLabel> + <shareParent v="false" /> <entityField>#ENTITY</entityField> + <defaultGroupFields> + <element>STATUS</element> + </defaultGroupFields> + <title>Sum Chart</title> <columns> <neonDynamicMultiDataChartColumn> <name>e5d14506-5205-43d0-89cb-416bf6debd25</name> @@ -162,5 +172,23 @@ </neonDynamicMultiDataChartColumn> </columns> </dynamicMultiDataChartViewTemplate> + <dynamicMultiDataChartViewTemplate> + <name>DynamicMultiDataChartProb</name> + <chartType>COLUMN</chartType> + <yAxisLabel>Total in euros</yAxisLabel> + <shareParent v="false" /> + <entityField>#ENTITY</entityField> + <defaultGroupFields> + <element>STATUS</element> + </defaultGroupFields> + <title>Probability Chart</title> + <columns> + <neonDynamicMultiDataChartColumn> + <name>e5d14506-5205-43d0-89cb-416bf6debd25</name> + <entityField>PROBABILITY</entityField> + <aggregateEntityField>PROBABILITY_aggregate</aggregateEntityField> + </neonDynamicMultiDataChartColumn> + </columns> + </dynamicMultiDataChartViewTemplate> </children> </neonView>