diff --git a/Pizzeria/Pizzeria/FormCreateSupply.Designer.cs b/Pizzeria/Pizzeria/FormCreateSupply.Designer.cs index 52fde78..389ed8d 100644 --- a/Pizzeria/Pizzeria/FormCreateSupply.Designer.cs +++ b/Pizzeria/Pizzeria/FormCreateSupply.Designer.cs @@ -62,7 +62,7 @@ this.labelPizza.Name = "labelPizza"; this.labelPizza.Size = new System.Drawing.Size(75, 20); this.labelPizza.TabIndex = 2; - this.labelPizza.Text = "Изделие: "; + this.labelPizza.Text = "Пицца: "; // // comboBoxPizza // diff --git a/Pizzeria/Pizzeria/FormCreateSupply.cs b/Pizzeria/Pizzeria/FormCreateSupply.cs index 57bb4a6..5cdf37c 100644 --- a/Pizzeria/Pizzeria/FormCreateSupply.cs +++ b/Pizzeria/Pizzeria/FormCreateSupply.cs @@ -60,7 +60,7 @@ namespace PizzeriaView } if (comboBoxPizza.SelectedValue == null) { - MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите пиццу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Создание поставки"); diff --git a/Pizzeria/Pizzeria/FormReportShop.Designer.cs b/Pizzeria/Pizzeria/FormReportShop.Designer.cs index a31aa59..fbde795 100644 --- a/Pizzeria/Pizzeria/FormReportShop.Designer.cs +++ b/Pizzeria/Pizzeria/FormReportShop.Designer.cs @@ -31,7 +31,7 @@ this.buttonSaveToExcel = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.ColumnShop = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnReinforced = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnPizza = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -55,7 +55,7 @@ this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.ColumnShop, - this.ColumnReinforced, + this.ColumnPizza, this.ColumnCount}); this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom; this.dataGridView.Location = new System.Drawing.Point(0, 47); @@ -74,13 +74,13 @@ this.ColumnShop.Name = "ColumnShop"; this.ColumnShop.ReadOnly = true; // - // ColumnReinforced + // ColumnPizza // - this.ColumnReinforced.FillWeight = 140F; - this.ColumnReinforced.HeaderText = "Изделие"; - this.ColumnReinforced.MinimumWidth = 6; - this.ColumnReinforced.Name = "ColumnReinforced"; - this.ColumnReinforced.ReadOnly = true; + this.ColumnPizza.FillWeight = 140F; + this.ColumnPizza.HeaderText = "Пицца"; + this.ColumnPizza.MinimumWidth = 6; + this.ColumnPizza.Name = "ColumnPizza"; + this.ColumnPizza.ReadOnly = true; // // ColumnCount // @@ -90,14 +90,14 @@ this.ColumnCount.Name = "ColumnCount"; this.ColumnCount.ReadOnly = true; // - // FormReportShopReinforcedes + // FormReportShop // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(598, 450); this.Controls.Add(this.buttonSaveToExcel); this.Controls.Add(this.dataGridView); - this.Name = "FormReportShopReinforcedes"; + this.Name = "FormReportShop"; this.Text = "Наполненость магазинов"; this.Load += new System.EventHandler(this.FormReportShop_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); @@ -110,7 +110,7 @@ private Button buttonSaveToExcel; private DataGridView dataGridView; private DataGridViewTextBoxColumn ColumnShop; - private DataGridViewTextBoxColumn ColumnReinforced; + private DataGridViewTextBoxColumn ColumnPizza; private DataGridViewTextBoxColumn ColumnCount; } } \ No newline at end of file diff --git a/Pizzeria/Pizzeria/FormReportShop.resx b/Pizzeria/Pizzeria/FormReportShop.resx index e1400c8..b4c8014 100644 --- a/Pizzeria/Pizzeria/FormReportShop.resx +++ b/Pizzeria/Pizzeria/FormReportShop.resx @@ -60,7 +60,7 @@ True - + True diff --git a/Pizzeria/Pizzeria/FormShop.cs b/Pizzeria/Pizzeria/FormShop.cs index 12783b8..0405091 100644 --- a/Pizzeria/Pizzeria/FormShop.cs +++ b/Pizzeria/Pizzeria/FormShop.cs @@ -61,7 +61,7 @@ namespace PizzeriaView private void LoadData() { - _logger.LogInformation("Загрузка изделий в магазине"); + _logger.LogInformation("Загрузка пиццы в магазине"); try { if (_ShopPizzas != null) @@ -75,7 +75,7 @@ namespace PizzeriaView } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки изделий магазина"); + _logger.LogError(ex, "Ошибка загрузки пиццы магазина"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs index 45f5e7a..449b584 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ReportLogic.cs @@ -122,7 +122,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics public void SaveShopsToExcelFile(ReportBindingModel model) { - _saveToExcel.CreateShopReinforcedesReport(new ExcelShop + _saveToExcel.CreateShopPizzasReport(new ExcelShop { FileName = model.FileName, Title = "Наполненость магазинов", diff --git a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs index 67ee484..b7b2ef3 100644 --- a/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/Pizzeria/PizzeriaBusinessLogic/BusinessLogics/ShopLogic.cs @@ -90,7 +90,7 @@ namespace PizzeriaBusinessLogic.BusinessLogics } if (model.Count <= 0) { - throw new ArgumentException("Количество изделий должно быть больше 0"); + throw new ArgumentException("Количество пиццы должно быть больше 0"); } var shop = _shopStorage.GetElement(new ShopSearchModel { diff --git a/Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 54136ff..b3ea2b4 100644 --- a/Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/Pizzeria/PizzeriaBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -82,7 +82,7 @@ namespace PizzeriaBusinessLogic.OfficePackage SaveExcel(info); } - public void CreateShopReinforcedesReport(ExcelShop info) + public void CreateShopPizzasReport(ExcelShop info) { CreateExcel(info); diff --git a/Pizzeria/PizzeriaContracts/ViewModels/ReportShopReinforcedViewModel.cs b/Pizzeria/PizzeriaContracts/ViewModels/ReportShopReinforcedViewModel.cs index 0c23c56..943d676 100644 --- a/Pizzeria/PizzeriaContracts/ViewModels/ReportShopReinforcedViewModel.cs +++ b/Pizzeria/PizzeriaContracts/ViewModels/ReportShopReinforcedViewModel.cs @@ -10,6 +10,6 @@ namespace PizzeriaContracts.ViewModels { public string ShopName { get; set; } = string.Empty; public int TotalCount { get; set; } - public List<(string Reinforced, int count)> Pizzas { get; set; } = new(); + public List<(string Pizza, int count)> Pizzas { get; set; } = new(); } }