Merge branch 'm_1074934_campaignstep_sorting_changeable' into '2021.1.0'

M 1074934 campaignstep sorting changeable

See merge request xrm/basic!1029

entity/CampaignStep_entity/CampaignStep_entity.aod

@@ -379,10 +379,29 @@
         </entityParameter>
       </children>
     </entityConsumer>
+    <entityActionGroup>
+      <name>group</name>
+      <children>
+        <entityActionField>
+          <name>moveUp</name>
+          <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/moveup/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:ARROW_UP</iconId>
+          <state>DISABLED</state>
+          <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/moveup/stateProcess.js</stateProcess>
+        </entityActionField>
+        <entityActionField>
+          <name>moveDown</name>
+          <onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/movedown/onActionProcess.js</onActionProcess>
+          <iconId>VAADIN:ARROW_DOWN</iconId>
+          <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/movedown/stateProcess.js</stateProcess>
+        </entityActionField>
+      </children>
+    </entityActionGroup>
   </entityFields>
   <recordContainers>
     <dbRecordContainer>
       <name>db</name>
+      <hasDependentRecords v="true" />
       <conditionProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
       <orderClauseProcess>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
       <onDBInsert>%aditoprj%/entity/CampaignStep_entity/recordcontainers/db/onDBInsert.js</onDBInsert>

entity/CampaignStep_entity/entityfields/group/children/movedown/onActionProcess.js

+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+
+CampaignUtils.moveStepDown(vars.get("$field.CAMPAIGNSTEPID"))
+
+neon.refreshAll();
+
+

entity/CampaignStep_entity/entityfields/group/children/movedown/stateProcess.js

+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("system.neon");
+
+var sorting = parseInt(vars.get("$field.SORTING"));
+var campaignId = vars.get("$field.CAMPAIGN_ID");
+var campaignStepId = vars.get("$field.CAMPAIGNSTEPID");
+
+var validNextStep = newSelect("CAMPAIGNSTEP.CAMPAIGNSTEPID")
+                        .from("CAMPAIGNSTEP")
+                        .where("CAMPAIGNSTEP.CAMPAIGN_ID",campaignId)
+                        .and("CAMPAIGNSTEP.SORTING",sorting+1)
+                        .and(newWhere("CAMPAIGNSTEP.PREDECESSORSTEP_ID",campaignStepId,SqlBuilder.NOT_EQUAL())
+                            .or("CAMPAIGNSTEP.PREDECESSORSTEP_ID is null"))
+                        .cell();
+
+
+if (validNextStep)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
+

entity/CampaignStep_entity/entityfields/group/children/moveup/onActionProcess.js

+import("system.vars");
+import("system.neon");
+import("Campaign_lib");
+
+CampaignUtils.moveStepUp(vars.get("$field.CAMPAIGNSTEPID"))
+
+
+neon.refreshAll();

entity/CampaignStep_entity/entityfields/group/children/moveup/stateProcess.js

+import("system.result");
+import("Sql_lib");
+import("system.vars");
+import("system.neon");
+
+var sorting = parseInt(vars.get("$field.SORTING"));
+var campaignId = vars.get("$field.CAMPAIGN_ID");
+var predecessorStepId = vars.get("$field.PREDECESSORSTEP_ID");
+
+var validPreviousStep = newSelect("CAMPAIGNSTEP.CAMPAIGNSTEPID")
+                        .from("CAMPAIGNSTEP")
+                        .where("CAMPAIGNSTEP.CAMPAIGN_ID",campaignId)
+                        .and("CAMPAIGNSTEP.SORTING",sorting-1)
+                        .and("CAMPAIGNSTEP.CAMPAIGNSTEPID",predecessorStepId,SqlBuilder.NOT_EQUAL())
+                        .cell();
+
+if (validPreviousStep)
+{
+    result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+    result.string(neon.COMPONENTSTATE_DISABLED);
+}
+

entity/CampaignStep_entity/recordcontainers/db/onDBDelete.js

+import("system.neon");
+import("system.vars");
 import("Workflow_lib");
+import("Sql_lib");
+import("Campaign_lib");
+
+newSelect("CAMPAIGNSTEP.CAMPAIGNSTEPID")
+.from("CAMPAIGNSTEP")
+.where("CAMPAIGNSTEP.CAMPAIGN_ID",vars.get("$field.CAMPAIGN_ID"))
+.and("CAMPAIGNSTEP.SORTING",vars.get("$field.SORTING"),SqlBuilder.GREATER_OR_EQUAL())
+.orderBy("CAMPAIGNSTEP.SORTING asc")
+.arrayColumn()
+.forEach(function(pCampaignStepId)
+        {
+            CampaignUtils.moveStepUp(pCampaignStepId)
+        });
+        
+newWhere("CAMPAIGNSTEP.PREDECESSORSTEP_ID",vars.get("$field.CAMPAIGNSTEPID"))
+.updateFields({"CAMPAIGNSTEP.PREDECESSORSTEP_ID":null});
 
 WorkflowSignalSender.deleted();
\ No newline at end of file

neonView/CampaignStepFilter_view/CampaignStepFilter_view.aod

@@ -15,6 +15,7 @@
       <name>StepsTable</name>
       <autoNewRow v="false" />
       <entityField>#ENTITY</entityField>
+      <favoriteActionGroup1>group</favoriteActionGroup1>
       <isEditable v="true" />
       <columns>
         <neonTableColumn>
@@ -62,6 +63,7 @@
     <treeTableViewTemplate>
       <name>Treetable</name>
       <entityField>#ENTITY</entityField>
+      <favoriteActionGroup1>group</favoriteActionGroup1>
       <columns>
         <neonTreeTableColumn>
           <name>2246fe5a-d4ed-454a-9007-6c1716ad2a1e</name>

process/Campaign_lib/process.js

@@ -814,4 +814,54 @@ CampaignUtils.getResolvedCampaignStepSqlpPart = function(pCampaignId){
     var res =  SqlUtils.getResolvingCaseWhen(campaignSteps, "CAMPAIGNSTEP.CAMPAIGNSTEPID"); 
     
     return  SqlUtils.translateStatementWithQuotes(res);
+}
+
+/*
+ * Swaps the Sorting of a campaignstep with the one above it
+ *
+ *  @param {String} pCampaignStepId CampaignStepId of the step that should be moved up
+ */
+CampaignUtils.moveStepUp = function(pCampaignStepId){
+    var sorting;
+    var campaignId;
+    
+    [campaignId,sorting] = newSelect(["CAMPAIGNSTEP.CAMPAIGN_ID","CAMPAIGNSTEP.SORTING"])
+                            .from("CAMPAIGNSTEP")
+                            .where("CAMPAIGNSTEP.CAMPAIGNSTEPID",pCampaignStepId)
+                            .arrayRow();
+                            
+    sorting = parseInt(sorting);
+
+
+    newWhere("CAMPAIGNSTEP.CAMPAIGN_ID",campaignId)
+    .and("CAMPAIGNSTEP.SORTING",sorting-1)
+    .updateFields({"SORTING":sorting});
+
+    newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID",pCampaignStepId)
+    .updateFields({"SORTING":sorting-1});
+}
+
+/*
+ * Swaps the Sorting of a campaignstep with the one below it
+ *
+ *  @param {String} pCampaignStepId CampaignStepId of the step that should be moved down
+ */
+CampaignUtils.moveStepDown = function(pCampaignStepId){
+    var sorting;
+    var campaignId;
+    
+    [campaignId,sorting] = newSelect(["CAMPAIGNSTEP.CAMPAIGN_ID","CAMPAIGNSTEP.SORTING"])
+                            .from("CAMPAIGNSTEP")
+                            .where("CAMPAIGNSTEP.CAMPAIGNSTEPID",pCampaignStepId)
+                            .arrayRow();
+                            
+    sorting = parseInt(sorting);
+
+
+    newWhere("CAMPAIGNSTEP.CAMPAIGN_ID",campaignId)
+    .and("CAMPAIGNSTEP.SORTING",sorting+1)
+    .updateFields({"SORTING":sorting});
+
+    newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID",pCampaignStepId)
+    .updateFields({"SORTING":sorting+1});
 }
\ No newline at end of file