From dca27ebcc3a8377bfe6f4f56481d321b615c4c24 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 09:16:10 +0300 Subject: Move ConvertTool to another file --- src/PriceListTools/ConvertTool.cs | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/PriceListTools/ConvertTool.cs (limited to 'src/PriceListTools/ConvertTool.cs') diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs new file mode 100644 index 0000000..4c95988 --- /dev/null +++ b/src/PriceListTools/ConvertTool.cs @@ -0,0 +1,22 @@ +namespace RehauSku.PriceListTools +{ + internal class ConvertTool : PriceListTool + { + private Source Current; + + public void GetCurrent() + { + Current = new Source(ExcelApp.ActiveWorkbook); + } + + public void FillTarget() + { + ExcelApp.ScreenUpdating = false; + FillColumn(Current.SkuAmount, TargetFile.amountCell.Column); + FilterByAmount(); + ExcelApp.ScreenUpdating = true; + + Forms.Dialog.SaveWorkbookAs(); + } + } +} \ No newline at end of file -- cgit v1.2.3 From 539d22fb1ef9302e6df6aea7be848ea0bfb62aa2 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 09:27:19 +0300 Subject: Edit dialog --- src/PriceListTools/ConvertTool.cs | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'src/PriceListTools/ConvertTool.cs') diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs index 4c95988..1af27f5 100644 --- a/src/PriceListTools/ConvertTool.cs +++ b/src/PriceListTools/ConvertTool.cs @@ -1,4 +1,6 @@ -namespace RehauSku.PriceListTools +using System; + +namespace RehauSku.PriceListTools { internal class ConvertTool : PriceListTool { @@ -6,7 +8,20 @@ public void GetCurrent() { - Current = new Source(ExcelApp.ActiveWorkbook); + try + { + Current = new Source(ExcelApp.ActiveWorkbook); + } + + catch (Exception exception) + { + System.Windows.Forms.MessageBox.Show + (exception.Message, + "Ошибка распознавания", + System.Windows.Forms.MessageBoxButtons.OK, + System.Windows.Forms.MessageBoxIcon.Information); + throw exception; + } } public void FillTarget() -- cgit v1.2.3 From 711cc313e0eaed646c5058ef294de6d89770e352 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 11:41:35 +0300 Subject: Add complete position class --- src/PriceListTools/ConvertTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ConvertTool.cs') diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs index 1af27f5..651e9c7 100644 --- a/src/PriceListTools/ConvertTool.cs +++ b/src/PriceListTools/ConvertTool.cs @@ -27,7 +27,7 @@ namespace RehauSku.PriceListTools public void FillTarget() { ExcelApp.ScreenUpdating = false; - FillColumn(Current.SkuAmount, TargetFile.amountCell.Column); + FillColumn(Current.PositionAmount, TargetFile.amountCell.Column); FilterByAmount(); ExcelApp.ScreenUpdating = true; -- cgit v1.2.3 From 60006126b97131e383a8fee137cf89a13672f042 Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Fri, 28 Jan 2022 18:15:13 +0300 Subject: Add not found positions to target file --- src/PriceListTools/ConvertTool.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PriceListTools/ConvertTool.cs') diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs index 651e9c7..48e93d2 100644 --- a/src/PriceListTools/ConvertTool.cs +++ b/src/PriceListTools/ConvertTool.cs @@ -27,7 +27,7 @@ namespace RehauSku.PriceListTools public void FillTarget() { ExcelApp.ScreenUpdating = false; - FillColumn(Current.PositionAmount, TargetFile.amountCell.Column); + FillColumnsWithDictionary(Current.PositionAmount, TargetFile.amountCell.Column); FilterByAmount(); ExcelApp.ScreenUpdating = true; -- cgit v1.2.3