From 11d37166ca9f4c2861fb45e68e5ae75e9413ed33 Mon Sep 17 00:00:00 2001
From: "S.Leierseder" <S.Leierseder@SLeierseder.aditosoftware.local>
Date: Thu, 4 Jul 2019 09:28:38 +0200
Subject: [PATCH] changes salesproject overview
---
.../generatedData/SALESPROJECT_MILESTONE.xml | 17 ++++++++++++++++-
neonContext/Salesproject/Salesproject.aod | 8 ++++++++
.../SaleprojectOverviewCharts_view.aod | 19 +++++++++++++++++++
.../SalesprojectMain_view.aod | 5 +++++
.../SalesprojectMilestoneInfo_view.aod | 19 +++++++++++++++++++
.../SalesprojectOverview_view.aod | 9 +++++++--
6 files changed, 74 insertions(+), 3 deletions(-)
create mode 100644 neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
create mode 100644 neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
index 9abc91ea7ec..702a5bb080d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -16,8 +16,23 @@
<column name="TYPE" value="SalesprojectState"/>
<column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
+
<insert tableName="SALESPROJECT_MILESTONE">
- <column name="DATE_START" valueDate="2019-05-17T08:08:07"/>
+ <column name="DATE_START" valueDate="2019-04-25T08:08:07"/>
+ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
+ <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="VALUE" value="SALPROJPHASENQC"/>
+ </insert>
+ <insert tableName="SALESPROJECT_MILESTONE">
+ <column name="DATE_START" valueDate="2019-05-10T08:08:07"/>
+ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
+ <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="VALUE" value="SALPROJPHASEMAL"/>
+ </insert>
+ <insert tableName="SALESPROJECT_MILESTONE">
+ <column name="DATE_START" valueDate="2019-06-17T08:08:07"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
<column name="TYPE" value="SalesprojectPhase"/>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index b076885b2b5..9b104d93a70 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -71,5 +71,13 @@
<name>589b0f12-a4d9-4108-9da1-4ddb418c3991</name>
<view>SalesprojectOverview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>1c957028-bf6b-4b9c-9b46-60f8b53f9edd</name>
+ <view>SaleprojectOverviewCharts_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fb935080-9328-48ad-a5ce-9ec966fb526a</name>
+ <view>SalesprojectMilestoneInfo_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
new file mode 100644
index 00000000000..b4a5b75297c
--- /dev/null
+++ b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_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>SaleprojectOverviewCharts_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="3" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>5cb29574-2cca-44da-a987-a2be76032b27</name>
+ <entityField>SalesprojectForecastCharts</entityField>
+ <view>TurnoverChartForecast_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index 125c428efad..417b5820500 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -19,6 +19,11 @@
<entityField>#ENTITY</entityField>
<view>SalesprojectOverview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d4daa13e-bf57-45e4-af43-d58c04f113f5</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectMemberActivity_view</view>
+ </neonViewReference>
<neonViewReference>
<name>67659a20-068f-4522-ad33-2c35e29f929a</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
new file mode 100644
index 00000000000..6f3a13c89ff
--- /dev/null
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_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>SalesprojectMilestoneInfo_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>04fca7a3-55a5-44b6-9e35-9dbd34153128</name>
+ <entityField>SalesprojectPhaseMilestones</entityField>
+ <view>SalesprojectMilestoneChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
index a847b5dda28..2e629e3ebd7 100644
--- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
+++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
@@ -16,9 +16,14 @@
<view>SalesprojectPhase_view</view>
</neonViewReference>
<neonViewReference>
- <name>23322723-b5a5-45ff-8cf7-1b85bf9ca3d4</name>
+ <name>176485e7-c79c-4fb4-8c59-26c2bfb29a46</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectMemberActivity_view</view>
+ <view>SalesprojectMilestoneInfo_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dd0dd64f-1135-46c5-82d7-9d1e67cf4810</name>
+ <entityField>#ENTITY</entityField>
+ <view>SaleprojectOverviewCharts_view</view>
</neonViewReference>
</children>
</neonView>
--
GitLab