Fix #132 Nested Ranges: Master-detail Report Issue (#204)

Author: b0bi79

ClosedXML.Report/Excel/TempSheetBuffer.cs

@@ -154,6 +154,17 @@ public IXLRange CopyTo(IXLRange range)
             return range;
         }
 
+        public void SetPrevCellToLastUsed()
+        {
+            var lastUsed = _sheet.LastCellUsed();
+            var clmn = _clmn < lastUsed.Address.ColumnNumber
+                ? lastUsed.Address.ColumnNumber + 1
+                : _clmn;
+
+            ChangeAddress(lastUsed.Address.RowNumber, clmn);
+            NewRow();
+        }
+
         public void Clear()
         {
             var srcRows = _sheet.RowsUsed(XLCellsUsedOptions.All);

ClosedXML.Report/RangeTemplate.cs

@@ -234,7 +234,11 @@ private void VerticalTable(object[] items, FormulaEvaluator evaluator)
             }
 
             if (_isSubrange)
+            {
                 _rangeTags.Execute(new ProcessingContext(resultRange, new DataSource(items)));
+                // if the range was increased by processing tags (for example, Group), move the buffer to the last cell
+                _buff.SetPrevCellToLastUsed(); 
+            }
         }
 
         private void RenderCell(FormulaEvaluator evaluator, TemplateCell cell, params Parameter[] pars)
@@ -340,10 +344,13 @@ private void RenderSubrange(object item, FormulaEvaluator evaluator, TemplateCel
                 }
                 else
                 {
-                    row += ownRng._rowCnt - 1;
-                    while (_cells[iCell].Row <= row+1)
+                    // move current template cell to next (skip subrange)
+                    row += ownRng._rowCnt+1;
+                    while (_cells[iCell].Row <= row-1)
                         iCell++;
 
+                    iCell--; // roll back. After it became clear that it was too much, we must go back.
+
                     int shiftLen = ownRng._rowCnt * (valArr.Length - 1);
                     tags.Where(tag => tag.Cell.Row > cell.Row)
                         .ForEach(t =>

tests/ClosedXML.Report.Tests/SubrangesTests.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using ClosedXML.Report.Tests.TestModels;
@@ -22,23 +23,40 @@ public void Simple(string templateFile)
                 {
                     using (var db = new DbDemos())
                     {
-                        var items = db.items.ToList().GroupBy(i=>i.OrderNo).ToDictionary(x=>x.Key);
-                        var parts = db.parts.ToList().ToDictionary(x=>x.PartNo);
-                        customer[] custs = db.customers.LoadWith(x => x.Orders).OrderBy(x=>x.CustNo).ToArray();
-                        foreach (var customer in custs)
-                        {
-                            customer.Orders.Sort((x, y) => x.OrderNo.CompareTo(y.OrderNo));
-                            foreach (var o in customer.Orders)
+                        var custs = GetCustomers(db);
+                        tpl.AddVariable("Customers", custs);
+                    }
+                },
+                wb =>
+                {
+                    CompareWithGauge(wb, templateFile);
+                });
+        }
+
+        [Fact]
+        public void MultipleSubRanges()
+        {
+            var random = new Random(1234);
+            var templateFile = "Subranges_Multiple.xlsx";
+            XlTemplateTest(templateFile,
+                tpl =>
+                {
+                    using (var db = new DbDemos())
+                    {
+                        var custs = GetCustomers(db).Select(cust =>
+                        new {
+                            CustNo = cust.CustNo,
+                            Company = cust.Company,
+                            Orders = cust.Orders,
+                            Visitors = new List<dynamic>
                             {
-                                var order = o;
-                                o.Items = items[order.OrderNo].ToList();
-                                o.Items.Sort((x,y)=>x.ItemNo.Value.CompareTo(y.ItemNo));
-                                foreach (var item in o.Items)
-                                    item.Part = parts[item.PartNo.Value];
+                                new { Name = "Alice", Age = random.Next(0, 100), Gender = "F" },
+                                new { Name = "Bob", Age = random.Next(0, 100), Gender = "M" },
+                                new { Name = "John", Age = random.Next(0, 100), Gender = "M" },
                             }
-                        }
-                        //var cust = db.Customers.Include(x => x.Orders.Select(o=>o.Items.Select(i=>i.Part)));
+                        });
                         tpl.AddVariable("Customers", custs);
+                        tpl.AddVariable("user", "John Doe");
                     }
                 },
                 wb =>
@@ -90,6 +108,27 @@ public void SingleEmptySubsetCorrectSum()
                 });
         }
 
+        private static customer[] GetCustomers(DbDemos db)
+        {
+            var items = db.items.ToList().GroupBy(i => i.OrderNo).ToDictionary(x => x.Key);
+            var parts = db.parts.ToList().ToDictionary(x => x.PartNo);
+            customer[] custs = db.customers.LoadWith(x => x.Orders).OrderBy(x => x.CustNo).ToArray();
+            foreach (var customer in custs)
+            {
+                customer.Orders.Sort((x, y) => x.OrderNo.CompareTo(y.OrderNo));
+                foreach (var o in customer.Orders)
+                {
+                    var order = o;
+                    o.Items = items[order.OrderNo].ToList();
+                    o.Items.Sort((x, y) => x.ItemNo.Value.CompareTo(y.ItemNo));
+                    foreach (var item in o.Items)
+                        item.Part = parts[item.PartNo.Value];
+                }
+            }
+            //var cust = db.Customers.Include(x => x.Orders.Select(o=>o.Items.Select(i=>i.Part)));
+            return custs;
+        }
+
         private IEnumerable<dynamic> GenerateVisitors()
         {
             return new List<dynamic>

tests/ClosedXML.Report.Tests/XlsxTemplateTestsBase.cs

@@ -73,7 +73,10 @@ protected void CompareWithGauge(XLWorkbook actual, string fileExpected)
             using (var expectStream = File.Open(fileExpected, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             using (var expected = new XLWorkbook(expectStream))
             {
-                actual.Worksheets.Count.ShouldBeEquivalentTo(expected.Worksheets.Count, $"Count of worksheets must be {expected.Worksheets.Count}");
+                var shEquals = actual.Worksheets.Count == expected.Worksheets.Count;
+                if (!shEquals)
+                    actual.SaveAs(Path.Combine("Output", Path.GetFileName(fileExpected)));
+                shEquals.Should().BeTrue($"Count of worksheets must be {expected.Worksheets.Count}");
 
                 for (int i = 0; i < actual.Worksheets.Count; i++)
                 {