Added Command to skip to next loop iteration saucepleez#184

taskt/Core/Automation/Commands/BeginContinousLoopCommand.cs

@@ -52,6 +52,13 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
                         engine.CurrentLoopCancelled = false;
                         return;
                     }
+
+                    if (engine.CurrentLoopContinuing)
+                    {
+                        engine.ReportProgress("Continuing Next Loop From Line " + loopCommand.LineNumber);
+                        engine.CurrentLoopContinuing = false;
+                        break;
+                    }
                 }
             }
         }

taskt/Core/Automation/Commands/BeginIfCommand.cs

@@ -144,7 +144,7 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
 
             for (int i = startIndex; i < endIndex; i++)
             {
-                if ((engine.IsCancellationPending) || (engine.CurrentLoopCancelled))
+                if ((engine.IsCancellationPending) || (engine.CurrentLoopCancelled) || (engine.CurrentLoopContinuing))
                     return;
 
                 engine.ExecuteCommand(parentCommand.AdditionalScriptCommands[i]);

taskt/Core/Automation/Commands/BeginListLoopCommand.cs

@@ -124,6 +124,13 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
                         engine.CurrentLoopCancelled = false;
                         return;
                     }
+
+                    if (engine.CurrentLoopContinuing)
+                    {
+                        engine.ReportProgress("Continuing Next Loop From Line " + loopCommand.LineNumber);
+                        engine.CurrentLoopContinuing = false;
+                        break;
+                    }
                 }
 
                 engine.ReportProgress("Finished Loop From Line " + loopCommand.LineNumber);

taskt/Core/Automation/Commands/BeginNumberOfTimesLoopCommand.cs

@@ -91,6 +91,14 @@ public override void RunCommand(object sender, Core.Script.ScriptAction parentCo
                         return;
                     }
 
+                    if (engine.CurrentLoopContinuing)
+                    {
+                        engine.ReportProgress("Continuing Next Loop From Line " + loopCommand.LineNumber);
+                        engine.CurrentLoopContinuing = false;
+                        break;
+                    }
+
+
                 }
 
 

taskt/Core/Automation/Commands/NextLoopCommand.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using taskt.UI.CustomControls;
+using taskt.UI.Forms;
+
+namespace taskt.Core.Automation.Commands
+{
+    [Serializable]
+    [Attributes.ClassAttributes.Group("Loop Commands")]
+    [Attributes.ClassAttributes.Description("This command enables user to break and exit from the current loop")]
+    [Attributes.ClassAttributes.UsesDescription("Use this command when you want to break from the current loop")]
+    [Attributes.ClassAttributes.ImplementationDescription("")]
+    public class NextLoopCommand : ScriptCommand
+    {
+        public NextLoopCommand()
+        {
+            this.DefaultPause = 0;
+            this.CommandName = "NextLoopCommand";
+            this.SelectionName = "Next Loop";
+            this.CommandEnabled = true;
+            this.CustomRendering = true;
+        }
+        public override List<Control> Render(frmCommandEditor editor)
+        {
+            base.Render(editor);
+
+            RenderedControls.Add(CommandControls.CreateDefaultLabelFor("v_Comment", this));
+            RenderedControls.Add(CommandControls.CreateDefaultInputFor("v_Comment", this, 100, 300));
+
+            return RenderedControls;
+        }
+
+        public override string GetDisplayValue()
+        {
+            return base.GetDisplayValue();
+        }
+    }
+}

taskt/Core/Automation/Commands/ScriptCommand.cs

@@ -86,7 +86,8 @@ namespace taskt.Core.Automation.Commands
     [XmlInclude(typeof(ExcelCreateDataSetCommand))]
     [XmlInclude(typeof(DatabaseRunQueryCommand))]
     [XmlInclude(typeof(BeginNumberOfTimesLoopCommand))]
-    [XmlInclude(typeof(BeginListLoopCommand))]
+    [XmlInclude(typeof(BeginListLoopCommand))]
+    [XmlInclude(typeof(NextLoopCommand))]
     [XmlInclude(typeof(BeginContinousLoopCommand))]
     [XmlInclude(typeof(SequenceCommand))]
     [XmlInclude(typeof(StopTaskCommand))]

taskt/Core/Automation/Engine/AutomationEngineInstance.cs

@@ -20,6 +20,7 @@ public class AutomationEngineInstance
         public List<ScriptError> ErrorsOccured { get; set; }
         public bool IsCancellationPending { get; set; }
         public bool CurrentLoopCancelled { get; set; }
+        public bool CurrentLoopContinuing { get; set; }
         private bool IsScriptPaused { get; set; }
         [JsonIgnore]
         public UI.Forms.frmScriptEngine tasktEngineUI { get; set; }
@@ -290,6 +291,10 @@ public void ExecuteCommand(Core.Script.ScriptAction command)
                 {
                     CurrentLoopCancelled = true;
                 }
+                else if (parentCommand is Core.Automation.Commands.NextLoopCommand)
+                {
+                    CurrentLoopContinuing = true;
+                }
                 else if(parentCommand is Core.Automation.Commands.SetEngineDelayCommand)
                 {
                     //get variable

taskt/Properties/Resources.resx

@@ -316,4 +316,7 @@
   <data name="command_begin_multi_if" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\command-begin-multi-if.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="command_nextloop" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\command-nextloop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

taskt/UI/CustomControls/CustomControls.cs

@@ -511,6 +511,7 @@ public static Dictionary<string, Image> UIImageDictionary()
             uiImages.Add("StringSplitCommand", taskt.Properties.Resources.command_string);
             uiImages.Add("StringReplaceCommand", taskt.Properties.Resources.command_string);
             uiImages.Add("BeginIfCommand", taskt.Properties.Resources.command_begin_if);
+            uiImages.Add("NextLoopCommand", taskt.Properties.Resources.command_nextloop);
             uiImages.Add("BeginMultiIfCommand", taskt.Properties.Resources.command_begin_multi_if);
             uiImages.Add("EndIfCommand", taskt.Properties.Resources.command_end_if);
             uiImages.Add("ElseCommand", taskt.Properties.Resources.command_else);

taskt/taskt.csproj

@@ -165,6 +165,7 @@
     <Compile Include="Core\ApplicationUpdate.cs" />
     <Compile Include="Core\ApplicationSettings.cs" />
     <Compile Include="Core\Automation\Commands\BeginMutliIfCommand.cs" />
+    <Compile Include="Core\Automation\Commands\NextLoopCommand.cs" />
     <Compile Include="Core\Automation\Commands\OutlookEmailCommand.cs" />
     <Compile Include="Core\Automation\Commands\GetRegexMatchesCommand.cs" />
     <Compile Include="Core\Automation\Commands\GetDictionaryValueCommand.cs" />
@@ -734,6 +735,7 @@
     <None Include="Resources\command-try.png" />
     <None Include="Resources\command-remote.png" />
     <None Include="Resources\command-begin-multi-if.png" />
+    <None Include="Resources\command-nextloop.png" />
     <Content Include="Resources\IEDriverServer.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>