From a032b002309427ad5811d767503a7cd8631ea7d4 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 25 Apr 2019 16:25:15 +0200
Subject: [PATCH] Campaigncost: sort + some fixes
---
entity/CampaignCost_entitiy/CampaignCost_entitiy.aod | 11 ++++++++++-
.../recordcontainers/db/fromClauseProcess.js | 3 +++
.../recordcontainers/db/orderClauseProcess.js | 4 ++++
.../CampaignParticipant_entity.aod | 3 +++
.../CampaignCostFilter_view.aod | 3 +++
.../CampaignStepCostFilter_view.aod | 3 ---
6 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
create mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index aae44ab683..a01a55abc1 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -209,15 +209,24 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<linkInformation>
<linkInformation>
- <name>70824b95-c84c-406c-89df-c5b9bb379b08</name>
+ <name>70c2db20-0695-4189-92cb-7da585bff401</name>
<tableName>CAMPAIGNCOST</tableName>
<primaryKey>CAMPAIGNCOSTID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>b97b7f67-86ea-4d0a-8303-abc05863ed66</name>
+ <tableName>CAMPAIGNSTEP</tableName>
+ <primaryKey>CAMPAIGNSTEPID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
diff --git a/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js b/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000..4d95079d7c
--- /dev/null
+++ b/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("CAMPAIGNCOST left join CAMPAIGNSTEP on CAMPAIGNCOST.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID")
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js b/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000..8538a702d1
--- /dev/null
+++ b/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object({"CAMPAIGNSTEP.SORTING": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 915da6b61a..964d14d872 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -64,6 +64,7 @@
<name>CAMPAIGN_ID</name>
<title>Campaign</title>
<consumer>CampaignsConsumer</consumer>
+ <mandatory v="true" />
<state>EDITABLE</state>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
@@ -76,6 +77,7 @@
<name>CAMPAIGNSTEP_ID</name>
<title>Campaign Step</title>
<consumer>CampaignSteps</consumer>
+ <mandatory v="true" />
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/CampaignParticipant_entity/entityfields/campaignstep_id/onValueChange.js</onValueChange>
@@ -106,6 +108,7 @@
<title>Participant</title>
<consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/contact_id/valueProcess.js</valueProcess>
diff --git a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
index 72f5af4f8b..d3aa701691 100644
--- a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
+++ b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
@@ -12,6 +12,9 @@
<treeTableViewTemplate>
<name>CostTreeTable</name>
<favoriteActionGroup1>alter</favoriteActionGroup1>
+ <defaultGroupFields>
+ <element>CAMPAIGNSTEP_ID</element>
+ </defaultGroupFields>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/neonView/CampaignStepCostFilter_view/CampaignStepCostFilter_view.aod b/neonView/CampaignStepCostFilter_view/CampaignStepCostFilter_view.aod
index e2e0f967d7..bfcf65a77f 100644
--- a/neonView/CampaignStepCostFilter_view/CampaignStepCostFilter_view.aod
+++ b/neonView/CampaignStepCostFilter_view/CampaignStepCostFilter_view.aod
@@ -12,9 +12,6 @@
<treeTableViewTemplate>
<name>CostTreeTable</name>
<favoriteActionGroup1>alter</favoriteActionGroup1>
- <defaultGroupFields>
- <element>CAMPAIGNSTEP_ID</element>
- </defaultGroupFields>
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab