Merge pull request #19 from schebotar/dev

Dev

5 files changed, 58 insertions, 71 deletions

diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs
index 26a2832..cd3fc8a 100644
--- a/src/PriceListTools/CombineTool.cs
+++ b/src/PriceListTools/CombineTool.cs
@@ -3,7 +3,6 @@ using RehauSku.Interface;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Dialog = RehauSku.Interface.Dialog;
 
 namespace RehauSku.PriceListTools
@@ -27,33 +26,31 @@ namespace RehauSku.PriceListTools
             }
         }
 
-        public override async void FillTarget()
+        public override void FillTarget()
         {
-            ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count));
-            ResultBar = new ResultBar();
-
-            foreach (SourcePriceList source in SourceFiles)
+            using (ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(file => file.PositionAmount.Count)))
+            using (ResultBar = new ResultBar())
             {
-                TargetFile.Sheet.Columns[TargetFile.AmountCell.Column]
-                    .EntireColumn
-                    .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow);
-
-                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)
+                foreach (SourcePriceList source in SourceFiles)
                 {
-                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column - 1, TargetFile.AmountCell.Column);
-                    ProgressBar.Update();
+                    TargetFile.Sheet.Columns[TargetFile.AmountCell.Column]
+                        .EntireColumn
+                        .Insert(XlInsertShiftDirection.xlShiftToRight, XlInsertFormatOrigin.xlFormatFromRightOrBelow);
+
+                    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);
+                        ProgressBar.Update();
+                    }
                 }
-            }
-
-            FilterByAmount();
-            ResultBar.Update();
 
-            await Task.Delay(new TimeSpan(0, 0, 5));
-            ExcelApp.StatusBar = false;
+                FilterByAmount();
+                ResultBar.Update();
+            }
         }
     }
 }
diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs
index dde969c..04cf1ec 100644
--- a/src/PriceListTools/ConvertTool.cs
+++ b/src/PriceListTools/ConvertTool.cs
@@ -1,6 +1,4 @@
 using RehauSku.Interface;
-using System;
-using System.Threading.Tasks;
 
 namespace RehauSku.PriceListTools
 {
@@ -13,22 +11,20 @@ namespace RehauSku.PriceListTools
             Current = new SourcePriceList(ExcelApp.ActiveWorkbook);
         }
 
-        public override async void FillTarget()
+        public override void FillTarget()
         {
-            ProgressBar = new ProgressBar("Заполняю строки...", Current.PositionAmount.Count);
-            ResultBar = new ResultBar();
-
-            foreach (var kvp in Current.PositionAmount)
+            using (ProgressBar = new ProgressBar("Заполняю строки...", Current.PositionAmount.Count))
+            using (ResultBar = new ResultBar())
             {
-                FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
-                ProgressBar.Update();
-            }
+                foreach (var kvp in Current.PositionAmount)
+                {
+                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
+                    ProgressBar.Update();
+                }
 
-            FilterByAmount();
-            ResultBar.Update();
-
-            await Task.Delay(new TimeSpan(0, 0, 5));
-            ExcelApp.StatusBar = false;
+                FilterByAmount();
+                ResultBar.Update();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs
index 6f910b7..1a24d48 100644
--- a/src/PriceListTools/ExportTool.cs
+++ b/src/PriceListTools/ExportTool.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using RehauSku.Interface;
-using System.Threading.Tasks;
 
 namespace RehauSku.PriceListTools
 {
@@ -22,22 +21,20 @@ namespace RehauSku.PriceListTools
             }
         }
 
-        public override async void FillTarget()
+        public override void FillTarget()
         {
-            ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count);
-            ResultBar = new ResultBar();
-
-            foreach (var kvp in PositionAmount)
+            using (ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count))
+            using (ResultBar = new ResultBar())
             {
-                FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
-                ProgressBar.Update();
-            }
-
-            FilterByAmount();
-            ResultBar.Update();
+                foreach (var kvp in PositionAmount)
+                {
+                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
+                    ProgressBar.Update();
+                }
 
-            await Task.Delay(new TimeSpan(0, 0, 5));
-            ExcelApp.StatusBar = false;
+                FilterByAmount();
+                ResultBar.Update();
+            }
         }
 
         private void GetSelected()
diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs
index 1eb1d54..ac2a455 100644
--- a/src/PriceListTools/MergeTool.cs
+++ b/src/PriceListTools/MergeTool.cs
@@ -2,7 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace RehauSku.PriceListTools
 {
@@ -25,25 +24,23 @@ namespace RehauSku.PriceListTools
             }
         }
 
-        public override async void FillTarget()
+        public override void FillTarget()
         {
-            ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(x => x.PositionAmount.Count));
-            ResultBar = new ResultBar();
-
-            foreach (SourcePriceList source in SourceFiles)
+            using (ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(x => x.PositionAmount.Count)))
+            using (ResultBar = new ResultBar())
             {
-                foreach (var kvp in source.PositionAmount)
+                foreach (SourcePriceList source in SourceFiles)
                 {
-                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
-                    ProgressBar.Update();
+                    foreach (var kvp in source.PositionAmount)
+                    {
+                        FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
+                        ProgressBar.Update();
+                    }
                 }
-            }
 
-            FilterByAmount();
-            ResultBar.Update();
-
-            await Task.Delay(new TimeSpan(0, 0, 5));
-            ExcelApp.StatusBar = false;
+                FilterByAmount();
+                ResultBar.Update();
+            }
         }
     }
 }
diff --git a/src/PriceListTools/SourcePriceList.cs b/src/PriceListTools/SourcePriceList.cs
index d03d776..b11e060 100644
--- a/src/PriceListTools/SourcePriceList.cs
+++ b/src/PriceListTools/SourcePriceList.cs
@@ -77,9 +77,9 @@ namespace RehauSku.PriceListTools
 
             for (int row = AmountCell.Row + 1; row <= Sheet.Cells[Sheet.Rows.Count, AmountCell.Column].End[XlDirection.xlUp].Row; row++)
             {
-                object amount = Sheet.Cells[row, AmountCell.Column].Value2;
+                double? amount = Sheet.Cells[row, AmountCell.Column].Value2 as double?;
 
-                if (amount != null && (double)amount != 0)
+                if (amount != null && amount.Value != 0)
                 {
                     object group = Sheet.Cells[row, GroupCell.Column].Value2;
                     object name = Sheet.Cells[row, NameCell.Column].Value2;
@@ -95,12 +95,12 @@ namespace RehauSku.PriceListTools
 
                     if (PositionAmount.ContainsKey(p))
                     {
-                        PositionAmount[p] += (double)amount;
+                        PositionAmount[p] += amount.Value;
                     }
 
                     else
                     {
-                        PositionAmount.Add(p, (double)amount);
+                        PositionAmount.Add(p, amount.Value);
                     }
                 }
             }