diff options
| author | Serghei Cebotari <serghei@cebotari.ru> | 2024-05-27 23:39:43 +0300 |
|---|---|---|
| committer | Serghei Cebotari <serghei@cebotari.ru> | 2024-05-27 23:39:43 +0300 |
| commit | dc1e8616a6ebeb89cbe76dccc5a771481cefb8af (patch) | |
| tree | 2090f5b50d54c6d707b98963393300e8516075d0 | |
| parent | e71636f5f8644cc99271ac1b1d6b11e4472fbb4e (diff) | |
Fix merged column ordering
| -rw-r--r-- | RhSolutions.AddIn/Services/ExcelReader.cs | 6 | ||||
| -rw-r--r-- | RhSolutions.AddIn/Services/GuessReader.cs | 4 | ||||
| -rw-r--r-- | RhSolutions.AddIn/Services/IReader.cs | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/RhSolutions.AddIn/Services/ExcelReader.cs b/RhSolutions.AddIn/Services/ExcelReader.cs index 74048c9..6c334b9 100644 --- a/RhSolutions.AddIn/Services/ExcelReader.cs +++ b/RhSolutions.AddIn/Services/ExcelReader.cs @@ -79,7 +79,7 @@ public class ExcelReader : IReader, IDisposable return readResult; } - public List<(string, Dictionary<Product, double>)> + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets) { List<(string, Dictionary<Product, double>)> result = new(); @@ -151,10 +151,10 @@ public class ExcelReader : IReader, IDisposable result.Add((wbName, readResult)); } - return result; + return result.OrderBy(x => x.Item1); } - public List<(string, Dictionary<Product, double>)> ReadProducts(string[] files) + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(string[] files) { HashSet<string> openedFiles = RhSolutionsAddIn.Excel.Workbooks .Cast<Workbook>() diff --git a/RhSolutions.AddIn/Services/GuessReader.cs b/RhSolutions.AddIn/Services/GuessReader.cs index 86e7d27..d61217d 100644 --- a/RhSolutions.AddIn/Services/GuessReader.cs +++ b/RhSolutions.AddIn/Services/GuessReader.cs @@ -192,7 +192,7 @@ public class GuessReader : IReader return result; } - public List<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets) + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets) { List<(string, Dictionary<Product, double>)> result = new(); foreach (Worksheet worksheet in worksheets) @@ -206,7 +206,7 @@ public class GuessReader : IReader return result; } - public List<(string, Dictionary<Product, double>)> ReadProducts(string[] files) + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(string[] files) { _progressBar = new("Открываю исходные файлы...", files.Length); List<Worksheet> worksheets = new(); diff --git a/RhSolutions.AddIn/Services/IReader.cs b/RhSolutions.AddIn/Services/IReader.cs index a2474cc..1ec1a0e 100644 --- a/RhSolutions.AddIn/Services/IReader.cs +++ b/RhSolutions.AddIn/Services/IReader.cs @@ -3,7 +3,7 @@ public interface IReader : IDisposable { public Dictionary<Product, double> ReadProducts(Range range); - public List<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets); - public List<(string, Dictionary<Product, double>)> ReadProducts(string[] files); + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets); + public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(string[] files); new void Dispose(); } |