From 87b5cc903f46a9f5ac284d8b15c67ccd76529556 Mon Sep 17 00:00:00 2001 From: "j.goderbauer" <j.goderbauer@adito.de> Date: Fri, 10 May 2019 10:25:13 +0200 Subject: [PATCH] Campaign, CampaignStep, Contacts: view adjustments --- .../Organisation_entity.aod | 2 + .../CampaignStepLookup_view.aod | 10 +- .../PersonSimpleList_view.aod | 93 ++++++++++--------- 3 files changed, 54 insertions(+), 51 deletions(-) diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod index dc7461589c1..9985bae92d3 100644 --- a/entity/Organisation_entity/Organisation_entity.aod +++ b/entity/Organisation_entity/Organisation_entity.aod @@ -85,6 +85,7 @@ <entityConsumer> <name>Contact</name> <fieldType>DEPENDENCY_OUT</fieldType> + <selectionMode>MULTI</selectionMode> <dependency> <name>dependency</name> <entityName>Person_entity</entityName> @@ -192,6 +193,7 @@ <entityConsumer> <name>Contracts</name> <fieldType>DEPENDENCY_OUT</fieldType> + <selectionMode>MULTI</selectionMode> <dependency> <name>dependency</name> <entityName>Contract_entity</entityName> diff --git a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod index ae38f449fa6..d5afb6f10dc 100644 --- a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod +++ b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod @@ -20,11 +20,6 @@ <name>fe2a2d1d-6050-4d8a-87ea-ef90febf7ae5</name> <entityField>#IMAGE</entityField> </neonTableColumn> - <neonTableColumn> - <name>1dc891fe-bbbc-4c91-ae71-4d0372d777bc</name> - <entityField>CAMPAIGN_ID</entityField> - <width v="75" /> - </neonTableColumn> <neonTableColumn> <name>5d52aaef-ec22-4c45-9ac7-eaec5d967283</name> <entityField>SORTING</entityField> @@ -33,6 +28,11 @@ <name>d9ca59de-1441-494a-91f0-1cff91c575de</name> <entityField>NAME</entityField> </neonTableColumn> + <neonTableColumn> + <name>1dc891fe-bbbc-4c91-ae71-4d0372d777bc</name> + <entityField>CAMPAIGN_ID</entityField> + <width v="75" /> + </neonTableColumn> <neonTableColumn> <name>0ffcc021-2b58-49f6-91d0-21f4029f744f</name> <entityField>DATE_START</entityField> diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod index e9408e8d52e..1e1136374ab 100644 --- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod +++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod @@ -1,46 +1,47 @@ -<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> - <name>PersonSimpleList_view</name> - <majorModelMode>DISTRIBUTED</majorModelMode> - <layout> - <boxLayout> - <name>layout</name> - </boxLayout> - </layout> - <children> - <tableViewTemplate> - <name>Persons</name> - <entityField>#ENTITY</entityField> - <columns> - <neonTableColumn> - <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name> - <entityField>#IMAGE</entityField> - </neonTableColumn> - <neonTableColumn> - <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name> - <entityField>SALUTATION</entityField> - </neonTableColumn> - <neonTableColumn> - <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name> - <entityField>TITLE</entityField> - </neonTableColumn> - <neonTableColumn> - <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name> - <entityField>FIRSTNAME</entityField> - </neonTableColumn> - <neonTableColumn> - <name>eacb1707-191c-4f09-b213-fbe87988c523</name> - <entityField>LASTNAME</entityField> - </neonTableColumn> - <neonTableColumn> - <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name> - <entityField>STANDARD_EMAIL_COMMUNICATION</entityField> - </neonTableColumn> - <neonTableColumn> - <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name> - <entityField>STANDARD_PHONE_COMMUNICATION</entityField> - </neonTableColumn> - </columns> - </tableViewTemplate> - </children> -</neonView> +<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1"> + <name>PersonSimpleList_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <tableViewTemplate> + <name>Persons</name> + <favoriteActionGroup1>campaignActionGroup</favoriteActionGroup1> + <entityField>#ENTITY</entityField> + <columns> + <neonTableColumn> + <name>d6207ade-29e7-4af0-ba5f-e9ddd799de7b</name> + <entityField>#IMAGE</entityField> + </neonTableColumn> + <neonTableColumn> + <name>1053d3a7-c5ee-4260-86f6-54e820f53e9f</name> + <entityField>SALUTATION</entityField> + </neonTableColumn> + <neonTableColumn> + <name>a7eb48e2-d2a0-4ddb-b197-74ee77896960</name> + <entityField>TITLE</entityField> + </neonTableColumn> + <neonTableColumn> + <name>302d875b-644d-4f75-b8c2-f99bab8ae88d</name> + <entityField>FIRSTNAME</entityField> + </neonTableColumn> + <neonTableColumn> + <name>eacb1707-191c-4f09-b213-fbe87988c523</name> + <entityField>LASTNAME</entityField> + </neonTableColumn> + <neonTableColumn> + <name>38e8ea31-060d-4a4c-aa70-a6752019dcff</name> + <entityField>STANDARD_EMAIL_COMMUNICATION</entityField> + </neonTableColumn> + <neonTableColumn> + <name>60cb743a-7a1f-4faa-92d6-780bd2ad0564</name> + <entityField>STANDARD_PHONE_COMMUNICATION</entityField> + </neonTableColumn> + </columns> + </tableViewTemplate> + </children> +</neonView> -- GitLab