From 06799119fb83cb6b75721c5cf60f4051e50976a7 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 2 Feb 2022 09:46:47 +0300 Subject: Add Interface namespace --- src/PriceListTools/ExportTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index bfb3d8a..119a289 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -31,7 +31,7 @@ namespace RehauSku.PriceListTools FilterByAmount(); - Forms.Dialog.SaveWorkbookAs(); + Interface.Dialog.SaveWorkbookAs(); } private void GetSelected() -- cgit v1.2.3 From 120eee0231d02e90d9d195ebc38327a58d4564a8 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 2 Feb 2022 10:23:50 +0300 Subject: Add Excel statusbar progress message --- src/PriceListTools/ExportTool.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 119a289..568145d 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -2,6 +2,7 @@ using RehauSku.Assistant; using System; using System.Collections.Generic; +using RehauSku.Interface; namespace RehauSku.PriceListTools { @@ -23,10 +24,12 @@ namespace RehauSku.PriceListTools public void FillTarget() { GetSelected(); - + ProgressBar bar = new ProgressBar(PositionAmount.Count); + foreach (var kvp in PositionAmount) { FillColumnsWithDictionary(kvp, TargetFile.amountCell.Column); + bar.DoProgress(); } FilterByAmount(); -- cgit v1.2.3 From cb5fee18918b5a29ccff23a0fb74bb13151f2e42 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Wed, 2 Feb 2022 18:02:17 +0300 Subject: Rename Abstract tool --- src/PriceListTools/ExportTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 568145d..562c1b2 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -6,7 +6,7 @@ using RehauSku.Interface; namespace RehauSku.PriceListTools { - internal class ExportTool : PriceListTool + internal class ExportTool : AbstractTool { private Dictionary PositionAmount; private Range Selection; -- cgit v1.2.3 From 99d1fb6740e93d7d81f0171885ac8f788b56dcfc Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Thu, 3 Feb 2022 21:44:24 +0300 Subject: Rename method --- src/PriceListTools/ExportTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 562c1b2..f2454f5 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -28,7 +28,7 @@ namespace RehauSku.PriceListTools foreach (var kvp in PositionAmount) { - FillColumnsWithDictionary(kvp, TargetFile.amountCell.Column); + FillPositionAmountToColumns(kvp, TargetFile.amountCell.Column); bar.DoProgress(); } -- cgit v1.2.3 From ef04747df50da1fbb5124fc9c02f1869d93864f5 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Thu, 3 Feb 2022 21:56:14 +0300 Subject: Additional message to statusbar --- src/PriceListTools/ExportTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index f2454f5..024cb3c 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -24,7 +24,7 @@ namespace RehauSku.PriceListTools public void FillTarget() { GetSelected(); - ProgressBar bar = new ProgressBar(PositionAmount.Count); + ProgressBar bar = new ProgressBar("Заполняю строки...", PositionAmount.Count); foreach (var kvp in PositionAmount) { -- cgit v1.2.3 From 6e889419e2658a3a80fa00582314f1428f6052e5 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 4 Feb 2022 09:17:12 +0300 Subject: Add Result Statusbar message --- src/PriceListTools/ExportTool.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 024cb3c..b36bf09 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -24,17 +24,20 @@ namespace RehauSku.PriceListTools public void FillTarget() { GetSelected(); - ProgressBar bar = new ProgressBar("Заполняю строки...", PositionAmount.Count); + ProgressBar = new ProgressBar("Заполняю строки...", PositionAmount.Count); + ResultBar = new ResultBar(); foreach (var kvp in PositionAmount) { FillPositionAmountToColumns(kvp, TargetFile.amountCell.Column); - bar.DoProgress(); + ProgressBar.Update(); } FilterByAmount(); + ResultBar.Update(); Interface.Dialog.SaveWorkbookAs(); + ExcelApp.StatusBar = false; } private void GetSelected() -- cgit v1.2.3 From cc96e1ebe7255c7278c70cef0f951103e9844487 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 4 Feb 2022 17:13:47 +0300 Subject: Implement Enable/Disable tools buttons events --- src/PriceListTools/ExportTool.cs | 1 - 1 file changed, 1 deletion(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index b36bf09..82fd86a 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -1,5 +1,4 @@ using Microsoft.Office.Interop.Excel; -using RehauSku.Assistant; using System; using System.Collections.Generic; using RehauSku.Interface; -- cgit v1.2.3 From 5a45c59b92c885cf20c5c69b1769273f3a124530 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Sat, 5 Feb 2022 13:04:18 +0300 Subject: Remove Selection check --- src/PriceListTools/ExportTool.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/PriceListTools/ExportTool.cs') diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 82fd86a..f341671 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -10,14 +10,9 @@ namespace RehauSku.PriceListTools private Dictionary PositionAmount; private Range Selection; - public void TryGetSelection() + public ExportTool() { Selection = ExcelApp.Selection; - - if (Selection == null || Selection.Columns.Count != 2) - { - throw new Exception("Неверный диапазон"); - } } public void FillTarget() -- cgit v1.2.3