From 3d8ff998ccd302b65023a7cffe0358d8ff5c9118 Mon Sep 17 00:00:00 2001
From: "S.Leierseder" <S.Leierseder@SLeierseder.aditosoftware.local>
Date: Thu, 18 Jul 2019 10:10:23 +0200
Subject: [PATCH] changes milestone charts
---
.../entityfields/value/titleProcess.js | 2 +-
.../_____LANGUAGE_EXTRA.aod | 12 ++++++++++
.../_____LANGUAGE_de/_____LANGUAGE_de.aod | 8 +++++++
.../_____LANGUAGE_en/_____LANGUAGE_en.aod | 12 ++++++++++
.../SalesprojectMilestone.aod | 8 +++++--
.../SalesprojectMilestoneChartPhase_view.aod} | 4 ++--
.../SalesprojectMilestoneChartState_view.aod | 22 +++++++++++++++++++
.../SalesprojectMilestone_view.aod | 12 +++++-----
8 files changed, 69 insertions(+), 11 deletions(-)
rename neonView/{SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod => SalesprojectMilestoneChartPhase_view/SalesprojectMilestoneChartPhase_view.aod} (85%)
create mode 100644 neonView/SalesprojectMilestoneChartState_view/SalesprojectMilestoneChartState_view.aod
diff --git a/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js b/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js
index 658e8105ef1..f02879713e4 100644
--- a/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js
+++ b/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js
@@ -4,7 +4,7 @@ import("system.result");
if (vars.exists("$field.TYPE") && vars.get("$field.TYPE"))
{
- result.string(translate.text("Milestones") + " " + translate.text(vars.get("$field.TYPE")));
+ result.string(translate.text(vars.get("$field.TYPE")));
}
else
result.string(translate.text("Milestones"));
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 7ed7b75c18d..ca3a3e9b2fc 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4989,6 +4989,18 @@
<entry>
<key>Phase progression</key>
</entry>
+ <entry>
+ <key>Occurrences</key>
+ </entry>
+ <entry>
+ <key>Occurrence</key>
+ </entry>
+ <entry>
+ <key>Milestones Phase</key>
+ </entry>
+ <entry>
+ <key>Milestones Status</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 01c18ad8467..a06c5b62d31 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -74,6 +74,10 @@
<key>Categorization</key>
<value>Einordnung</value>
</entry>
+ <entry>
+ <key>Milestones Phase</key>
+ <value>Meilensteine Phase</value>
+ </entry>
<entry>
<key>Names</key>
<value>Namen</value>
@@ -3453,6 +3457,10 @@
<key>Dominican Republic</key>
<value>Dominikanische Republik</value>
</entry>
+ <entry>
+ <key>Milestones Status</key>
+ <value>Meilensteine Status</value>
+ </entry>
<entry>
<key>MAL</key>
</entry>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index b171cf67ae3..cf458992c29 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5038,6 +5038,18 @@
<entry>
<key>Phase progression</key>
</entry>
+ <entry>
+ <key>Occurrences</key>
+ </entry>
+ <entry>
+ <key>Occurrence</key>
+ </entry>
+ <entry>
+ <key>Milestones Phase</key>
+ </entry>
+ <entry>
+ <key>Milestones Status</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod b/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
index 08aae3b6872..93653cb716a 100644
--- a/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
+++ b/neonContext/SalesprojectMilestone/SalesprojectMilestone.aod
@@ -3,16 +3,20 @@
<name>SalesprojectMilestone</name>
<description>Milestones of a salesproject</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterview>SalesprojectMilestoneChart_view</filterview>
+ <filterview>SalesprojectMilestoneChartPhase_view</filterview>
<entity>SalesprojectMilestone_entity</entity>
<references>
<neonViewReference>
<name>54bee07a-f45d-458a-bfc6-56ba4992b63d</name>
- <view>SalesprojectMilestoneChart_view</view>
+ <view>SalesprojectMilestoneChartPhase_view</view>
</neonViewReference>
<neonViewReference>
<name>8efe4695-9e0c-43e5-876c-374338a346af</name>
<view>SalesprojectMilestoneInfo_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>e3909e48-c921-47db-9e83-d95674490c4e</name>
+ <view>SalesprojectMilestoneChartState_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod b/neonView/SalesprojectMilestoneChartPhase_view/SalesprojectMilestoneChartPhase_view.aod
similarity index 85%
rename from neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
rename to neonView/SalesprojectMilestoneChartPhase_view/SalesprojectMilestoneChartPhase_view.aod
index d1f4aa8521c..ec1d4cfa00d 100644
--- a/neonView/SalesprojectMilestoneChart_view/SalesprojectMilestoneChart_view.aod
+++ b/neonView/SalesprojectMilestoneChartPhase_view/SalesprojectMilestoneChartPhase_view.aod
@@ -1,11 +1,11 @@
<?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>SalesprojectMilestoneChart_view</name>
+ <name>SalesprojectMilestoneChartPhase_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<drawerLayout>
<name>layout</name>
- <layoutCaption>Milestones</layoutCaption>
+ <layoutCaption>Milestones Phase</layoutCaption>
<fixedDrawer v="true" />
</drawerLayout>
</layout>
diff --git a/neonView/SalesprojectMilestoneChartState_view/SalesprojectMilestoneChartState_view.aod b/neonView/SalesprojectMilestoneChartState_view/SalesprojectMilestoneChartState_view.aod
new file mode 100644
index 00000000000..af089d692fe
--- /dev/null
+++ b/neonView/SalesprojectMilestoneChartState_view/SalesprojectMilestoneChartState_view.aod
@@ -0,0 +1,22 @@
+<?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>SalesprojectMilestoneChartState_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Milestones Status</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
+ </layout>
+ <children>
+ <multiDataChartViewTemplate>
+ <name>MilestoneChart</name>
+ <chartType>COLUMN</chartType>
+ <xAxis>VALUE</xAxis>
+ <yAxis>DaysCount</yAxis>
+ <categoryField>TYPE</categoryField>
+ <entityField>#ENTITY</entityField>
+ </multiDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
index 7546c68acb3..d86c5a012ca 100644
--- a/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
+++ b/neonView/SalesprojectMilestone_view/SalesprojectMilestone_view.aod
@@ -12,14 +12,14 @@
</layout>
<children>
<neonViewReference>
- <name>30c775ea-7488-4dfd-8e6d-c65b7982849d</name>
- <entityField>SalesprojectStateMilestones</entityField>
- <view>SalesprojectMilestoneChart_view</view>
+ <name>af5d5121-2d6e-40f7-8236-37392a3a44e5</name>
+ <entityField>SalesprojectPhaseMilestones</entityField>
+ <view>SalesprojectMilestoneChartPhase_view</view>
</neonViewReference>
<neonViewReference>
- <name>cc8f1469-805f-4e2c-aa4f-d55f932c6deb</name>
- <entityField>SalesprojectPhaseMilestones</entityField>
- <view>SalesprojectMilestoneChart_view</view>
+ <name>867fec73-23a3-48ed-bd56-33aabb59315d</name>
+ <entityField>SalesprojectStateMilestones</entityField>
+ <view>SalesprojectMilestoneChartState_view</view>
</neonViewReference>
</children>
</neonView>
--
GitLab