diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 4f929d040cf0b4b30f03dc2c0b6eacddca0f23c6..ec60c81963ac88e2ef437a9d707a0e7f095a27c2 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -526,7 +526,7 @@ </entityField> <entityField> <name>OVERALL_FORECAST</name> - <title>Forecast actual year</title> + <title>Forecast actual year </title> <contentType>NUMBER</contentType> <state>READONLY</state> <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/overall_forecast/valueProcess.js</valueProcess> diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index cbab88eb793cfc0110ac49ba9028e0888d7a847f..53087cf5d281def2ce180cfc8b68951dbff8d32d 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -2739,6 +2739,9 @@ <entry> <key>{$ADDRESS_IDENTIFIER}</key> </entry> + <entry> + <key>Salesproject phases</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 c565c0d19b70392368d0ed2438ef243ae34092fb..4e7c4ae02df05f70989fad15d70337e64d635252 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -31,7 +31,7 @@ <value>Eingangsdatum (Tag)</value> </entry> <entry> - <key>Salesproject Phases</key> + <key>Salesproject phases</key> <value>Vertriebsprojektphasen</value> </entry> <entry> @@ -3517,6 +3517,12 @@ <key>{$ADDRESS_IDENTIFIER}</key> <value>Bezeichnung</value> </entry> + <entry> + <key>Turnover actual year</key> + </entry> + <entry> + <key>Forecast actual year</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 55aa1f3290b63fcf617d332326a3536d38100df6..e430baa5051be37cf31866175a124c384bd899c3 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2770,6 +2770,9 @@ <key>{$ADDRESS_IDENTIFIER}</key> <value>Identifier</value> </entry> + <entry> + <key>Salesproject phases</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod index ff38a00b95d81d85d53ccfd0f0c24c6135676240..7b0791b033d56a015d4c91ef98986531deb2998e 100644 --- a/neonView/SalesprojectChart_view/SalesprojectChart_view.aod +++ b/neonView/SalesprojectChart_view/SalesprojectChart_view.aod @@ -1,7 +1,27 @@ <?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0"> +<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>SalesprojectChart_view</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <dashletConfigurations> + <neonDashletConfiguration> + <name>Salesproject phases</name> + <title>Salesproject Phases</title> + <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description> + <fragment>SalesprojectChart/full</fragment> + <singleton v="true" /> + <icon>VAADIN:FUNNEL</icon> + <categories> + <neonDashletCategory> + <name>salesproject</name> + <title>Salesproject</title> + </neonDashletCategory> + <neonDashletCategory> + <name>chart</name> + <title>Chart</title> + </neonDashletCategory> + </categories> + </neonDashletConfiguration> + </dashletConfigurations> <layout> <groupLayout> <name>layout</name> @@ -17,8 +37,8 @@ <entityField>#ENTITY</entityField> </singleDataChartViewTemplate> <singleDataChartViewTemplate> - <name>PhaseDonutChart</name> - <chartType>DONUT</chartType> + <name>PhasePieChart</name> + <chartType>PIE</chartType> <xAxis>X_PHASE</xAxis> <yAxis>Y_COUNT</yAxis> <parentField></parentField>