aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Chebotar <s.chebotar@gmail.com>2023-06-21 16:30:16 +0300
committerSergey Chebotar <s.chebotar@gmail.com>2023-06-21 16:30:16 +0300
commite4aa8dff931319f085435353fdcdb2dc52b43fef (patch)
treedc33d66559ababbc330505874730a864029888ab
parent5fbfd3732fd959109b23fb59803f717bdb23fa34 (diff)
Fix Application using ordering
-rw-r--r--RhSolutions.AddIn/Tools/ConvertTool.cs2
-rw-r--r--RhSolutions.AddIn/Tools/ExportTool.cs2
-rw-r--r--RhSolutions.AddIn/Tools/GuessTool.cs2
-rw-r--r--RhSolutions.AddIn/Tools/MergeTool.cs2
-rw-r--r--RhSolutions.AddIn/Tools/SleevesTool.cs2
5 files changed, 5 insertions, 5 deletions
diff --git a/RhSolutions.AddIn/Tools/ConvertTool.cs b/RhSolutions.AddIn/Tools/ConvertTool.cs
index 70a73cd..e77ef6d 100644
--- a/RhSolutions.AddIn/Tools/ConvertTool.cs
+++ b/RhSolutions.AddIn/Tools/ConvertTool.cs
@@ -19,8 +19,8 @@ internal class ConvertTool : Tool
Application app = RhSolutionsAddIn.Excel.Application;
Worksheet worksheet = app.ActiveWorkbook.ActiveSheet;
_reader = _readerFactory.GetReader("Excel");
- _writer = _writerFactory.GetWriter("NewPrice");
var products = _reader.ReadProducts(new[] { worksheet });
+ _writer = _writerFactory.GetWriter("NewPrice");
_writer.WriteProducts(products);
}
} \ No newline at end of file
diff --git a/RhSolutions.AddIn/Tools/ExportTool.cs b/RhSolutions.AddIn/Tools/ExportTool.cs
index 3b158a9..aefb906 100644
--- a/RhSolutions.AddIn/Tools/ExportTool.cs
+++ b/RhSolutions.AddIn/Tools/ExportTool.cs
@@ -17,8 +17,8 @@ internal class ExportTool : Tool
{
Application app = RhSolutionsAddIn.Excel.Application;
_reader = _readerFactory.GetReader("Excel");
- _writer = _writerFactory.GetWriter("NewPrice");
var products = _reader.ReadProducts(app.Selection);
+ _writer = _writerFactory.GetWriter("NewPrice");
_writer.WriteProducts(products);
}
}
diff --git a/RhSolutions.AddIn/Tools/GuessTool.cs b/RhSolutions.AddIn/Tools/GuessTool.cs
index a61c25c..43ecfca 100644
--- a/RhSolutions.AddIn/Tools/GuessTool.cs
+++ b/RhSolutions.AddIn/Tools/GuessTool.cs
@@ -15,8 +15,8 @@ internal class GuessTool : Tool
Application app = RhSolutionsAddIn.Excel.Application;
Worksheet worksheet = app.ActiveWorkbook.ActiveSheet;
_reader = _readerFactory.GetReader("Guess");
- _writer = _writerFactory.GetWriter("NewPrice");
var products = _reader.ReadProducts(new[] { worksheet });
+ _writer = _writerFactory.GetWriter("NewPrice");
_writer.WriteProducts(products);
}
}
diff --git a/RhSolutions.AddIn/Tools/MergeTool.cs b/RhSolutions.AddIn/Tools/MergeTool.cs
index 87dbe91..504b607 100644
--- a/RhSolutions.AddIn/Tools/MergeTool.cs
+++ b/RhSolutions.AddIn/Tools/MergeTool.cs
@@ -18,8 +18,8 @@ internal class MergeTool : Tool
IFileDialog dialog = RhSolutionsAddIn.ServiceProvider.GetRequiredService<IFileDialog>();
string[] files = dialog.GetFiles();
_reader = _readerFactory.GetReader("Excel");
- _writer = _writerFactory.GetWriter("NewPrice");
var products = _reader.ReadProducts(files);
+ _writer = _writerFactory.GetWriter("NewPrice");
_writer.WriteProducts(products);
}
}
diff --git a/RhSolutions.AddIn/Tools/SleevesTool.cs b/RhSolutions.AddIn/Tools/SleevesTool.cs
index 4952ff2..c43bc6c 100644
--- a/RhSolutions.AddIn/Tools/SleevesTool.cs
+++ b/RhSolutions.AddIn/Tools/SleevesTool.cs
@@ -14,9 +14,9 @@ internal class SleevesTool : Tool
Application app = RhSolutionsAddIn.Excel.Application;
Worksheet worksheet = app.ActiveWorkbook.ActiveSheet;
_reader = _readerFactory.GetReader("Excel");
- _writer = _writerFactory.GetWriter("CurrentPrice");
var products = _reader.ReadProducts(new[] { worksheet });
var sleeves = _sleevesCaluculator.CalculateSleeves(products.Select(p => p.Item2).First());
+ _writer = _writerFactory.GetWriter("CurrentPrice");
_writer.WriteProducts(sleeves);
}
}