From c436d188e87afad8672e54038bbe7ce03237e42e Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Wed, 22 May 2019 16:36:21 +0200
Subject: [PATCH] Classification refactorings
---
.../Salesproject_entity.aod | 1 +
neonContext/Salesproject/Salesproject.aod | 72 +++----
.../ClassificationTree_view.aod | 4 +-
.../SalesprojectClassification_view.aod | 28 +++
.../SalesprojectFilter_view.aod | 180 +++++++++---------
.../SalesprojectMain_view.aod | 6 +-
.../SalesprojectPreview_view.aod | 4 +
7 files changed, 168 insertions(+), 127 deletions(-)
create mode 100644 neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 9ce26b107ed..074152c91b8 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -624,6 +624,7 @@
<entityField>
<name>ClassificationResult</name>
<title>Classification</title>
+ <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
</entityField>
</entityFields>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 32644798b5c..682b44c4ab3 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -1,34 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext 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/neonContext/1.1.0">
- <name>Salesproject</name>
- <title>Salesproject</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>SalesprojectMain_view</mainview>
- <filterview>SalesprojectFilter_view</filterview>
- <editview>SalesprojectEdit_view</editview>
- <preview>SalesprojectPreview_view</preview>
- <lookupview>SalesprojectFilter_view</lookupview>
- <entity>Salesproject_entity</entity>
- <references>
- <neonViewReference>
- <name>a791a80d-ecec-43e3-b168-633e411835c2</name>
- <view>SalesprojectPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0d053d4a-a946-417f-a6f7-95e22b9a7cae</name>
- <view>SalesprojectMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>fe6fb9fc-4e7c-49d6-a452-e022b55cbc55</name>
- <view>SalesprojectFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
- <view>SalesprojectEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
- <view>SalesprojectMilestone_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext 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/neonContext/1.1.0">
+ <name>Salesproject</name>
+ <title>Salesproject</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>SalesprojectMain_view</mainview>
+ <filterview>SalesprojectFilter_view</filterview>
+ <editview>SalesprojectEdit_view</editview>
+ <preview>SalesprojectPreview_view</preview>
+ <lookupview>SalesprojectFilter_view</lookupview>
+ <entity>Salesproject_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>a791a80d-ecec-43e3-b168-633e411835c2</name>
+ <view>SalesprojectPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0d053d4a-a946-417f-a6f7-95e22b9a7cae</name>
+ <view>SalesprojectMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fe6fb9fc-4e7c-49d6-a452-e022b55cbc55</name>
+ <view>SalesprojectFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c35cc718-94a8-43cf-afe4-f02d251d4e9f</name>
+ <view>SalesprojectEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9d4603e0-6e0e-4c9e-af97-f5c059debe9e</name>
+ <view>SalesprojectMilestone_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5990b9d2-b9b8-495e-85de-68a765d09b7f</name>
+ <view>SalesprojectClassification_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/ClassificationTree_view/ClassificationTree_view.aod b/neonView/ClassificationTree_view/ClassificationTree_view.aod
index ea3e32db2cb..f4592d59df1 100644
--- a/neonView/ClassificationTree_view/ClassificationTree_view.aod
+++ b/neonView/ClassificationTree_view/ClassificationTree_view.aod
@@ -3,9 +3,9 @@
<name>ClassificationTree_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <noneLayout>
<name>layout</name>
- </boxLayout>
+ </noneLayout>
</layout>
<children>
<treeTableViewTemplate>
diff --git a/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
new file mode 100644
index 00000000000..465ac261fdf
--- /dev/null
+++ b/neonView/SalesprojectClassification_view/SalesprojectClassification_view.aod
@@ -0,0 +1,28 @@
+<?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>SalesprojectClassification_view</name>
+ <title>Classifications</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <scoreCardViewTemplate>
+ <name>ClassificationResult</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>c9fef1fc-21d2-4b6d-913f-a4507fde4dcb</name>
+ <entityField>ClassificationResult</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ <neonViewReference>
+ <name>dab87547-93e4-43d4-94c9-b584f5bb8502</name>
+ <entityField>Classifications</entityField>
+ <view>ClassificationTree_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 72c6b1886e9..e4677ec4061 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -1,88 +1,92 @@
-<?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>SalesprojectFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllSalesprojectDashlet</name>
- <title>Salesprojects</title>
- <description>Show all salesprojects</description>
- <fragment>Salesproject/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>OpenSalesprojectsDashlet</name>
- <title>Open salesprojects</title>
- <description>Show open salesprojects</description>
- <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Salesprojects</name>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
- <entityField>PROJECTTITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
- <entityField>STARTDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
- <entityField>ENDDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
- <entityField>PHASE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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>SalesprojectFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllSalesprojectDashlet</name>
+ <title>Salesprojects</title>
+ <description>Show all salesprojects</description>
+ <fragment>Salesproject/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>OpenSalesprojectsDashlet</name>
+ <title>Open salesprojects</title>
+ <description>Show open salesprojects</description>
+ <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiMjViMGFjNzctZWY5Mi00ODA5LTgwMmUtYmI5ZDg3ODJmODY1IiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Salesprojects</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
+ <entityField>PROJECTTITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
+ <entityField>STARTDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
+ <entityField>ENDDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
+ <entityField>PHASE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>90b7548a-afb0-4d77-9675-02572c31008b</name>
+ <entityField>ClassificationResult</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index ced09a2fdf6..1e5aa1272be 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -25,9 +25,9 @@
<view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>2a26811c-de47-442a-97d2-adc90a6c99ae</name>
- <entityField>Classifications</entityField>
- <view>ClassificationTree_view</view>
+ <name>a2e010e7-434c-4188-be41-01672b9ccd25</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectClassification_view</view>
</neonViewReference>
<neonViewReference>
<name>9dbe03b3-e5d3-4db8-b542-506b13322d4f</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 06b27678220..ff1c7af2fd6 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -100,6 +100,10 @@
<name>884d9900-7e75-42d1-a669-53f6aae5c420</name>
<entityField>RunTime</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
+ <entityField>ClassificationResult</entityField>
+ </entityFieldLink>
</fields>
</scoreCardViewTemplate>
</children>
--
GitLab