Added All option for second cell location in ExcelSplitRangeByColumn

corxi · Mar 26, 2020 · e796c47 · e796c47
1 parent 5b386e3
commit e796c47
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/taskt/Core/Automation/Commands/ExcelGetRangeCommandASDT.cs b/taskt/Core/Automation/Commands/ExcelGetRangeCommandASDT.cs
@@ -40,7 +40,7 @@ public class ExcelGetRangeCommandAsDT : ScriptCommand
         [Attributes.PropertyAttributes.Remarks("")]
         public string v_Output { get; set; }
         [XmlAttribute]
-        [Attributes.PropertyAttributes.PropertyDescription("Please Enter the Second Cell Location (ex. A1 or B2, Optional)")]
+        [Attributes.PropertyAttributes.PropertyDescription("Please Enter the Second Cell Location (ex. A1 or B2, Leave Blank for All)")]
         [Attributes.PropertyAttributes.PropertyUIHelper(Attributes.PropertyAttributes.PropertyUIHelper.UIAdditionalHelperType.ShowVariableHelper)]
         [Attributes.PropertyAttributes.InputSpecification("Enter the actual location of the cell.")]
         [Attributes.PropertyAttributes.SampleUsage("A1, B10, [vAddress]")]

diff --git a/taskt/Core/Automation/Commands/ExcelSplitRangeByColumnCommand.cs b/taskt/Core/Automation/Commands/ExcelSplitRangeByColumnCommand.cs
@@ -35,7 +35,7 @@ public class ExcelSplitRangeByColumnCommand : ScriptCommand
         public string v_ExcelCellAddress1 { get; set; }
 
         [XmlAttribute]
-        [Attributes.PropertyAttributes.PropertyDescription("Please Enter the Second Cell Location (ex. A1 or B2)")]
+        [Attributes.PropertyAttributes.PropertyDescription("Please Enter the Second Cell Location (ex. A1 or B2, Leave Blank for All)")]
         [Attributes.PropertyAttributes.PropertyUIHelper(Attributes.PropertyAttributes.PropertyUIHelper.UIAdditionalHelperType.ShowVariableHelper)]
         [Attributes.PropertyAttributes.InputSpecification("Enter the actual location of the cell.")]
         [Attributes.PropertyAttributes.SampleUsage("A1, B10, [vAddress]")]
@@ -88,7 +88,15 @@ public override void RunCommand(object sender)
             excelInstance.Visible = false;
             excelInstance.DisplayAlerts = false;
             Microsoft.Office.Interop.Excel.Worksheet excelSheet = excelInstance.ActiveSheet;
-            var cellValue = excelSheet.Range[vTargetAddress1, vTargetAddress2];
+
+            Microsoft.Office.Interop.Excel.Range cellValue;
+            if (vTargetAddress2 != "")
+                cellValue = excelSheet.Range[vTargetAddress1, vTargetAddress2];
+            else
+            {
+                Microsoft.Office.Interop.Excel.Range last = excelSheet.Cells.SpecialCells(Microsoft.Office.Interop.Excel.XlCellType.xlCellTypeLastCell, Type.Missing);
+                cellValue = excelSheet.Range[vTargetAddress1, last];
+            }
 
             //Convert Range to DataTable
             List<object> lst = new List<object>();