From ff41d0682030e9b899477dfd6c3a322df7483f96 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 8 Feb 2019 11:33:00 +0100
Subject: [PATCH] refactor Salesproject entities
---
entity/Organisation_entity/Organisation_entity.aod | 4 ++--
.../SalesprojectClassificationEntry_entity.aod | 4 ++--
.../SalesprojectClassification_entity.aod | 10 +++++-----
.../children/classid_param/code.js | 0
.../children/salesprojectid_param/code.js | 4 ++++
.../SalesprojectCompetition_entity.aod | 12 ++++++------
.../children/relationid_param/code.js | 0
.../SalesprojectCycle_entity.aod | 4 ++--
.../SalesprojectForecast_entity.aod | 4 ++--
.../SalesprojectMember_entity.aod | 4 ++--
.../SalesprojectSource_entity.aod | 2 +-
entity/Salesproject_entity/Salesproject_entity.aod | 12 ++++++------
.../SalesprojectClassificationPreview_view.aod | 2 +-
.../SalesprojectCompetitionPreview_view.aod | 2 +-
14 files changed, 34 insertions(+), 30 deletions(-)
rename entity/SalesprojectClassification_entity/entityfields/{salesprojectclassificationentry_dfo => salesprojectclassificationentries}/children/classid_param/code.js (100%)
create mode 100644 entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js
rename entity/SalesprojectCompetition_entity/entityfields/{salesprojectcompetitionorg_dfo => organisation}/children/relationid_param/code.js (100%)
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 3eee6d8d10..56d21d1539 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -181,7 +181,7 @@
<entityDependency>
<name>120c8bfb-1b03-408d-97e7-88e3b7249c53</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>SalesprojectCompetitionOrg_dfo</fieldName>
+ <fieldName>Organisation</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
@@ -292,7 +292,7 @@ Usually this is used for filtering COMM-entires by a specified contact or creati
<entityDependency>
<name>1fa399a8-8c0c-470f-94a8-6c748293d93d</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>CompetitionOrg_lookup_dfo</fieldName>
+ <fieldName>Organisations</fieldName>
<isConsumer v="false" />
</entityDependency>
<entityDependency>
diff --git a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
index 14903e274f..49979dffce 100644
--- a/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
+++ b/entity/SalesprojectClassificationEntry_entity/SalesprojectClassificationEntry_entity.aod
@@ -8,14 +8,14 @@
<name>#PROVIDER</name>
</entityProvider>
<entityProvider>
- <name>SalesprojectClassificatonEntry_dfi</name>
+ <name>SalesprojectClassificatonEntries</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>jdito</recordContainer>
<dependencies>
<entityDependency>
<name>a7414022-56d3-4ca0-b15f-33601b655d78</name>
<entityName>SalesprojectClassification_entity</entityName>
- <fieldName>SalesprojectClassificationEntry_dfo</fieldName>
+ <fieldName>SalesprojectClassificationEntries</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
diff --git a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
index ad34c89ad9..43d35b74f2 100644
--- a/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
+++ b/entity/SalesprojectClassification_entity/SalesprojectClassification_entity.aod
@@ -12,28 +12,28 @@
<name>CLASSNAME</name>
</entityField>
<entityConsumer>
- <name>SalesprojectClassificationEntry_dfo</name>
+ <name>SalesprojectClassificationEntries</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>SalesprojectClassificationEntry_entity</entityName>
- <fieldName>SalesprojectClassificatonEntry_dfi</fieldName>
+ <fieldName>SalesprojectClassificatonEntries</fieldName>
</dependency>
<children>
<entityParameter>
<name>ClassId_param</name>
- <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/classid_param/code.js</code>
+ <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
<entityParameter>
<name>SalesprojectId_param</name>
- <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/salesprojectid_param/code.js</code>
+ <code>%aditoprj%/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js</code>
<triggerRecalculation v="true" />
</entityParameter>
</children>
</entityConsumer>
<entityProvider>
- <name>SalesprojectClassification_dfi</name>
+ <name>SalesprojectClassifications</name>
<fieldType>DEPENDENCY_IN</fieldType>
<title>Classification</title>
<recordContainer>jdito</recordContainer>
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/classid_param/code.js b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/code.js
similarity index 100%
rename from entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentry_dfo/children/classid_param/code.js
rename to entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/classid_param/code.js
diff --git a/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js
new file mode 100644
index 0000000000..098d87cfa5
--- /dev/null
+++ b/entity/SalesprojectClassification_entity/entityfields/salesprojectclassificationentries/children/salesprojectid_param/code.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$param.SalesprojectId_param"));
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 032b437f01..806d224d07 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -58,11 +58,11 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>SalesprojectCompetition_dfi</name>
+ <name>SalesprojectCompetitions</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -77,7 +77,7 @@
<entityField>
<name>RELATION_ID</name>
<title>Organisation</title>
- <consumer>CompetitionOrg_lookup_dfo</consumer>
+ <consumer>Organisations</consumer>
<linkedContext>Organisation_context</linkedContext>
</entityField>
<entityField>
@@ -93,7 +93,7 @@
<state>AUTO</state>
</entityField>
<entityConsumer>
- <name>SalesprojectCompetitionOrg_dfo</name>
+ <name>Organisation</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
@@ -103,7 +103,7 @@
<children>
<entityParameter>
<name>relationId_param</name>
- <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfo/children/relationid_param/code.js</code>
+ <code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js</code>
<expose v="true" />
<triggerRecalculation v="true" />
</entityParameter>
@@ -125,7 +125,7 @@
<possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/org_weakness/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityConsumer>
- <name>CompetitionOrg_lookup_dfo</name>
+ <name>Organisations</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfo/children/relationid_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js
similarity index 100%
rename from entity/SalesprojectCompetition_entity/entityfields/salesprojectcompetitionorg_dfo/children/relationid_param/code.js
rename to entity/SalesprojectCompetition_entity/entityfields/organisation/children/relationid_param/code.js
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index 6848f17d67..cb61f80aae 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -61,11 +61,11 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>SalesprojectCycle_dfi</name>
+ <name>SalesprojectCycles</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
diff --git a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
index 498f2f509a..70d49ca7bd 100644
--- a/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+++ b/entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
@@ -62,11 +62,11 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
- <name>SalesprojectForecast_dfi</name>
+ <name>SalesprojectForecasts</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
diff --git a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
index d09ecea2c6..cb25b9d4ba 100644
--- a/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
+++ b/entity/SalesprojectMember_entity/SalesprojectMember_entity.aod
@@ -48,7 +48,7 @@
<valueProcess>%aditoprj%/entity/SalesprojectMember_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
- <name>SalesprojectMember_dfi</name>
+ <name>SalesprojectMembers</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
@@ -64,7 +64,7 @@
<name>SalesprojectId_param</name>
<expose v="true" />
<triggerRecalculation v="true" />
- <mandatory v="false" />
+ <mandatory v="true" />
<description>PARAMETER</description>
</entityParameter>
<entityField>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 1b606cf32c..dd533ac21e 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -9,7 +9,7 @@
<name>#PROVIDER</name>
</entityProvider>
<entityProvider>
- <name>SalesprojectSouce_dfi</name>
+ <name>SalesprojectSouces</name>
<fieldType>DEPENDENCY_IN</fieldType>
<recordContainer>db</recordContainer>
<dependencies>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 596801eee7..cf6bbde2da 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -139,7 +139,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectSource_entity</entityName>
- <fieldName>SalesprojectSouce_dfi</fieldName>
+ <fieldName>SalesprojectSouces</fieldName>
</dependency>
<children>
<entityParameter>
@@ -156,7 +156,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectCycle_entity</entityName>
- <fieldName>SalesprojectCycle_dfi</fieldName>
+ <fieldName>SalesprojectCycles</fieldName>
</dependency>
<children>
<entityParameter>
@@ -173,7 +173,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectForecast_entity</entityName>
- <fieldName>SalesprojectForecast_dfi</fieldName>
+ <fieldName>SalesprojectForecasts</fieldName>
</dependency>
<children>
<entityParameter>
@@ -190,7 +190,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectCompetition_entity</entityName>
- <fieldName>SalesprojectCompetition_dfi</fieldName>
+ <fieldName>SalesprojectCompetitions</fieldName>
</dependency>
<children>
<entityParameter>
@@ -245,7 +245,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectMember_entity</entityName>
- <fieldName>SalesprojectMember_dfi</fieldName>
+ <fieldName>SalesprojectMembers</fieldName>
</dependency>
<children>
<entityParameter>
@@ -262,7 +262,7 @@
<dependency>
<name>dependency</name>
<entityName>SalesprojectClassification_entity</entityName>
- <fieldName>SalesprojectClassification_dfi</fieldName>
+ <fieldName>SalesprojectClassifications</fieldName>
</dependency>
<children>
<entityParameter>
diff --git a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
index 9fb4bc8270..eb623b4fad 100644
--- a/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
+++ b/neonView/SalesprojectClassificationPreview_view/SalesprojectClassificationPreview_view.aod
@@ -24,7 +24,7 @@
</genericViewTemplate>
<neonViewReference>
<name>c6c26fdd-3812-495f-bd30-d3a6cdcd4eb0</name>
- <entityField>SalesprojectClassificationEntry_dfo</entityField>
+ <entityField>SalesprojectClassificationEntries</entityField>
<view>SalesprojectClassificationEntryPreview_view</view>
</neonViewReference>
</children>
diff --git a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
index 6fe84ed770..81e1139a44 100644
--- a/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
+++ b/neonView/SalesprojectCompetitionPreview_view/SalesprojectCompetitionPreview_view.aod
@@ -60,7 +60,7 @@
</genericViewTemplate>
<neonViewReference>
<name>3ad88e2c-b159-4c97-b81f-beb689b0fc1c</name>
- <entityField>SalesprojectCompetitionOrg_dfo</entityField>
+ <entityField>Organisation</entityField>
<view>OrganisationAttr_view</view>
</neonViewReference>
</children>
--
GitLab