chebser/RhSolutions-AddIn
0
0
Fork 0
Code Packages Releases 16 Wiki Activity

Fix merged column ordering

Browse Source
This commit is contained in:
Serghei Cebotari 2024-05-27 23:39:43 +03:00
parent e71636f5f8
commit dc1e8616a6
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RhSolutions.AddIn/Services/ExcelReader.cs
View File

@ -79,7 +79,7 @@ public class ExcelReader : IReader, IDisposable
return readResult; return readResult;
} }
public List<(string, Dictionary<Product, double>)> public IEnumerable<(string, Dictionary<Product, double>)>
ReadProducts(IEnumerable<Worksheet> worksheets) ReadProducts(IEnumerable<Worksheet> worksheets)
{ {
List<(string, Dictionary<Product, double>)> result = new(); List<(string, Dictionary<Product, double>)> result = new();
@ -151,10 +151,10 @@ public class ExcelReader : IReader, IDisposable
result.Add((wbName, readResult)); 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 HashSet<string> openedFiles = RhSolutionsAddIn.Excel.Workbooks
.Cast<Workbook>() .Cast<Workbook>()

4
RhSolutions.AddIn/Services/GuessReader.cs
View File

@ -192,7 +192,7 @@ public class GuessReader : IReader
return result; 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(); List<(string, Dictionary<Product, double>)> result = new();
foreach (Worksheet worksheet in worksheets) foreach (Worksheet worksheet in worksheets)
@ -206,7 +206,7 @@ public class GuessReader : IReader
return result; return result;
} }
public List<(string, Dictionary<Product, double>)> ReadProducts(string[] files) public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(string[] files)
{ {
_progressBar = new("Открываю исходные файлы...", files.Length); _progressBar = new("Открываю исходные файлы...", files.Length);
List<Worksheet> worksheets = new(); List<Worksheet> worksheets = new();

4
RhSolutions.AddIn/Services/IReader.cs
View File

@ -3,7 +3,7 @@
public interface IReader : IDisposable public interface IReader : IDisposable
{ {
public Dictionary<Product, double> ReadProducts(Range range); public Dictionary<Product, double> ReadProducts(Range range);
public List<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets); public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(IEnumerable<Worksheet> worksheets);
public List<(string, Dictionary<Product, double>)> ReadProducts(string[] files); public IEnumerable<(string, Dictionary<Product, double>)> ReadProducts(string[] files);
new void Dispose(); new void Dispose();
} }