From adbc7928e6ff98fa6a3458fcfba10c225a5c7d28 Mon Sep 17 00:00:00 2001 From: Yunusov_Niyaz Date: Sun, 11 Feb 2024 18:33:58 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=BE2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CarRepairShop/CarRepairShop/FormCreateOrder.cs | 6 +++--- CarRepairShop/CarRepairShop/FormRepair.cs | 12 ++++++------ CarRepairShop/CarRepairShop/FormRepairs.cs | 2 +- .../CarRepairShopBusinessLogic/RepairLogic.cs | 4 ++-- .../Implements/OrderStorage.cs | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CarRepairShop/CarRepairShop/FormCreateOrder.cs b/CarRepairShop/CarRepairShop/FormCreateOrder.cs index e3f4ec6..f3763da 100644 --- a/CarRepairShop/CarRepairShop/FormCreateOrder.cs +++ b/CarRepairShop/CarRepairShop/FormCreateOrder.cs @@ -47,13 +47,13 @@ namespace CarRepairShop try { int id = Convert.ToInt32(comboBoxRepair.SelectedValue); - var product = _logicR.ReadElement(new RepairSearchModel + var repair = _logicR.ReadElement(new RepairSearchModel { Id = id }); int count = Convert.ToInt32(textBoxCount.Text); - textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), + textBoxSum.Text = Math.Round(count * (repair?.Price ?? 0), 2).ToString(); _logger.LogInformation("Расчет суммы заказа"); } @@ -87,7 +87,7 @@ namespace CarRepairShop } if (comboBoxRepair.SelectedValue == null) { - MessageBox.Show("Выберите изделие", "Ошибка", + MessageBox.Show("Выберите ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } diff --git a/CarRepairShop/CarRepairShop/FormRepair.cs b/CarRepairShop/CarRepairShop/FormRepair.cs index c3996c0..7603346 100644 --- a/CarRepairShop/CarRepairShop/FormRepair.cs +++ b/CarRepairShop/CarRepairShop/FormRepair.cs @@ -24,7 +24,7 @@ namespace CarRepairShop { if (_id.HasValue) { - _logger.LogInformation("Загрузка изделия"); + _logger.LogInformation("Загрузка ремонта"); try { var view = _logic.ReadElement(new RepairSearchModel @@ -41,7 +41,7 @@ namespace CarRepairShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки изделия"); + _logger.LogError(ex, "Ошибка загрузки ремонта"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -49,7 +49,7 @@ namespace CarRepairShop } private void LoadData() { - _logger.LogInformation("Загрузка компонент изделия"); + _logger.LogInformation("Загрузка компонент ремонта"); try { if (_repairComponents != null) @@ -64,7 +64,7 @@ namespace CarRepairShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + _logger.LogError(ex, "Ошибка загрузки компонент ремонта"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -168,7 +168,7 @@ namespace CarRepairShop MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - _logger.LogInformation("Сохранение изделия"); + _logger.LogInformation("Сохранение ремонта"); try { var model = new RepairBindingModel @@ -191,7 +191,7 @@ namespace CarRepairShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения изделия"); + _logger.LogError(ex, "Ошибка сохранения ремонта"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } diff --git a/CarRepairShop/CarRepairShop/FormRepairs.cs b/CarRepairShop/CarRepairShop/FormRepairs.cs index d67cbf3..ab0c331 100644 --- a/CarRepairShop/CarRepairShop/FormRepairs.cs +++ b/CarRepairShop/CarRepairShop/FormRepairs.cs @@ -32,7 +32,7 @@ namespace CarRepairShop dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; dataGridView.Columns["RepairComponents"].Visible = false; } - _logger.LogInformation("Загрузка компьютеров"); + _logger.LogInformation("Загрузка ремонтов"); } catch (Exception ex) { diff --git a/CarRepairShop/CarRepairShopBusinessLogic/RepairLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/RepairLogic.cs index 96aace7..1c80564 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/RepairLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/RepairLogic.cs @@ -92,12 +92,12 @@ namespace CarRepairShopBusinessLogic } if (string.IsNullOrEmpty(model.RepairName)) { - throw new ArgumentNullException("Нет названия мороженного", + throw new ArgumentNullException("Нет названия ремонта", nameof(model.RepairName)); } if (model.Price <= 0) { - throw new ArgumentNullException("Цена мороженного должна быть больше 0", nameof(model.Price)); + throw new ArgumentNullException("Цена ремонта должна быть больше 0", nameof(model.Price)); } _logger.LogInformation("Repair. Repair:{Repair}. Price:{ Price }. Id: { Id}", model.RepairName, model.Price, model.Id); var element = _repairStorage.GetElement(new RepairSearchModel diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs index e666ec7..000661d 100644 --- a/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs +++ b/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs @@ -18,7 +18,7 @@ namespace CarRepairShopListImplement.Implements var result = new List(); foreach (var order in _source.Orders) { - result.Add(AccessIceCreamStorage(order.GetViewModel)); + result.Add(AccessRepairStorage(order.GetViewModel)); } return result; } @@ -33,7 +33,7 @@ namespace CarRepairShopListImplement.Implements { if (order.Id == model.Id) { - result.Add(AccessIceCreamStorage(order.GetViewModel)); + result.Add(AccessRepairStorage(order.GetViewModel)); } } return result; @@ -97,7 +97,7 @@ namespace CarRepairShopListImplement.Implements return null; } - public OrderViewModel AccessIceCreamStorage(OrderViewModel model) + public OrderViewModel AccessRepairStorage(OrderViewModel model) { foreach (var repair in _source.Repairs) {