From d4710217427714d1505169583b942226ae37e0ab Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 23 May 2019 11:06:43 +0200
Subject: [PATCH] =?UTF-8?q?Es=20wurde=20das=20"CampaignCost=5Fentitiy"=20i?=
=?UTF-8?q?n=20"CampaignCost=5Fentity"=20umbenannt.=20Dadurch=20wurde=20di?=
=?UTF-8?q?ese=20ganzen=20Dateien=20wie=20im=20Commit=20zu=20sehen=20als?=
=?UTF-8?q?=20gel=C3=B6scht=20und=20angepasst.=20Sollte=20das=20hier=20zu?=
=?UTF-8?q?=20fehler=20f=C3=BChren=20muss=20der=20Commit=20R=C3=BCckg?=
=?UTF-8?q?=C3=A4ngig=20gemacht=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
CampaignCostVariable_view.aod:
CampaignCostFilter_view.aod:
Sind nicht mehr filterable und der Drawer ist als fix markiert.
---
.../CampaignCost_entitiy.aod | 310 ------------------
.../afterOperatingState.js | 7 -
.../alter/children/edit/onActionProcess.js | 7 -
.../campaign_id/displayValueProcess.js | 9 -
.../entityfields/campaign_id/valueProcess.js | 8 -
.../campaigncostid/valueProcess.js | 7 -
.../campaignsteps_param/valueProcess.js | 2 -
.../campaignstep_id/displayValueProcess.js | 20 --
.../campaignstep_id/mandatoryProcess.js | 7 -
.../campaignstep_id/onValueChange.js | 3 -
.../campaignstep_id/stateProcess.js | 13 -
.../campaignstep_id/valueProcess.js | 8 -
.../children/campaignid_param/valueProcess.js | 4 -
.../campaignsteps_param/documentation.adoc | 2 -
.../category/displayValueProcess.js | 6 -
.../countparticipants/valueProcess.js | 12 -
.../entityfields/date_edit/valueProcess.js | 7 -
.../entityfields/date_new/valueProcess.js | 7 -
.../containername_param/valueProcess.js | 4 -
.../valueProcess.js | 18 -
.../netperparticipant/titleProcess.js | 4 -
.../netperparticipant/valueProcess.js | 11 -
.../campaignsteps_param/valueProcess.js | 3 -
.../entityfields/user_edit/valueProcess.js | 7 -
.../entityfields/user_new/valueProcess.js | 7 -
.../recordcontainers/db/conditionProcess.js | 22 --
.../recordcontainers/db/fromClauseProcess.js | 3 -
.../recordcontainers/db/orderClauseProcess.js | 4 -
.../category.displayvalue/expression.js | 6 -
.../CampaignStep_entity.aod | 4 +-
entity/Campaign_entity/Campaign_entity.aod | 6 +-
.../KeywordEntry_entity.aod | 2 +-
neonContext/CampaignCost/CampaignCost.aod | 2 +-
.../CampaignCostFilter_view.aod | 3 +-
.../CampaignCostVariable_view.aod | 3 +-
35 files changed, 11 insertions(+), 537 deletions(-)
delete mode 100644 entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
delete mode 100644 entity/CampaignCost_entitiy/afterOperatingState.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc
delete mode 100644 entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js
delete mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js
delete mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
delete mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js
delete mode 100644 entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
deleted file mode 100644
index 1ed10ca0a52..00000000000
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.5" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.5">
- <name>CampaignCost_entitiy</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CAMPAIGNCOSTID</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CAMPAIGN_ID</name>
- <title>Campaign</title>
- <consumer>Campaigns</consumer>
- <mandatory v="true" />
- <groupable v="true" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CAMPAIGNSTEP_ID</name>
- <title>Campaign Step</title>
- <consumer>CampaignSteps</consumer>
- <mandatoryProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js</mandatoryProcess>
- <groupable v="true" />
- <stateProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>CATEGORY</name>
- <title>Category</title>
- <consumer>KeywordCampaignManagementCostCategory</consumer>
- <mandatory v="true" />
- <groupable v="true" />
- <displayValueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>NET</name>
- <title>Cost</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <mandatory v="true" />
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>CampaignCosts</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>7131288b-af5c-4914-96f5-c5d70217fc23</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>CampaignStepId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>CampaignId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>CampaignSteps_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>StepCosts</name>
- <fieldType>DEPENDENCY_IN</fieldType>
- <dependencies>
- <entityDependency>
- <name>af147f3e-a1bd-4eb0-9ac8-325dbdaba17d</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2a92b738-c0bb-4c14-9915-aff9e18effaf</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignStepCosts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>CampaignStepId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>CampaignId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>CampaignSteps_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Campaigns</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>Campaigns</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>CampaignSteps</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>CampaignSteps</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>campaignId_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordCampaignManagementCostCategory</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>edit</name>
- <fieldType>ACTION</fieldType>
- <onActionProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>NEON:PENCIL</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityParameter>
- <name>CampaignId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>CampaignStepId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>netPerParticipant</name>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>countParticipants</name>
- <title>Participants</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#0</outputFormat>
- <inputFormat>#0</inputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>CampaignSteps_param</name>
- <title></title>
- <expose v="true" />
- <documentation>%aditoprj%/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <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>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>
- <name>CAMPAIGN_ID.value</name>
- <recordfield>CAMPAIGNCOST.CAMPAIGN_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CAMPAIGNCOSTID.value</name>
- <recordfield>CAMPAIGNCOST.CAMPAIGNCOSTID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CAMPAIGNSTEP_ID.value</name>
- <recordfield>CAMPAIGNCOST.CAMPAIGNSTEP_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CATEGORY.value</name>
- <recordfield>CAMPAIGNCOST.CATEGORY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>CAMPAIGNCOST.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>CAMPAIGNCOST.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NET.value</name>
- <recordfield>CAMPAIGNCOST.NET</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>CAMPAIGNCOST.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>CAMPAIGNCOST.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CATEGORY.displayValue</name>
- <expression>%aditoprj%/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/CampaignCost_entitiy/afterOperatingState.js b/entity/CampaignCost_entitiy/afterOperatingState.js
deleted file mode 100644
index aadf712515f..00000000000
--- a/entity/CampaignCost_entitiy/afterOperatingState.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
-{
- neon.refreshAll();
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js b/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js
deleted file mode 100644
index 5808a7a781c..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/alter/children/edit/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-
-var params = {
- "Uid_param" : vars.get("$sys.uid")
-}
-neon.openContext("CampaignCost", "CampaignCostEdit_view", null, neon.OPERATINGSTATE_EDIT, params);
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js
deleted file mode 100644
index 2e2d6acf76a..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaign_id/displayValueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Campaign_lib");
-
-var campaignId = vars.get("$field.CAMPAIGN_ID");
-var campaignName = CampaignUtils.getCampaignNameById(campaignId);
-
-result.string(campaignName);
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js
deleted file mode 100644
index 4037fcb0249..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaign_id/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.CampaignId_param") && vars.get("$param.CampaignId_param"))
-{
- result.string(vars.get("$param.CampaignId_param"));
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js
deleted file mode 100644
index 622e00f05f7..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaigncostid/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.util");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js
deleted file mode 100644
index 4f08839a6a4..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaigncosts/children/campaignsteps_param/valueProcess.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import("system.result");
-result.string(0)
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js
deleted file mode 100644
index f05a19497e2..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/displayValueProcess.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import("system.neon");
-import("system.translate");
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Campaign_lib");
-
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- var campaignStepId = vars.get("$field.CAMPAIGNSTEP_ID");
- if (campaignStepId)
- {
- var campaignStepName = CampaignUtils.getCampaignStepNameById(campaignStepId);
- result.string(translate.text("Step") + ": " + campaignStepName);
- }
- else
- {
- result.string(translate.text("Fix cost"));
- }
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js
deleted file mode 100644
index 32de11947a0..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/mandatoryProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-result.object((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW &&
- vars.exists("$param.CampaignSteps_param") && vars.get("$param.CampaignSteps_param") == "1" &&
- vars.exists("$param.CampaignStepId_param") && !vars.get("$param.CampaignStepId_param")));
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js b/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js
deleted file mode 100644
index 6483cdd91c7..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/onValueChange.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.neon");
-
-neon.setFieldValue("$field.CATEGORY", "");
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js
deleted file mode 100644
index a3d6f4f4d26..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/stateProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW &&
- vars.exists("$param.CampaignSteps_param") && vars.get("$param.CampaignSteps_param") == "1" &&
- vars.exists("$param.CampaignStepId_param") && !vars.get("$param.CampaignStepId_param"))
-{
- result.string(neon.COMPONENTSTATE_AUTO);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js
deleted file mode 100644
index 30896ea50e4..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignstep_id/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.CampaignStepId_param") && vars.get("$param.CampaignStepId_param"))
-{
- result.string(vars.get("$param.CampaignStepId_param"));
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
deleted file mode 100644
index dc855dd0514..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignsteps/children/campaignid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$param.CampaignId_param"))
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc b/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc
deleted file mode 100644
index d74c862542f..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/campaignsteps_param/documentation.adoc
+++ /dev/null
@@ -1,2 +0,0 @@
-if 0: show only fix costs
-if 1: show only campaign steps
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js b/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js
deleted file mode 100644
index c8d7303fade..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/category/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.campaignStepCostCategory(), vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js
deleted file mode 100644
index c8cec9a46f4..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/countparticipants/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Campaign_lib");
-
-if (vars.get("$field.CAMPAIGNSTEP_ID"))
-{
- result.string(CampaignUtils.getParticipantCountForStep(vars.get("$field.CAMPAIGNSTEP_ID")));
-}
-else
-{
- result.string(CampaignUtils.getParticipantCount(vars.get("$field.CAMPAIGN_ID")));
-}
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 96630036eca..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js
deleted file mode 100644
index 1b1ea7c082a..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js
deleted file mode 100644
index 621fdd82097..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.campaignStepCostCategory());
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js
deleted file mode 100644
index 7bf0f39ed06..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/keywordcampaignmanagementcostcategory/children/excludedkeyidssubquery_param/valueProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Sql_lib");
-import("system.result");
-
-var cond = SqlCondition.begin()
- .andPrepareVars("CAMPAIGNCOST.CAMPAIGN_ID", "$field.CAMPAIGN_ID");
-
-if (vars.get("$field.CAMPAIGNSTEP_ID"))
- cond.andPrepareVars("CAMPAIGNCOST.CAMPAIGNSTEP_ID", "$field.CAMPAIGNSTEP_ID");
-else
- cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null")
-
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
- cond.andPrepareVars("CAMPAIGNCOST.CAMPAIGNCOSTID", "$field.CAMPAIGNCOSTID", "# <> ?");
-
-result.string(db.translateStatement(cond.buildSql("select CATEGORY from CAMPAIGNCOST", "1=2", "group by CATEGORY")));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js b/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js
deleted file mode 100644
index c5ea14f73ec..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.string(translate.text("Cost") + " " + translate.text("per") + " " + translate.text("Participant"));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js
deleted file mode 100644
index eea808176cb..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.vars");
-import("system.result");
-import("system.eMath");
-
-var netto = parseFloat(vars.get("$field.NET"));
-var countParticipants = parseFloat(vars.get("$field.countParticipants"));
-
-if (netto && countParticipants &&countParticipants > 0)
- result.string(eMath.roundDec(netto / countParticipants, 2, eMath.ROUND_HALF_UP));
-else
- result.string(0);
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js
deleted file mode 100644
index 4336563e79c..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.string(1);
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 8a93ff7e16a..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js b/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js
deleted file mode 100644
index 2615c2bbe71..00000000000
--- a/entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js b/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js
deleted file mode 100644
index f553af6bac5..00000000000
--- a/entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = SqlCondition.begin()
- .andPrepareVars("CAMPAIGNCOST.CAMPAIGNCOSTID", "$param.Uid_param")
- .andPrepareVars("CAMPAIGNCOST.CAMPAIGN_ID", "$param.CampaignId_param")
- .andPrepareVars("CAMPAIGNCOST.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param");
-
-if (vars.exists("$param.CampaignSteps_param") && vars.get("$param.CampaignSteps_param") == "1")
-{
- // only step costs
- cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is not null");
-}
-else
-{
- // only fix costs
- cond.and("CAMPAIGNCOST.CAMPAIGNSTEP_ID is null");
-}
-
-result.string(db.translateCondition(cond.build("1=2")));
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js b/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
deleted file mode 100644
index e075c4e8949..00000000000
--- a/entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index e8abc388f8e..00000000000
--- a/entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.db");
-
-result.object({"CAMPAIGNSTEP.SORTING": db.ASCENDING});
\ No newline at end of file
diff --git a/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js b/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
deleted file mode 100644
index 4f14958aedf..00000000000
--- a/entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.campaignStepCostCategory(), "CAMPAIGNCOST.CATEGORY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 972daa93743..10c9826fa04 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -124,7 +124,7 @@
</entityDependency>
<entityDependency>
<name>ad4ee503-95b9-4add-a0ef-e833db008349</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>CampaignSteps</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -229,7 +229,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>StepCosts</fieldName>
</dependency>
<children>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 87e2fba10cf..7865abaefab 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -146,7 +146,7 @@
</entityDependency>
<entityDependency>
<name>d238b02c-75e7-4cf4-b90c-bb36d41ae90f</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>Campaigns</fieldName>
<isConsumer v="false" />
</entityDependency>
@@ -197,7 +197,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>CampaignCosts</fieldName>
</dependency>
<children>
@@ -219,7 +219,7 @@
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>StepCosts</fieldName>
</dependency>
<children>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index f7dacc68896..b4b9660d0b0 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -382,7 +382,7 @@
</entityDependency>
<entityDependency>
<name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
- <entityName>CampaignCost_entitiy</entityName>
+ <entityName>CampaignCost_entity</entityName>
<fieldName>KeywordCampaignManagementCostCategory</fieldName>
<isConsumer v="false" />
</entityDependency>
diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod
index 0e1a0721491..9c38b9368d9 100644
--- a/neonContext/CampaignCost/CampaignCost.aod
+++ b/neonContext/CampaignCost/CampaignCost.aod
@@ -4,7 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<filterview>CampaignCostFilter_view</filterview>
<editview>CampaignCostEdit_view</editview>
- <entity>CampaignCost_entitiy</entity>
+ <entity>CampaignCost_entity</entity>
<references>
<neonViewReference>
<name>fa4ac7f7-4f30-42ba-86b2-99e86597734f</name>
diff --git a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
index ecafe08950d..c8076b48e2f 100644
--- a/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
+++ b/neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod
@@ -2,11 +2,12 @@
<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>CampaignCostFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
+ <filterable v="false" />
<layout>
<drawerLayout>
<name>layout</name>
<layoutCaption>Fix costs</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
index 637e35e7165..5f8b4816b86 100644
--- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
+++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod
@@ -3,11 +3,12 @@
<name>CampaignCostVariable_view</name>
<title>Step costs</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
+ <filterable v="false" />
<layout>
<drawerLayout>
<name>layout</name>
<layoutCaption>Variable costs</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
--
GitLab