From 8672fa8f6b28ee3e3cf0d00e05e1b9d3ab7a2bfd Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Fri, 7 Jan 2022 19:04:07 +0300
Subject: Add CombineTool for conjoining files into columns

---
 src/Ribbon/RibbonController.cs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/Ribbon')

diff --git a/src/Ribbon/RibbonController.cs b/src/Ribbon/RibbonController.cs
index df6f327..ad27bc2 100644
--- a/src/Ribbon/RibbonController.cs
+++ b/src/Ribbon/RibbonController.cs
@@ -17,8 +17,11 @@ namespace RehauSku.Ribbon
         <tabs>
           <tab id='rau' label='REHAU'>
             <group id='priceList' label='Прайс-лист'>
-                <button id='exportToPrice' label='Экспорт в новый файл' size='normal' imageMso='PivotExportToExcel' onAction='OnExportPressed'/>
-                <button id='mergeFiles' label='Объединить' size='normal' imageMso='Copy' onAction='OnMergePressed'/>                
+                <button id='exportToPrice' label='Экспорт в новый файл' size='normal' imageMso='PivotExportToExcel' onAction='OnExportPressed'/> 
+                <menu id='conjoinMenu' label='Объединить' imageMso='Copy'>
+                    <button id='mergeFiles' label='Сложить' onAction='OnMergePressed'/>    
+                    <button id='combineFiles' label='По колонкам' onAction='OnCombinePressed'/>   
+                </menu>
             </group>
             <group id='rausettings' label='Настройки'>
                 <button id='setPriceList' label='Файл прайс-листа' size='normal' imageMso='CurrentViewSettings' onAction='OnSetPricePressed'/>
@@ -29,14 +32,27 @@ namespace RehauSku.Ribbon
     </customUI>";
         }
 
+        // <dropDown id = 'dd1' label = 'Drop dynamic' getItemCount = 'fncGetItemCountDrop' getItemLabel = 'fncGetItemLabelDrop' onAction = 'fncOnActionDrop'/>
+
         public void OnMergePressed(IRibbonControl control)
         {
             using (MergeTool mergeTool = new MergeTool())
             {
                 string[] files = Dialog.GetMultiplyFiles();
-                mergeTool.AddSkuAmountToDict(files);
+                mergeTool.CollectSkuAmount(files);
+                string exportFile = PriceListUtil.CreateNewExportFile();
+                mergeTool.ExportToFile(exportFile);
+            }
+        }
+
+        public void OnCombinePressed(IRibbonControl control)
+        {
+            using (CombineTool combineTool = new CombineTool())
+            {
+                string[] files = Dialog.GetMultiplyFiles();
+                combineTool.CollectSkuAmount(files);
                 string exportFile = PriceListUtil.CreateNewExportFile();
-                mergeTool.ExportToNewFile(exportFile);
+                combineTool.ExportToFile(exportFile);
             }
         }
 
-- 
cgit v1.2.3


From 762127a4aa1ee393f19e08018830bc8ba023c050 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Sun, 9 Jan 2022 10:37:25 +0300
Subject: Refactoring

---
 src/Ribbon/RibbonController.cs | 44 ++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

(limited to 'src/Ribbon')

diff --git a/src/Ribbon/RibbonController.cs b/src/Ribbon/RibbonController.cs
index ad27bc2..d0eb590 100644
--- a/src/Ribbon/RibbonController.cs
+++ b/src/Ribbon/RibbonController.cs
@@ -3,6 +3,7 @@ using System.Windows.Forms;
 using ExcelDna.Integration.CustomUI;
 using RehauSku.PriceListTools;
 using RehauSku.Forms;
+using System;
 
 namespace RehauSku.Ribbon
 {
@@ -24,7 +25,7 @@ namespace RehauSku.Ribbon
                 </menu>
             </group>
             <group id='rausettings' label='Настройки'>
-                <button id='setPriceList' label='Файл прайс-листа' size='normal' imageMso='CurrentViewSettings' onAction='OnSetPricePressed'/>
+                <button id='setPriceList' label='Файл прайс-листа' size='large' imageMso='CurrentViewSettings' onAction='OnSetPricePressed'/>
             </group>
           </tab>
         </tabs>
@@ -39,9 +40,10 @@ namespace RehauSku.Ribbon
             using (MergeTool mergeTool = new MergeTool())
             {
                 string[] files = Dialog.GetMultiplyFiles();
-                mergeTool.CollectSkuAmount(files);
-                string exportFile = PriceListUtil.CreateNewExportFile();
-                mergeTool.ExportToFile(exportFile);
+                mergeTool.GetSource(files);
+                string exportFile = PriceList.CreateNewFile();
+                mergeTool.OpenNewPrice(exportFile);
+                mergeTool.FillPriceList();
             }
         }
 
