diff --git a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod index 09065e34bb370b7d14806ff55e393df36c67093f..bfa47c0a1f10110663a51a99eca52076da1d9573 100644 --- a/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod +++ b/entity/CommunicationSettings_entity/CommunicationSettings_entity.aod @@ -24,6 +24,12 @@ <fieldName>ContactCommunicationSettings</fieldName> <isConsumer v="false" /> </entityDependency> + <entityDependency> + <name>f94ce98a-46e1-4666-a7ef-2685baa3fcae</name> + <entityName>Organisation_entity</entityName> + <fieldName>ContactCommunicationSettings</fieldName> + <isConsumer v="false" /> + </entityDependency> </dependencies> </entityProvider> <entityField> diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index e0b542fa6018fa159f9893c39c7452b98f2dd6c9..cf70abb5c6d02d2571374317250eb8e06b65d0ed 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -1481,6 +1481,20 @@ <fieldName>#PROVIDER</fieldName> </dependency> </entityConsumer> + <entityConsumer> + <name>ContactCommunicationSettings</name> + <dependency> + <name>dependency</name> + <entityName>CommunicationSettings_entity</entityName> + <fieldName>SettingsForContact</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContactId_param</name> + <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> </entityFields> <recordContainers> <dbRecordContainer> diff --git a/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js b/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 --- /dev/null +++ b/entity/Organisation_entity/entityfields/contactcommunicationsettings/children/contactid_param/valueProcess.js @@ -0,0 +1,4 @@ +import("system.vars"); +import("system.result"); + +result.string(vars.get("$field.CONTACTID")); \ No newline at end of file diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod index f3e985e7707b9387eb3b2ff38bf51ae6cb2a2bc2..4fdc9462f16d3a980bf04fd0b5cab855930c0cec 100644 --- a/neonContext/Organisation/Organisation.aod +++ b/neonContext/Organisation/Organisation.aod @@ -71,5 +71,9 @@ <name>d9091127-4ad7-46bb-ba5f-988aa84c52b5</name> <view>OrganisationPlanningTurnoverChart_view</view> </neonViewReference> + <neonViewReference> + <name>a6132e66-81b6-4350-a398-0d9d9c1bbafd</name> + <view>OrganisationMarketing_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod index 9457155195dafc5a55d96976ca5adb0ac88110a1..dff4f05bbf71c277cfcdc293033eff09a1494139 100644 --- a/neonView/OrganisationMain_view/OrganisationMain_view.aod +++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod @@ -80,5 +80,10 @@ <entityField>Duplicates</entityField> <view>DuplicateOrganisationFilter_view</view> </neonViewReference> + <neonViewReference> + <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name> + <entityField>#ENTITY</entityField> + <view>OrganisationMarketing_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod b/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..d5ae1fe81a3ad82703c2abab6ee94419de2f591c --- /dev/null +++ b/neonView/OrganisationMarketing_view/OrganisationMarketing_view.aod @@ -0,0 +1,18 @@ +<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8"> + <name>OrganisationMarketing_view</name> + <title>Advertising</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <neonViewReference> + <name>0561b125-ac76-4ee1-829c-8fd954204f7d</name> + <entityField>ContactCommunicationSettings</entityField> + <view>CommunicationSettingsFilter_view</view> + </neonViewReference> + </children> +</neonView>