From 90935ab1645a1470d94ec605c307b4ff77a968b1 Mon Sep 17 00:00:00 2001 From: Zakharov_Rostislav Date: Sat, 10 Feb 2024 20:41:00 +0400 Subject: [PATCH] some minor fixes --- .../BlacksmithWorkshop/FormCreateOrder.cs | 2 +- .../BlacksmithWorkshop/FormMain.Designer.cs | 6 +++--- .../BlacksmithWorkshop/FormManufacture.cs | 10 +++++----- .../BlacksmithWorkshop/FormManufactures.cs | 4 ++-- .../ViewModels/ManufactureViewModel.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs index 36ff2dd..e610485 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormCreateOrder.cs @@ -40,7 +40,7 @@ namespace BlacksmithWorkshop ComboBoxManufacture.DataSource = list; ComboBoxManufacture.SelectedItem = null; } - _logger.LogInformation("Кузнечные изделий загружено"); + _logger.LogInformation("Кузнечные изделия загружены"); } catch (Exception ex) { diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs index 34ec0da..4dabbf6 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs @@ -61,15 +61,15 @@ // ComponentsToolStripMenuItem // ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(145, 22); + ComponentsToolStripMenuItem.Size = new Size(181, 22); ComponentsToolStripMenuItem.Text = "Компоненты"; ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click; // // ManufactureToolStripMenuItem // ManufactureToolStripMenuItem.Name = "ManufactureToolStripMenuItem"; - ManufactureToolStripMenuItem.Size = new Size(145, 22); - ManufactureToolStripMenuItem.Text = "Изделия"; + ManufactureToolStripMenuItem.Size = new Size(181, 22); + ManufactureToolStripMenuItem.Text = "Кузнечные изделия"; ManufactureToolStripMenuItem.Click += ManufacturesStripMenuItem_Click; // // dataGridView diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs index 80b8f7b..92a6d68 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs @@ -33,7 +33,7 @@ namespace BlacksmithWorkshop { if (_id.HasValue) { - _logger.LogInformation("Загрузка изделия"); + _logger.LogInformation("Загрузка кузнечного изделия"); try { var view = _logic.ReadElement(new ManufactureSearchModel { Id = _id.Value }); @@ -48,7 +48,7 @@ namespace BlacksmithWorkshop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки изделия"); + _logger.LogError(ex, "Ошибка загрузки кузнечного изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -56,7 +56,7 @@ namespace BlacksmithWorkshop } private void LoadData() { - _logger.LogInformation("Загрузка компонент изделия"); + _logger.LogInformation("Загрузка компонентов кузнечного изделия"); try { if (_manufactureComponents != null) @@ -73,7 +73,7 @@ namespace BlacksmithWorkshop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + _logger.LogError(ex, "Ошибка загрузки компонентов кузнечного изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -170,7 +170,7 @@ namespace BlacksmithWorkshop MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - _logger.LogInformation("Сохранение изделия"); + _logger.LogInformation("Сохранение кузнечного изделия"); try { var model = new ManufactureBindingModel diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs index 0752cfc..98c512c 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs @@ -81,7 +81,7 @@ namespace BlacksmithWorkshop if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Удаление кузнечных изделий"); + _logger.LogInformation("Удаление кузнечного изделия"); try { if (!_logic.Delete(new ManufactureBindingModel { Id = id })) @@ -92,7 +92,7 @@ namespace BlacksmithWorkshop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка удаления кузнечных изделий"); + _logger.LogError(ex, "Ошибка удаления кузнечного изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs index 8fad94d..64ac3a9 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs @@ -11,7 +11,7 @@ namespace BlacksmithWorkshopContracts.ViewModels public class ManufactureViewModel : IManufactureModel { public int Id { get; set; } - [DisplayName("Название изделия")] + [DisplayName("Название кузнечного изделия")] public string ManufactureName { get; set; } = string.Empty; [DisplayName("Цена")] public double Price { get; set; }