From f502d1323fc469bbf42778478f762c6428500efd Mon Sep 17 00:00:00 2001 From: Artyom_Yashin Date: Sat, 10 Feb 2024 20:46:23 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B5=D0=BD=D1=8C=201950.=20=D0=98=20?= =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=B2=D1=8C=20=D1=8F=20=D0=BD=D0=B0=D1=82?= =?UTF-8?q?=D1=8B=D0=BA=D0=B0=D1=8E=D1=81=D1=8C=20=D0=BD=D0=B0=20=D1=82?= =?UTF-8?q?=D0=B5=20=D0=B6=D0=B5=20=D0=B3=D1=80=D0=B0=D0=B1=D0=BB=D0=B8.?= =?UTF-8?q?=20=D0=AF=20=D0=B1=D1=83=D0=B4=D1=82=D0=BE=20=D1=85=D0=BE=D0=B6?= =?UTF-8?q?=D1=83=20=D0=BF=D0=BE=20=D0=BA=D1=80=D1=83=D0=B3=D1=83=20=D0=B2?= =?UTF-8?q?=20=D1=82=D1=89=D0=B5=D1=82=D0=BD=D0=BE=D0=B9=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BF=D1=8B=D1=82=D0=BA=D0=B5=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D0=B2=D1=81=D0=B5=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=B4=D0=BE=D1=87=D1=91=D1=82=D1=8B.=20=D0=98=20=D1=87=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=B4=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20=D1=8D=D1=82?= =?UTF-8?q?=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B4=D0=BE=D0=BB=D0=B6=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F,=20=D1=82=D0=B5=D0=BC=20=D0=B3=D0=BB=D1=83?= =?UTF-8?q?=D0=B1=D0=B6=D0=B5=20=D1=8F=20=D0=B7=D0=B0=D1=80=D1=8B=D0=B2?= =?UTF-8?q?=D0=B0=D1=8E=D1=81=D1=8C.=20=D0=AF=20=D0=B4=D0=BE=D0=BB=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=BE=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=D1=81=D1=8F,=20=D0=BE=D1=81=D1=82=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D1=81=D1=82=D1=80=D0=B5=D0=BC=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=20=D0=B8=D0=B4=D0=B5=D0=B0=D0=BB=D1=8C?= =?UTF-8?q?=D0=BD=D1=8B=D0=BC.=20=D0=AF=20=D1=87=D1=83=D0=B2=D1=81=D1=82?= =?UTF-8?q?=D0=B2=D1=83=D1=8E,=20=D1=87=D1=82=D0=BE=20=D1=82=D0=B5=D1=80?= =?UTF-8?q?=D1=8F=D1=8E=20=D1=81=D0=B5=D0=B1=D1=8F,=20=D1=80=D0=B0=D1=81?= =?UTF-8?q?=D1=82=D0=B2=D0=BE=D1=80=D1=8F=D1=8E=D1=81=D1=8C=20=D0=B2=20?= =?UTF-8?q?=D0=B1=D0=B5=D0=B7=D0=BC=D0=B5=D1=80=D0=BD=D0=BE=D0=BC=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D0=BA=D0=B5=20=D0=BD=D1=83=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B8=20=D0=B5=D0=B4=D0=B8=D0=BD=D0=B8=D1=86.=20=D0=9D?= =?UTF-8?q?=D0=BE=20=D1=86=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1?= =?UTF-8?q?=D0=BA=D0=B8=20=D1=81=D0=BB=D0=B8=D1=88=D0=BA=D0=BE=D0=BC=20?= =?UTF-8?q?=D0=B2=D1=8B=D1=81=D0=BE=D0=BA=D0=B0...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComputersShop/ComputersShop/FormComputer.cs | 12 ++++++------ .../ViewModels/ComputerViewModel.cs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ComputersShop/ComputersShop/FormComputer.cs b/ComputersShop/ComputersShop/FormComputer.cs index 5ef146a..ffafe34 100644 --- a/ComputersShop/ComputersShop/FormComputer.cs +++ b/ComputersShop/ComputersShop/FormComputer.cs @@ -33,7 +33,7 @@ namespace ComputersShop { if (_id.HasValue) { - _logger.LogInformation("Загрузка изделия"); + _logger.LogInformation("Загрузка компьютера"); try { var view = _logic.ReadElement(new ComputerSearchModel @@ -51,7 +51,7 @@ namespace ComputersShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки изделия"); + _logger.LogError(ex, "Ошибка загрузки компьютера"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -59,7 +59,7 @@ namespace ComputersShop } private void LoadData() { - _logger.LogInformation("Загрузка компонент изделия"); + _logger.LogInformation("Загрузка компонент компьютера"); try { if (_ComputerComponents != null) @@ -74,7 +74,7 @@ namespace ComputersShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонент изделия"); + _logger.LogError(ex, "Ошибка загрузки компонент компьютера"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } @@ -168,7 +168,7 @@ namespace ComputersShop MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - _logger.LogInformation("Сохранение изделия"); + _logger.LogInformation("Сохранение компьютера"); try { var model = new ComputerBindingModel @@ -189,7 +189,7 @@ namespace ComputersShop } catch (Exception ex) { - _logger.LogError(ex, "Ошибка сохранения изделия"); + _logger.LogError(ex, "Ошибка сохранения компьютера"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/ComputersShop/ComputersShopContracts/ViewModels/ComputerViewModel.cs b/ComputersShop/ComputersShopContracts/ViewModels/ComputerViewModel.cs index f8f6aa0..ca81470 100644 --- a/ComputersShop/ComputersShopContracts/ViewModels/ComputerViewModel.cs +++ b/ComputersShop/ComputersShopContracts/ViewModels/ComputerViewModel.cs @@ -6,7 +6,7 @@ namespace ComputersShopContracts.ViewModels public class ComputerViewModel : IComputerModel { public int Id { get; set; } - [DisplayName("Название изделия")] + [DisplayName("Название компьютера")] public string ComputerName { get; set; } = string.Empty; [DisplayName("Цена")] public double Price { get; set; }