diff options
| -rw-r--r-- | src/PriceListTools/CombineTool.cs | 5 | ||||
| -rw-r--r-- | src/PriceListTools/PriceListTool.cs | 20 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index a5864b7..474fd99 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -1,6 +1,5 @@ using Microsoft.Office.Interop.Excel; using System.Collections.Generic; -using System.Linq; namespace RehauSku.PriceListTools { @@ -22,8 +21,8 @@ namespace RehauSku.PriceListTools newColumnHeader.Value2 = $"{source.Name}"; newColumnHeader.WrapText = true; - FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1); - FillColumn(source.PositionAmount, TargetFile.amountCell.Column); + FillColumn(source.PositionAmount, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column); + //FillColumn(source.PositionAmount, ); } FilterByAmount(); diff --git a/src/PriceListTools/PriceListTool.cs b/src/PriceListTools/PriceListTool.cs index c3cc137..9aebd25 100644 --- a/src/PriceListTools/PriceListTool.cs +++ b/src/PriceListTools/PriceListTool.cs @@ -31,7 +31,7 @@ namespace RehauSku.PriceListTools } } - protected private void FillColumn(IEnumerable<KeyValuePair<Position, double>> dictionary, int column) + protected private void FillColumn(IEnumerable<KeyValuePair<Position, double>> dictionary, params int[] columns) { List<KeyValuePair<Position, double>> missing = new List<KeyValuePair<Position, double>>(); object[,] groupColumn = TargetFile.groupCell.EntireColumn.Value2; @@ -60,16 +60,18 @@ namespace RehauSku.PriceListTools else { - Range sumCell = TargetFile.Sheet.Cells[foundCell.Row, column]; - - if (sumCell.Value2 == null) + foreach (var column in columns) { - sumCell.Value2 = kvp.Value; - } + Range sumCell = TargetFile.Sheet.Cells[foundCell.Row, column]; + if (sumCell.Value2 == null) + { + sumCell.Value2 = kvp.Value; + } - else - { - sumCell.Value2 += kvp.Value; + else + { + sumCell.Value2 += kvp.Value; + } } } } |