diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 8dd8aa144722e5bf7230b72799eb66b3c76acca4..898991dfdd3ef11c99a1c0e61ae3ab2b44c87620 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -389,6 +389,10 @@ <name>COST.value</name> <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/cost.value/expression.js</expression> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>CAMPAIGN_ID.displayValue</name> + <expression>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js</expression> + </dbRecordFieldMapping> </recordFieldMappings> </dbRecordContainer> </recordContainers> diff --git a/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..8b0e58bb166cdf86ae459585247513c7055af3de --- /dev/null +++ b/entity/CampaignStep_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js @@ -0,0 +1,4 @@ +import("system.result"); + +var res = "select CAMPAIGN.NAME from CAMPAIGN where CAMPAIGN.CAMPAIGNID = CAMPAIGNSTEP.CAMPAIGN_ID"; +result.string(res); \ No newline at end of file diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod index 4347dcf41de3c2e0f603ab1f53a66f6acf4f4aae..86578e3723f513b599c88a4092df08c78fb51ed8 100644 --- a/neonContext/CampaignStep/CampaignStep.aod +++ b/neonContext/CampaignStep/CampaignStep.aod @@ -7,7 +7,7 @@ <filterview>CampaignStepFilter_view</filterview> <editview>CampaignStepEdit_view</editview> <preview>CampaignStepPreview_view</preview> - <lookupview>CampaignStepFilter_view</lookupview> + <lookupview>CampaignStepLookup_view</lookupview> <entity>CampaignStep_entity</entity> <references> <neonViewReference> @@ -38,5 +38,9 @@ <name>ad879f25-4659-49d0-81ed-2e09c8b11ac1</name> <view>CampaignStepParticipnatsPerStep_view</view> </neonViewReference> + <neonViewReference> + <name>b69f5e66-42ce-41a9-8877-66e8f82875e8</name> + <view>CampaignStepLookup_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..a7de04ea822baf241b363fb553a22c0612470dbc --- /dev/null +++ b/neonView/CampaignStepLookup_view/CampaignStepLookup_view.aod @@ -0,0 +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>CampaignStepLookup_view</name> + <title>Kampagnenschritte</title> + <description></description> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <boxLayout> + <name>layout</name> + </boxLayout> + </layout> + <children> + <tableViewTemplate> + <name>StepsTable</name> + <autoNewRow v="true" /> + <entityField>#ENTITY</entityField> + <title></title> + <columns> + <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> + </neonTableColumn> + <neonTableColumn> + <name>d9ca59de-1441-494a-91f0-1cff91c575de</name> + <entityField>NAME</entityField> + </neonTableColumn> + <neonTableColumn> + <name>0ffcc021-2b58-49f6-91d0-21f4029f744f</name> + <entityField>DATE_START</entityField> + </neonTableColumn> + <neonTableColumn> + <name>2507d34f-3bc2-426c-9acc-d8ae146daee8</name> + <entityField>DATE_END</entityField> + </neonTableColumn> + <neonTableColumn> + <name>9fa9d9f4-5851-4125-ba59-09aa2fb07f89</name> + <entityField>STATE</entityField> + </neonTableColumn> + </columns> + </tableViewTemplate> + </children> +</neonView> diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js index 39a53ff50e6a8ae0983da1ece4743bb30868f17e..fc3833233ee6fbefd1464e224810b1b138cc9cf0 100644 --- a/process/Context_lib/process.js +++ b/process/Context_lib/process.js @@ -65,6 +65,10 @@ ContextUtils.getContextConsumer = function(pContextId) return "Contracts"; case ContextUtils.getContextName("Salesproject"): return "Salesprojects"; + case ContextUtils.getContextName("Campaign"): + return "Campaigns"; + case ContextUtils.getContextName("CampaignStep"): + return "CampaignSteps"; } } @@ -380,9 +384,8 @@ ContextUtils.getSelectMap = function() ,"Campaign": ContextSelector.create("CAMPAIGN", "CAMPAIGNID") .setTitleExpression(maskingUtils.concat([ maskingUtils.cast("CAMPAIGN.NAME", SQLTYPES.VARCHAR, 10), - "' - '", maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10) - ], "", false)) + ], " - ", false)) .setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID") .setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " + "left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")