Piotr Czajkowski 2 months ago
parent
commit
b0729f13f5
2 changed files with 33 additions and 33 deletions
  1. 21 21
      ExcelORM/ExcelORM/ExcelDynamicWriter.cs
  2. 12 12
      ExcelORM/ExcelORM/ExcelWriter.cs

+ 21 - 21
ExcelORM/ExcelORM/ExcelDynamicWriter.cs

@@ -20,6 +20,27 @@ public class ExcelDynamicWriter
         return ++rowIndex;
     }
 
+    private static void Write(IEnumerable<List<DynamicCell>> values, IXLWorksheet worksheet, bool append)
+    {
+        var rowIndex = append switch
+        {
+            true => worksheet.LastRowUsed().RowNumber() + 1,
+            false => GenerateHeader(worksheet, values.First()),
+        };
+
+        foreach (var row in values)
+        {
+            foreach (var cell in row)
+            {
+                if (cell.Value == null) continue;
+
+                worksheet.Cell(rowIndex, cell.Position).Value = XLCellValue.FromObject(cell.Value);
+            }
+
+            rowIndex++;
+        }
+    }
+
     public void Write(IEnumerable<List<DynamicCell>>? values, string? worksheetName = null, bool append = false)
     {
         if (values == null) return;
@@ -41,27 +62,6 @@ public class ExcelDynamicWriter
             Write(dynamicWorksheet.Cells, dynamicWorksheet.Name, append);
     }
 
-    private static void Write(IEnumerable<List<DynamicCell>> values, IXLWorksheet worksheet, bool append)
-    {
-        var rowIndex = append switch
-        {
-            true => worksheet.LastRowUsed().RowNumber() + 1,
-            false => GenerateHeader(worksheet, values.First()),
-        };
-
-        foreach (var row in values)
-        {
-            foreach (var cell in row)
-            {
-                if (cell.Value == null) continue;
-                
-                worksheet.Cell(rowIndex, cell.Position).Value = XLCellValue.FromObject(cell.Value);
-            }
-
-            rowIndex++;
-        }
-    }
-
     public void SaveAs(string path, IExcelConverter? converter = null)
     {
         xlWorkbook.SaveAs(path);

+ 12 - 12
ExcelORM/ExcelORM/ExcelWriter.cs

@@ -26,17 +26,6 @@ public class ExcelWriter
         return ++rowIndex;
     }
 
-    public void Write<T>(IEnumerable<T> values, string? worksheetName = null, bool append = false) where T : class, new()
-    {
-        var xlWorksheet = xlWorkbook.Worksheets.FirstOrDefault(x => x.Name.Equals(worksheetName, StringComparison.InvariantCultureIgnoreCase));
-        
-        xlWorksheet ??= !string.IsNullOrWhiteSpace(worksheetName) ?
-            xlWorkbook.AddWorksheet(worksheetName)
-            : xlWorkbook.Worksheets.Count == 0 ? xlWorkbook.AddWorksheet() : xlWorkbook.Worksheets.First();
-
-        Write(values, xlWorksheet, append);
-    }
-
     private static void Write<T>(IEnumerable<T> values, IXLWorksheet worksheet, bool append) where T : class, new()
     {
         var enumerable = values as T[] ?? values.ToArray();
@@ -56,7 +45,7 @@ public class ExcelWriter
             {
                 var valueToSet = property.GetValue(value);
                 if (valueToSet == null) continue;
-                
+
                 worksheet.Cell(rowIndex, cellIndex).Value = XLCellValue.FromObject(valueToSet);
                 cellIndex++;
             }
@@ -65,6 +54,17 @@ public class ExcelWriter
         }
     }
 
+    public void Write<T>(IEnumerable<T> values, string? worksheetName = null, bool append = false) where T : class, new()
+    {
+        var xlWorksheet = xlWorkbook.Worksheets.FirstOrDefault(x => x.Name.Equals(worksheetName, StringComparison.InvariantCultureIgnoreCase));
+        
+        xlWorksheet ??= !string.IsNullOrWhiteSpace(worksheetName) ?
+            xlWorkbook.AddWorksheet(worksheetName)
+            : xlWorkbook.Worksheets.Count == 0 ? xlWorkbook.AddWorksheet() : xlWorkbook.Worksheets.First();
+
+        Write(values, xlWorksheet, append);
+    }
+
     public void SaveAs(string path, IExcelConverter? converter = null)
     {
         xlWorkbook.SaveAs(path);