From 3e83f34934016977f9bcb448d838c3f97eb2e5e4 Mon Sep 17 00:00:00 2001
From: Sophia Leierseder <s.leierseder@adito.de>
Date: Fri, 5 Apr 2019 08:09:55 +0200
Subject: [PATCH] Fixes salesproject charts and score card
---
.../Salesproject_entity.aod | 2 +-
.../_____LANGUAGE_EXTRA.aod | 3 +++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 +++++-
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 3 +++
.../SalesprojectChart_view.aod | 26 ++++++++++++++++---
5 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 4f929d040c..ec60c81963 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 cbab88eb79..53087cf5d2 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 c565c0d19b..4e7c4ae02d 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 55aa1f3290..e430baa505 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 ff38a00b95..7b0791b033 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>
--
GitLab