Merge pull request #17 from schebotar/dev

Dev

1 files changed, 23 insertions, 6 deletions

diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs
index af9378c..eddf9e7 100644
--- a/src/PriceListTools/CombineTool.cs
+++ b/src/PriceListTools/CombineTool.cs
@@ -1,32 +1,49 @@
 using Microsoft.Office.Interop.Excel;
-using System.Collections.Generic;
 using RehauSku.Interface;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using Dialog = RehauSku.Interface.Dialog;
 
 namespace RehauSku.PriceListTools
 {
     internal class CombineTool : AbstractTool
     {
-        public List<SourcePriceList> SourceFiles;
+        private List<SourcePriceList> SourceFiles { get; set; }
+
+        public CombineTool()
+        {
+            string[] files = Dialog.GetMultiplyFiles();
+
+            if (files != null)
+            {
+                SourceFiles = SourcePriceList.GetSourceLists(files);
+            }
+
+            else
+            {
+                throw new Exception("Не выбраны файлы");
+            }
+        }
 
-        public void FillTarget()
+        public override void FillTarget()
         {
             ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count));
             ResultBar = new ResultBar();
 
             foreach (SourcePriceList source in SourceFiles)
             {
-                TargetFile.Sheet.Columns[TargetFile.amountCell.Column]
+                TargetFile.Sheet.Columns[TargetFile.AmountCell.Column]
                     .EntireColumn
                     .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow);
 
-                Range newColumnHeader = TargetFile.Sheet.Cells[TargetFile.amountCell.Row, TargetFile.amountCell.Column - 1];
+                Range newColumnHeader = TargetFile.Sheet.Cells[TargetFile.AmountCell.Row, TargetFile.AmountCell.Column - 1];
                 newColumnHeader.Value2 = $"{source.Name}";
                 newColumnHeader.WrapText = true;
 
                 foreach (var kvp in source.PositionAmount)
                 {
-                    FillPositionAmountToColumns(kvp, TargetFile.amountCell.Column - 1, TargetFile.amountCell.Column);
+                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column - 1, TargetFile.AmountCell.Column);
                     ProgressBar.Update();
                 }
             }