diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod index 8481518fc08e1d768446eeaadd32cb8eb8f63730..2af24acc0d0ade0e8fbe9d0df0397c5b4c1a2ced 100644 --- a/entity/CampaignCost_entity/CampaignCost_entity.aod +++ b/entity/CampaignCost_entity/CampaignCost_entity.aod @@ -184,17 +184,6 @@ </entityParameter> </children> </entityConsumer> - <entityActionGroup> - <name>alter</name> - <children> - <entityActionField> - <name>edit</name> - <onActionProcess>%aditoprj%/entity/CampaignCost_entity/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" /> diff --git a/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/CampaignCost_entity/entityfields/alter/children/edit/onActionProcess.js deleted file mode 100644 index 2f19601f3e8f533982bac2823f085588c6f8dd7e..0000000000000000000000000000000000000000 --- a/entity/CampaignCost_entity/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/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod index 355bc08150fab6ab5386e5270d80b186a86747e2..36cdf483335292baf54abb472c038999081e2b0a 100644 --- a/neonContext/Campaign/Campaign.aod +++ b/neonContext/Campaign/Campaign.aod @@ -39,9 +39,5 @@ <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name> <view>CampaignOverview_view</view> </neonViewReference> - <neonViewReference> - <name>c32002ad-92ff-408c-a399-2998868f94d0</name> - <view>CampaignCostFix_view</view> - </neonViewReference> </references> </neonContext> diff --git a/neonContext/CampaignCost/CampaignCost.aod b/neonContext/CampaignCost/CampaignCost.aod index 56cc86e548426777a6fbf261a6d30ee4b26fa00f..53037d640711f1e4fe24d715c0ea34eccceabeda 100644 --- a/neonContext/CampaignCost/CampaignCost.aod +++ b/neonContext/CampaignCost/CampaignCost.aod @@ -22,5 +22,9 @@ <name>a4f131e8-2371-4070-83f7-fd69dfd6a7df</name> <view>CampaignCostExtendedFilter_view</view> </neonViewReference> + <neonViewReference> + <name>4d06f59b-f801-460e-8efd-3c08b14541ec</name> + <view>CampaignCostFix_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod index 810bd1d346de0ccd495f545db7e1eda47d5ff882..4397f42cbf18230de40eb4ebb24f8505ada8c7a8 100644 --- a/neonView/CampaignCostFix_view/CampaignCostFix_view.aod +++ b/neonView/CampaignCostFix_view/CampaignCostFix_view.aod @@ -1,17 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6"> <name>CampaignCostFix_view</name> + <title>Fix costs</title> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <noneLayout> + <drawerLayout> <name>layout</name> - </noneLayout> + <layoutCaption>Fix costs</layoutCaption> + <fixedDrawer v="true" /> + </drawerLayout> </layout> <children> - <neonViewReference> - <name>127a0cab-ec21-47e6-ba6c-c091cb31c794</name> - <entityField>CampaignCosts</entityField> - <view>CampaignCostFilter_view</view> - </neonViewReference> + <tableViewTemplate> + <name>CampaignCostFix</name> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>1b2b3ce3-eaff-472b-a873-5e054adac89a</name> + <entityField>CATEGORY</entityField> + </neonTableColumn> + <neonTableColumn> + <name>00630ccd-689f-4cf7-9dfc-cc0a67771c0c</name> + <entityField>NET</entityField> + </neonTableColumn> + </columns> + </tableViewTemplate> </children> </neonView> diff --git a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod index 5821748a900a19990031ba11b07df46add91ec77..95a79e654d6cb9a4fe5a661811b9c8f5e05f3035 100644 --- a/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod +++ b/neonView/CampaignCostVariable_view/CampaignCostVariable_view.aod @@ -14,8 +14,6 @@ <children> <treeTableViewTemplate> <name>CostTreeTable</name> - <favoriteActionGroup1>alter</favoriteActionGroup1> - <entityField>#ENTITY</entityField> <defaultGroupFields> <element>CAMPAIGNSTEP_ID</element> </defaultGroupFields> diff --git a/neonView/CampaignCost_view/CampaignCost_view.aod b/neonView/CampaignCost_view/CampaignCost_view.aod index 5fdcc86527717b04f2342d680a95644a45b8bfd9..03ccab3dbb9ccba29ba81793ec30f82fa684d0b2 100644 --- a/neonView/CampaignCost_view/CampaignCost_view.aod +++ b/neonView/CampaignCost_view/CampaignCost_view.aod @@ -17,8 +17,8 @@ <view>CampaignCostVariable_view</view> </neonViewReference> <neonViewReference> - <name>c4476130-ca57-4707-9448-266138c09880</name> - <entityField>#ENTITY</entityField> + <name>cc960341-1f55-4ad5-8ae9-dece0df73b5c</name> + <entityField>CampaignCosts</entityField> <view>CampaignCostFix_view</view> </neonViewReference> <neonViewReference>