aboutsummaryrefslogtreecommitdiff
path: root/src/PriceListTools/MergeTool.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/PriceListTools/MergeTool.cs')
-rw-r--r--src/PriceListTools/MergeTool.cs27
1 files changed, 12 insertions, 15 deletions
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();
+ }
}
}
}