diff --git a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js index 34147650e0d817d4b6948d420b5f59169c399c1f..323f5b11c4f2cef69ff6967f0617919aabfccc2b 100644 --- a/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js +++ b/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js @@ -3,6 +3,7 @@ import("system.db"); import("system.util"); import("Campaign_lib"); +var campaignId = vars.getString("$field.CAMPAIGN_ID"); var newCampaignStepId = vars.getString("$field.CAMPAIGNSTEP_ID"); var participants = JSON.parse(vars.getString("$param.campaignParticipants_param")); diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod index ec1f5061f9c94083f255ad23db3404c907cfbcf8..bdf9f42fea1814b4fc877f6cfa23cb8c2528ac1b 100644 --- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod +++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod @@ -2,6 +2,11 @@ <entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8"> <name>CampaignParticipantChart_entity</name> <majorModelMode>DISTRIBUTED</majorModelMode> + <siblings> + <element>CampaignParticipant_entity</element> + <element>CampaignStep_entity</element> + <element>CampaignAddParticipants_entity</element> + </siblings> <recordContainer>jdito</recordContainer> <entityFields> <entityProvider> diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod index cd8c6dfe3cd120e866c635e9731170af6ba9c82b..d84f09f692270d4b7c3e47a319145e2df4a558a1 100644 --- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod +++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod @@ -5,6 +5,7 @@ <title>Participant</title> <siblings> <element>CampaignAddParticipants_entity</element> + <element>CampaignParticipantChart_entity</element> </siblings> <afterOperatingState>%aditoprj%/entity/CampaignParticipant_entity/afterOperatingState.js</afterOperatingState> <titlePlural>Participants</titlePlural> diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod index 6abbcfe3a71c0ab31204cd4afa844b5980d6de92..9c9867bd3fdcd968c535551bca1bb18e2d0d4031 100644 --- a/entity/CampaignStep_entity/CampaignStep_entity.aod +++ b/entity/CampaignStep_entity/CampaignStep_entity.aod @@ -6,6 +6,7 @@ <title>Campaign Step</title> <siblings> <element>CampaignPlanning_entity</element> + <element>CampaignParticipantChart_entity</element> </siblings> <contentTitleProcess>%aditoprj%/entity/CampaignStep_entity/contentTitleProcess.js</contentTitleProcess> <onValidation>%aditoprj%/entity/CampaignStep_entity/onValidation.js</onValidation> diff --git a/neonView/CampaignMain_view/CampaignMain_view.aod b/neonView/CampaignMain_view/CampaignMain_view.aod index c3eeb205dcaa6c235b0d8650758cca0592efc3a2..e7d4c8acfc62f35b324af45d46c8fe27664550b7 100644 --- a/neonView/CampaignMain_view/CampaignMain_view.aod +++ b/neonView/CampaignMain_view/CampaignMain_view.aod @@ -56,10 +56,5 @@ <entityField>Attributes</entityField> <view>AttributeRelationTree_view</view> </neonViewReference> - <neonViewReference> - <name>db6fe68c-e5e8-4916-8a78-2d01665877a7</name> - <entityField>CampaignSteps</entityField> - <view>CampaignStepsGantt_view</view> - </neonViewReference> </children> </neonView> diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js index 922c416365d53ba8205887caf76a7b0750a237d9..bf72837d510bb4fb8ada0a5359e0745c352d7ea4 100644 --- a/process/Campaign_lib/process.js +++ b/process/Campaign_lib/process.js @@ -30,20 +30,11 @@ CampaignUtils.addParticipant = function(pContactId) * * @param {String} pRowIds req ContactIds */ -CampaignUtils.addParticipantsByRowIds = function(pRowIds, pConditionSourceTableName) +CampaignUtils.addParticipants = function(pRowIds) { - _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pRowIds, "campaignParticipantsRowIds_param", "CampaignAddParticipantsEdit_view", pConditionSourceTableName); + _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pRowIds, "campaignParticipants_param", "CampaignAddParticipantsEdit_view"); } -/** - * Add many Contacts (Person or Organistaion) to a Campaign - * - * @param {String} pRowIds req ContactIds - */ -CampaignUtils.addParticipantsByCondition = function(pCondition, pConditionSourceTableName) -{ - _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pCondition, "campaignParticipantsCondition_param", "CampaignAddParticipantsEdit_view", pConditionSourceTableName); -} /** * todo @@ -320,7 +311,7 @@ function _CampaignUtils() {} * @param {String} pView req targeting view * */ -_CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityParam, pView, pConditionSourceTableName) +_CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityParam, pView) { var params = {}; @@ -329,11 +320,11 @@ _CampaignUtils._openAddParticipantContext = function(pContext, pRowIds, pEntityP params[pEntityParam] = pRowIds; } params["isUpdate_param"] = false; - params["conditionSourceTableName_param"] = pConditionSourceTableName; neon.openContext(pContext, null, null, neon.OPERATINGSTATE_NEW, params); } + /** * todo */