Campaign, CampaignStep: Activities and Tasks added

entity/Task_entity/Task_entity.aod

@@ -361,6 +361,18 @@
           <fieldName>Tasks</fieldName>
           <isConsumer v="false" />
         </entityDependency>
+        <entityDependency>
+          <name>335e31ad-ab67-4567-b4ea-3668f04922b2</name>
+          <entityName>Campaign_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
+        <entityDependency>
+          <name>fbaa2f6c-0ba1-4c93-acae-d7b636581679</name>
+          <entityName>CampaignStep_entity</entityName>
+          <fieldName>Tasks</fieldName>
+          <isConsumer v="false" />
+        </entityDependency>
       </dependencies>
       <children>
         <entityParameter>

neonView/CampaignMain_view/CampaignMain_view.aod

@@ -30,5 +30,15 @@
       <entityField>#ENTITY</entityField>
       <view>CampaignCost_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>90d3d016-63e6-4e8a-98ee-30033bef49fc</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>e28e5598-9366-4f5a-be8f-70dd3cc0399a</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/CampaignPreview_view/CampaignPreview_view.aod

@@ -17,6 +17,7 @@
       <titleField>NAME</titleField>
       <subtitleField>STATE</subtitleField>
       <descriptionField>DESCRIPTION</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
       <title></title>
     </cardViewTemplate>

neonView/CampaignStepMain_view/CampaignStepMain_view.aod

@@ -29,5 +29,15 @@
       <entityField>CampaignStepCosts</entityField>
       <view>CampaignCostExtendedFilter_view</view>
     </neonViewReference>
+    <neonViewReference>
+      <name>d99ab70c-2a08-408e-a665-1ef566c75650</name>
+      <entityField>Activities</entityField>
+      <view>ActivityFilter_view</view>
+    </neonViewReference>
+    <neonViewReference>
+      <name>4fd5e3cc-0696-4fc4-877b-440c0b6c2472</name>
+      <entityField>Tasks</entityField>
+      <view>TaskFilter_view</view>
+    </neonViewReference>
   </children>
 </neonView>

neonView/CampaignStepPreview_view/CampaignStepPreview_view.aod

@@ -15,6 +15,7 @@
       <titleField>NAME</titleField>
       <subtitleField>STATE</subtitleField>
       <descriptionField>DESCRIPTION</descriptionField>
+      <favoriteAction1>newActivity</favoriteAction1>
       <entityField>#ENTITY</entityField>
     </cardViewTemplate>
     <genericViewTemplate>

process/Context_lib/process.js

+import("system.logging");
 import("system.translate");
 import("system.project");
 import("system.vars");
@@ -385,11 +386,12 @@ ContextUtils.getSelectMap  = function()
                                                 maskingUtils.cast("CAMPAIGNSTEP.NAME", SQLTYPES.VARCHAR, 10)
                                             ], "", false))
                          .setContactIdField("CAMPAIGNPARTICIPANT.CONTACT_ID")
-                         .setJoinExpression("join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
-                                            "join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
+                         .setJoinExpression("left join CAMPAIGNPARTICIPANT on CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID " +
+                                            "left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
                         .setCreationDateField("CAMPAIGNSTEP.DATE_START")
                         .setStateField("CAMPAIGN.STATE")
                         .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])
+            ,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
 
     }
 }