From 1e9d638a77e0083a0c1e345276e4d8d0277f1730 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 2 Oct 2020 12:01:47 +0200
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1066544][Vertriebsprojekt - Anzeige Klassifizierung im Footer der Preview ist
weg]
---
.../Organisation_entity.aod | 4 ++--
.../Salesproject_entity.aod | 18 +++++++++++-------
.../OrganisationFilter_view.aod | 7 +++++--
.../OrganisationLesserNoiseTable_view.aod | 2 ++
.../OrganisationLookup_view.aod | 2 ++
.../OrganisationNoNoiseTable_view.aod | 2 ++
.../OrganisationPreview_view.aod | 2 +-
.../SalesprojectFilter_view.aod | 4 ++--
.../SalesprojectPreview_view.aod | 8 ++++----
9 files changed, 31 insertions(+), 18 deletions(-)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d60f65bf914..f69a7064959 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1206,7 +1206,7 @@
<title>Count</title>
</entityAggregateField>
<entityField>
- <name>CLASSIFICATIONSTORAGE_ID</name>
+ <name>CLASSIFICATIONVALUE</name>
<title>Classification</title>
<groupable v="true" />
</entityField>
@@ -1617,7 +1617,7 @@
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
<dbRecordFieldMapping>
- <name>CLASSIFICATIONSTORAGE_ID.value</name>
+ <name>CLASSIFICATIONVALUE.value</name>
<recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
<isFilterable v="true" />
<isLookupFilter v="false" />
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 5cc67eef56d..f33a3391222 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -595,6 +595,7 @@
</entityConsumer>
<entityConsumer>
<name>Classifications</name>
+ <refreshParent v="true" />
<dependency>
<name>dependency</name>
<entityName>Classification_entity</entityName>
@@ -625,13 +626,6 @@
<title>Days running</title>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/runtime/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>ClassificationResult</name>
- <title>Classification</title>
- <groupable v="false" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/classificationresult/valueProcess.js</valueProcess>
- </entityField>
<entityConsumer>
<name>SalesprojectForecastCharts</name>
<dependency>
@@ -752,6 +746,11 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONVALUE</name>
+ <title>Classification</title>
+ <groupable v="true" />
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -898,6 +897,11 @@
<recordfield>SALESPROJECT.SALESPROJECTID</recordfield>
<aggregateType>COUNT</aggregateType>
</aggregateFieldDbMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONVALUE.value</name>
+ <recordfield>CLASSIFICATIONSTORAGE.CLASSIFICATIONVALUE</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
</recordFieldMappings>
<filterExtensions>
<filterExtensionSet>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index b969a541b7f..1cbde0c5309 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -56,6 +56,7 @@
<linkedColumns>
<element>NAME</element>
</linkedColumns>
+ <fixedFilterFields />
<columns>
<neonTableColumn>
<name>2008e7ac-9e6a-4104-9d5b-da60a10a1c02</name>
@@ -79,7 +80,7 @@
</neonTableColumn>
<neonTableColumn>
<name>c935dcaf-d1eb-4b2c-afee-a58f3f63458d</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ <entityField>CLASSIFICATIONVALUE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>2a82ed1e-05bf-408a-82e0-4de6195dad49</name>
@@ -103,6 +104,8 @@
<linkedColumns>
<element>NAME</element>
</linkedColumns>
+ <defaultGroupFields />
+ <fixedFilterFields />
<columns>
<neonTreeTableColumn>
<name>222c9da2-928c-4a93-a7a5-074e1c61a25c</name>
@@ -126,7 +129,7 @@
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>3aedcc38-0313-43d7-9c84-67f03e28038a</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ <entityField>CLASSIFICATIONVALUE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>d134034c-e391-4df3-9205-465d8a390996</name>
diff --git a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
index 6cdd2403b23..5b29deefbee 100644
--- a/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
+++ b/neonView/OrganisationLesserNoiseTable_view/OrganisationLesserNoiseTable_view.aod
@@ -14,6 +14,8 @@
<hideContentSearch v="true" />
<iconField></iconField>
<entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <fixedFilterFields />
<hideHeader v="false" />
<columns>
<neonTableColumn>
diff --git a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
index d3bab7e2d2d..0d9e7c9051b 100644
--- a/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
+++ b/neonView/OrganisationLookup_view/OrganisationLookup_view.aod
@@ -11,6 +11,8 @@
<tableViewTemplate>
<name>Organisations</name>
<entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <fixedFilterFields />
<columns>
<neonTableColumn>
<name>8c14a108-c672-4b48-bd10-b5ca2e777168</name>
diff --git a/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
index 22d274421a2..2648fff3580 100644
--- a/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
+++ b/neonView/OrganisationNoNoiseTable_view/OrganisationNoNoiseTable_view.aod
@@ -14,6 +14,8 @@
<hideContentSearch v="true" />
<iconField></iconField>
<entityField>#ENTITY</entityField>
+ <linkedColumns />
+ <fixedFilterFields />
<hideHeader v="true" />
<title>Duplicates</title>
<columns>
diff --git a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
index b57cbbcf2f6..b3ee9054032 100644
--- a/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
+++ b/neonView/OrganisationPreview_view/OrganisationPreview_view.aod
@@ -103,7 +103,7 @@
</entityFieldLink>
<entityFieldLink>
<name>7699811a-42f2-48d4-833d-1425db5ba5d0</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ <entityField>CLASSIFICATIONVALUE</entityField>
</entityFieldLink>
</fields>
</scoreCardViewTemplate>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 3ca5b6aa0b8..c055908d526 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -85,7 +85,7 @@
</neonTableColumn>
<neonTableColumn>
<name>88e6bebb-e83d-43ec-82f1-cc778fac458e</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ <entityField>CLASSIFICATIONVALUE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
@@ -133,7 +133,7 @@
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>6d9d1365-985a-4357-8ecc-16ddcc201ea8</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
+ <entityField>CLASSIFICATIONVALUE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>745d6192-4817-49e6-8cb2-8470c9c25f4d</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index ab9b03eab92..fcabc60c03f 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -102,14 +102,14 @@
<name>79490331-6be4-422f-9450-da0db56f0654</name>
<entityField>InactiveTime</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>49513dd7-f19a-450b-9fcf-d320e2f72c42</name>
- <entityField>CLASSIFICATIONSTORAGE_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
<entityField>RemainingTime</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>22c0b0ad-02e8-4743-9062-d1130bdb482d</name>
+ <entityField>CLASSIFICATIONVALUE</entityField>
+ </entityFieldLink>
</fields>
</scoreCardViewTemplate>
</children>
--
GitLab