From b99c1bb0a4783479694ec3e2ad1362ccc332d1a6 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 17 May 2024 00:00:36 +0400 Subject: [PATCH] 100% --- CarRepairShop/CarRepairShop.sln | 26 +- .../BusinessLogics/ComponentLogic.cs | 115 ++++++++ .../BusinessLogics/OrderLogic.cs | 129 +++++++++ .../BusinessLogics/RepairLogic.cs | 119 +++++++++ .../CarRepairShopBusinessLogic.csproj | 17 ++ .../BindingModels/ComponentBindingModel.cs | 16 ++ .../BindingModels/OrderBindingModel.cs | 21 ++ .../BindingModels/RepairBindingModel.cs | 22 ++ .../IComponentLogic.cs | 19 ++ .../BusinessLogicsContracts/IOrderLogic.cs | 19 ++ .../BusinessLogicsContracts/IRepairLogic.cs | 19 ++ .../CarRepairShopContracts.csproj | 13 + .../SearchModels/ComponentSearchModel.cs | 15 ++ .../SearchModels/OrderSearchModel.cs | 13 + .../SearchModels/RepairSearchModel.cs | 15 ++ .../StoragesContracts/IComponentStorage.cs | 21 ++ .../StoragesContracts/IOrderStorage.cs | 21 ++ .../StoragesContracts/IRepairStorage.cs | 21 ++ .../ViewModels/ComponentViewModel.cs | 20 ++ .../ViewModels/OrderViewModel.cs | 30 +++ .../ViewModels/RepairViewModel.cs | 25 ++ .../CarRepairShopDataModels.csproj | 9 + .../Enums/OrderStatus.cs | 17 ++ CarRepairShop/CarRepairShopDataModels/IId.cs | 13 + .../Models/IComponentModel.cs | 14 + .../Models/IOrderModel.cs | 19 ++ .../Models/IRepairModel.cs | 15 ++ .../CarRepairShopListImplement.csproj | 14 + .../DataListSingleton.cs | 31 +++ .../Implements/ComponentStorage.cs | 109 ++++++++ .../Implements/OrderStorage.cs | 117 ++++++++ .../Implements/RepairStorage.cs | 109 ++++++++ .../Models/Component.cs | 46 ++++ .../Models/Order.cs | 63 +++++ .../Models/Repair.cs | 55 ++++ .../CarRepairShopView.csproj | 11 + .../CarRepairShopView/Form1.Designer.cs | 39 --- CarRepairShop/CarRepairShopView/Form1.cs | 10 - .../CarRepairShopView/FormComponent.cs | 85 ++++++ .../FormComponent.designer.cs | 127 +++++++++ .../{Form1.resx => FormComponent.resx} | 0 .../CarRepairShopView/FormComponents.cs | 103 +++++++ .../FormComponents.designer.cs | 122 +++++++++ .../CarRepairShopView/FormComponents.resx | 120 +++++++++ .../CarRepairShopView/FormCreateOrder.cs | 117 ++++++++ .../FormCreateOrder.designer.cs | 155 +++++++++++ .../CarRepairShopView/FormCreateOrder.resx | 60 +++++ CarRepairShop/CarRepairShopView/FormMain.cs | 148 ++++++++++ .../CarRepairShopView/FormMain.designer.cs | 198 ++++++++++++++ CarRepairShop/CarRepairShopView/FormMain.resx | 66 +++++ CarRepairShop/CarRepairShopView/FormRepair.cs | 208 +++++++++++++++ .../CarRepairShopView/FormRepair.designer.cs | 252 ++++++++++++++++++ .../CarRepairShopView/FormRepair.resx | 120 +++++++++ .../CarRepairShopView/FormRepairComponent.cs | 71 +++++ .../FormRepairComponent.designer.cs | 121 +++++++++ .../FormRepairComponent.resx | 120 +++++++++ .../CarRepairShopView/FormRepairs.Designer.cs | 122 +++++++++ .../CarRepairShopView/FormRepairs.cs | 104 ++++++++ .../CarRepairShopView/FormRepairs.resx | 60 +++++ CarRepairShop/CarRepairShopView/Program.cs | 39 ++- 60 files changed, 3874 insertions(+), 51 deletions(-) create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ComponentLogic.cs create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/RepairLogic.cs create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/ComponentBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/OrderBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/RepairBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IComponentLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IOrderLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IRepairLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj create mode 100644 CarRepairShop/CarRepairShopContracts/SearchModels/ComponentSearchModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/SearchModels/OrderSearchModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/SearchModels/RepairSearchModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/StoragesContracts/IComponentStorage.cs create mode 100644 CarRepairShop/CarRepairShopContracts/StoragesContracts/IOrderStorage.cs create mode 100644 CarRepairShop/CarRepairShopContracts/StoragesContracts/IRepairStorage.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/CarRepairShopDataModels.csproj create mode 100644 CarRepairShop/CarRepairShopDataModels/Enums/OrderStatus.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/IId.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/Models/IComponentModel.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/Models/IOrderModel.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/Models/IRepairModel.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj create mode 100644 CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Implements/ComponentStorage.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Implements/RepairStorage.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Models/Component.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Models/Order.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Models/Repair.cs delete mode 100644 CarRepairShop/CarRepairShopView/Form1.Designer.cs delete mode 100644 CarRepairShop/CarRepairShopView/Form1.cs create mode 100644 CarRepairShop/CarRepairShopView/FormComponent.cs create mode 100644 CarRepairShop/CarRepairShopView/FormComponent.designer.cs rename CarRepairShop/CarRepairShopView/{Form1.resx => FormComponent.resx} (100%) create mode 100644 CarRepairShop/CarRepairShopView/FormComponents.cs create mode 100644 CarRepairShop/CarRepairShopView/FormComponents.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormComponents.resx create mode 100644 CarRepairShop/CarRepairShopView/FormCreateOrder.cs create mode 100644 CarRepairShop/CarRepairShopView/FormCreateOrder.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormCreateOrder.resx create mode 100644 CarRepairShop/CarRepairShopView/FormMain.cs create mode 100644 CarRepairShop/CarRepairShopView/FormMain.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormMain.resx create mode 100644 CarRepairShop/CarRepairShopView/FormRepair.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepair.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepair.resx create mode 100644 CarRepairShop/CarRepairShopView/FormRepairComponent.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepairComponent.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepairComponent.resx create mode 100644 CarRepairShop/CarRepairShopView/FormRepairs.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepairs.cs create mode 100644 CarRepairShop/CarRepairShopView/FormRepairs.resx diff --git a/CarRepairShop/CarRepairShop.sln b/CarRepairShop/CarRepairShop.sln index d1c2adb..ee98bf9 100644 --- a/CarRepairShop/CarRepairShop.sln +++ b/CarRepairShop/CarRepairShop.sln @@ -3,7 +3,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.8.34525.116 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopView", "CarRepairShopView\CarRepairShopView.csproj", "{C6C94E0D-0F2B-4C14-93F0-8AF368D775D6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopView", "CarRepairShopView\CarRepairShopView.csproj", "{C6C94E0D-0F2B-4C14-93F0-8AF368D775D6}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopDataModels", "CarRepairShopDataModels\CarRepairShopDataModels.csproj", "{F5D7CE87-99D4-4562-88E6-638EED0FDB0A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopContracts", "CarRepairShopContracts\CarRepairShopContracts.csproj", "{C83B0980-6FA6-4D62-86C3-74ABE84371BB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopListImplement", "CarRepairShopListImplement\CarRepairShopListImplement.csproj", "{440AE3B9-56C4-485F-B812-B87FF66196FD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopBusinessLogic", "CarRepairShopBusinessLogic\CarRepairShopBusinessLogic.csproj", "{C70C353D-7793-48BF-8A8F-28AE3F15424B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +23,22 @@ Global {C6C94E0D-0F2B-4C14-93F0-8AF368D775D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {C6C94E0D-0F2B-4C14-93F0-8AF368D775D6}.Release|Any CPU.ActiveCfg = Release|Any CPU {C6C94E0D-0F2B-4C14-93F0-8AF368D775D6}.Release|Any CPU.Build.0 = Release|Any CPU + {F5D7CE87-99D4-4562-88E6-638EED0FDB0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5D7CE87-99D4-4562-88E6-638EED0FDB0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5D7CE87-99D4-4562-88E6-638EED0FDB0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5D7CE87-99D4-4562-88E6-638EED0FDB0A}.Release|Any CPU.Build.0 = Release|Any CPU + {C83B0980-6FA6-4D62-86C3-74ABE84371BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C83B0980-6FA6-4D62-86C3-74ABE84371BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C83B0980-6FA6-4D62-86C3-74ABE84371BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C83B0980-6FA6-4D62-86C3-74ABE84371BB}.Release|Any CPU.Build.0 = Release|Any CPU + {440AE3B9-56C4-485F-B812-B87FF66196FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {440AE3B9-56C4-485F-B812-B87FF66196FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {440AE3B9-56C4-485F-B812-B87FF66196FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {440AE3B9-56C4-485F-B812-B87FF66196FD}.Release|Any CPU.Build.0 = Release|Any CPU + {C70C353D-7793-48BF-8A8F-28AE3F15424B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C70C353D-7793-48BF-8A8F-28AE3F15424B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C70C353D-7793-48BF-8A8F-28AE3F15424B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C70C353D-7793-48BF-8A8F-28AE3F15424B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ComponentLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ComponentLogic.cs new file mode 100644 index 0000000..a7a1ed2 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ComponentLogic.cs @@ -0,0 +1,115 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopBusinessLogic.BusinessLogics +{ + public class ComponentLogic : IComponentLogic + { + private readonly ILogger _logger; + + private readonly IComponentStorage _componentStorage; + + public ComponentLogic(ILogger logger, IComponentStorage componentStorage) + { + _logger = logger; + _componentStorage = componentStorage; + } + + public List? ReadList(ComponentSearchModel? model) + { + _logger.LogInformation("ReadList. ComponentName: {ComponentName}. Id: {Id}", model?.ComponentName, model?.Id); + var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public ComponentViewModel? ReadElement(ComponentSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ComponentName: {ComponentName}. Id: {Id}", model.ComponentName, model.Id); + var element = _componentStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id: {Id}", element.Id); + return element; + } + + public bool Create(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ComponentBindingModel model) + { + CheckModel(model); + if (_componentStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(ComponentBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_componentStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ComponentBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ComponentName)) + { + throw new ArgumentNullException("Нет названия компонента", nameof(model.ComponentName)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("Component. ComponentName: {ComponentName}. Cost: {Cost}. Id: {Id}", model.ComponentName, model.Cost, model.Id); + var element = _componentStorage.GetElement(new ComponentSearchModel + { + ComponentName = model.ComponentName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs new file mode 100644 index 0000000..5253fc5 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -0,0 +1,129 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Enums; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopBusinessLogic.BusinessLogics +{ + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + + private readonly IOrderStorage _orderStorage; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage) + { + _logger = logger; + _orderStorage = orderStorage; + } + + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); + if (model.Status != OrderStatus.Неизвестен) + { + _logger.LogWarning("Invalid order status"); + return false; + } + model.Status = OrderStatus.Принят; + if (_orderStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("ReadList. OrderId: {Id}.", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Выполняется); + } + + public bool FinishOrder(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Выдан); + } + + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.RepairId <= 0) + { + throw new ArgumentNullException("Некорректный идентификатор ремонта", nameof(model.RepairId)); + } + if (model.Count <= 0) + { + throw new ArgumentNullException("В заказе должен быть хотя бы один ремонт", nameof(model.Count)); + } + if (model.Sum <= 0) + { + throw new ArgumentNullException("Стоимость заказа должна быть больше 0", nameof(model.Sum)); + } + _logger.LogInformation("Order. Id: {Id}. Sum: {Sum}. CarRepairId: {CarRepairId}. CarRepairCount: {Count}", model.Id, model.Sum, + model.RepairId, model.Count); + } + + private bool ChangeStatus(OrderBindingModel model, OrderStatus newStatus) + { + CheckModel(model, false); + var order = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id } ); + if (order == null) + { + _logger.LogWarning("Change status operation failed. Order not found"); + return false; + } + if (order.Status + 1 != newStatus) + { + _logger.LogWarning("Change status operation failed. Incorrect new status: {newStatus}. Current status: {currStatus}", + newStatus, order.Status); + return false; + } + model.RepairId = order.RepairId; + model.Count = order.Count; + model.Sum = order.Sum; + model.DateCreate = order.DateCreate; + model.Status = newStatus; + if (model.Status == OrderStatus.Готов) + { + model.DateImplement = DateTime.Now; + } else + { + model.DateImplement = order.DateImplement; + } + if (_orderStorage.Update(model) == null) + { + _logger.LogWarning("Change status operation failed"); + return false; + } + return true; + } + } +} diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/RepairLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/RepairLogic.cs new file mode 100644 index 0000000..73fb451 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/RepairLogic.cs @@ -0,0 +1,119 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopBusinessLogic.BusinessLogics +{ + public class RepairLogic : IRepairLogic + { + private readonly ILogger _logger; + + private readonly IRepairStorage _repairStorage; + + public RepairLogic(ILogger logger, IRepairStorage repairStorage) + { + _logger = logger; + _repairStorage = repairStorage; + } + + public List? ReadList(RepairSearchModel? model) + { + _logger.LogInformation("ReadList. CarRepairName: {CarRepairName}. Id: {Id}", model?.RepairName, model?.Id); + var list = model == null ? _repairStorage.GetFullList() : _repairStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public RepairViewModel? ReadElement(RepairSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. CarRepairName: {CarRepairName}. Id: {Id}", model.RepairName, model.Id); + var element = _repairStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id: {Id}", element.Id); + return element; + } + + public bool Create(RepairBindingModel model) + { + CheckModel(model); + if (_repairStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(RepairBindingModel model) + { + CheckModel(model); + if (_repairStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(RepairBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_repairStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(RepairBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.RepairName)) + { + throw new ArgumentNullException("Нет названия ремонта", nameof(model.RepairName)); + } + if (model.Price <= 0) + { + throw new ArgumentNullException("Цена ремонта должна быть больше 0", nameof(model.Price)); + } + if (model.RepairComponents == null || model.RepairComponents.Count == 0) + { + throw new ArgumentNullException("Ремонт должнен состоять хотя бы из одного компонента"); + } + _logger.LogInformation("CarRepair. CarRepairName: {CarRepairName}. Price: {Price}. Id: {Id}", model.RepairName, model.Price, model.Id); + var element = _repairStorage.GetElement(new RepairSearchModel + { + RepairName = model.RepairName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Ремонт с таким названием уже есть"); + } + } + } +} diff --git a/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj b/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj new file mode 100644 index 0000000..e5343c6 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/CarRepairShopBusinessLogic.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + enable + + + + + + + + + + + diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/ComponentBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..fa7d9e4 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,16 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.BindingModels +{ + public class ComponentBindingModel : IComponentModel + { + public int Id { get; set; } + public string ComponentName { get; set; } = string.Empty; + public double Cost { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/OrderBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/OrderBindingModel.cs new file mode 100644 index 0000000..314d4ab --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/OrderBindingModel.cs @@ -0,0 +1,21 @@ +using CarRepairShopDataModels.Enums; +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.BindingModels +{ + public class OrderBindingModel : IOrderModel + { + public int Id { get; set; } + public int RepairId { get; set; } + public int Count { get; set; } + public double Sum { get; set; } + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; set; } = DateTime.Now; + public DateTime? DateImplement { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/RepairBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/RepairBindingModel.cs new file mode 100644 index 0000000..0615d49 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/RepairBindingModel.cs @@ -0,0 +1,22 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.BindingModels +{ + public class RepairBindingModel : IRepairModel + { + public int Id { get; set; } + public string RepairName { get; set; } = string.Empty; + public double Price { get; set; } + public Dictionary RepairComponents + { + get; + set; + } = new(); + } + +} diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IComponentLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IComponentLogic.cs new file mode 100644 index 0000000..2d69041 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IComponentLogic.cs @@ -0,0 +1,19 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.BusinessLogicsContracts +{ + public interface IComponentLogic + { + List? ReadList(ComponentSearchModel? model); + + ComponentViewModel? ReadElement(ComponentSearchModel model); + + bool Create(ComponentBindingModel model); + + bool Update(ComponentBindingModel model); + + bool Delete(ComponentBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IOrderLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IOrderLogic.cs new file mode 100644 index 0000000..0129f06 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -0,0 +1,19 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.BusinessLogicsContracts +{ + public interface IOrderLogic + { + List? ReadList(OrderSearchModel? model); + + bool CreateOrder(OrderBindingModel model); + + bool TakeOrderInWork(OrderBindingModel model); + + bool FinishOrder(OrderBindingModel model); + + bool DeliveryOrder(OrderBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IRepairLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IRepairLogic.cs new file mode 100644 index 0000000..c209cc3 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IRepairLogic.cs @@ -0,0 +1,19 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.BusinessLogicsContracts +{ + public interface IRepairLogic + { + List? ReadList(RepairSearchModel? model); + + RepairViewModel? ReadElement(RepairSearchModel model); + + bool Create(RepairBindingModel model); + + bool Update(RepairBindingModel model); + + bool Delete(RepairBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj b/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj new file mode 100644 index 0000000..8991a06 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/CarRepairShopContracts.csproj @@ -0,0 +1,13 @@ + + + + net8.0 + enable + enable + + + + + + + diff --git a/CarRepairShop/CarRepairShopContracts/SearchModels/ComponentSearchModel.cs b/CarRepairShop/CarRepairShopContracts/SearchModels/ComponentSearchModel.cs new file mode 100644 index 0000000..cc8f8bc --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/SearchModels/ComponentSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.SearchModels +{ + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } + } + +} diff --git a/CarRepairShop/CarRepairShopContracts/SearchModels/OrderSearchModel.cs b/CarRepairShop/CarRepairShopContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..1344f19 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/SearchModels/RepairSearchModel.cs b/CarRepairShop/CarRepairShopContracts/SearchModels/RepairSearchModel.cs new file mode 100644 index 0000000..2fb681c --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/SearchModels/RepairSearchModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.SearchModels +{ + public class RepairSearchModel + { + public int? Id { get; set; } + public string? RepairName { get; set; } + } + +} diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IComponentStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IComponentStorage.cs new file mode 100644 index 0000000..d3116a8 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IComponentStorage.cs @@ -0,0 +1,21 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.StoragesContracts +{ + public interface IComponentStorage + { + List GetFullList(); + + List GetFilteredList(ComponentSearchModel model); + + ComponentViewModel? GetElement(ComponentSearchModel model); + + ComponentViewModel? Insert(ComponentBindingModel model); + + ComponentViewModel? Update(ComponentBindingModel model); + + ComponentViewModel? Delete(ComponentBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IOrderStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IOrderStorage.cs new file mode 100644 index 0000000..fc47179 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IOrderStorage.cs @@ -0,0 +1,21 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.StoragesContracts +{ + public interface IOrderStorage + { + List GetFullList(); + + List GetFilteredList(OrderSearchModel model); + + OrderViewModel? GetElement(OrderSearchModel model); + + OrderViewModel? Insert(OrderBindingModel model); + + OrderViewModel? Update(OrderBindingModel model); + + OrderViewModel? Delete(OrderBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IRepairStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IRepairStorage.cs new file mode 100644 index 0000000..619939d --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IRepairStorage.cs @@ -0,0 +1,21 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.StoragesContracts +{ + public interface IRepairStorage + { + List GetFullList(); + + List GetFilteredList(RepairSearchModel model); + + RepairViewModel? GetElement(RepairSearchModel model); + + RepairViewModel? Insert(RepairBindingModel model); + + RepairViewModel? Update(RepairBindingModel model); + + RepairViewModel? Delete(RepairBindingModel model); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs new file mode 100644 index 0000000..031993c --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ComponentViewModel.cs @@ -0,0 +1,20 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.ViewModels +{ + public class ComponentViewModel : IComponentModel + { + public int Id { get; set; } + [DisplayName("Название компонента")] + public string ComponentName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Cost { get; set; } + } + +} diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs new file mode 100644 index 0000000..5e39739 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/OrderViewModel.cs @@ -0,0 +1,30 @@ +using CarRepairShopDataModels.Enums; +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.ViewModels +{ + public class OrderViewModel : IOrderModel + { + [DisplayName("Номер")] + public int Id { get; set; } + public int RepairId { get; set; } + [DisplayName("Ремонт")] + public string RepairName { get; set; } = string.Empty; + [DisplayName("Количество")] + public int Count { get; set; } + [DisplayName("Сумма")] + public double Sum { get; set; } + [DisplayName("Статус")] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } = DateTime.Now; + [DisplayName("Дата выполнения")] + public DateTime? DateImplement { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs new file mode 100644 index 0000000..42e4553 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/RepairViewModel.cs @@ -0,0 +1,25 @@ +using CarRepairShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopContracts.ViewModels +{ + public class RepairViewModel : IRepairModel + { + public int Id { get; set; } + [DisplayName("Название ремонта")] + public string RepairName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Price { get; set; } + public Dictionary RepairComponents + { + get; + set; + } = new(); + } + +} diff --git a/CarRepairShop/CarRepairShopDataModels/CarRepairShopDataModels.csproj b/CarRepairShop/CarRepairShopDataModels/CarRepairShopDataModels.csproj new file mode 100644 index 0000000..fa71b7a --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/CarRepairShopDataModels.csproj @@ -0,0 +1,9 @@ + + + + net8.0 + enable + enable + + + diff --git a/CarRepairShop/CarRepairShopDataModels/Enums/OrderStatus.cs b/CarRepairShop/CarRepairShopDataModels/Enums/OrderStatus.cs new file mode 100644 index 0000000..fce8e78 --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Enums/OrderStatus.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels.Enums +{ + public enum OrderStatus + { + Неизвестен = -1, + Принят = 0, + Выполняется = 1, + Готов = 2, + Выдан = 3 + } +} diff --git a/CarRepairShop/CarRepairShopDataModels/IId.cs b/CarRepairShop/CarRepairShopDataModels/IId.cs new file mode 100644 index 0000000..0276204 --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/CarRepairShop/CarRepairShopDataModels/Models/IComponentModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..e097829 --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Models/IComponentModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + } +} diff --git a/CarRepairShop/CarRepairShopDataModels/Models/IOrderModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IOrderModel.cs new file mode 100644 index 0000000..b7ccdba --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Models/IOrderModel.cs @@ -0,0 +1,19 @@ +using CarRepairShopDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels.Models +{ + public interface IOrderModel : IId + { + int RepairId { get; } + int Count { get; } + double Sum { get; } + OrderStatus Status { get; } + DateTime DateCreate { get; } + DateTime? DateImplement { get; } + } +} diff --git a/CarRepairShop/CarRepairShopDataModels/Models/IRepairModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IRepairModel.cs new file mode 100644 index 0000000..9326efe --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Models/IRepairModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CarRepairShopDataModels.Models +{ + public interface IRepairModel : IId + { + string RepairName { get; } + double Price { get; } + Dictionary RepairComponents { get; } + } +} diff --git a/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj b/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj new file mode 100644 index 0000000..71cdd60 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/CarRepairShopListImplement.csproj @@ -0,0 +1,14 @@ + + + + net8.0 + enable + enable + + + + + + + + diff --git a/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs new file mode 100644 index 0000000..b943306 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs @@ -0,0 +1,31 @@ +using CarRepairShopListImplement.Models; + +namespace CarRepairShopListImplement +{ + public class DataListSingleton + { + private static DataListSingleton? _instance; + + public List Components { get; set; } + + public List Orders { get; set; } + + public List Repairs { get; set; } + + private DataListSingleton() + { + Components = new List(); + Orders = new List(); + Repairs = new List(); + } + + public static DataListSingleton GetInstance() + { + if (_instance == null) + { + _instance = new DataListSingleton(); + } + return _instance; + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/ComponentStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..2a33973 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/ComponentStorage.cs @@ -0,0 +1,109 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopListImplement.Models; + +namespace CarRepairShopListImplement.Implements +{ + public class ComponentStorage : IComponentStorage + { + private readonly DataListSingleton _source; + + public ComponentStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var component in _source.Components) + { + result.Add(component.GetViewModel); + } + return result; + } + + public List GetFilteredList(ComponentSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ComponentName)) + { + return result; + } + foreach (var component in _source.Components) + { + if (component.ComponentName.Contains(model.ComponentName)) + { + result.Add(component.GetViewModel); + } + } + return result; + } + + public ComponentViewModel? GetElement(ComponentSearchModel model) + { + if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) + { + return null; + } + foreach (var component in _source.Components) + { + if ((!string.IsNullOrEmpty(model.ComponentName) && + component.ComponentName == model.ComponentName) || + (model.Id.HasValue && component.Id == model.Id)) + { + return component.GetViewModel; + } + } + return null; + } + + public ComponentViewModel? Insert(ComponentBindingModel model) + { + model.Id = 1; + foreach (var component in _source.Components) + { + if (model.Id <= component.Id) + { + model.Id = component.Id + 1; + } + } + var newComponent = Component.Create(model); + if (newComponent == null) + { + return null; + } + _source.Components.Add(newComponent); + return newComponent.GetViewModel; + } + + public ComponentViewModel? Update(ComponentBindingModel model) + { + foreach (var component in _source.Components) + { + if (component.Id == model.Id) + { + component.Update(model); + return component.GetViewModel; + } + } + return null; + } + + public ComponentViewModel? Delete(ComponentBindingModel model) + { + for (int i = 0; i < _source.Components.Count; ++i) + { + if (_source.Components[i].Id == model.Id) + { + var element = _source.Components[i]; + _source.Components.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..91317a8 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/OrderStorage.cs @@ -0,0 +1,117 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopListImplement.Models; + +namespace CarRepairShopListImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataListSingleton _source; + + public OrderStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var order in _source.Orders) + { + result.Add(AddRepairName(order.GetViewModel)); + } + return result; + } + + public List GetFilteredList(OrderSearchModel model) + { + var result = new List(); + if (!model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AddRepairName(order.GetViewModel)); + } + } + return result; + } + + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + return AddRepairName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Insert(OrderBindingModel model) + { + model.Id = 1; + foreach (var order in _source.Orders) + { + if (model.Id <= order.Id) + { + model.Id = order.Id + 1; + } + } + var newOrder = Order.Create(model); + if (newOrder == null) + { + return null; + } + _source.Orders.Add(newOrder); + return AddRepairName(newOrder.GetViewModel); + } + + public OrderViewModel? Update(OrderBindingModel model) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + order.Update(model); + return AddRepairName(order.GetViewModel); + } + } + return null; + } + + public OrderViewModel? Delete(OrderBindingModel model) + { + for (int i = 0; i < _source.Orders.Count; ++i) + { + if (_source.Orders[i].Id == model.Id) + { + var element = _source.Orders[i]; + _source.Orders.RemoveAt(i); + return AddRepairName(element.GetViewModel); + } + } + return null; + } + + private OrderViewModel AddRepairName(OrderViewModel model) + { + var selectedRepair = _source.Repairs.Find(Repair => Repair.Id == model.RepairId); + if (selectedRepair != null) + { + model.RepairName = selectedRepair.RepairName; + } + return model; + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/RepairStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/RepairStorage.cs new file mode 100644 index 0000000..49fe6ad --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/RepairStorage.cs @@ -0,0 +1,109 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopListImplement.Models; + +namespace CarRepairShopListImplement.Implements +{ + public class RepairStorage : IRepairStorage + { + private readonly DataListSingleton _source; + + public RepairStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var Repair in _source.Repairs) + { + result.Add(Repair.GetViewModel); + } + return result; + } + + public List GetFilteredList(RepairSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.RepairName)) + { + return result; + } + foreach (var Repair in _source.Repairs) + { + if (Repair.RepairName.Contains(model.RepairName)) + { + result.Add(Repair.GetViewModel); + } + } + return result; + } + + public RepairViewModel? GetElement(RepairSearchModel model) + { + if (string.IsNullOrEmpty(model.RepairName) && !model.Id.HasValue) + { + return null; + } + foreach (var Repair in _source.Repairs) + { + if ((!string.IsNullOrEmpty(model.RepairName) && + Repair.RepairName == model.RepairName) || + (model.Id.HasValue && Repair.Id == model.Id)) + { + return Repair.GetViewModel; + } + } + return null; + } + + public RepairViewModel? Insert(RepairBindingModel model) + { + model.Id = 1; + foreach (var Repair in _source.Repairs) + { + if (model.Id <= Repair.Id) + { + model.Id = Repair.Id + 1; + } + } + var newRepair = Repair.Create(model); + if (newRepair == null) + { + return null; + } + _source.Repairs.Add(newRepair); + return newRepair.GetViewModel; + } + + public RepairViewModel? Update(RepairBindingModel model) + { + foreach (var Repair in _source.Repairs) + { + if (Repair.Id == model.Id) + { + Repair.Update(model); + return Repair.GetViewModel; + } + } + return null; + } + + public RepairViewModel? Delete(RepairBindingModel model) + { + for (int i = 0; i < _source.Repairs.Count; ++i) + { + if (_source.Repairs[i].Id == model.Id) + { + var element = _source.Repairs[i]; + _source.Repairs.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Models/Component.cs b/CarRepairShop/CarRepairShopListImplement/Models/Component.cs new file mode 100644 index 0000000..ea665ae --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Models/Component.cs @@ -0,0 +1,46 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; + +namespace CarRepairShopListImplement.Models +{ + public class Component : IComponentModel + { + public int Id { get; private set; } + + public string ComponentName { get; private set; } = string.Empty; + + public double Cost { get; set; } + + public static Component? Create(ComponentBindingModel? model) + { + if (model == null) + { + return null; + } + return new Component() + { + Id = model.Id, + ComponentName = model.ComponentName, + Cost = model.Cost + }; + } + + public void Update(ComponentBindingModel? model) + { + if (model == null) + { + return; + } + ComponentName = model.ComponentName; + Cost = model.Cost; + } + + public ComponentViewModel GetViewModel => new() + { + Id = Id, + ComponentName = ComponentName, + Cost = Cost + }; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Models/Order.cs b/CarRepairShop/CarRepairShopListImplement/Models/Order.cs new file mode 100644 index 0000000..4bed167 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Models/Order.cs @@ -0,0 +1,63 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using CarRepairShopDataModels.Enums; + +namespace CarRepairShopListImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + + public int RepairId { get; private set; } + + public int Count { get; private set; } + + public double Sum { get; private set; } + + public OrderStatus Status { get; private set; } + + public DateTime DateCreate { get; private set; } + + public DateTime? DateImplement { get; private set; } + + public static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + RepairId = model.RepairId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement + }; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + RepairId = RepairId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Models/Repair.cs b/CarRepairShop/CarRepairShopListImplement/Models/Repair.cs new file mode 100644 index 0000000..a118524 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Models/Repair.cs @@ -0,0 +1,55 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; + +namespace CarRepairShopListImplement.Models +{ + public class Repair : IRepairModel + { + public int Id { get; private set; } + + public string RepairName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public Dictionary RepairComponents + { + get; + private set; + } = new Dictionary(); + + public static Repair? Create(RepairBindingModel? model) + { + if (model == null) + { + return null; + } + return new Repair() + { + Id = model.Id, + RepairName = model.RepairName, + Price = model.Price, + RepairComponents = model.RepairComponents + }; + } + + public void Update(RepairBindingModel? model) + { + if (model == null) + { + return; + } + RepairName = model.RepairName; + Price = model.Price; + RepairComponents = model.RepairComponents; + } + + public RepairViewModel GetViewModel => new() + { + Id = Id, + RepairName = RepairName, + Price = Price, + RepairComponents = RepairComponents + }; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj index 663fdb8..f14be73 100644 --- a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj +++ b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj @@ -8,4 +8,15 @@ enable + + + + + + + + + + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/Form1.Designer.cs b/CarRepairShop/CarRepairShopView/Form1.Designer.cs deleted file mode 100644 index bc86da5..0000000 --- a/CarRepairShop/CarRepairShopView/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace CarRepairShopView -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} diff --git a/CarRepairShop/CarRepairShopView/Form1.cs b/CarRepairShop/CarRepairShopView/Form1.cs deleted file mode 100644 index aa5a4e0..0000000 --- a/CarRepairShop/CarRepairShopView/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace CarRepairShopView -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/CarRepairShop/CarRepairShopView/FormComponent.cs b/CarRepairShop/CarRepairShopView/FormComponent.cs new file mode 100644 index 0000000..9e6a621 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormComponent.cs @@ -0,0 +1,85 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormComponent : Form + { + private readonly ILogger _logger; + + private readonly IComponentLogic _logic; + + private int? _id; + + public int Id { set { _id = value; } } + + public FormComponent(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponent_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение компонента"); + var view = _logic.ReadElement(new ComponentSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxName.Text = view.ComponentName; + textBoxCost.Text = view.Cost.ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение компонента"); + try + { + var model = new ComponentBindingModel + { + Id = _id ?? 0, + ComponentName = textBoxName.Text, + Cost = Convert.ToDouble(textBoxCost.Text) + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormComponent.designer.cs b/CarRepairShop/CarRepairShopView/FormComponent.designer.cs new file mode 100644 index 0000000..f42929d --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormComponent.designer.cs @@ -0,0 +1,127 @@ +namespace CarRepairShopView +{ + partial class FormComponent + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.labelName = new System.Windows.Forms.Label(); + this.textBoxCost = new System.Windows.Forms.TextBox(); + this.labelCost = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(257, 71); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(88, 27); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(162, 71); + this.buttonSave.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(88, 27); + this.buttonSave.TabIndex = 4; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(91, 7); + this.textBoxName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(252, 23); + this.textBoxName.TabIndex = 1; + // + // labelName + // + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(14, 10); + this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(62, 15); + this.labelName.TabIndex = 0; + this.labelName.Text = "Название:"; + // + // textBoxCost + // + this.textBoxCost.Location = new System.Drawing.Point(91, 36); + this.textBoxCost.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxCost.Name = "textBoxCost"; + this.textBoxCost.Size = new System.Drawing.Size(129, 23); + this.textBoxCost.TabIndex = 3; + // + // labelCost + // + this.labelCost.AutoSize = true; + this.labelCost.Location = new System.Drawing.Point(14, 39); + this.labelCost.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelCost.Name = "labelCost"; + this.labelCost.Size = new System.Drawing.Size(38, 15); + this.labelCost.TabIndex = 2; + this.labelCost.Text = "Цена:"; + // + // FormComponent + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(360, 110); + this.Controls.Add(this.textBoxCost); + this.Controls.Add(this.labelCost); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelName); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Name = "FormComponent"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Компонент"; + this.Load += new System.EventHandler(this.FormComponent_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.TextBox textBoxName; + private System.Windows.Forms.Label labelName; + private TextBox textBoxCost; + private Label labelCost; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/Form1.resx b/CarRepairShop/CarRepairShopView/FormComponent.resx similarity index 100% rename from CarRepairShop/CarRepairShopView/Form1.resx rename to CarRepairShop/CarRepairShopView/FormComponent.resx diff --git a/CarRepairShop/CarRepairShopView/FormComponents.cs b/CarRepairShop/CarRepairShopView/FormComponents.cs new file mode 100644 index 0000000..dda9549 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormComponents.cs @@ -0,0 +1,103 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormComponents : Form + { + private readonly ILogger _logger; + + private readonly IComponentLogic _logic; + + public FormComponents(ILogger logger, IComponentLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormComponents_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка компонентов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонентов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + if (service is FormComponent form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление компонента"); + try + { + if (!_logic.Delete(new ComponentBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления компонента"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormComponents.designer.cs b/CarRepairShop/CarRepairShopView/FormComponents.designer.cs new file mode 100644 index 0000000..1a61a8b --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormComponents.designer.cs @@ -0,0 +1,122 @@ +namespace CarRepairShopView +{ + partial class FormComponents + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(370, 132); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(75, 23); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(370, 91); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(75, 23); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(370, 50); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(75, 23); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(370, 12); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(350, 312); + this.dataGridView.TabIndex = 0; + // + // FormComponents + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(464, 312); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonDel); + this.Controls.Add(this.buttonUpd); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormComponents"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Компоненты"; + this.Load += new System.EventHandler(this.FormComponents_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button buttonRef; + private System.Windows.Forms.Button buttonDel; + private System.Windows.Forms.Button buttonUpd; + private System.Windows.Forms.Button buttonAdd; + private System.Windows.Forms.DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormComponents.resx b/CarRepairShop/CarRepairShopView/FormComponents.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormComponents.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormCreateOrder.cs b/CarRepairShop/CarRepairShopView/FormCreateOrder.cs new file mode 100644 index 0000000..8c4fff6 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormCreateOrder.cs @@ -0,0 +1,117 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormCreateOrder : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logicR; + + private readonly IOrderLogic _logicO; + + public FormCreateOrder(ILogger logger, IRepairLogic logicR, IOrderLogic logicO) + { + InitializeComponent(); + _logger = logger; + _logicR = logicR; + _logicO = logicO; + } + + private void FormCreateOrder_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка ремонтов для заказа"); + try + { + var repairList = _logicR.ReadList(null); + if (repairList != null) + { + comboBoxRepair.DisplayMember = "RepairName"; + comboBoxRepair.ValueMember = "Id"; + comboBoxRepair.DataSource = repairList; + comboBoxRepair.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонтов для заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void CalcSum() + { + if (comboBoxRepair.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + { + try + { + int id = Convert.ToInt32(comboBoxRepair.SelectedValue); + var Repair = _logicR.ReadElement(new RepairSearchModel { Id = id }); + int count = Convert.ToInt32(textBoxCount.Text); + textBoxSum.Text = Math.Round(count * (Repair?.Price ?? 0), 2).ToString(); + _logger.LogInformation("Расчет суммы заказа"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка расчета суммы заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void TextBoxCount_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void ComboBoxRepair_SelectedIndexChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxRepair.SelectedValue == null) + { + MessageBox.Show("Выберите ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Создание заказа"); + try + { + var operationResult = _logicO.CreateOrder(new OrderBindingModel + { + RepairId = Convert.ToInt32(comboBoxRepair.SelectedValue), + Count = Convert.ToInt32(textBoxCount.Text), + Sum = Convert.ToDouble(textBoxSum.Text) + }); + if (!operationResult) + { + throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormCreateOrder.designer.cs b/CarRepairShop/CarRepairShopView/FormCreateOrder.designer.cs new file mode 100644 index 0000000..4da6195 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormCreateOrder.designer.cs @@ -0,0 +1,155 @@ +namespace CarRepairShopView +{ + partial class FormCreateOrder + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.labelCount = new System.Windows.Forms.Label(); + this.comboBoxRepair = new System.Windows.Forms.ComboBox(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.labelRepair = new System.Windows.Forms.Label(); + this.labelSum = new System.Windows.Forms.Label(); + this.textBoxSum = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(14, 42); + this.labelCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(75, 15); + this.labelCount.TabIndex = 2; + this.labelCount.Text = "Количество:"; + // + // comboBoxRepair + // + this.comboBoxRepair.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxRepair.FormattingEnabled = true; + this.comboBoxRepair.Location = new System.Drawing.Point(102, 7); + this.comboBoxRepair.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.comboBoxRepair.Name = "comboBoxRepair"; + this.comboBoxRepair.Size = new System.Drawing.Size(252, 23); + this.comboBoxRepair.TabIndex = 1; + this.comboBoxRepair.SelectedIndexChanged += new System.EventHandler(this.ComboBoxRepair_SelectedIndexChanged); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(255, 98); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(88, 27); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(161, 98); + this.buttonSave.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(88, 27); + this.buttonSave.TabIndex = 6; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(102, 38); + this.textBoxCount.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(252, 23); + this.textBoxCount.TabIndex = 3; + this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); + // + // labelRepair + // + this.labelRepair.AutoSize = true; + this.labelRepair.Location = new System.Drawing.Point(14, 10); + this.labelRepair.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelRepair.Name = "labelRepair"; + this.labelRepair.Size = new System.Drawing.Size(51, 15); + this.labelRepair.TabIndex = 0; + this.labelRepair.Text = "Ремонт:"; + // + // labelSum + // + this.labelSum.AutoSize = true; + this.labelSum.Location = new System.Drawing.Point(14, 72); + this.labelSum.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelSum.Name = "labelSum"; + this.labelSum.Size = new System.Drawing.Size(48, 15); + this.labelSum.TabIndex = 4; + this.labelSum.Text = "Сумма:"; + // + // textBoxSum + // + this.textBoxSum.Location = new System.Drawing.Point(102, 68); + this.textBoxSum.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxSum.Name = "textBoxSum"; + this.textBoxSum.ReadOnly = true; + this.textBoxSum.Size = new System.Drawing.Size(252, 23); + this.textBoxSum.TabIndex = 5; + // + // FormCreateOrder + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(371, 136); + this.Controls.Add(this.labelSum); + this.Controls.Add(this.textBoxSum); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.comboBoxRepair); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.labelRepair); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Name = "FormCreateOrder"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Заказ"; + this.Load += new System.EventHandler(this.FormCreateOrder_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + private System.Windows.Forms.Label labelCount; + private System.Windows.Forms.ComboBox comboBoxRepair; + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.TextBox textBoxCount; + private System.Windows.Forms.Label labelRepair; + private System.Windows.Forms.Label labelSum; + private System.Windows.Forms.TextBox textBoxSum; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormCreateOrder.resx b/CarRepairShop/CarRepairShopView/FormCreateOrder.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormCreateOrder.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.cs b/CarRepairShop/CarRepairShopView/FormMain.cs new file mode 100644 index 0000000..54b5e20 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMain.cs @@ -0,0 +1,148 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormMain : Form + { + private readonly ILogger _logger; + + private readonly IOrderLogic _orderLogic; + + public FormMain(ILogger logger, IOrderLogic orderLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + } + + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["RepairId"].Visible = false; + dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } + + private void РемонтыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepairs)); + if (service is FormRepairs form) + { + form.ShowDialog(); + } + } + + private void ButtonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } + + private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); + try + { + var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка передачи заказа в работу"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonOrderReady_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + try + { + var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.designer.cs b/CarRepairShop/CarRepairShopView/FormMain.designer.cs new file mode 100644 index 0000000..e6b5aea --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMain.designer.cs @@ -0,0 +1,198 @@ +namespace CarRepairShopView +{ + partial class FormMain + { + /// + /// Обязательная переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором форм Windows + + /// + /// Требуемый метод для поддержки конструктора — не изменяйте + /// содержимое этого метода с помощью редактора кода. + /// + private void InitializeComponent() + { + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ремонтыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.buttonIssuedOrder = new System.Windows.Forms.Button(); + this.buttonOrderReady = new System.Windows.Forms.Button(); + this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); + this.buttonCreateOrder = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonRef = new System.Windows.Forms.Button(); + this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.справочникиToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + this.menuStrip1.Size = new System.Drawing.Size(1031, 24); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "menuStrip1"; + // + // справочникиToolStripMenuItem + // + this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.компонентыToolStripMenuItem, + this.ремонтыToolStripMenuItem}); + this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; + this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); + this.справочникиToolStripMenuItem.Text = "Справочники"; + // + // компонентыToolStripMenuItem + // + this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.компонентыToolStripMenuItem.Text = "Компоненты"; + this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); + // + // ремонтыToolStripMenuItem + // + this.ремонтыToolStripMenuItem.Name = "ремонтыToolStripMenuItem"; + this.ремонтыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.ремонтыToolStripMenuItem.Text = "Ремонты"; + this.ремонтыToolStripMenuItem.Click += new System.EventHandler(this.РемонтыToolStripMenuItem_Click); + // + // buttonIssuedOrder + // + this.buttonIssuedOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonIssuedOrder.Location = new System.Drawing.Point(844, 231); + this.buttonIssuedOrder.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonIssuedOrder.Name = "buttonIssuedOrder"; + this.buttonIssuedOrder.Size = new System.Drawing.Size(174, 27); + this.buttonIssuedOrder.TabIndex = 4; + this.buttonIssuedOrder.Text = "Заказ выдан"; + this.buttonIssuedOrder.UseVisualStyleBackColor = true; + this.buttonIssuedOrder.Click += new System.EventHandler(this.ButtonIssuedOrder_Click); + // + // buttonOrderReady + // + this.buttonOrderReady.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOrderReady.Location = new System.Drawing.Point(844, 171); + this.buttonOrderReady.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonOrderReady.Name = "buttonOrderReady"; + this.buttonOrderReady.Size = new System.Drawing.Size(174, 27); + this.buttonOrderReady.TabIndex = 3; + this.buttonOrderReady.Text = "Заказ готов"; + this.buttonOrderReady.UseVisualStyleBackColor = true; + this.buttonOrderReady.Click += new System.EventHandler(this.ButtonOrderReady_Click); + // + // buttonTakeOrderInWork + // + this.buttonTakeOrderInWork.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonTakeOrderInWork.Location = new System.Drawing.Point(844, 117); + this.buttonTakeOrderInWork.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + this.buttonTakeOrderInWork.Size = new System.Drawing.Size(174, 27); + this.buttonTakeOrderInWork.TabIndex = 2; + this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; + this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; + this.buttonTakeOrderInWork.Click += new System.EventHandler(this.ButtonTakeOrderInWork_Click); + // + // buttonCreateOrder + // + this.buttonCreateOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCreateOrder.Location = new System.Drawing.Point(844, 58); + this.buttonCreateOrder.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonCreateOrder.Name = "buttonCreateOrder"; + this.buttonCreateOrder.Size = new System.Drawing.Size(174, 27); + this.buttonCreateOrder.TabIndex = 1; + this.buttonCreateOrder.Text = "Создать заказ"; + this.buttonCreateOrder.UseVisualStyleBackColor = true; + this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 28); + this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(826, 320); + this.dataGridView.TabIndex = 0; + // + // buttonRef + // + this.buttonRef.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRef.Location = new System.Drawing.Point(844, 290); + this.buttonRef.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(174, 27); + this.buttonRef.TabIndex = 5; + this.buttonRef.Text = "Обновить список"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // FormMain + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(1031, 347); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonIssuedOrder); + this.Controls.Add(this.buttonOrderReady); + this.Controls.Add(this.buttonTakeOrderInWork); + this.Controls.Add(this.buttonCreateOrder); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.menuStrip1); + this.MainMenuStrip = this.menuStrip1; + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Name = "FormMain"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Автомастерская"; + this.Load += new System.EventHandler(this.FormMain_Load); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem справочникиToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem компонентыToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem ремонтыToolStripMenuItem; + private System.Windows.Forms.Button buttonIssuedOrder; + private System.Windows.Forms.Button buttonOrderReady; + private System.Windows.Forms.Button buttonTakeOrderInWork; + private System.Windows.Forms.Button buttonCreateOrder; + private System.Windows.Forms.DataGridView dataGridView; + private System.Windows.Forms.Button buttonRef; + } +} + diff --git a/CarRepairShop/CarRepairShopView/FormMain.resx b/CarRepairShop/CarRepairShopView/FormMain.resx new file mode 100644 index 0000000..228d5dd --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMain.resx @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 161 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepair.cs b/CarRepairShop/CarRepairShopView/FormRepair.cs new file mode 100644 index 0000000..8e665c3 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepair.cs @@ -0,0 +1,208 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormRepair : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logic; + + private int? _id; + + private Dictionary _RepairComponents; + + public int Id { set { _id = value; } } + + public FormRepair(ILogger logger, IRepairLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _RepairComponents = new Dictionary(); + } + + private void FormRepair_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка ремонта"); + try + { + var view = _logic.ReadElement(new RepairSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxName.Text = view.RepairName; + textBoxPrice.Text = view.Price.ToString(); + _RepairComponents = view.RepairComponents ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Загрузка компонент ремонта"); + try + { + if (_RepairComponents != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _RepairComponents) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + } + textBoxPrice.Text = CalcPrice().ToString(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компонент ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + if (service is FormRepairComponent form) + { + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); + if (_RepairComponents.ContainsKey(form.Id)) + { + _RepairComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _RepairComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); + if (service is FormRepairComponent form) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _RepairComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); + _RepairComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + try + { + _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", dataGridView.SelectedRows[0].Cells[1].Value); + _RepairComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + LoadData(); + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPrice.Text)) + { + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (_RepairComponents == null || _RepairComponents.Count == 0) + { + MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение ремонта"); + try + { + var model = new RepairBindingModel + { + Id = _id ?? 0, + RepairName = textBoxName.Text, + Price = Convert.ToDouble(textBoxPrice.Text), + RepairComponents = _RepairComponents + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private double CalcPrice() + { + double price = 0; + foreach (var elem in _RepairComponents) + { + price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); + } + return Math.Round(price * 1.1, 2); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepair.designer.cs b/CarRepairShop/CarRepairShopView/FormRepair.designer.cs new file mode 100644 index 0000000..117bfaa --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepair.designer.cs @@ -0,0 +1,252 @@ +namespace CarRepairShopView +{ + partial class FormRepair + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.labelName = new System.Windows.Forms.Label(); + this.textBoxPrice = new System.Windows.Forms.TextBox(); + this.labelPrice = new System.Windows.Forms.Label(); + this.groupBoxComponents = new System.Windows.Forms.GroupBox(); + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.groupBoxComponents.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(455, 362); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(88, 27); + this.buttonCancel.TabIndex = 6; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(360, 362); + this.buttonSave.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(88, 27); + this.buttonSave.TabIndex = 5; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(92, 7); + this.textBoxName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(252, 23); + this.textBoxName.TabIndex = 1; + // + // labelName + // + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(14, 10); + this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(62, 15); + this.labelName.TabIndex = 0; + this.labelName.Text = "Название:"; + // + // textBoxPrice + // + this.textBoxPrice.Enabled = false; + this.textBoxPrice.Location = new System.Drawing.Point(92, 37); + this.textBoxPrice.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxPrice.Name = "textBoxPrice"; + this.textBoxPrice.Size = new System.Drawing.Size(147, 23); + this.textBoxPrice.TabIndex = 3; + // + // labelPrice + // + this.labelPrice.AutoSize = true; + this.labelPrice.Location = new System.Drawing.Point(14, 40); + this.labelPrice.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.labelPrice.Name = "labelPrice"; + this.labelPrice.Size = new System.Drawing.Size(70, 15); + this.labelPrice.TabIndex = 2; + this.labelPrice.Text = "Стоимость:"; + // + // groupBoxComponents + // + this.groupBoxComponents.Controls.Add(this.buttonRef); + this.groupBoxComponents.Controls.Add(this.buttonDel); + this.groupBoxComponents.Controls.Add(this.buttonUpd); + this.groupBoxComponents.Controls.Add(this.buttonAdd); + this.groupBoxComponents.Controls.Add(this.dataGridView); + this.groupBoxComponents.Location = new System.Drawing.Point(14, 67); + this.groupBoxComponents.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.groupBoxComponents.Name = "groupBoxComponents"; + this.groupBoxComponents.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.groupBoxComponents.Size = new System.Drawing.Size(558, 288); + this.groupBoxComponents.TabIndex = 4; + this.groupBoxComponents.TabStop = false; + this.groupBoxComponents.Text = "Компоненты"; + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(441, 171); + this.buttonRef.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(88, 27); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(441, 123); + this.buttonDel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(88, 27); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(441, 76); + this.buttonUpd.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(88, 27); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(441, 32); + this.buttonAdd.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(88, 27); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnId, + this.ColumnName, + this.ColumnCount}); + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(4, 19); + this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(408, 266); + this.dataGridView.TabIndex = 0; + // + // ColumnId + // + this.ColumnId.HeaderText = "Id"; + this.ColumnId.Name = "ColumnId"; + this.ColumnId.ReadOnly = true; + this.ColumnId.Visible = false; + // + // ColumnName + // + this.ColumnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ColumnName.HeaderText = "Компонент"; + this.ColumnName.Name = "ColumnName"; + this.ColumnName.ReadOnly = true; + // + // ColumnCount + // + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.Name = "ColumnCount"; + this.ColumnCount.ReadOnly = true; + // + // FormRepair + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(586, 402); + this.Controls.Add(this.groupBoxComponents); + this.Controls.Add(this.textBoxPrice); + this.Controls.Add(this.labelPrice); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelName); + this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.Name = "FormRepair"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Ремонт"; + this.Load += new System.EventHandler(this.FormRepair_Load); + this.groupBoxComponents.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.TextBox textBoxName; + private System.Windows.Forms.Label labelName; + private System.Windows.Forms.TextBox textBoxPrice; + private System.Windows.Forms.Label labelPrice; + private System.Windows.Forms.GroupBox groupBoxComponents; + private System.Windows.Forms.Button buttonRef; + private System.Windows.Forms.Button buttonDel; + private System.Windows.Forms.Button buttonUpd; + private System.Windows.Forms.Button buttonAdd; + private System.Windows.Forms.DataGridView dataGridView; + private System.Windows.Forms.DataGridViewTextBoxColumn ColumnId; + private System.Windows.Forms.DataGridViewTextBoxColumn ColumnName; + private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCount; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepair.resx b/CarRepairShop/CarRepairShopView/FormRepair.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepair.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepairComponent.cs b/CarRepairShop/CarRepairShopView/FormRepairComponent.cs new file mode 100644 index 0000000..8caa659 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairComponent.cs @@ -0,0 +1,71 @@ +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; + +namespace CarRepairShopView +{ + public partial class FormRepairComponent : Form + { + private readonly List? _list; + + public int Id { get { return Convert.ToInt32(comboBoxComponent.SelectedValue); } set { comboBoxComponent.SelectedValue = value; } } + + public IComponentModel? ComponentModel + { + get + { + if (_list == null) + { + return null; + } + foreach(var elem in _list) + { + if (elem.Id == Id) + { + return elem; + } + } + return null; + } + } + + public int Count { get { return Convert.ToInt32(textBoxCount.Text); } set { textBoxCount.Text = value.ToString(); } } + + public FormRepairComponent(IComponentLogic logic) + { + InitializeComponent(); + + _list = logic.ReadList(null); + if (_list != null) + { + comboBoxComponent.DisplayMember = "ComponentName"; + comboBoxComponent.ValueMember = "Id"; + comboBoxComponent.DataSource = _list; + comboBoxComponent.SelectedItem = null; + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxComponent.SelectedValue == null) + { + MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + DialogResult = DialogResult.OK; + Close(); + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepairComponent.designer.cs b/CarRepairShop/CarRepairShopView/FormRepairComponent.designer.cs new file mode 100644 index 0000000..548ed0c --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairComponent.designer.cs @@ -0,0 +1,121 @@ +namespace CarRepairShopView +{ + partial class FormRepairComponent + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.labelComponent = new System.Windows.Forms.Label(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.comboBoxComponent = new System.Windows.Forms.ComboBox(); + this.labelCount = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(218, 59); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(137, 59); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 4; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // labelComponent + // + this.labelComponent.AutoSize = true; + this.labelComponent.Location = new System.Drawing.Point(12, 9); + this.labelComponent.Name = "labelComponent"; + this.labelComponent.Size = new System.Drawing.Size(66, 13); + this.labelComponent.TabIndex = 0; + this.labelComponent.Text = "Компонент:"; + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(87, 33); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(217, 20); + this.textBoxCount.TabIndex = 3; + // + // comboBoxComponent + // + this.comboBoxComponent.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxComponent.FormattingEnabled = true; + this.comboBoxComponent.Location = new System.Drawing.Point(87, 6); + this.comboBoxComponent.Name = "comboBoxComponent"; + this.comboBoxComponent.Size = new System.Drawing.Size(217, 21); + this.comboBoxComponent.TabIndex = 1; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(12, 36); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(69, 13); + this.labelCount.TabIndex = 2; + this.labelCount.Text = "Количество:"; + // + // FormRepairComponent + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(320, 96); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.comboBoxComponent); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.labelComponent); + this.Name = "FormRepairComponent"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Компонент ремонта"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonSave; + private System.Windows.Forms.Label labelComponent; + private System.Windows.Forms.TextBox textBoxCount; + private System.Windows.Forms.ComboBox comboBoxComponent; + private System.Windows.Forms.Label labelCount; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepairComponent.resx b/CarRepairShop/CarRepairShopView/FormRepairComponent.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairComponent.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepairs.Designer.cs b/CarRepairShop/CarRepairShopView/FormRepairs.Designer.cs new file mode 100644 index 0000000..5540079 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairs.Designer.cs @@ -0,0 +1,122 @@ +namespace CarRepairShopView +{ + partial class FormRepairs + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(370, 132); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(75, 23); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(370, 91); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(75, 23); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(370, 50); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(75, 23); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(370, 12); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(350, 312); + this.dataGridView.TabIndex = 0; + // + // FormRepairs + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(464, 312); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonDel); + this.Controls.Add(this.buttonUpd); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormRepairs"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "Ремонты"; + this.Load += new System.EventHandler(this.FormRepairs_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button buttonRef; + private System.Windows.Forms.Button buttonDel; + private System.Windows.Forms.Button buttonUpd; + private System.Windows.Forms.Button buttonAdd; + private System.Windows.Forms.DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormRepairs.cs b/CarRepairShop/CarRepairShopView/FormRepairs.cs new file mode 100644 index 0000000..f9b4eef --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairs.cs @@ -0,0 +1,104 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormRepairs : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logic; + + public FormRepairs(ILogger logger, IRepairLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormRepairs_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["RepairComponents"].Visible = false; + } + _logger.LogInformation("Загрузка ремонтов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки ремонтов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + if (service is FormRepair form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); + if (service is FormRepair form) + { + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление ремонта"); + try + { + if (!_logic.Delete(new RepairBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления ремонта"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/CarRepairShop/CarRepairShopView/FormRepairs.resx b/CarRepairShop/CarRepairShopView/FormRepairs.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormRepairs.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index b109aeb..a63c4a2 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -1,7 +1,18 @@ +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopListImplement.Implements; +using CarRepairShopBusinessLogic.BusinessLogics; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using NLog.Extensions.Logging; + + namespace CarRepairShopView { internal static class Program { + private static ServiceProvider? _serviceProvider; + public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -11,7 +22,33 @@ namespace CarRepairShopView // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new Form1()); + var services = new ServiceCollection(); + ConfigureServices(services); + _serviceProvider = services.BuildServiceProvider(); + Application.Run(_serviceProvider.GetRequiredService()); + } + private static void ConfigureServices(ServiceCollection services) + { + services.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file -- 2.25.1