@@ -50,30 +52,34 @@ namespace RehauSku.Ribbon
             using (CombineTool combineTool = new CombineTool())
             {
                 string[] files = Dialog.GetMultiplyFiles();
-                combineTool.CollectSkuAmount(files);
-                string exportFile = PriceListUtil.CreateNewExportFile();
-                combineTool.ExportToFile(exportFile);
+                combineTool.GetSource(files);
+                string exportFile = PriceList.CreateNewFile();
+                combineTool.OpenNewPrice(exportFile);
+                combineTool.FillPriceList();
             }
         }
 
         public void OnExportPressed(IRibbonControl control)
         {
-            using (ExportTool exportTool = new ExportTool())
+            try
             {
-                if (!exportTool.IsRangeValid())
+                using (ExportTool exportTool = new ExportTool())
                 {
-                    MessageBox.Show("Выделен неверный диапазон!",
-                        "Неверный диапазон",
-                        MessageBoxButtons.OK,
-                        MessageBoxIcon.Information);
-                    return;
-                }
-
-                else
-                {
-                    exportTool.ExportToNewFile();
+                    exportTool.GetSource(null);
+                    string exportFile = PriceList.CreateNewFile();
+                    exportTool.OpenNewPrice(exportFile);
+                    exportTool.FillPriceList();
                 }
             }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message,
+                    "Ошибка",
+                    MessageBoxButtons.OK,
+                    MessageBoxIcon.Information);
+                return;
+            }
+
         }
 
         public void OnSetPricePressed(IRibbonControl control)
-- 
cgit v1.2.3


From 379fb6d99673e390e701b0b16e10dbc2d4edb148 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Sun, 9 Jan 2022 10:49:41 +0300
Subject: Add virtual GetSource with no params to abstract pricelist tool

---
 src/Ribbon/RibbonController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Ribbon')

diff --git a/src/Ribbon/RibbonController.cs b/src/Ribbon/RibbonController.cs
index d0eb590..15bd1a0 100644
--- a/src/Ribbon/RibbonController.cs
+++ b/src/Ribbon/RibbonController.cs
@@ -65,7 +65,7 @@ namespace RehauSku.Ribbon
             {
                 using (ExportTool exportTool = new ExportTool())
                 {
-                    exportTool.GetSource(null);
+                    exportTool.GetSource();
                     string exportFile = PriceList.CreateNewFile();
                     exportTool.OpenNewPrice(exportFile);
                     exportTool.FillPriceList();
-- 
cgit v1.2.3


From 846547d6d905e0dbee73cd9c62760ea43bb88134 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Sun, 9 Jan 2022 15:47:54 +0300
Subject: Add SaveAs Dialog after export

---
 src/Ribbon/RibbonController.cs | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

(limited to 'src/Ribbon')

diff --git a/src/Ribbon/RibbonController.cs b/src/Ribbon/RibbonController.cs
index 15bd1a0..ed59541 100644
--- a/src/Ribbon/RibbonController.cs
+++ b/src/Ribbon/RibbonController.cs
@@ -40,10 +40,13 @@ namespace RehauSku.Ribbon
             using (MergeTool mergeTool = new MergeTool())
             {
                 string[] files = Dialog.GetMultiplyFiles();
-                mergeTool.GetSource(files);
-                string exportFile = PriceList.CreateNewFile();
-                mergeTool.OpenNewPrice(exportFile);
-                mergeTool.FillPriceList();
+                if (files.Length != 0)
+                {
+                    mergeTool.GetSource(files);
+                    string exportFile = RegistryUtil.PriceListPath;
+                    mergeTool.OpenNewPrice(exportFile);
+                    mergeTool.FillPriceList();
+                }
             }
         }
 
@@ -52,10 +55,13 @@ namespace RehauSku.Ribbon
             using (CombineTool combineTool = new CombineTool())
             {
                 string[] files = Dialog.GetMultiplyFiles();
-                combineTool.GetSource(files);
-                string exportFile = PriceList.CreateNewFile();
-                combineTool.OpenNewPrice(exportFile);
-                combineTool.FillPriceList();
+                if (files.Length != 0)
+                {
+                    combineTool.GetSource(files);
+                    string exportFile = RegistryUtil.PriceListPath;
+                    combineTool.OpenNewPrice(exportFile);
+                    combineTool.FillPriceList();
+                }
             }
         }
 
@@ -66,7 +72,7 @@ namespace RehauSku.Ribbon
                 using (ExportTool exportTool = new ExportTool())
                 {
                     exportTool.GetSource();
-                    string exportFile = PriceList.CreateNewFile();
+                    string exportFile = RegistryUtil.PriceListPath;
                     exportTool.OpenNewPrice(exportFile);
                     exportTool.FillPriceList();
                 }
-- 
cgit v1.2.3