Ensured showTotal is inserted correctly (#1164)

* Ensured showTotal is inserted correctly

* Insert delete alternative

* Functional fix

* Cleanup comments and unused functions

---------

Co-authored-by: Jan Källman <[email protected]>

Author: OssianEPPlus

src/EPPlus/Table/ExcelTable.cs

@@ -24,7 +24,6 @@ Date               Author                       Change
 using OfficeOpenXml.Export.ToDataTable;
 using System.IO;
 using OfficeOpenXml.Style.Dxf;
-using OfficeOpenXml.Export.HtmlExport;
 using System.Globalization;
 using OfficeOpenXml.Sorting;
 using OfficeOpenXml.Export.HtmlExport.Interfaces;
@@ -788,7 +787,8 @@ public bool ShowTotal
                 {
                     if (value)
                     {
-                        Address=new ExcelAddress(WorkSheet.Name, ExcelAddressBase.GetAddress(Address.Start.Row, Address.Start.Column, Address.End.Row+1, Address.End.Column));
+                        WorkSheet.Cells[Address._toRow + 1, Address._fromCol, Address._toRow + 1, Address._toCol].Clear();
+                        Address =new ExcelAddress(WorkSheet.Name, ExcelAddressBase.GetAddress(Address.Start.Row, Address.Start.Column, Address.End.Row+1, Address.End.Column));
                     }
                     else
                     {
@@ -806,10 +806,12 @@ public bool ShowTotal
                     }
                     else
                     {
+                        WorkSheet.Cells[Address._toRow + 1, Address._fromCol, Address._toRow + 1, Address._toCol].Clear();
                         DeleteNode(TOTALSROWCOUNT_PATH);
                         DataStyle.SetStyle();
                     }
                     WriteAutoFilter(value);
+   
                 }
             }
         }
@@ -1044,12 +1046,12 @@ public ExcelRangeBase InsertRow(int position, int rows=1, bool copyStyles=true)
             }
             var firstRow = _address._fromRow;
             var isFirstRow = position == 0;
-            var subtact = ShowTotal ? 2 : 1;
-            if (position>=ExcelPackage.MaxRows || position > _address._fromRow + position + rows - subtact)
+            var subtract = ShowTotal ? 2 : 1;
+            if (position>=ExcelPackage.MaxRows || position > _address._fromRow + position + rows - subtract)
             {
-                position = _address.Rows - subtact;
+                position = _address.Rows - subtract;
             }
-            if (_address._fromRow+position+rows>ExcelPackage.MaxRows)
+            if (_address._fromRow + position + rows>ExcelPackage.MaxRows)
             {
                 throw new InvalidOperationException("Insert will exceed the maximum number of rows in the worksheet");
             }

src/EPPlusTest/Issues.cs

@@ -36,6 +36,7 @@ Date               Author                       Change
 using OfficeOpenXml.Drawing.Chart.Style;
 using OfficeOpenXml.Drawing.Slicer;
 using OfficeOpenXml.Drawing.Style.Coloring;
+using OfficeOpenXml.Export.HtmlExport;
 using OfficeOpenXml.Filter;
 using OfficeOpenXml.FormulaParsing;
 using OfficeOpenXml.Sparkline;

src/EPPlusTest/Table/TableInsertTests.cs

@@ -107,6 +107,7 @@ public void TableInsertRowBottomWithTotal()
             Assert.AreEqual("Don't Shift Me", ws.Cells["F5"].Value);
             Assert.AreEqual("Shift Me Down", ws.Cells["B106"].Value);
         }
+
         [TestMethod]
         public void TableInsertRowInside()
         {

src/EPPlusTest/Table/TableTests.cs

@@ -33,7 +33,6 @@ Date               Author                       Change
 using System;
 using System.Drawing;
 using System.Globalization;
-using System.IO;
 
 namespace EPPlusTest.Table
 {
@@ -697,5 +696,79 @@ public void CreateTableAfterDeletingAMergedCell()
                 var table = worksheet.Tables.Add(tableCells, "table"); // --> This triggers a NullReferenceException
             }
         }
+
+        [TestMethod]
+        public void ShowTotalWhenValueBelowIt()
+        {
+            using (var package = OpenPackage("ShowTotalInsert.xlsx", true))
+            {
+                var sheet = package.Workbook.Worksheets.Add("Tables");
+
+                //Cause of issue. (Specifically sheet.cells[11,1]
+                for (int i = 1; i < 25; i++)
+                {
+                    sheet.Cells[1 + i, 1].Formula = $"\"Number:{i}\"";
+                }
+
+                sheet.Cells["A1"].Value = "Month";
+                sheet.Cells["B1"].Value = "Sales";
+                sheet.Cells["C1"].Value = "VAT";
+                sheet.Cells["D1"].Value = "Total";
+
+                var table = sheet.Tables.Add(new ExcelAddress("A1:E10"), "testTable");
+                table.ShowHeader = true;
+                table.ShowFirstColumn = true;
+                table.TableStyle = TableStyles.Dark2;
+
+                sheet.Cells["A1"].Value = "testStuff";
+
+                sheet.Cells["C3:C5"].Value = 3;
+                sheet.Cells["D3:E3"].Value = 4;
+                sheet.Cells["E10"].Value = 5;
+
+                sheet.Cells["F11"].Value = "Don't clear me";
+                var noHeader = package.Workbook.Worksheets.Add("noHeader", sheet);
+                var stackTest = package.Workbook.Worksheets.Add("stackTest", sheet);
+
+                table.ShowTotal = true;
+                table.Columns[2].TotalsRowFunction = RowFunctions.Sum;
+
+                sheet.Calculate();
+
+                Assert.AreEqual(sheet.Cells["A10"].Value, "Number:9");
+                Assert.AreEqual(sheet.Cells["A11"].Value, null);
+                Assert.AreEqual(sheet.Cells["A12"].Value, "Number:11");
+                Assert.AreEqual(sheet.Cells["F11"].Value, "Don't clear me");
+
+                noHeader.Tables[0].ShowHeader = false;
+                noHeader.Tables[0].ShowTotal = true;
+                noHeader.Tables[0].Columns[2].TotalsRowFunction = RowFunctions.Sum;
+
+                noHeader.Calculate();
+
+                Assert.AreEqual(noHeader.Cells["A10"].Value, "Number:9");
+                Assert.AreEqual(noHeader.Cells["A11"].Value, null);
+                Assert.AreEqual(noHeader.Cells["A12"].Value, "Number:11");
+                Assert.AreEqual(noHeader.Cells["F11"].Value, "Don't clear me");
+
+                stackTest.Tables[0].ShowTotal = true;
+                stackTest.Tables[0].ShowTotal = false;
+                stackTest.Tables[0].ShowTotal = true;
+                stackTest.Tables[0].ShowTotal = false;
+                stackTest.Tables[0].ShowTotal = true;
+                stackTest.Tables[0].ShowTotal = false;
+                stackTest.Tables[0].ShowTotal = true;
+                stackTest.Tables[0].ShowTotal = false;
+
+                stackTest.Calculate();
+
+                Assert.AreEqual(stackTest.Cells["A10"].Value, "Number:9");
+                Assert.AreEqual(stackTest.Cells["A11"].Value, null);
+                Assert.AreEqual(stackTest.Cells["A12"].Value, "Number:11");
+                Assert.AreEqual(stackTest.Cells["F11"].Value, "Don't clear me");
+
+                SaveAndCleanup(package);
+            }
+        }
     }
 }