From ba42d5c602948ec6620c8ba6e2ab331054bbee22 Mon Sep 17 00:00:00 2001 From: "Nikolaeva_Y.A" Date: Wed, 17 May 2023 15:39:42 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F=20?= =?UTF-8?q?=D1=88=D0=B5=D1=81=D1=82=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0?= =?UTF-8?q?=D0=B1=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/ImplementerBindingModel.cs | 17 ++ .../BindingModels/OrderBindingModel.cs | 3 +- .../IImplementerLogic.cs | 19 ++ .../BusinessLogicsContracts/IOrderLogic.cs | 3 +- .../BusinessLogicsContracts/IWorkProcess.cs | 7 + .../SearchModels/ImplementerSearchModel.cs | 11 + .../SearchModels/OrderSearchModel.cs | 7 +- .../StoragesContracts/IImplementerStorage.cs | 21 ++ .../ViewModels/ImplementerViewModel.cs | 22 ++ .../ViewModels/OrderViewModel.cs | 8 +- .../BusinessLogic/ImplementerLogic.cs | 125 ++++++++++ .../BusinessLogic/OrderLogic.cs | 146 ++++++----- .../BusinessLogic/WorkModeling.cs | 134 +++++++++++ .../Implements/ImplementerStorage.cs | 117 +++++++++ .../Implements/OrderStorage.cs | 164 +++++++------ .../Models/Implementer.cs | 65 +++++ .../Models/Order.cs | 57 +++-- .../SoftwareInstallationDataBase.cs | 3 +- .../Models/IImplementerModel.cs | 11 + .../Models/IOrderModel.cs | 3 +- .../DataFileSingleton.cs | 12 +- .../Implements/ImplementerStorage.cs | 103 ++++++++ .../Implements/OrderStorage.cs | 20 +- .../Models/Implementer.cs | 81 +++++++ .../Models/Order.cs | 15 +- .../DataListSingleton.cs | 6 +- .../Implements/ImplementerStorage.cs | 126 ++++++++++ .../Implements/OrderStorage.cs | 46 +++- .../Models/Implementer.cs | 56 +++++ .../Models/Order.cs | 11 +- .../Controllers/ImplementerController.cs | 105 ++++++++ .../FormCreateOrder.Designer.cs | 227 ++++++++++-------- .../FormImplementer.Designer.cs | 167 +++++++++++++ .../FormImplementer.cs | 106 ++++++++ .../FormImplementer.resx | 60 +++++ .../FormImplementers.Designer.cs | 114 +++++++++ .../FormImplementers.cs | 120 +++++++++ .../FormImplementers.resx | 60 +++++ .../SoftwareInstallationView/FormMain.cs | 26 +- .../SoftwareInstallationView/Program.cs | 11 +- 40 files changed, 2121 insertions(+), 294 deletions(-) create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/BindingModels/ImplementerBindingModel.cs create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IImplementerLogic.cs create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IWorkProcess.cs create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/SearchModels/ImplementerSearchModel.cs create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/StoragesContracts/IImplementerStorage.cs create mode 100644 SoftwareInstallation/SofrwareInstallationContracts/ViewModels/ImplementerViewModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs create mode 100644 SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/ImplementerStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Implementer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationDataModels/Models/IImplementerModel.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ImplementerStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationFileImplement/Models/Implementer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationListImplement/Implements/ImplementerStorage.cs create mode 100644 SoftwareInstallation/SoftwareInstallationListImplement/Models/Implementer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementer.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementer.resx create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementers.Designer.cs create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs create mode 100644 SoftwareInstallation/SoftwareInstallationView/FormImplementers.resx diff --git a/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/ImplementerBindingModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/ImplementerBindingModel.cs new file mode 100644 index 0000000..3326d3a --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/ImplementerBindingModel.cs @@ -0,0 +1,17 @@ +using SoftwareInstallationDataModels.Models; + +namespace SofrwareInstallationContracts.BindingModels +{ + public class ImplementerBindingModel : IImplementerModel + { + public int Id { get; set; } + + public string ImplementerFIO { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + + public int WorkExperience { get; set; } + + public int Qualification { get; set; } + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/OrderBindingModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/OrderBindingModel.cs index 47f393d..e80a2bc 100644 --- a/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/OrderBindingModel.cs +++ b/SoftwareInstallation/SofrwareInstallationContracts/BindingModels/OrderBindingModel.cs @@ -21,5 +21,6 @@ namespace SofrwareInstallationContracts.BindingModels public int Id { get; set; } public string PackageName { get; set; } = string.Empty; - } + public int? ImplementerId { get; set; } + } } \ No newline at end of file diff --git a/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IImplementerLogic.cs b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IImplementerLogic.cs new file mode 100644 index 0000000..a0612fb --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IImplementerLogic.cs @@ -0,0 +1,19 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.ViewModels; +using SofrwareInstallationContracts.SearchModels; + +namespace SofrwareInstallationContracts.BusinessLogicsContracts +{ + public interface IImplementerLogic + { + List? ReadList(ImplementerSearchModel? model); + + ImplementerViewModel? ReadElement(ImplementerSearchModel model); + + bool Create(ImplementerBindingModel model); + + bool Update(ImplementerBindingModel model); + + bool Delete(ImplementerBindingModel model); + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IOrderLogic.cs b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IOrderLogic.cs index a00e584..9b936da 100644 --- a/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -7,7 +7,8 @@ namespace SofrwareInstallationContracts.BusinessLogicsContracts public interface IOrderLogic { List? ReadList(OrderSearchModel? model); - bool CreateOrder(OrderBindingModel model); + OrderViewModel? ReadElement(OrderSearchModel model); + bool CreateOrder(OrderBindingModel model); bool TakeOrderInWork(OrderBindingModel model); bool FinishOrder(OrderBindingModel model); bool DeliveryOrder(OrderBindingModel model); diff --git a/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IWorkProcess.cs b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IWorkProcess.cs new file mode 100644 index 0000000..7bb0472 --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/BusinessLogicsContracts/IWorkProcess.cs @@ -0,0 +1,7 @@ +namespace SofrwareInstallationContracts.BusinessLogicsContracts +{ + public interface IWorkProcess + { + void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic); + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/ImplementerSearchModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/ImplementerSearchModel.cs new file mode 100644 index 0000000..05fa055 --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/ImplementerSearchModel.cs @@ -0,0 +1,11 @@ +namespace SofrwareInstallationContracts.SearchModels +{ + public class ImplementerSearchModel + { + public int? Id { get; set; } + + public string? ImplementerFIO { get; set; } + + public string? Password { get; set; } + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/OrderSearchModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/OrderSearchModel.cs index 2ea139a..f28e523 100644 --- a/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/OrderSearchModel.cs +++ b/SoftwareInstallation/SofrwareInstallationContracts/SearchModels/OrderSearchModel.cs @@ -1,4 +1,5 @@ -namespace SofrwareInstallationContracts.SearchModels +using SoftwareInstallationDataModels.Enums; +namespace SofrwareInstallationContracts.SearchModels { public class OrderSearchModel { @@ -6,5 +7,7 @@ public int? ClientId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } - } + public int? ImplementerId { get; set; } + public List? Statuses { get; set; } + } } diff --git a/SoftwareInstallation/SofrwareInstallationContracts/StoragesContracts/IImplementerStorage.cs b/SoftwareInstallation/SofrwareInstallationContracts/StoragesContracts/IImplementerStorage.cs new file mode 100644 index 0000000..ff83054 --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/StoragesContracts/IImplementerStorage.cs @@ -0,0 +1,21 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.ViewModels; + +namespace SofrwareInstallationContracts.StoragesContracts +{ + public interface IImplementerStorage + { + List GetFullList(); + + List GetFilteredList(ImplementerSearchModel model); + + ImplementerViewModel? GetElement(ImplementerSearchModel model); + + ImplementerViewModel? Insert(ImplementerBindingModel model); + + ImplementerViewModel? Update(ImplementerBindingModel model); + + ImplementerViewModel? Delete(ImplementerBindingModel model); + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/ImplementerViewModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/ImplementerViewModel.cs new file mode 100644 index 0000000..0c5edac --- /dev/null +++ b/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/ImplementerViewModel.cs @@ -0,0 +1,22 @@ +using SoftwareInstallationDataModels.Models; +using System.ComponentModel; + +namespace SofrwareInstallationContracts.ViewModels +{ + public class ImplementerViewModel : IImplementerModel + { + public int Id { get; set; } + + [DisplayName("ФИО исполнителя")] + public string ImplementerFIO { get; set; } = string.Empty; + + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + + [DisplayName("Стаж работы")] + public int WorkExperience { get; set; } + + [DisplayName("Квалификация")] + public int Qualification { get; set; } + } +} diff --git a/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/OrderViewModel.cs b/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/OrderViewModel.cs index e05664c..a05bc39 100644 --- a/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/OrderViewModel.cs +++ b/SoftwareInstallation/SofrwareInstallationContracts/ViewModels/OrderViewModel.cs @@ -8,11 +8,15 @@ namespace SofrwareInstallationContracts.ViewModels { public int PackageId { get; set; } public int ClientId { get; set; } + public int? ImplementerId { get; set; } - [DisplayName("Номер")] + [DisplayName("Номер")] public int Id { get; set; } - [DisplayName("Название изделия")] + [DisplayName("ФИО исполнителя")] + public string ImplementerFIO { get; set; } = string.Empty; + + [DisplayName("Название изделия")] public string PackageName { get; set; } = string.Empty; [DisplayName("Клиент")] public string ClientFIO { get; set; } = string.Empty; diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs new file mode 100644 index 0000000..c925a42 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/ImplementerLogic.cs @@ -0,0 +1,125 @@ +using Microsoft.Extensions.Logging; +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.BusinessLogicsContracts; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.StoragesContracts; +using SofrwareInstallationContracts.ViewModels; + +namespace SoftwareInstallationBusinessLogic.BusinessLogic +{ + public class ImplementerLogic : IImplementerLogic + { + private readonly ILogger _logger; + private readonly IImplementerStorage _implementerStorage; + + public ImplementerLogic(ILogger logger, IImplementerStorage implementerStorage) + { + _logger = logger; + _implementerStorage = implementerStorage; + } + + public bool Create(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Delete(ImplementerBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_implementerStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + public ImplementerViewModel? ReadElement(ImplementerSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", + model.ImplementerFIO, model.Id); + var element = _implementerStorage.GetElement(model); + + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public List? ReadList(ImplementerSearchModel? model) + { + _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id); + var list = (model == null) ? _implementerStorage.GetFullList() : + _implementerStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool Update(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + private void CheckModel(ImplementerBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.WorkExperience < 0) + { + throw new ArgumentException("Опыт работы не должен быть отрицательным", nameof(model.WorkExperience)); + } + if (model.Qualification < 0) + { + throw new ArgumentException("Квалификация не должна быть отрицательной", nameof(model.Qualification)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO)); + } + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO)); + } + _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO); + var element = _implementerStorage.GetElement(new ImplementerSearchModel + { + ImplementerFIO = model.ImplementerFIO, + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Исполнитель с таким ФИО уже есть"); + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs index cc1d448..bea54b8 100644 --- a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/OrderLogic.cs @@ -43,22 +43,36 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) { - CheckModel(model); + var vmodel = _orderStorage.GetElement(new() { Id = model.Id }); - if (model.Status + 1 != newStatus) + if (vmodel == null) { - _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect."); - return false; - } + throw new ArgumentNullException(nameof(model)); + } + + if ((int)vmodel.Status + 1 != (int)newStatus) + { + throw new InvalidOperationException($"Попытка перевести заказ не в следующий статус: " + + $"Текущий статус: {vmodel.Status} \n" + + $"Планируемый статус: {newStatus} \n" + + $"Доступный статус: {(OrderStatus)((int)vmodel.Status + 1)}"); + } model.Status = newStatus; + model.DateCreate = vmodel.DateCreate; - if (model.Status == OrderStatus.Выдан) - model.DateImplement = DateTime.Now; + if (model.DateImplement == null) + model.DateImplement = vmodel.DateImplement; - if (_orderStorage.Update(model) == null) + if (vmodel.ImplementerId.HasValue) + model.ImplementerId = vmodel.ImplementerId; + + model.PackageId = vmodel.PackageId; + model.Sum = vmodel.Sum; + model.Count = vmodel.Count; + + if (_orderStorage.Update(model) == null) { - model.Status--; _logger.LogWarning("Update operation failed"); return false; } @@ -66,65 +80,81 @@ namespace SoftwareInstallationBusinessLogic.BusinessLogic return true; } - public bool TakeOrderInWork(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выполняется); - } + public bool TakeOrderInWork(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выполняется); + } - public bool DeliveryOrder(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Готов); - } + public bool DeliveryOrder(OrderBindingModel model) + { + model.DateImplement = DateTime.Now; + return StatusUpdate(model, OrderStatus.Готов); + } - public bool FinishOrder(OrderBindingModel model) - { - return StatusUpdate(model, OrderStatus.Выдан); - } + public bool FinishOrder(OrderBindingModel model) + { + return StatusUpdate(model, OrderStatus.Выдан); + } - public List? ReadList(OrderSearchModel? model) - { - _logger.LogInformation("Order. OrderId:{Id}", model?.Id); + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("Order. OrderId:{Id}", model?.Id); - var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); - if (list == null) - { - _logger.LogWarning("ReadList return null list"); - return null; - } + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } - _logger.LogInformation("ReadList. Count:{Count}", list.Count); - return list; - } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } - private void CheckModel(OrderBindingModel model, bool withParams = true) - { - if (model == null) - { - throw new ArgumentNullException(nameof(model)); - } + private bool CheckModel(OrderBindingModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (model.Count <= 0) + { + throw new ArgumentException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); + } + if (model.Sum <= 0) + { + throw new ArgumentException("Суммарная стоимость заказа должна быть больше 0", nameof(model.Sum)); + } + if (model.DateCreate > model.DateImplement) + { + throw new ArgumentException("Время создания заказа не может быть больше времени его выполнения", nameof(model.DateImplement)); + } - if (!withParams) - { - return; - } + return true; + } - if (model.PackageId < 0) - { - throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.PackageId)); - } + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } - if (model.Count <= 0) - { - throw new ArgumentNullException("Количество изделий в заказе должно быть больше 0", nameof(model.Count)); - } + _logger.LogInformation("ReadElement. Id:{ Id}", model.Id); - if (model.Sum <= 0) - { - throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); - } + var element = _orderStorage.GetElement(model); - _logger.LogInformation("Order. OrderId:{Id}.Sum:{ Sum}. PackageId: { PackageId}", model.Id, model.Sum, model.PackageId); - } - } + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + + return null; + } + + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + + return element; + } + } } diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs new file mode 100644 index 0000000..7bd001d --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogic/WorkModeling.cs @@ -0,0 +1,134 @@ +using Microsoft.Extensions.Logging; +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.BusinessLogicsContracts; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Enums; + +namespace SoftwareInstallationBusinessLogic.BusinessLogic +{ + public class WorkModeling : IWorkProcess + { + private readonly ILogger _logger; + + private readonly Random _rnd; + + private IOrderLogic? _orderLogic; + + public WorkModeling(ILogger logger) + { + _logger = logger; + _rnd = new Random(1000); + } + + public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic) + { + _orderLogic = orderLogic; + var implementers = implementerLogic.ReadList(null); + if (implementers == null) + { + _logger.LogWarning("DoWork. Implementers is null"); + return; + } + + var orders = _orderLogic.ReadList(new OrderSearchModel { Statuses = new() { OrderStatus.Принят, OrderStatus.Выполняется } }); + if (orders == null || orders.Count == 0) + { + _logger.LogWarning("DoWork. Orders is null or empty"); + return; + } + + _logger.LogDebug("DoWork for {Count} orders", orders.Count); + + foreach (var implementer in implementers) + { + Task.Run(() => WorkerWorkAsync(implementer, orders)); + } + } + + private async Task WorkerWorkAsync(ImplementerViewModel implementer, List orders) + { + if (_orderLogic == null || implementer == null) + { + return; + } + await RunOrderInWork(implementer, orders); + + await Task.Run(() => + { + foreach (var order in orders) + { + try + { + _logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id); + + _orderLogic.TakeOrderInWork(new OrderBindingModel + { + Id = order.Id, + ImplementerId = implementer.Id + }); + + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id); + + _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = order.Id + }); + + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + } + }); + } + + private async Task RunOrderInWork(ImplementerViewModel implementer, List allOrders) + { + if (_orderLogic == null || implementer == null || allOrders == null || allOrders.Count == 0) + { + return; + } + try + { + var runOrder = await Task.Run(() => allOrders.FirstOrDefault(x => x.ImplementerId == implementer.Id && x.Status == OrderStatus.Выполняется)); + if (runOrder == null) + { + return; + } + + _logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id); + + Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count); + _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id); + _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = runOrder.Id + }); + + Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100)); + } + + catch (InvalidOperationException ex) + { + _logger.LogWarning(ex, "Error try get work"); + } + + catch (Exception ex) + { + _logger.LogError(ex, "Error while do work"); + throw; + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/ImplementerStorage.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/ImplementerStorage.cs new file mode 100644 index 0000000..f813506 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/ImplementerStorage.cs @@ -0,0 +1,117 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.StoragesContracts; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataBaseImplement.Models; + +namespace SoftwareInstallationDataBaseImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + using var context = new SoftwareInstallationDataBase(); + + var res = context.Implementers + .FirstOrDefault(x => x.Id == model.Id); + + if (res != null) + { + context.Implementers.Remove(res); + context.SaveChanges(); + } + + return res?.GetViewModel; + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + using var context = new SoftwareInstallationDataBase(); + + if (model.Id.HasValue) + return context.Implementers + .FirstOrDefault(x => x.Id == model.Id) + ?.GetViewModel; + + if (model.ImplementerFIO != null && model.Password != null) + return context.Implementers + .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) + && x.Password.Equals(model.Password)) + ?.GetViewModel; + + if (model.ImplementerFIO != null) + return context.Implementers + .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) + ?.GetViewModel; + + return null; + } + + public List GetFilteredList(ImplementerSearchModel model) + { + if (model == null) + { + return new(); + } + + if (model.Id.HasValue) + { + var res = GetElement(model); + + return res != null ? new() { res } : new(); + } + + if (model.ImplementerFIO != null) + { + using var context = new SoftwareInstallationDataBase(); + + return context.Implementers + .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + + return new(); + } + + public List GetFullList() + { + using var context = new SoftwareInstallationDataBase(); + + return context.Implementers + .Select(x => x.GetViewModel) + .ToList(); + } + + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + using var context = new SoftwareInstallationDataBase(); + + var res = Implementer.Create(model); + + if (res != null) + { + context.Implementers.Add(res); + context.SaveChanges(); + } + + return res?.GetViewModel; + } + + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + using var context = new SoftwareInstallationDataBase(); + + var res = context.Implementers + .FirstOrDefault(x => x.Id == model.Id); + + if (res != null) + { + res.Update(model); + context.SaveChanges(); + } + + return res?.GetViewModel; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/OrderStorage.cs index 379e117..96d5103 100644 --- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Implements/OrderStorage.cs @@ -13,9 +13,13 @@ namespace SoftwareInstallationDataBaseImplement.Implements { using var context = new SoftwareInstallationDataBase(); - var element = context.Orders.Include(x => x.Package).Include(x => x.Client).FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Orders + .Include(x => x.Package) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(rec => rec.Id == model.Id); - if (element != null) + if (element != null) { context.Orders.Remove(element); context.SaveChanges(); @@ -35,85 +39,109 @@ namespace SoftwareInstallationDataBaseImplement.Implements using var context = new SoftwareInstallationDataBase(); - return context.Orders.Include(x => x.Package).Include(x => x.Client).FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } + return context.Orders + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => + (model.Statuses == null || model.Statuses != null && model.Statuses.Contains(x.Status)) && + model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId || + model.Id.HasValue && x.Id == model.Id + ) + ?.GetViewModel; + } - public List GetFilteredList(OrderSearchModel model) - { - if (!model.DateFrom.HasValue && !model.DateTo.HasValue && !model.ClientId.HasValue) - { - return new(); - } + public List GetFilteredList(OrderSearchModel model) + { + if (model.Id.HasValue) + { + var result = GetElement(model); + return result != null ? new() { result } : new(); + } - using var context = new SoftwareInstallationDataBase(); + using var context = new SoftwareInstallationDataBase(); + IQueryable? queryWhere = null; - if (model.DateFrom.HasValue) - { - return context.Orders - .Include(x => x.Package) - .Include(x => x.Client) - .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => x.GetViewModel) - .ToList(); - } - else if (model.ClientId.HasValue) - return context.Orders - .Include(x => x.Package) - .Include(x => x.Client) - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); - return context.Orders - .Include(x => x.Package) - .Include(x => x.Client) - .Where(x => x.Id == model.Id) - .Select(x => x.GetViewModel) - .ToList(); - } + if (model.DateFrom.HasValue && model.DateTo.HasValue) + { + queryWhere = context.Orders + .Where(x => model.DateFrom <= x.DateCreate.Date && + x.DateCreate.Date <= model.DateTo); + } - public List GetFullList() - { - using var context = new SoftwareInstallationDataBase(); + else if (model.Statuses != null) + { + queryWhere = context.Orders.Where(x => model.Statuses.Contains(x.Status)); + } - return context.Orders.Include(x => x.Package).Include(x => x.Client).Select(x => x.GetViewModel).ToList(); - } + else if (model.ClientId.HasValue) + { + queryWhere = context.Orders.Where(x => x.ClientId == model.ClientId); + } - public OrderViewModel? Insert(OrderBindingModel model) - { - var newOrder = Order.Create(model); + else + { + return new(); + } - if (newOrder == null) - { - return null; - } + return queryWhere + .Include(x => x.Client) + .Include(x => x.Implementer) + .Select(x => x.GetViewModel) + .ToList(); + } - using var context = new SoftwareInstallationDataBase(); + public List GetFullList() + { + using var context = new SoftwareInstallationDataBase(); - context.Orders.Add(newOrder); - context.SaveChanges(); + return context.Orders + .Include(x => x.Package) + .Include(x => x.Client) + .Include(x => x.Implementer) + .Select(x => x.GetViewModel).ToList(); + } - return context.Orders - .Include(x => x.Package) - .Include(x => x.Client) - .FirstOrDefault(x => x.Id == newOrder.Id) - ?.GetViewModel; - } + public OrderViewModel? Insert(OrderBindingModel model) + { + var newOrder = Order.Create(model); - public OrderViewModel? Update(OrderBindingModel model) - { - using var context = new SoftwareInstallationDataBase(); + if (newOrder == null) + { + return null; + } - var order = context.Orders.Include(x => x.Package).Include(x => x.Client).FirstOrDefault(x => x.Id == model.Id); + using var context = new SoftwareInstallationDataBase(); - if (order == null) - { - return null; - } + context.Orders.Add(newOrder); + context.SaveChanges(); - order.Update(model); - context.SaveChanges(); + return context.Orders + .Include(x => x.Package) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.Id == newOrder.Id) + ?.GetViewModel; + } - return order.GetViewModel; - } - } + public OrderViewModel? Update(OrderBindingModel model) + { + using var context = new SoftwareInstallationDataBase(); + + var order = context.Orders + .Include(x => x.Package) + .Include(x => x.Client) + .Include(x => x.Implementer) + .FirstOrDefault(x => x.Id == model.Id); + + if (order == null) + { + return null; + } + + order.Update(model); + context.SaveChanges(); + + return order.GetViewModel; + } + } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Implementer.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Implementer.cs new file mode 100644 index 0000000..fd6fdd6 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Implementer.cs @@ -0,0 +1,65 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace SoftwareInstallationDataBaseImplement.Models +{ + public class Implementer : IImplementerModel + { + [Required] + public string ImplementerFIO { get; private set; } = string.Empty; + + [Required] + public string Password { get; private set; } = string.Empty; + + [Required] + public int WorkExperience { get; private set; } + + [Required] + public int Qualification { get; private set; } + + public int Id { get; private set; } + + [ForeignKey("ImplementerId")] + public virtual List Orders { get; private set; } = new(); + + public static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + Password = model.Password, + Qualification = model.Qualification, + ImplementerFIO = model.ImplementerFIO, + WorkExperience = model.WorkExperience + }; + } + + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + Password = model.Password; + Qualification = model.Qualification; + ImplementerFIO = model.ImplementerFIO; + WorkExperience = model.WorkExperience; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + Password = Password, + Qualification = Qualification, + ImplementerFIO = ImplementerFIO, + WorkExperience = WorkExperience + }; + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs index 2e03039..8651535 100644 --- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/Models/Order.cs @@ -11,8 +11,9 @@ namespace SoftwareInstallationDataBaseImplement.Models public int Id { get; private set; } public int PackageId { get; private set; } - - [Required] + public int? ImplementerId { get; private set; } + + [Required] public int ClientId { get; set; } public string PackageName { get; private set; } = string.Empty; @@ -32,7 +33,8 @@ namespace SoftwareInstallationDataBaseImplement.Models public virtual Package Package { get; set; } public Client Client { get; set; } - public static Order? Create(OrderBindingModel? model) + public Implementer? Implementer { get; set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) { @@ -44,13 +46,15 @@ namespace SoftwareInstallationDataBaseImplement.Models Id = model.Id, PackageId = model.PackageId, ClientId = model.ClientId, - PackageName = model.PackageName, + ImplementerId = model.ImplementerId, + PackageName = model.PackageName, Count = model.Count, Sum = model.Sum, Status = model.Status, DateCreate = model.DateCreate, - DateImplement = model.DateImplement - }; + DateImplement = model.DateImplement + + }; } public void Update(OrderBindingModel? model) @@ -62,21 +66,32 @@ namespace SoftwareInstallationDataBaseImplement.Models Status = model.Status; DateImplement = model.DateImplement; - } + ImplementerId = model.ImplementerId; + } - public OrderViewModel GetViewModel => new() - { - Id = Id, - PackageId = PackageId, - ClientId = ClientId, - ClientFIO = Client.ClientFIO, - PackageName = PackageName, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement - }; - } + public OrderViewModel GetViewModel + { + get + { + using var context = new SoftwareInstallationDataBase(); + return new OrderViewModel + { + Id = Id, + PackageId = PackageId, + ClientId = ClientId, + ImplementerId = ImplementerId, + ClientFIO = context.Clients.FirstOrDefault(x => x.Id == ClientId)?.ClientFIO ?? string.Empty, + PackageName = context.Packages.FirstOrDefault(x => x.Id == PackageId)?.PackageName ?? string.Empty, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty + }; + } + } + } } + diff --git a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/SoftwareInstallationDataBase.cs b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/SoftwareInstallationDataBase.cs index 72db054..cf7a782 100644 --- a/SoftwareInstallation/SoftwareInstallationDataBaseImplement/SoftwareInstallationDataBase.cs +++ b/SoftwareInstallation/SoftwareInstallationDataBaseImplement/SoftwareInstallationDataBase.cs @@ -18,5 +18,6 @@ namespace SoftwareInstallationDataBaseImplement public virtual DbSet PackageComponents { set; get; } public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } - } + public virtual DbSet Implementers { set; get; } + } } diff --git a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IImplementerModel.cs b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IImplementerModel.cs new file mode 100644 index 0000000..669bbd4 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IImplementerModel.cs @@ -0,0 +1,11 @@ +namespace SoftwareInstallationDataModels.Models +{ + public interface IImplementerModel : IId + { + string ImplementerFIO { get; } + string Password { get; } + int WorkExperience { get; } + int Qualification { get; } + + } +} diff --git a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IOrderModel.cs b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IOrderModel.cs index 58c6335..2429828 100644 --- a/SoftwareInstallation/SoftwareInstallationDataModels/Models/IOrderModel.cs +++ b/SoftwareInstallation/SoftwareInstallationDataModels/Models/IOrderModel.cs @@ -5,7 +5,8 @@ namespace SoftwareInstallationDataModels.Models public interface IOrderModel : IId { int PackageId { get; } - string PackageName { get; } + int? ImplementerId { get; } + string PackageName { get; } int Count { get; } double Sum { get; } OrderStatus Status { get; } diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs index 2971ff7..1d1cb2f 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/DataFileSingleton.cs @@ -11,13 +11,15 @@ namespace SoftwareInstallationFileImplement private readonly string OrderFileName = "Order.xml"; private readonly string PackageFileName = "Package.xml"; private readonly string ClientFileName = "Client.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; - public List Components { get; private set; } + public List Components { get; private set; } public List Orders { get; private set; } public List Packages { get; private set; } public List Clients { get; private set; } + public List Implementers { get; private set; } - public static DataFileSingleton GetInstance() + public static DataFileSingleton GetInstance() { if (instance == null) { @@ -30,14 +32,16 @@ namespace SoftwareInstallationFileImplement public void SavePackages() => SaveData(Packages, PackageFileName, "Packages", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveClients() => SaveData(Clients, OrderFileName, "Clients", x => x.GetXElement); + public void SaveImplementers() => SaveData(Implementers, OrderFileName, "Implementers", x => x.GetXElement); - private DataFileSingleton() + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Packages = LoadData(PackageFileName, "Package", x => Package.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; - } + Implementers = LoadData(ImplementerFileName, "Implementer", x => Implementer.Create(x)!)!; + } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) { diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ImplementerStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ImplementerStorage.cs new file mode 100644 index 0000000..3971688 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/ImplementerStorage.cs @@ -0,0 +1,103 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.StoragesContracts; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationFileImplement.Models; + +namespace SoftwareInstallationFileImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataFileSingleton _source; + public ImplementerStorage() + { + _source = DataFileSingleton.GetInstance(); + } + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + + if (res != null) + { + _source.Implementers.Remove(res); + _source.SaveImplementers(); + } + return res?.GetViewModel; + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (model.Id.HasValue) + return _source.Implementers.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel; + + if (model.ImplementerFIO != null && model.Password != null) + return _source.Implementers + .FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO) + && x.Password.Equals(model.Password)) + ?.GetViewModel; + + if (model.ImplementerFIO != null) + return _source.Implementers.FirstOrDefault(x => x.ImplementerFIO.Equals(model.ImplementerFIO))?.GetViewModel; + + return null; + } + + public List GetFilteredList(ImplementerSearchModel model) + { + if (model == null) + { + return new(); + } + + if (model.Id.HasValue) + { + var res = GetElement(model); + + return res != null ? new() { res } : new(); + } + + if (model.ImplementerFIO != null) + { + return _source.Implementers + .Where(x => x.ImplementerFIO.Equals(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + + return new(); + } + + public List GetFullList() + { + return _source.Implementers.Select(x => x.GetViewModel).ToList(); + } + + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = _source.Implementers.Count > 0 ? _source.Implementers.Max(x => x.Id) + 1 : 1; + + var res = Implementer.Create(model); + + if (res != null) + { + _source.Implementers.Add(res); + _source.SaveImplementers(); + } + + return res?.GetViewModel; + } + + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + var res = _source.Implementers.FirstOrDefault(x => x.Id == model.Id); + + if (res != null) + { + res.Update(model); + _source.SaveImplementers(); + } + + return res?.GetViewModel; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs index 5c645b0..274d119 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implements/OrderStorage.cs @@ -32,13 +32,27 @@ namespace SoftwareInstallationFileImplement.Implements public OrderViewModel? GetElement(OrderSearchModel model) { - if (!model.Id.HasValue) + if (model.ImplementerId.HasValue && model.Statuses != null) + { + return source.Orders + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId && + model.Statuses.Contains(x.Status)) + ?.GetViewModel; + } + + if (model.ImplementerId.HasValue) + { + return source.Orders + .FirstOrDefault(x => x.ImplementerId == model.ImplementerId) + ?.GetViewModel; + } + if (!model.Id.HasValue) { return null; } - return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Implementer.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Implementer.cs new file mode 100644 index 0000000..148a310 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Implementer.cs @@ -0,0 +1,81 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; +using System.Xml.Linq; + +namespace SoftwareInstallationFileImplement.Models +{ + public class Implementer : IImplementerModel + { + public string ImplementerFIO { get; private set; } = string.Empty; + + public string Password { get; private set; } = string.Empty; + + public int WorkExperience { get; private set; } + + public int Qualification { get; private set; } + + public int Id { get; private set; } + + public static Implementer? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + ImplementerFIO = element.Element("FIO")!.Value, + Password = element.Element("Password")!.Value, + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + Qualification = Convert.ToInt32(element.Element("Qualification")!.Value), + WorkExperience = Convert.ToInt32(element.Element("WorkExperience")!.Value), + }; + } + + public static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + Password = model.Password, + Qualification = model.Qualification, + ImplementerFIO = model.ImplementerFIO, + WorkExperience = model.WorkExperience, + }; + } + + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + Password = model.Password; + Qualification = model.Qualification; + ImplementerFIO = model.ImplementerFIO; + WorkExperience = model.WorkExperience; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + Password = Password, + Qualification = Qualification, + ImplementerFIO = ImplementerFIO, + WorkExperience = WorkExperience + }; + + public XElement GetXElement => new("Client", + new XAttribute("Id", Id), + new XElement("Password", Password), + new XElement("FIO", ImplementerFIO), + new XElement("Qualification", Qualification), + new XElement("WorkExperience", WorkExperience) + ); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs index 9cd2d4e..a653c1e 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Models/Order.cs @@ -9,8 +9,9 @@ namespace SoftwareInstallationFileImplement.Models public class Order : IOrderModel { public int PackageId { get; private set; } + public int? ImplementerId { get; set; } - public string PackageName { get; private set; } = string.Empty; + public string PackageName { get; private set; } = string.Empty; public int ClientId { get; private set; } public int Count { get; private set; } @@ -33,7 +34,8 @@ namespace SoftwareInstallationFileImplement.Models return new Order() { Id = model.Id, - PackageId = model.PackageId, + ImplementerId = model.ImplementerId, + PackageId = model.PackageId, PackageName = model.PackageName, ClientId = model.ClientId, Count = model.Count, @@ -54,7 +56,8 @@ namespace SoftwareInstallationFileImplement.Models var order = new Order() { Id = Convert.ToInt32(element.Attribute("Id")!.Value), - PackageId = Convert.ToInt32(element.Element("PackageId")!.Value), + ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), + PackageId = Convert.ToInt32(element.Element("PackageId")!.Value), ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), PackageName = element.Element("PackageName")!.Value, Count = Convert.ToInt32(element.Element("Count")!.Value), @@ -82,7 +85,8 @@ namespace SoftwareInstallationFileImplement.Models public OrderViewModel GetViewModel => new() { Id = Id, - PackageId = PackageId, + ImplementerId = ImplementerId, + PackageId = PackageId, ClientId = ClientId, PackageName = PackageName, Count = Count, @@ -99,7 +103,8 @@ namespace SoftwareInstallationFileImplement.Models new XElement("Count", Count.ToString()), new XElement("Sum", Sum.ToString()), new XElement("ClientId", ClientId.ToString()), - new XElement("Status", Status.ToString()), + new XElement("ImplementerId", ImplementerId.ToString()), + new XElement("Status", Status.ToString()), new XElement("DateCreate", DateCreate.ToString()), new XElement("DateImplement", DateImplement.ToString())); } diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs b/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs index e9dfd36..71dd261 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/DataListSingleton.cs @@ -9,14 +9,16 @@ namespace SoftwareInstallationListImplement public List Orders { get; set; } public List Packages { get; set; } public List Clients { get; set; } + public List Implementers { get; set; } - private DataListSingleton() + private DataListSingleton() { Components = new List(); Orders = new List(); Packages = new List(); Clients = new List(); - } + Implementers = new List(); + } public static DataListSingleton GetInstance() { diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ImplementerStorage.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ImplementerStorage.cs new file mode 100644 index 0000000..ae7ca4b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/ImplementerStorage.cs @@ -0,0 +1,126 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.StoragesContracts; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationListImplement.Models; + +namespace SoftwareInstallationListImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataListSingleton _source; + public ImplementerStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + for (int i = 0; i < _source.Implementers.Count; ++i) + { + if (_source.Implementers[i].Id == model.Id) + { + var element = _source.Implementers[i]; + _source.Implementers.RemoveAt(i); + + return element.GetViewModel; + } + } + return null; + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + foreach (var x in _source.Implementers) + { + if (model.Id.HasValue && x.Id == model.Id) + return x.GetViewModel; + + if (model.ImplementerFIO != null && model.Password != null && + x.ImplementerFIO.Equals(model.ImplementerFIO) && + x.Password.Equals(model.Password)) + return x.GetViewModel; + + if (model.ImplementerFIO != null && x.ImplementerFIO.Equals(model.ImplementerFIO)) + return x.GetViewModel; + } + return null; + } + + public List GetFilteredList(ImplementerSearchModel model) + { + if (model == null) + { + return new(); + } + + if (model.Id.HasValue) + { + var res = GetElement(model); + + return res != null ? new() { res } : new(); + } + + List result = new(); + + if (model.ImplementerFIO != null) + { + foreach (var implementer in _source.Implementers) + { + if (implementer.ImplementerFIO.Equals(model.ImplementerFIO)) + { + result.Add(implementer.GetViewModel); + } + } + } + return result; + } + + public List GetFullList() + { + var result = new List(); + + foreach (var implementer in _source.Implementers) + { + result.Add(implementer.GetViewModel); + } + + return result; + } + + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = 1; + + foreach (var implementer in _source.Implementers) + { + if (model.Id <= implementer.Id) + { + model.Id = implementer.Id + 1; + } + } + + var res = Implementer.Create(model); + + if (res != null) + { + _source.Implementers.Add(res); + } + return res?.GetViewModel; + } + + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + foreach (var implementer in _source.Implementers) + { + if (implementer.Id == model.Id) + { + implementer.Update(model); + + return implementer.GetViewModel; + } + } + return null; + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/OrderStorage.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/OrderStorage.cs index caceaad..42c53e9 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Implements/OrderStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Implements/OrderStorage.cs @@ -41,7 +41,19 @@ namespace SoftwareInstallationListImplement.Implements { return order.GetViewModel; } - } + else if (model.ImplementerId.HasValue && model.Statuses != null && + order.ImplementerId == model.ImplementerId && + model.Statuses.Contains(order.Status)) + { + return GetViewModel(order); + } + + else if (model.ImplementerId.HasValue && + model.ImplementerId == order.ImplementerId) + { + return GetViewModel(order); + } + } return null; } @@ -71,18 +83,28 @@ namespace SoftwareInstallationListImplement.Implements } } } - else if (model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.Id == model.Id) - { - result.Add(GetViewModel(order)); - } - } - } + else if (model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(GetViewModel(order)); + } - return result; + else if (model.ImplementerId.HasValue && order.ImplementerId == model.ImplementerId) + { + result.Add(GetViewModel(order)); + } + + else if (model.Statuses != null && model.Statuses.Contains(order.Status)) + { + result.Add(GetViewModel(order)); + } + } + } + + return result; } private OrderViewModel GetViewModel(Order order) { diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Implementer.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Implementer.cs new file mode 100644 index 0000000..8f9d2b3 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Implementer.cs @@ -0,0 +1,56 @@ +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Models; + +namespace SoftwareInstallationListImplement.Models +{ + public class Implementer : IImplementerModel + { + public string ImplementerFIO { get; private set; } = string.Empty; + + public string Password { get; private set; } = string.Empty; + + public int WorkExperience { get; private set; } + + public int Qualification { get; private set; } + + public int Id { get; private set; } + + public static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + Password = model.Password, + Qualification = model.Qualification, + ImplementerFIO = model.ImplementerFIO, + WorkExperience = model.WorkExperience, + }; + } + + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + Password = model.Password; + Qualification = model.Qualification; + ImplementerFIO = model.ImplementerFIO; + WorkExperience = model.WorkExperience; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + Password = Password, + Qualification = Qualification, + ImplementerFIO = ImplementerFIO, + WorkExperience = WorkExperience + }; + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs index 83e5f42..cc9e7f8 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/Models/Order.cs @@ -35,7 +35,8 @@ namespace SoftwareInstallationListImplement.Models { Id = model.Id, PackageId = model.PackageId, - ClientId = model.ClientId, + ImplementerId = model.ImplementerId, + ClientId = model.ClientId, PackageName = model.PackageName, Count = model.Count, Sum = model.Sum, @@ -65,7 +66,9 @@ namespace SoftwareInstallationListImplement.Models Sum = Sum, Status = Status, DateCreate = DateCreate, - DateImplement = DateImplement - }; - } + DateImplement = DateImplement, + ImplementerId = ImplementerId + }; + public int? ImplementerId { get; private set; } + } } diff --git a/SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs b/SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs new file mode 100644 index 0000000..f1f2993 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationRestApi/Controllers/ImplementerController.cs @@ -0,0 +1,105 @@ +using DocumentFormat.OpenXml.Office2010.Excel; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.BusinessLogicsContracts; +using SofrwareInstallationContracts.SearchModels; +using SofrwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.Enums; + +namespace SoftwareInstallationRestApi.Controllers +{ + [Route("api/[controller]/[action]")] + [ApiController] + public class ImplementerController : Controller + { + private readonly ILogger _logger; + private readonly IOrderLogic _order; + private readonly IImplementerLogic _logic; + public ImplementerController(IOrderLogic order, IImplementerLogic logic, ILogger logger) + { + _logger = logger; + _order = order; + _logic = logic; + } + + [HttpGet] + public ImplementerViewModel? Login(string login, string password) + { + try + { + return _logic.ReadElement(new ImplementerSearchModel + { + ImplementerFIO = login, + Password = password + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка авторизации сотрудника"); + throw; + } + } + + [HttpGet] + public List? GetNewOrders() + { + try + { + return _order.ReadList(new OrderSearchModel + { + Statuses = new() { OrderStatus.Принят } + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения новых заказов"); + throw; + } + } + [HttpGet] + public OrderViewModel? GetImplementerOrder(int implementerId) + { + try + { + return _order.ReadElement(new OrderSearchModel + { + ImplementerId = implementerId + }); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения текущего заказа исполнителя"); + + throw; + } + } + [HttpPost] + public void TakeOrderInWork(OrderBindingModel model) + { + try + { + _order.TakeOrderInWork(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка перевода заказа с №{Id} в работу", + model.Id); + throw; + } + } + [HttpPost] + public void FinishOrder(OrderBindingModel model) + { + try + { + _order.FinishOrder(model); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о готовности заказа с №{ Id}", model.Id); + throw; + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationView/FormCreateOrder.Designer.cs b/SoftwareInstallation/SoftwareInstallationView/FormCreateOrder.Designer.cs index 6fb3ef7..0fceb5c 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormCreateOrder.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormCreateOrder.Designer.cs @@ -28,108 +28,129 @@ /// private void InitializeComponent() { - this.PackageNameLabel = new System.Windows.Forms.Label(); - this.CountLabel = new System.Windows.Forms.Label(); - this.SumLabel = new System.Windows.Forms.Label(); - this.PackageComboBox = new System.Windows.Forms.ComboBox(); - this.CountTextBox = new System.Windows.Forms.TextBox(); - this.SumTextBox = new System.Windows.Forms.TextBox(); - this.ButtonCancel = new System.Windows.Forms.Button(); - this.SaveButton = new System.Windows.Forms.Button(); - this.SuspendLayout(); - // - // PackageNameLabel - // - this.PackageNameLabel.AutoSize = true; - this.PackageNameLabel.Location = new System.Drawing.Point(12, 9); - this.PackageNameLabel.Name = "PackageNameLabel"; - this.PackageNameLabel.Size = new System.Drawing.Size(59, 15); - this.PackageNameLabel.TabIndex = 0; - this.PackageNameLabel.Text = "Изделие: "; - // - // CountLabel - // - this.CountLabel.AutoSize = true; - this.CountLabel.Location = new System.Drawing.Point(12, 40); - this.CountLabel.Name = "CountLabel"; - this.CountLabel.Size = new System.Drawing.Size(78, 15); - this.CountLabel.TabIndex = 1; - this.CountLabel.Text = "Количество: "; - // - // SumLabel - // - this.SumLabel.AutoSize = true; - this.SumLabel.Location = new System.Drawing.Point(12, 72); - this.SumLabel.Name = "SumLabel"; - this.SumLabel.Size = new System.Drawing.Size(51, 15); - this.SumLabel.TabIndex = 2; - this.SumLabel.Text = "Сумма: "; - // - // PackageComboBox - // - this.PackageComboBox.DisplayMember = "Изделие 1"; - this.PackageComboBox.FormattingEnabled = true; - this.PackageComboBox.Items.AddRange(new object[] { + this.PackageNameLabel = new System.Windows.Forms.Label(); + this.CountLabel = new System.Windows.Forms.Label(); + this.SumLabel = new System.Windows.Forms.Label(); + this.PackageComboBox = new System.Windows.Forms.ComboBox(); + this.CountTextBox = new System.Windows.Forms.TextBox(); + this.SumTextBox = new System.Windows.Forms.TextBox(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.SaveButton = new System.Windows.Forms.Button(); + this.ClientComboBox = new System.Windows.Forms.ComboBox(); + this.ClientLabel = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // PackageNameLabel + // + this.PackageNameLabel.AutoSize = true; + this.PackageNameLabel.Location = new System.Drawing.Point(12, 9); + this.PackageNameLabel.Name = "PackageNameLabel"; + this.PackageNameLabel.Size = new System.Drawing.Size(59, 15); + this.PackageNameLabel.TabIndex = 0; + this.PackageNameLabel.Text = "Изделие: "; + // + // CountLabel + // + this.CountLabel.AutoSize = true; + this.CountLabel.Location = new System.Drawing.Point(12, 79); + this.CountLabel.Name = "CountLabel"; + this.CountLabel.Size = new System.Drawing.Size(78, 15); + this.CountLabel.TabIndex = 1; + this.CountLabel.Text = "Количество: "; + // + // SumLabel + // + this.SumLabel.AutoSize = true; + this.SumLabel.Location = new System.Drawing.Point(12, 112); + this.SumLabel.Name = "SumLabel"; + this.SumLabel.Size = new System.Drawing.Size(51, 15); + this.SumLabel.TabIndex = 2; + this.SumLabel.Text = "Сумма: "; + // + // PackageComboBox + // + this.PackageComboBox.DisplayMember = "Изделие 1"; + this.PackageComboBox.FormattingEnabled = true; + this.PackageComboBox.Items.AddRange(new object[] { "Изделие1"}); - this.PackageComboBox.Location = new System.Drawing.Point(93, 6); - this.PackageComboBox.Name = "PackageComboBox"; - this.PackageComboBox.Size = new System.Drawing.Size(201, 23); - this.PackageComboBox.TabIndex = 3; - this.PackageComboBox.ValueMember = "1"; - this.PackageComboBox.SelectedIndexChanged += new System.EventHandler(this.PackageComboBox_SelectedIndexChanged); - // - // CountTextBox - // - this.CountTextBox.Location = new System.Drawing.Point(93, 37); - this.CountTextBox.Name = "CountTextBox"; - this.CountTextBox.Size = new System.Drawing.Size(201, 23); - this.CountTextBox.TabIndex = 4; - this.CountTextBox.TextChanged += new System.EventHandler(this.CountTextBox_TextChanged); - // - // SumTextBox - // - this.SumTextBox.Location = new System.Drawing.Point(93, 69); - this.SumTextBox.Name = "SumTextBox"; - this.SumTextBox.Size = new System.Drawing.Size(201, 23); - this.SumTextBox.TabIndex = 5; - // - // ButtonCancel - // - this.ButtonCancel.Location = new System.Drawing.Point(219, 113); - this.ButtonCancel.Name = "ButtonCancel"; - this.ButtonCancel.Size = new System.Drawing.Size(75, 23); - this.ButtonCancel.TabIndex = 6; - this.ButtonCancel.Text = "Отменить"; - this.ButtonCancel.UseVisualStyleBackColor = true; - this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); - // - // SaveButton - // - this.SaveButton.Location = new System.Drawing.Point(138, 113); - this.SaveButton.Name = "SaveButton"; - this.SaveButton.Size = new System.Drawing.Size(75, 23); - this.SaveButton.TabIndex = 7; - this.SaveButton.Text = "Сохранить"; - this.SaveButton.UseVisualStyleBackColor = true; - this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); - // - // FormCreateOrder - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(309, 153); - this.Controls.Add(this.SaveButton); - this.Controls.Add(this.ButtonCancel); - this.Controls.Add(this.SumTextBox); - this.Controls.Add(this.CountTextBox); - this.Controls.Add(this.PackageComboBox); - this.Controls.Add(this.SumLabel); - this.Controls.Add(this.CountLabel); - this.Controls.Add(this.PackageNameLabel); - this.Name = "FormCreateOrder"; - this.Text = "Заказ"; - this.ResumeLayout(false); - this.PerformLayout(); + this.PackageComboBox.Location = new System.Drawing.Point(93, 6); + this.PackageComboBox.Name = "PackageComboBox"; + this.PackageComboBox.Size = new System.Drawing.Size(201, 23); + this.PackageComboBox.TabIndex = 3; + this.PackageComboBox.ValueMember = "1"; + this.PackageComboBox.SelectedIndexChanged += new System.EventHandler(this.PackageComboBox_SelectedIndexChanged); + // + // CountTextBox + // + this.CountTextBox.Location = new System.Drawing.Point(93, 76); + this.CountTextBox.Name = "CountTextBox"; + this.CountTextBox.Size = new System.Drawing.Size(201, 23); + this.CountTextBox.TabIndex = 4; + this.CountTextBox.TextChanged += new System.EventHandler(this.CountTextBox_TextChanged); + // + // SumTextBox + // + this.SumTextBox.Location = new System.Drawing.Point(93, 109); + this.SumTextBox.Name = "SumTextBox"; + this.SumTextBox.Size = new System.Drawing.Size(201, 23); + this.SumTextBox.TabIndex = 5; + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(219, 141); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(75, 23); + this.ButtonCancel.TabIndex = 6; + this.ButtonCancel.Text = "Отменить"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // SaveButton + // + this.SaveButton.Location = new System.Drawing.Point(138, 141); + this.SaveButton.Name = "SaveButton"; + this.SaveButton.Size = new System.Drawing.Size(75, 23); + this.SaveButton.TabIndex = 7; + this.SaveButton.Text = "Сохранить"; + this.SaveButton.UseVisualStyleBackColor = true; + this.SaveButton.Click += new System.EventHandler(this.SaveButton_Click); + // + // ClientComboBox + // + this.ClientComboBox.FormattingEnabled = true; + this.ClientComboBox.Location = new System.Drawing.Point(93, 41); + this.ClientComboBox.Name = "ClientComboBox"; + this.ClientComboBox.Size = new System.Drawing.Size(201, 23); + this.ClientComboBox.TabIndex = 10; + // + // ClientLabel + // + this.ClientLabel.AutoSize = true; + this.ClientLabel.Location = new System.Drawing.Point(13, 46); + this.ClientLabel.Name = "ClientLabel"; + this.ClientLabel.Size = new System.Drawing.Size(52, 15); + this.ClientLabel.TabIndex = 11; + this.ClientLabel.Text = "Клиент: "; + // + // FormCreateOrder + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(309, 192); + this.Controls.Add(this.ClientLabel); + this.Controls.Add(this.ClientComboBox); + this.Controls.Add(this.SaveButton); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.SumTextBox); + this.Controls.Add(this.CountTextBox); + this.Controls.Add(this.PackageComboBox); + this.Controls.Add(this.SumLabel); + this.Controls.Add(this.CountLabel); + this.Controls.Add(this.PackageNameLabel); + this.Name = "FormCreateOrder"; + this.Text = "Заказ"; + this.ResumeLayout(false); + this.PerformLayout(); } @@ -143,5 +164,7 @@ private TextBox SumTextBox; private Button ButtonCancel; private Button SaveButton; - } + private ComboBox ClientComboBox; + private Label ClientLabel; + } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationView/FormImplementer.Designer.cs b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.Designer.cs new file mode 100644 index 0000000..550354e --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.Designer.cs @@ -0,0 +1,167 @@ +namespace SoftwareInstallationView +{ + partial class FormImplementer + { + /// + /// 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.FIOTextBox = new System.Windows.Forms.TextBox(); + this.PasswordTextBox = new System.Windows.Forms.TextBox(); + this.LabelFIO = new System.Windows.Forms.Label(); + this.LabelPassword = new System.Windows.Forms.Label(); + this.QualificationNumericUpDown = new System.Windows.Forms.NumericUpDown(); + this.WorkExpNumericUpDown = new System.Windows.Forms.NumericUpDown(); + this.LabelWorkExperience = new System.Windows.Forms.Label(); + this.LabelQualification = new System.Windows.Forms.Label(); + this.ButtonCancel = new System.Windows.Forms.Button(); + this.ButtonSave = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.QualificationNumericUpDown)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.WorkExpNumericUpDown)).BeginInit(); + this.SuspendLayout(); + // + // FIOTextBox + // + this.FIOTextBox.Location = new System.Drawing.Point(112, 12); + this.FIOTextBox.Name = "FIOTextBox"; + this.FIOTextBox.Size = new System.Drawing.Size(170, 23); + this.FIOTextBox.TabIndex = 0; + // + // PasswordTextBox + // + this.PasswordTextBox.Location = new System.Drawing.Point(112, 49); + this.PasswordTextBox.Name = "PasswordTextBox"; + this.PasswordTextBox.Size = new System.Drawing.Size(170, 23); + this.PasswordTextBox.TabIndex = 1; + // + // LabelFIO + // + this.LabelFIO.AutoSize = true; + this.LabelFIO.Location = new System.Drawing.Point(12, 15); + this.LabelFIO.Name = "LabelFIO"; + this.LabelFIO.Size = new System.Drawing.Size(40, 15); + this.LabelFIO.TabIndex = 2; + this.LabelFIO.Text = "ФИО: "; + // + // LabelPassword + // + this.LabelPassword.AutoSize = true; + this.LabelPassword.Location = new System.Drawing.Point(12, 52); + this.LabelPassword.Name = "LabelPassword"; + this.LabelPassword.Size = new System.Drawing.Size(55, 15); + this.LabelPassword.TabIndex = 3; + this.LabelPassword.Text = "Пароль: "; + // + // QualificationNumericUpDown + // + this.QualificationNumericUpDown.Location = new System.Drawing.Point(112, 131); + this.QualificationNumericUpDown.Name = "QualificationNumericUpDown"; + this.QualificationNumericUpDown.Size = new System.Drawing.Size(170, 23); + this.QualificationNumericUpDown.TabIndex = 4; + // + // WorkExpNumericUpDown + // + this.WorkExpNumericUpDown.Location = new System.Drawing.Point(112, 90); + this.WorkExpNumericUpDown.Name = "WorkExpNumericUpDown"; + this.WorkExpNumericUpDown.Size = new System.Drawing.Size(170, 23); + this.WorkExpNumericUpDown.TabIndex = 5; + // + // LabelWorkExperience + // + this.LabelWorkExperience.AutoSize = true; + this.LabelWorkExperience.Location = new System.Drawing.Point(12, 92); + this.LabelWorkExperience.Name = "LabelWorkExperience"; + this.LabelWorkExperience.Size = new System.Drawing.Size(87, 15); + this.LabelWorkExperience.TabIndex = 6; + this.LabelWorkExperience.Text = "Опыт работы: "; + // + // LabelQualification + // + this.LabelQualification.AutoSize = true; + this.LabelQualification.Location = new System.Drawing.Point(12, 133); + this.LabelQualification.Name = "LabelQualification"; + this.LabelQualification.Size = new System.Drawing.Size(94, 15); + this.LabelQualification.TabIndex = 7; + this.LabelQualification.Text = "Квалификация: "; + // + // ButtonCancel + // + this.ButtonCancel.Location = new System.Drawing.Point(185, 169); + this.ButtonCancel.Name = "ButtonCancel"; + this.ButtonCancel.Size = new System.Drawing.Size(97, 29); + this.ButtonCancel.TabIndex = 8; + this.ButtonCancel.Text = "Отмена"; + this.ButtonCancel.UseVisualStyleBackColor = true; + this.ButtonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // ButtonSave + // + this.ButtonSave.Location = new System.Drawing.Point(82, 169); + this.ButtonSave.Name = "ButtonSave"; + this.ButtonSave.Size = new System.Drawing.Size(97, 29); + this.ButtonSave.TabIndex = 9; + this.ButtonSave.Text = "Сохранить"; + this.ButtonSave.UseVisualStyleBackColor = true; + this.ButtonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // FormImplementer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(306, 214); + this.Controls.Add(this.ButtonSave); + this.Controls.Add(this.ButtonCancel); + this.Controls.Add(this.LabelQualification); + this.Controls.Add(this.LabelWorkExperience); + this.Controls.Add(this.WorkExpNumericUpDown); + this.Controls.Add(this.QualificationNumericUpDown); + this.Controls.Add(this.LabelPassword); + this.Controls.Add(this.LabelFIO); + this.Controls.Add(this.PasswordTextBox); + this.Controls.Add(this.FIOTextBox); + this.Name = "FormImplementer"; + this.Text = "Исполнитель"; + this.Load += new System.EventHandler(this.FormImplementer_Load); + ((System.ComponentModel.ISupportInitialize)(this.QualificationNumericUpDown)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.WorkExpNumericUpDown)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox FIOTextBox; + private TextBox PasswordTextBox; + private Label LabelFIO; + private Label LabelPassword; + private NumericUpDown QualificationNumericUpDown; + private NumericUpDown WorkExpNumericUpDown; + private Label LabelWorkExperience; + private Label LabelQualification; + private Button ButtonCancel; + private Button ButtonSave; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationView/FormImplementer.cs b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.cs new file mode 100644 index 0000000..ab6be65 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.cs @@ -0,0 +1,106 @@ +using Microsoft.Extensions.Logging; +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.BusinessLogicsContracts; +using SofrwareInstallationContracts.SearchModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SoftwareInstallationView +{ + public partial class FormImplementer : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + private int? _id; + public int Id { set { _id = value; } } + + public FormImplementer(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(PasswordTextBox.Text)) + { + MessageBox.Show("Заполните пароль", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(FIOTextBox.Text)) + { + MessageBox.Show("Заполните фио", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение исполнителя"); + try + { + var model = new ImplementerBindingModel + { + Id = _id ?? 0, + ImplementerFIO = FIOTextBox.Text, + Password = PasswordTextBox.Text, + Qualification = (int)QualificationNumericUpDown.Value, + WorkExperience = (int)WorkExpNumericUpDown.Value, + }; + 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 void FormImplementer_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение исполнителя"); + var view = _logic.ReadElement(new ImplementerSearchModel + { + Id = _id.Value + }); + if (view != null) + { + FIOTextBox.Text = view.ImplementerFIO; + PasswordTextBox.Text = view.Password; + QualificationNumericUpDown.Value = view.Qualification; + WorkExpNumericUpDown.Value = view.WorkExperience; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка получения исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationView/FormImplementer.resx b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementer.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/SoftwareInstallation/SoftwareInstallationView/FormImplementers.Designer.cs b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.Designer.cs new file mode 100644 index 0000000..cdde0af --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.Designer.cs @@ -0,0 +1,114 @@ +namespace SoftwareInstallationView +{ + partial class FormImplementers + { + /// + /// 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.DataGridView = new System.Windows.Forms.DataGridView(); + this.AddButton = new System.Windows.Forms.Button(); + this.ChangeButton = new System.Windows.Forms.Button(); + this.DeleteButton = new System.Windows.Forms.Button(); + this.UpdateButton = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit(); + this.SuspendLayout(); + // + // DataGridView + // + this.DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.DataGridView.Location = new System.Drawing.Point(1, 1); + this.DataGridView.Name = "DataGridView"; + this.DataGridView.RowTemplate.Height = 25; + this.DataGridView.Size = new System.Drawing.Size(632, 448); + this.DataGridView.TabIndex = 0; + // + // AddButton + // + this.AddButton.Location = new System.Drawing.Point(639, 12); + this.AddButton.Name = "AddButton"; + this.AddButton.Size = new System.Drawing.Size(98, 45); + this.AddButton.TabIndex = 1; + this.AddButton.Text = "Добавить"; + this.AddButton.UseVisualStyleBackColor = true; + this.AddButton.Click += new System.EventHandler(this.AddButton_Click); + // + // ChangeButton + // + this.ChangeButton.Location = new System.Drawing.Point(639, 63); + this.ChangeButton.Name = "ChangeButton"; + this.ChangeButton.Size = new System.Drawing.Size(98, 45); + this.ChangeButton.TabIndex = 2; + this.ChangeButton.Text = "Изменить"; + this.ChangeButton.UseVisualStyleBackColor = true; + this.ChangeButton.Click += new System.EventHandler(this.ChangeButton_Click); + // + // DeleteButton + // + this.DeleteButton.Location = new System.Drawing.Point(639, 114); + this.DeleteButton.Name = "DeleteButton"; + this.DeleteButton.Size = new System.Drawing.Size(98, 45); + this.DeleteButton.TabIndex = 3; + this.DeleteButton.Text = "Удалить"; + this.DeleteButton.UseVisualStyleBackColor = true; + this.DeleteButton.Click += new System.EventHandler(this.DeleteButton_Click); + // + // UpdateButton + // + this.UpdateButton.Location = new System.Drawing.Point(639, 165); + this.UpdateButton.Name = "UpdateButton"; + this.UpdateButton.Size = new System.Drawing.Size(98, 45); + this.UpdateButton.TabIndex = 4; + this.UpdateButton.Text = "Обновить"; + this.UpdateButton.UseVisualStyleBackColor = true; + this.UpdateButton.Click += new System.EventHandler(this.UpdateButton_Click); + // + // FormImplementers + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(749, 450); + this.Controls.Add(this.UpdateButton); + this.Controls.Add(this.DeleteButton); + this.Controls.Add(this.ChangeButton); + this.Controls.Add(this.AddButton); + this.Controls.Add(this.DataGridView); + this.Name = "FormImplementers"; + this.Text = "Исполнители"; + this.Load += new System.EventHandler(this.FormImplementers_Load); + ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView DataGridView; + private Button AddButton; + private Button ChangeButton; + private Button DeleteButton; + private Button UpdateButton; + } +} \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs new file mode 100644 index 0000000..b4a4305 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs @@ -0,0 +1,120 @@ +using Microsoft.Extensions.Logging; +using SofrwareInstallationContracts.BindingModels; +using SofrwareInstallationContracts.BusinessLogicsContracts; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace SoftwareInstallationView +{ + public partial class FormImplementers : Form + { + private readonly ILogger _logger; + private readonly IImplementerLogic _logic; + public FormImplementers(ILogger logger, IImplementerLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void AddButton_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + + if (service is FormImplementer form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ChangeButton_Click(object sender, EventArgs e) + { + if (DataGridView.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.Id = Convert.ToInt32(DataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void DeleteButton_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 ImplementerBindingModel + { + Id = id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления исполнителя"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void UpdateButton_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void FormImplementers_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["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка исполнителей"); + } + + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки исполнителей"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationView/FormImplementers.resx b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.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/SoftwareInstallation/SoftwareInstallationView/FormMain.cs b/SoftwareInstallation/SoftwareInstallationView/FormMain.cs index f47651e..ef23a94 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormMain.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormMain.cs @@ -13,14 +13,16 @@ namespace SoftwareInstallationView private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; + private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) + public FormMain(ILogger logger, IWorkProcess workProcess, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; - LoadData(); + _workProcess = workProcess; + LoadData(); } private void FormMain_Load(object sender, EventArgs e) @@ -41,7 +43,8 @@ namespace SoftwareInstallationView DataGridView.DataSource = list; DataGridView.Columns["PackageId"].Visible = false; DataGridView.Columns["ClientId"].Visible = false; - } + DataGridView.Columns["ImplementerId"].Visible = false; + } _logger.LogInformation("Загрузка заказов"); } @@ -215,5 +218,20 @@ namespace SoftwareInstallationView form.ShowDialog(); } } - } + private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) + { + _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + + private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + + if (service is FormImplementers form) + { + form.ShowDialog(); + } + } + } } diff --git a/SoftwareInstallation/SoftwareInstallationView/Program.cs b/SoftwareInstallation/SoftwareInstallationView/Program.cs index 65feca2..8d41077 100644 --- a/SoftwareInstallation/SoftwareInstallationView/Program.cs +++ b/SoftwareInstallation/SoftwareInstallationView/Program.cs @@ -36,8 +36,11 @@ namespace SoftwareInstallationView 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(); @@ -54,6 +57,8 @@ namespace SoftwareInstallationView services.AddTransient(); services.AddTransient(); services.AddTransient(); - } + services.AddTransient(); + services.AddTransient(); + } } } \ No newline at end of file