Revert "Es wurde das "CampaignCost_entitiy" in "CampaignCost_entity" umbenannt...."

This reverts commit d4710217

entity/CampaignCost_entitiy/entityfields/netperparticipant/titleProcess.js

+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Cost") +  " " + translate.text("per") + " "  + translate.text("Participant"));
\ No newline at end of file

entity/CampaignCost_entitiy/entityfields/netperparticipant/valueProcess.js

+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

entity/CampaignCost_entitiy/entityfields/stepcosts/children/campaignsteps_param/valueProcess.js

+import("system.result");
+
+result.string(1);
\ No newline at end of file

entity/CampaignCost_entitiy/entityfields/user_edit/valueProcess.js

+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

entity/CampaignCost_entitiy/entityfields/user_new/valueProcess.js

+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

entity/CampaignCost_entitiy/recordcontainers/db/conditionProcess.js

+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

entity/CampaignCost_entitiy/recordcontainers/db/fromClauseProcess.js

+import("system.result");
+
+result.string("CAMPAIGNCOST left join CAMPAIGNSTEP on CAMPAIGNCOST.CAMPAIGNSTEP_ID = CAMPAIGNSTEP.CAMPAIGNSTEPID")
\ No newline at end of file

entity/CampaignCost_entitiy/recordcontainers/db/orderClauseProcess.js

+import("system.result");
+import("system.db");
+
+result.object({"CAMPAIGNSTEP.SORTING": db.ASCENDING});
\ No newline at end of file

entity/CampaignCost_entitiy/recordcontainers/db/recordfieldmappings/category.displayvalue/expression.js

+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

entity/CampaignStep_entity/CampaignStep_entity.aod

@@ -124,7 +124,7 @@
         </entityDependency>
         <entityDependency>
           <name>ad4ee503-95b9-4add-a0ef-e833db008349</name>
-          <entityName>CampaignCost_entity</entityName>
+          <entityName>CampaignCost_entitiy</entityName>
           <fieldName>CampaignSteps</fieldName>
           <isConsumer v="false" />
         </entityDependency>
@@ -229,7 +229,7 @@
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>CampaignCost_entity</entityName>
+        <entityName>CampaignCost_entitiy</entityName>
         <fieldName>StepCosts</fieldName>
       </dependency>
       <children>

entity/Campaign_entity/Campaign_entity.aod

@@ -146,7 +146,7 @@
         </entityDependency>
         <entityDependency>
           <name>d238b02c-75e7-4cf4-b90c-bb36d41ae90f</name>
-          <entityName>CampaignCost_entity</entityName>
+          <entityName>CampaignCost_entitiy</entityName>
           <fieldName>Campaigns</fieldName>
           <isConsumer v="false" />
         </entityDependency>
@@ -197,7 +197,7 @@
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>CampaignCost_entity</entityName>
+        <entityName>CampaignCost_entitiy</entityName>
         <fieldName>CampaignCosts</fieldName>
       </dependency>
       <children>
@@ -219,7 +219,7 @@
       <fieldType>DEPENDENCY_OUT</fieldType>
       <dependency>
         <name>dependency</name>
-        <entityName>CampaignCost_entity</entityName>
+        <entityName>CampaignCost_entitiy</entityName>
         <fieldName>StepCosts</fieldName>
       </dependency>
       <children>

entity/KeywordEntry_entity/KeywordEntry_entity.aod

@@ -382,7 +382,7 @@
         </entityDependency>
         <entityDependency>
           <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
-          <entityName>CampaignCost_entity</entityName>
+          <entityName>CampaignCost_entitiy</entityName>
           <fieldName>KeywordCampaignManagementCostCategory</fieldName>
           <isConsumer v="false" />
         </entityDependency>

neonContext/CampaignCost/CampaignCost.aod

@@ -4,7 +4,7 @@
   <majorModelMode>DISTRIBUTED</majorModelMode>
   <filterview>CampaignCostFilter_view</filterview>
   <editview>CampaignCostEdit_view</editview>
-  <entity>CampaignCost_entity</entity>
+  <entity>CampaignCost_entitiy</entity>
   <references>
     <neonViewReference>
       <name>fa4ac7f7-4f30-42ba-86b2-99e86597734f</name>

neonView/CampaignCostFilter_view/CampaignCostFilter_view.aod

@@ -2,12 +2,11 @@
 <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="false" />
+  <filterable v="true" />
   <layout>
     <drawerLayout>
       <name>layout</name>
       <layoutCaption>Fix costs</layoutCaption>
-      <fixedDrawer v="true" />
     </drawerLayout>
   </layout>
   <children>

neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod

@@ -3,12 +3,11 @@
   <name>CampaignCostVariable_view</name>
   <title>Step costs</title>
   <majorModelMode>DISTRIBUTED</majorModelMode>
-  <filterable v="false" />
+  <filterable v="true" />
   <layout>
     <drawerLayout>
       <name>layout</name>
       <layoutCaption>Variable costs</layoutCaption>
-      <fixedDrawer v="true" />
     </drawerLayout>
   </layout>
   <children>