diff --git a/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs b/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs index 13d6341..f14b4e8 100644 --- a/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/ComputerShopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -40,24 +40,22 @@ namespace ComputerShopBusinessLogic.BusinessLogics public List GetComputerComponent() { var components = _componentStorage.GetFullList(); - var products = _productStorage.GetFullList(); + var computers = _productStorage.GetFullList(); var list = new List(); - foreach (var component in components) + foreach (var computer in computers) { var record = new ReportComputerComponentViewModel { - ComponentName = component.ComponentName, - Computers = new List>(), + ComputerName = computer.ComputerName, + Components = new List>(), TotalCount = 0 }; - foreach (var product in products) + foreach (var component in components) { - if (product.ComputerComponents.ContainsKey(component.Id)) + if (computer.ComputerComponents.ContainsKey(component.Id)) { - record.Computers.Add(new Tuple(product.ComputerName, product.ComputerComponents[component.Id].Item2)); - record.TotalCount += - product.ComputerComponents[component.Id].Item2; + record.Components.Add(new Tuple(component.ComponentName, computer.ComputerComponents[component.Id].Item2)); + record.TotalCount += computer.ComputerComponents[component.Id].Item2; } } list.Add(record); diff --git a/ComputerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/ComputerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index b6529f5..712d9af 100644 --- a/ComputerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/ComputerShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -36,11 +36,11 @@ namespace ComputerShopBusinessLogic.OfficePackage { ColumnName = "A", RowIndex = rowIndex, - Text = pc.ComponentName, + Text = pc.ComputerName, StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var product in pc.Computers) + foreach (var product in pc.Components) { InsertCellInWorksheet(new ExcelCellParameters { diff --git a/ComputerShopContracts/ViewModels/ReportComputerComponentViewModel.cs b/ComputerShopContracts/ViewModels/ReportComputerComponentViewModel.cs index fb1c074..5b92dcd 100644 --- a/ComputerShopContracts/ViewModels/ReportComputerComponentViewModel.cs +++ b/ComputerShopContracts/ViewModels/ReportComputerComponentViewModel.cs @@ -8,8 +8,8 @@ namespace ComputerShopContracts.ViewModels { public class ReportComputerComponentViewModel { - public string ComponentName { get; set; } = string.Empty; + public string ComputerName { get; set; } = string.Empty; public int TotalCount { get; set; } - public List> Computers { get; set; } = new(); + public List> Components { get; set; } = new(); } } diff --git a/ComputersShop/FormReportComputerComponents.cs b/ComputersShop/FormReportComputerComponents.cs index 4d6c292..ef6d784 100644 --- a/ComputersShop/FormReportComputerComponents.cs +++ b/ComputersShop/FormReportComputerComponents.cs @@ -34,8 +34,8 @@ namespace ComputersShop dataGridView.Rows.Clear(); foreach (var elem in dict) { - dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" }); - foreach (var listElem in elem.Computers) + dataGridView.Rows.Add(new object[] { elem.ComputerName, "", "" }); + foreach (var listElem in elem.Components) { dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); } @@ -43,11 +43,11 @@ namespace ComputersShop dataGridView.Rows.Add(Array.Empty()); } } - _logger.LogInformation("Загрузка списка изделий по компонентам"); + _logger.LogInformation("Загрузка списка компонентов по изделиям"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам"); + _logger.LogError(ex, "Ошибка загрузки списка компонентов по изделиям"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); }