From 2085514118d7ee4a298fb6ebb22ba48512b57442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B8=D0=BD=D0=B0?= <Алина@DESKTOP-PH8VQJA> Date: Tue, 16 Apr 2024 21:39:40 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20=D0=B1?= =?UTF-8?q?=D1=8B=D0=BB=D0=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ImplementerLogic.cs | 122 ++++++ .../BusinessLogics/OrderLogic.cs | 30 +- .../BusinessLogics/WorkModeling.cs | 124 ++++++ .../BindingModels/ImplementerBindingModel.cs | 22 ++ .../BindingModels/OrderBindingModel.cs | 1 + .../IImplementerLogic.cs | 24 ++ .../BusinessLogicsContracts/IOrderLogic.cs | 1 + .../BusinessLogicsContracts/IWorkProcess.cs | 13 + .../SearchModels/ImplementerSearchModel.cs | 17 + .../SearchModels/OrderSearchModel.cs | 3 + .../StoragesContracts/IImplementerStorage.cs | 26 ++ .../ViewModels/ImplementerViewModel.cs | 27 ++ .../ViewModels/OrderViewModel.cs | 5 + .../Models/IImplementerModel.cs | 19 + .../Models/IOrderModel.cs | 1 + .../Implements/ImplementerStorage.cs | 89 +++++ .../Implements/OrderStorage.cs | 16 +- .../Models/Implementer.cs | 71 ++++ .../Models/Order.cs | 12 +- .../TypographyDatabase.cs | 2 + .../DataFileSingleton.cs | 6 + .../Implements/ImplementerStorage .cs | 87 +++++ .../Implements/OrderStorage .cs | 17 +- .../Models/Implementer.cs | 81 ++++ .../TypographyFileImplement/Models/Order.cs | 8 + .../TypographyFileImplement.csproj | 1 + .../DataListSingleton.cs | 3 + .../Implements/ImplementerStorage .cs | 109 ++++++ .../Implements/OrderStorage.cs | 30 +- .../Models/Implementer .cs | 57 +++ .../TypographyListImplement/Models/Order.cs | 5 + .../Controllers/ImplementerController.cs | 105 +++++ Typography/TypographyRestApi/Program.cs | 2 + .../FormImplementer.Designer.cs | 163 ++++++++ Typography/TypographyView/FormImplementer.cs | 92 +++++ .../TypographyView/FormImplementer.resx | 60 +++ .../FormImplementers.Designer.cs | 118 ++++++ Typography/TypographyView/FormImplementers.cs | 103 +++++ .../TypographyView/FormImplementers.resx | 60 +++ .../TypographyView/FormMain.Designer.cs | 362 +++++++++--------- Typography/TypographyView/FormMain.cs | 310 +++++++-------- Typography/TypographyView/FormMain.resx | 62 ++- Typography/TypographyView/Program.cs | 6 +- 43 files changed, 2097 insertions(+), 375 deletions(-) create mode 100644 Typography/TypographyBusinessLogic/BusinessLogics/ImplementerLogic.cs create mode 100644 Typography/TypographyBusinessLogic/BusinessLogics/WorkModeling.cs create mode 100644 Typography/TypographyContracts/BindingModels/ImplementerBindingModel.cs create mode 100644 Typography/TypographyContracts/BusinessLogicsContracts/IImplementerLogic.cs create mode 100644 Typography/TypographyContracts/BusinessLogicsContracts/IWorkProcess.cs create mode 100644 Typography/TypographyContracts/SearchModels/ImplementerSearchModel.cs create mode 100644 Typography/TypographyContracts/StoragesContracts/IImplementerStorage.cs create mode 100644 Typography/TypographyContracts/ViewModels/ImplementerViewModel.cs create mode 100644 Typography/TypographyDataModels/Models/IImplementerModel.cs create mode 100644 Typography/TypographyDatabaseImplement/Implements/ImplementerStorage.cs create mode 100644 Typography/TypographyDatabaseImplement/Models/Implementer.cs create mode 100644 Typography/TypographyFileImplement/Implements/ImplementerStorage .cs create mode 100644 Typography/TypographyFileImplement/Models/Implementer.cs create mode 100644 Typography/TypographyListImplement/Implements/ImplementerStorage .cs create mode 100644 Typography/TypographyListImplement/Models/Implementer .cs create mode 100644 Typography/TypographyRestApi/Controllers/ImplementerController.cs create mode 100644 Typography/TypographyView/FormImplementer.Designer.cs create mode 100644 Typography/TypographyView/FormImplementer.cs create mode 100644 Typography/TypographyView/FormImplementer.resx create mode 100644 Typography/TypographyView/FormImplementers.Designer.cs create mode 100644 Typography/TypographyView/FormImplementers.cs create mode 100644 Typography/TypographyView/FormImplementers.resx diff --git a/Typography/TypographyBusinessLogic/BusinessLogics/ImplementerLogic.cs b/Typography/TypographyBusinessLogic/BusinessLogics/ImplementerLogic.cs new file mode 100644 index 0000000..effd301 --- /dev/null +++ b/Typography/TypographyBusinessLogic/BusinessLogics/ImplementerLogic.cs @@ -0,0 +1,122 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace TypographyBusinessLogic.BusinessLogics +{ + public class ImplementerLogic : IImplementerLogic + { + private readonly ILogger _logger; + private readonly IImplementerStorage _implementerStorage; + + public ImplementerLogic(ILogger logger, IImplementerStorage implementerStorage) + { + _logger = logger; + _implementerStorage = implementerStorage; + } + + public List? ReadList(ImplementerSearchModel? model) + { + _logger.LogInformation("ReadList. Id: {Id}. ImplementerFIO: {ImplementerFIO}.", + model?.Id, model?.ImplementerFIO); + 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 ImplementerViewModel? ReadElement(ImplementerSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Id: {Id}. ImplementerFIO: {ImplementerFIO}.", + model?.Id, model?.ImplementerFIO); + 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 bool Create(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ImplementerBindingModel model) + { + CheckModel(model); + if (_implementerStorage.Update(model) == null) + { + _logger.LogWarning("Update 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; + } + + private void CheckModel(ImplementerBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.Password)); + } + if (model.WorkExperience < 0) + { + throw new ArgumentNullException("Стаж работы должен быть неотрицательным", nameof(model.WorkExperience)); + } + if (model.Qualification < 0) + { + throw new ArgumentNullException("Квалификация должна быть неотрицательной", nameof(model.Qualification)); + } + _logger.LogInformation("Implementer. Id: {Id}. ImplementerFIO: {ImplementerFIO}. WorkExperience: {WorkExperience}. Qualification: {Qualification}.", + model?.Id, model?.ImplementerFIO, model?.WorkExperience, model?.Qualification); + var element = _implementerStorage.GetElement(new ImplementerSearchModel { ImplementerFIO = model.ImplementerFIO }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Исполнитель с таким ФИО уже есть"); + } + } + } +} \ No newline at end of file diff --git a/Typography/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs b/Typography/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs index fca1b7a..04d65c2 100644 --- a/Typography/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/Typography/TypographyBusinessLogic/BusinessLogics/OrderLogic.cs @@ -12,6 +12,7 @@ namespace TypographyBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + static readonly object _locker = new object(); public OrderLogic(ILogger logger, IOrderStorage orderStorage) { @@ -32,6 +33,24 @@ namespace TypographyBusinessLogic.BusinessLogics return list; } + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ClientId: {ClientId}. ImplementerId: {ImplementerId}. Status: {Status}. DateFrom: {DateFrom}. DateTo: {DateTo}. Id: {Id}", + model.ClientId, model.ImplementerId, model.Status, model.DateFrom, model.DateTo, model.Id); + var element = _orderStorage.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 CreateOrder(OrderBindingModel model) { CheckModel(model); @@ -52,7 +71,10 @@ namespace TypographyBusinessLogic.BusinessLogics public bool TakeOrderInWork(OrderBindingModel model) { - return ChangeOrderStatus(model, OrderStatus.Выполняется); + lock (_locker) + { + return ChangeOrderStatus(model, OrderStatus.Выполняется); + } } public bool FinishOrder(OrderBindingModel model) @@ -98,7 +120,11 @@ namespace TypographyBusinessLogic.BusinessLogics } model.Status = newStatus; - if (newStatus == OrderStatus.Выдан) + if (!model.ImplementerId.HasValue) + model.ImplementerId = orderView.ImplementerId; + model.DateImplement = orderView.DateImplement; + + if (newStatus == OrderStatus.Готов) { model.DateImplement = DateTime.Now; } diff --git a/Typography/TypographyBusinessLogic/BusinessLogics/WorkModeling.cs b/Typography/TypographyBusinessLogic/BusinessLogics/WorkModeling.cs new file mode 100644 index 0000000..fe5f9ed --- /dev/null +++ b/Typography/TypographyBusinessLogic/BusinessLogics/WorkModeling.cs @@ -0,0 +1,124 @@ +using TypographyDataModels.Enums; +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace TypographyBusinessLogic.BusinessLogics +{ + 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 { Status = 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); + + 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.FinishOrder(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) + { + if (_orderLogic == null || implementer == null) + { + return; + } + try + { + var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel + { + ImplementerId = implementer.Id, + 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.FinishOrder(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; + } + } + } +} \ No newline at end of file diff --git a/Typography/TypographyContracts/BindingModels/ImplementerBindingModel.cs b/Typography/TypographyContracts/BindingModels/ImplementerBindingModel.cs new file mode 100644 index 0000000..f9ba2ad --- /dev/null +++ b/Typography/TypographyContracts/BindingModels/ImplementerBindingModel.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyDataModels.Models; + +namespace TypographyContracts.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/Typography/TypographyContracts/BindingModels/OrderBindingModel.cs b/Typography/TypographyContracts/BindingModels/OrderBindingModel.cs index 6b83d36..4794f9a 100644 --- a/Typography/TypographyContracts/BindingModels/OrderBindingModel.cs +++ b/Typography/TypographyContracts/BindingModels/OrderBindingModel.cs @@ -14,6 +14,7 @@ namespace TypographyContracts.BindingModels { public int Id { get; set; } public int ClientId { get; set; } + public int? ImplementerId { get; set; } public int PrintedId { get; set; } public int Count { get; set; } public double Sum { get; set; } diff --git a/Typography/TypographyContracts/BusinessLogicsContracts/IImplementerLogic.cs b/Typography/TypographyContracts/BusinessLogicsContracts/IImplementerLogic.cs new file mode 100644 index 0000000..c15ed80 --- /dev/null +++ b/Typography/TypographyContracts/BusinessLogicsContracts/IImplementerLogic.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; + +namespace TypographyContracts.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/Typography/TypographyContracts/BusinessLogicsContracts/IOrderLogic.cs b/Typography/TypographyContracts/BusinessLogicsContracts/IOrderLogic.cs index 394bf91..cb84d54 100644 --- a/Typography/TypographyContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/Typography/TypographyContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -12,6 +12,7 @@ namespace TypographyContracts.BusinessLogicsContracts public interface IOrderLogic { List? ReadList(OrderSearchModel? model); + OrderViewModel? ReadElement(OrderSearchModel model); bool CreateOrder(OrderBindingModel model); bool TakeOrderInWork(OrderBindingModel model); bool FinishOrder(OrderBindingModel model); diff --git a/Typography/TypographyContracts/BusinessLogicsContracts/IWorkProcess.cs b/Typography/TypographyContracts/BusinessLogicsContracts/IWorkProcess.cs new file mode 100644 index 0000000..186d4b7 --- /dev/null +++ b/Typography/TypographyContracts/BusinessLogicsContracts/IWorkProcess.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyContracts.BusinessLogicsContracts +{ + public interface IWorkProcess + { + void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic); + } +} diff --git a/Typography/TypographyContracts/SearchModels/ImplementerSearchModel.cs b/Typography/TypographyContracts/SearchModels/ImplementerSearchModel.cs new file mode 100644 index 0000000..6b57369 --- /dev/null +++ b/Typography/TypographyContracts/SearchModels/ImplementerSearchModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyContracts.SearchModels +{ + public class ImplementerSearchModel + { + public int? Id { get; set; } + + public string? ImplementerFIO { get; set; } + + public string? Password { get; set; } + } +} diff --git a/Typography/TypographyContracts/SearchModels/OrderSearchModel.cs b/Typography/TypographyContracts/SearchModels/OrderSearchModel.cs index 2014761..9e2cc0e 100644 --- a/Typography/TypographyContracts/SearchModels/OrderSearchModel.cs +++ b/Typography/TypographyContracts/SearchModels/OrderSearchModel.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using TypographyDataModels.Enums; namespace TypographyContracts.SearchModels { @@ -10,6 +11,8 @@ namespace TypographyContracts.SearchModels { public int? Id { get; set; } public int? ClientId { get; set; } + public int? ImplementerId { get; set; } + public OrderStatus? Status { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/Typography/TypographyContracts/StoragesContracts/IImplementerStorage.cs b/Typography/TypographyContracts/StoragesContracts/IImplementerStorage.cs new file mode 100644 index 0000000..a34b820 --- /dev/null +++ b/Typography/TypographyContracts/StoragesContracts/IImplementerStorage.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; + +namespace TypographyContracts.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/Typography/TypographyContracts/ViewModels/ImplementerViewModel.cs b/Typography/TypographyContracts/ViewModels/ImplementerViewModel.cs new file mode 100644 index 0000000..ba792fb --- /dev/null +++ b/Typography/TypographyContracts/ViewModels/ImplementerViewModel.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyDataModels.Models; + +namespace TypographyContracts.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/Typography/TypographyContracts/ViewModels/OrderViewModel.cs b/Typography/TypographyContracts/ViewModels/OrderViewModel.cs index 0b3ee63..9d50823 100644 --- a/Typography/TypographyContracts/ViewModels/OrderViewModel.cs +++ b/Typography/TypographyContracts/ViewModels/OrderViewModel.cs @@ -20,6 +20,11 @@ namespace TypographyContracts.ViewModels [DisplayName("Клиент")] public string ClientFIO { get; set; } = string.Empty; + public int? ImplementerId { get; set; } + + [DisplayName("Исполнитель")] + public string? ImplementerFIO { get; set; } = string.Empty; + public int PrintedId { get; set; } [DisplayName("Изделие")] diff --git a/Typography/TypographyDataModels/Models/IImplementerModel.cs b/Typography/TypographyDataModels/Models/IImplementerModel.cs new file mode 100644 index 0000000..3a018df --- /dev/null +++ b/Typography/TypographyDataModels/Models/IImplementerModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace TypographyDataModels.Models +{ + public interface IImplementerModel : IId + { + string ImplementerFIO { get; } + + string Password { get; } + + int WorkExperience { get; } + + int Qualification { get; } + } +} diff --git a/Typography/TypographyDataModels/Models/IOrderModel.cs b/Typography/TypographyDataModels/Models/IOrderModel.cs index 47eb633..a8d01f6 100644 --- a/Typography/TypographyDataModels/Models/IOrderModel.cs +++ b/Typography/TypographyDataModels/Models/IOrderModel.cs @@ -10,6 +10,7 @@ namespace TypographyDataModels.Models public interface IOrderModel : IId { int ClientId { get; } + int? ImplementerId { get; } int PrintedId { get; } int Count { get; } double Sum { get; } diff --git a/Typography/TypographyDatabaseImplement/Implements/ImplementerStorage.cs b/Typography/TypographyDatabaseImplement/Implements/ImplementerStorage.cs new file mode 100644 index 0000000..748436f --- /dev/null +++ b/Typography/TypographyDatabaseImplement/Implements/ImplementerStorage.cs @@ -0,0 +1,89 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyDatabaseImplement.Models; +namespace TypographyDatabaseImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + public List GetFullList() + { + using var context = new TypographyDatabase(); + return context.Implementers + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return new(); + } + using var context = new TypographyDatabase(); + return context.Implementers + .Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (!model.Id.HasValue && string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password)) + { + return null; + } + using var context = new TypographyDatabase(); + return context.Implementers + .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || + (!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO && + !string.IsNullOrEmpty(model.Password) && x.Password == model.Password)) + ?.GetViewModel; + } + + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + using var context = new TypographyDatabase(); + context.Implementers.Add(newImplementer); + context.SaveChanges(); + return newImplementer.GetViewModel; + } + + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + using var context = new TypographyDatabase(); + var implementer = context.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (implementer == null) + { + return null; + } + implementer.Update(model); + context.SaveChanges(); + return implementer.GetViewModel; + } + + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + using var context = new TypographyDatabase(); + var element = context.Implementers.FirstOrDefault(rec => rec.Id == model.Id); + if (element != null) + { + context.Implementers.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/Typography/TypographyDatabaseImplement/Implements/OrderStorage.cs b/Typography/TypographyDatabaseImplement/Implements/OrderStorage.cs index 726867c..d1a293c 100644 --- a/Typography/TypographyDatabaseImplement/Implements/OrderStorage.cs +++ b/Typography/TypographyDatabaseImplement/Implements/OrderStorage.cs @@ -16,7 +16,7 @@ namespace TypographyDatabaseImplement.Implements { public OrderViewModel? GetElement(OrderSearchModel model) { - if (!model.Id.HasValue) + if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue)) { return null; } @@ -24,12 +24,15 @@ namespace TypographyDatabaseImplement.Implements return context.Orders .Include(x => x.Printed) .Include(x => x.Client) - .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || (model.ClientId.HasValue && x.ClientId == model.ClientId))?.GetViewModel; + .Include(x => x.Implementer) + .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || + (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId && x.Status == model.Status))? + .GetViewModel; } public List GetFilteredList(OrderSearchModel model) { - if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue) + if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue) { return new(); } @@ -37,8 +40,10 @@ namespace TypographyDatabaseImplement.Implements return context.Orders .Include(x => x.Printed) .Include(x => x.Client) + .Include(x => x.Implementer) .Where(x => (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) || - (model.ClientId.HasValue && x.ClientId == model.ClientId)) + (model.ClientId.HasValue && x.ClientId == model.ClientId) || + (model.Status.HasValue && x.Status == model.Status)) .Select(x => x.GetViewModel) .ToList(); } @@ -49,6 +54,7 @@ namespace TypographyDatabaseImplement.Implements return context.Orders .Include(x => x.Printed) .Include(x => x.Client) + .Include(x => x.Implementer) .Select(x => x.GetViewModel) .ToList(); } @@ -74,7 +80,7 @@ namespace TypographyDatabaseImplement.Implements { return null; } - order.Update(model); + order.Update(model, context); context.SaveChanges(); return order.GetViewModel; } diff --git a/Typography/TypographyDatabaseImplement/Models/Implementer.cs b/Typography/TypographyDatabaseImplement/Models/Implementer.cs new file mode 100644 index 0000000..739965e --- /dev/null +++ b/Typography/TypographyDatabaseImplement/Models/Implementer.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; + +namespace TypographyDatabaseImplement.Models +{ + public class Implementer : IImplementerModel + { + public int Id { get; set; } + + [Required] + public string ImplementerFIO { get; set; } = string.Empty; + + [Required] + public string Password { get; set; } = string.Empty; + + [Required] + public int WorkExperience { get; set; } + + [Required] + public int Qualification { get; set; } + + [ForeignKey("ImplementerId")] + public virtual List ImplementerOrders { get; set; } = new(); + + public static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification + }; + } + + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification + }; + } +} + diff --git a/Typography/TypographyDatabaseImplement/Models/Order.cs b/Typography/TypographyDatabaseImplement/Models/Order.cs index cf34556..1b4774f 100644 --- a/Typography/TypographyDatabaseImplement/Models/Order.cs +++ b/Typography/TypographyDatabaseImplement/Models/Order.cs @@ -20,6 +20,10 @@ namespace TypographyDatabaseImplement.Models public virtual Client Client { get; set; } = new(); + public int? ImplementerId { get; private set; } + + public virtual Implementer? Implementer { get; set; } = new(); + [Required] public int PrintedId { get; private set; } @@ -50,6 +54,8 @@ namespace TypographyDatabaseImplement.Models Id = model.Id, ClientId = model.ClientId, Client = context.Clients.First(x => model.ClientId == x.Id), + ImplementerId = model.ImplementerId, + Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => model.ImplementerId == x.Id) : null, PrintedId = model.PrintedId, Printed = context.Printeds.First(x => model.PrintedId == x.Id), Count = model.Count, @@ -60,12 +66,14 @@ namespace TypographyDatabaseImplement.Models }; } - public void Update(OrderBindingModel? model) + public void Update(OrderBindingModel? model, TypographyDatabase context) { if (model == null) { return; } + ImplementerId = model.ImplementerId; + Implementer = model.ImplementerId.HasValue ? context.Implementers.First(x => model.ImplementerId == x.Id) : null; Status = model.Status; DateImplement = model.DateImplement; } @@ -75,6 +83,8 @@ namespace TypographyDatabaseImplement.Models Id = Id, ClientId = ClientId, ClientFIO = Client.ClientFIO, + ImplementerId = ImplementerId, + ImplementerFIO = Implementer != null ? Implementer.ImplementerFIO : null, PrintedId = PrintedId, PrintedName = Printed.PrintedName, Count = Count, diff --git a/Typography/TypographyDatabaseImplement/TypographyDatabase.cs b/Typography/TypographyDatabaseImplement/TypographyDatabase.cs index 15c1d75..b242081 100644 --- a/Typography/TypographyDatabaseImplement/TypographyDatabase.cs +++ b/Typography/TypographyDatabaseImplement/TypographyDatabase.cs @@ -27,5 +27,7 @@ namespace TypographyDatabaseImplement public virtual DbSet Orders { set; get; } public virtual DbSet Clients { set; get; } + + public virtual DbSet Implementers { set; get; } } } diff --git a/Typography/TypographyFileImplement/DataFileSingleton.cs b/Typography/TypographyFileImplement/DataFileSingleton.cs index 1b5b0e2..f79a7ee 100644 --- a/Typography/TypographyFileImplement/DataFileSingleton.cs +++ b/Typography/TypographyFileImplement/DataFileSingleton.cs @@ -6,6 +6,7 @@ using System.Threading.Tasks; using TypographyFileImplement.Models; using System.Xml.Linq; + namespace TypographyFileImplement { public class DataFileSingleton @@ -16,11 +17,13 @@ namespace TypographyFileImplement private readonly string OrderFileName = "Order.xml"; private readonly string PrintedFileName = "Printed.xml"; private readonly string ClientFileName = "Client.xml"; + private readonly string ImplementerFileName = "Implementer.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Printeds { get; private set; } public List Clients { get; private set; } + public List Implementers { get; private set; } public static DataFileSingleton GetInstance() { @@ -39,12 +42,15 @@ namespace TypographyFileImplement public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); + public void SaveImplementers() => SaveData(Implementers, ImplementerFileName, "Implementers", x => x.GetXElement); + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Printeds = LoadData(PrintedFileName, "Product", x => Printed.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/Typography/TypographyFileImplement/Implements/ImplementerStorage .cs b/Typography/TypographyFileImplement/Implements/ImplementerStorage .cs new file mode 100644 index 0000000..7f70ea9 --- /dev/null +++ b/Typography/TypographyFileImplement/Implements/ImplementerStorage .cs @@ -0,0 +1,87 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyFileImplement.Models; + +namespace TypographyFileImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataFileSingleton source; + + public ImplementerStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Implementers + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ImplementerSearchModel model) + { + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return new(); + } + return source.Implementers + .Where(x => x.ImplementerFIO.Contains(model.ImplementerFIO)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (!model.Id.HasValue && string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password)) + { + return null; + } + return source.Implementers + .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || + (!string.IsNullOrEmpty(model.ImplementerFIO) && x.ImplementerFIO == model.ImplementerFIO && + !string.IsNullOrEmpty(model.Password) && x.Password == model.Password)) + ?.GetViewModel; + } + + public ImplementerViewModel? Insert(ImplementerBindingModel model) + { + model.Id = source.Components.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + source.Implementers.Add(newImplementer); + source.SaveImplementers(); + return newImplementer.GetViewModel; + } + + public ImplementerViewModel? Update(ImplementerBindingModel model) + { + var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (implementer == null) + { + return null; + } + implementer.Update(model); + source.SaveImplementers(); + return implementer.GetViewModel; + } + + public ImplementerViewModel? Delete(ImplementerBindingModel model) + { + var element = source.Implementers.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Implementers.Remove(element); + source.SaveImplementers(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/Typography/TypographyFileImplement/Implements/OrderStorage .cs b/Typography/TypographyFileImplement/Implements/OrderStorage .cs index fb4a1bd..34ea373 100644 --- a/Typography/TypographyFileImplement/Implements/OrderStorage .cs +++ b/Typography/TypographyFileImplement/Implements/OrderStorage .cs @@ -25,11 +25,16 @@ namespace TypographyFileImplement.Implements private OrderViewModel DefineOthersNames(OrderViewModel model) { string? clientFIO = source.Clients.FirstOrDefault(x => model.ClientId == x.Id)?.ClientFIO; + string? implementerFIO = source.Implementers.FirstOrDefault(x => model.ImplementerId == x.Id)?.ImplementerFIO; string? printedName = source.Printeds.FirstOrDefault(x => model.PrintedId == x.Id)?.PrintedName; if (clientFIO != null) { model.ClientFIO = clientFIO; } + if (implementerFIO != null) + { + model.ImplementerFIO = implementerFIO; + } if (printedName != null) { model.PrintedName = printedName; @@ -39,25 +44,29 @@ namespace TypographyFileImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue) + if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue) { return new(); } return source.Orders .Where(x => (model.DateFrom.HasValue && model.DateTo.HasValue && x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) || - (model.ClientId.HasValue && x.ClientId == model.ClientId)) + (model.ClientId.HasValue && x.ClientId == model.ClientId) || + (model.Status.HasValue && x.Status == model.Status)) .Select(x => DefineOthersNames(x.GetViewModel)) .ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { - if (!model.Id.HasValue && !model.ClientId.HasValue) + if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue)) { return null; } return DefineOthersNames(source.Orders - .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || (model.ClientId.HasValue && x.Id == model.ClientId))?.GetViewModel); + .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id) || + (model.ClientId.HasValue && x.Id == model.ClientId) || + (model.ImplementerId.HasValue && x.Id == model.ImplementerId && x.Status == model.Status))? + .GetViewModel); } public OrderViewModel? Insert(OrderBindingModel model) diff --git a/Typography/TypographyFileImplement/Models/Implementer.cs b/Typography/TypographyFileImplement/Models/Implementer.cs new file mode 100644 index 0000000..693358c --- /dev/null +++ b/Typography/TypographyFileImplement/Models/Implementer.cs @@ -0,0 +1,81 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; +using System.Xml.Linq; +using System.Reflection; + +namespace TypographyFileImplement.Models +{ + public class Implementer : IImplementerModel + { + public int Id { get; private set; } + + 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 static Implementer? Create(ImplementerBindingModel model) + { + if (model == null) + { + return null; + } + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification, + }; + } + + public static Implementer? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Implementer() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ImplementerFIO = element.Element("ImplementerFIO")!.Value, + Password = element.Element("Password")!.Value, + WorkExperience = Convert.ToInt32(element.Element("Cost")!.Value), + Qualification = Convert.ToInt32(element.Element("Cost")!.Value) + }; + } + + public void Update(ImplementerBindingModel model) + { + if (model == null) + { + return; + } + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification + }; + + public XElement GetXElement => new("Implementer", + new XAttribute("Id", Id), + new XElement("ImplementerFIO", ImplementerFIO), + new XElement("Password", Password), + new XElement("WorkExperience", WorkExperience), + new XElement("Qualification", Qualification)); + } +} \ No newline at end of file diff --git a/Typography/TypographyFileImplement/Models/Order.cs b/Typography/TypographyFileImplement/Models/Order.cs index c757851..8399283 100644 --- a/Typography/TypographyFileImplement/Models/Order.cs +++ b/Typography/TypographyFileImplement/Models/Order.cs @@ -13,8 +13,10 @@ namespace TypographyFileImplement.Models { public class Order : IOrderModel { + public int Id { get; private set; } public int ClientId { get; private set; } + public int? ImplementerId { get; private set; } public int PrintedId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } @@ -32,6 +34,7 @@ namespace TypographyFileImplement.Models { Id = model.Id, ClientId = model.ClientId, + ImplementerId = model.ImplementerId, PrintedId = model.PrintedId, Count = model.Count, Sum = model.Sum, @@ -51,6 +54,7 @@ namespace TypographyFileImplement.Models { Id = Convert.ToInt32(element.Attribute("Id")!.Value), ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), + ImplementerId = Convert.ToInt32(element.Element("ImplementerId")!.Value), PrintedId = Convert.ToInt32(element.Element("PrintedId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), @@ -67,6 +71,7 @@ namespace TypographyFileImplement.Models { return; } + ImplementerId = model.ImplementerId; Status = model.Status; DateImplement = model.DateImplement; } @@ -75,6 +80,7 @@ namespace TypographyFileImplement.Models { Id = Id, ClientId = ClientId, + ImplementerId = ImplementerId, PrintedId = PrintedId, Count = Count, Sum = Sum, @@ -86,6 +92,7 @@ namespace TypographyFileImplement.Models public XElement GetXElement => new("Order", new XAttribute("Id", Id), new XElement("ClientId", ClientId), + new XElement("ImplementerId", ImplementerId), new XElement("PrintedId", PrintedId), new XElement("Count", Count), new XElement("Sum", Sum.ToString()), @@ -94,3 +101,4 @@ namespace TypographyFileImplement.Models new XElement("DateImplement", DateImplement.ToString())); } } + diff --git a/Typography/TypographyFileImplement/TypographyFileImplement.csproj b/Typography/TypographyFileImplement/TypographyFileImplement.csproj index fe9f0c9..96adc37 100644 --- a/Typography/TypographyFileImplement/TypographyFileImplement.csproj +++ b/Typography/TypographyFileImplement/TypographyFileImplement.csproj @@ -9,6 +9,7 @@ + diff --git a/Typography/TypographyListImplement/DataListSingleton.cs b/Typography/TypographyListImplement/DataListSingleton.cs index 6e2cfa7..428c7cd 100644 --- a/Typography/TypographyListImplement/DataListSingleton.cs +++ b/Typography/TypographyListImplement/DataListSingleton.cs @@ -14,6 +14,8 @@ namespace TypographyListImplement public List Orders { get; set; } public List Printeds { get; set; } public List Clients { get; set; } + public List Implementers { get; set; } + private DataListSingleton() { @@ -21,6 +23,7 @@ namespace TypographyListImplement Orders = new List(); Printeds = new List(); Clients = new List(); + Implementers = new List(); } public static DataListSingleton GetInstance() diff --git a/Typography/TypographyListImplement/Implements/ImplementerStorage .cs b/Typography/TypographyListImplement/Implements/ImplementerStorage .cs new file mode 100644 index 0000000..7de2b4f --- /dev/null +++ b/Typography/TypographyListImplement/Implements/ImplementerStorage .cs @@ -0,0 +1,109 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.SearchModels; +using TypographyContracts.StoragesContracts; +using TypographyContracts.ViewModels; +using TypographyListImplement.Models; + +namespace TypographyListImplement.Implements +{ + public class ImplementerStorage : IImplementerStorage + { + private readonly DataListSingleton _source; + + public ImplementerStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var implementer in _source.Implementers) + { + result.Add(implementer.GetViewModel); + } + return result; + } + + public List GetFilteredList(ImplementerSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ImplementerFIO)) + { + return result; + } + foreach (var implementer in _source.Implementers) + { + if (implementer.ImplementerFIO.Contains(model.ImplementerFIO)) + { + result.Add(implementer.GetViewModel); + } + } + return result; + } + + public ImplementerViewModel? GetElement(ImplementerSearchModel model) + { + if (!model.Id.HasValue && string.IsNullOrEmpty(model.ImplementerFIO) && string.IsNullOrEmpty(model.Password)) + { + return null; + } + foreach (var implementer in _source.Implementers) + { + if ((model.Id.HasValue && implementer.Id == model.Id) || + (!string.IsNullOrEmpty(model.ImplementerFIO) && implementer.ImplementerFIO == model.ImplementerFIO && + !string.IsNullOrEmpty(model.Password) && implementer.Password == model.Password)) + { + return implementer.GetViewModel; + } + } + return null; + } + + 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 newImplementer = Implementer.Create(model); + if (newImplementer == null) + { + return null; + } + _source.Implementers.Add(newImplementer); + return newImplementer.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; + } + + 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; + } + } +} diff --git a/Typography/TypographyListImplement/Implements/OrderStorage.cs b/Typography/TypographyListImplement/Implements/OrderStorage.cs index 882c0e2..e5c86c7 100644 --- a/Typography/TypographyListImplement/Implements/OrderStorage.cs +++ b/Typography/TypographyListImplement/Implements/OrderStorage.cs @@ -33,19 +33,27 @@ namespace TypographyListImplement.Implements private OrderViewModel DefineOthersNames(Order model) { OrderViewModel result = model.GetViewModel; - foreach (var order in _source.Clients) + foreach (var client in _source.Clients) { - if (result.ClientId == order.Id) + if (result.ClientId == client.Id) { - result.ClientFIO = order.ClientFIO; + result.ClientFIO = client.ClientFIO; break; } } - foreach (var order in _source.Printeds) + foreach (var implementer in _source.Implementers) { - if (result.PrintedId == order.Id) + if (result.ImplementerId == implementer.Id) { - result.PrintedName = order.PrintedName; + result.ImplementerFIO = implementer.ImplementerFIO; + break; + } + } + foreach (var printed in _source.Printeds) + { + if (result.PrintedId == printed.Id) + { + result.PrintedName = printed.PrintedName; break; } } @@ -55,14 +63,15 @@ namespace TypographyListImplement.Implements public List GetFilteredList(OrderSearchModel model) { var result = new List(); - if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue) + if ((!model.DateFrom.HasValue || !model.DateTo.HasValue) && !model.ClientId.HasValue && !model.Status.HasValue) { return result; } foreach (var order in _source.Orders) { if ((model.DateFrom.HasValue && model.DateTo.HasValue && order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) || - (model.ClientId.HasValue && order.ClientId == model.ClientId)) + (model.ClientId.HasValue && order.ClientId == model.ClientId) || + (model.Status.HasValue && order.Status == model.Status)) { result.Add(DefineOthersNames(order)); } @@ -72,13 +81,14 @@ namespace TypographyListImplement.Implements public OrderViewModel? GetElement(OrderSearchModel model) { - if (!model.Id.HasValue) + if (!model.Id.HasValue && (!model.ImplementerId.HasValue || !model.Status.HasValue)) { return null; } foreach (var order in _source.Orders) { - if ((model.Id.HasValue && order.Id == model.Id) || (model.ClientId.HasValue && order.ClientId == model.ClientId)) + if ((model.Id.HasValue && order.Id == model.Id) || + (model.ImplementerId.HasValue && order.Id == model.ImplementerId && order.Status == model.Status)) { return DefineOthersNames(order); } diff --git a/Typography/TypographyListImplement/Models/Implementer .cs b/Typography/TypographyListImplement/Models/Implementer .cs new file mode 100644 index 0000000..0e9e4c5 --- /dev/null +++ b/Typography/TypographyListImplement/Models/Implementer .cs @@ -0,0 +1,57 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using TypographyContracts.BindingModels; +using TypographyContracts.ViewModels; +using TypographyDataModels.Models; + +namespace TypographyListImplement.Models +{ + public class Implementer : IImplementerModel + { + public int Id { get; private set; } + 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 static Implementer? Create(ImplementerBindingModel? model) + { + if (model == null) + { + return null; + } + return new Implementer() + { + Id = model.Id, + ImplementerFIO = model.ImplementerFIO, + Password = model.Password, + WorkExperience = model.WorkExperience, + Qualification = model.Qualification, + }; + } + + public void Update(ImplementerBindingModel? model) + { + if (model == null) + { + return; + } + ImplementerFIO = model.ImplementerFIO; + Password = model.Password; + WorkExperience = model.WorkExperience; + Qualification = model.Qualification; + } + + public ImplementerViewModel GetViewModel => new() + { + Id = Id, + ImplementerFIO = ImplementerFIO, + Password = Password, + WorkExperience = WorkExperience, + Qualification = Qualification + }; + } +} diff --git a/Typography/TypographyListImplement/Models/Order.cs b/Typography/TypographyListImplement/Models/Order.cs index 97f923c..0614d6f 100644 --- a/Typography/TypographyListImplement/Models/Order.cs +++ b/Typography/TypographyListImplement/Models/Order.cs @@ -10,10 +10,12 @@ using TypographyDataModels.Models; namespace TypographyListImplement.Models { + public class Order : IOrderModel { public int Id { get; private set; } public int ClientId { get; private set; } + public int? ImplementerId { get; private set; } public int PrintedId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } @@ -31,6 +33,7 @@ namespace TypographyListImplement.Models { Id = model.Id, ClientId = model.ClientId, + ImplementerId = model.ImplementerId, PrintedId = model.PrintedId, Count = model.Count, Sum = model.Sum, @@ -46,6 +49,7 @@ namespace TypographyListImplement.Models { return; } + ImplementerId = model.ImplementerId; Status = model.Status; DateImplement = model.DateImplement; } @@ -54,6 +58,7 @@ namespace TypographyListImplement.Models { Id = Id, ClientId = ClientId, + ImplementerId = ImplementerId, PrintedId = PrintedId, Count = Count, Sum = Sum, diff --git a/Typography/TypographyRestApi/Controllers/ImplementerController.cs b/Typography/TypographyRestApi/Controllers/ImplementerController.cs new file mode 100644 index 0000000..6d2ffa4 --- /dev/null +++ b/Typography/TypographyRestApi/Controllers/ImplementerController.cs @@ -0,0 +1,105 @@ +using TypographyDataModels.Enums; +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using TypographyContracts.SearchModels; +using TypographyContracts.ViewModels; +using Microsoft.AspNetCore.Mvc; + +namespace TypographyRestApi.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 + { + Status = 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; + } + } + } +} \ No newline at end of file diff --git a/Typography/TypographyRestApi/Program.cs b/Typography/TypographyRestApi/Program.cs index f799404..16dae25 100644 --- a/Typography/TypographyRestApi/Program.cs +++ b/Typography/TypographyRestApi/Program.cs @@ -13,10 +13,12 @@ builder.Logging.AddLog4Net("log4net.config"); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); builder.Services.AddTransient(); +builder.Services.AddTransient(); builder.Services.AddControllers(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle diff --git a/Typography/TypographyView/FormImplementer.Designer.cs b/Typography/TypographyView/FormImplementer.Designer.cs new file mode 100644 index 0000000..2980487 --- /dev/null +++ b/Typography/TypographyView/FormImplementer.Designer.cs @@ -0,0 +1,163 @@ +namespace TypographyView +{ + 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() + { + labelFIO = new Label(); + labelPassword = new Label(); + labelWorkExperience = new Label(); + labelQualification = new Label(); + textBoxPassword = new TextBox(); + textBoxFIO = new TextBox(); + textBoxWorkExperience = new TextBox(); + textBoxQualification = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelFIO + // + labelFIO.AutoSize = true; + labelFIO.Location = new Point(12, 15); + labelFIO.Name = "labelFIO"; + labelFIO.Size = new Size(42, 20); + labelFIO.TabIndex = 0; + labelFIO.Text = "ФИО"; + // + // labelPassword + // + labelPassword.AutoSize = true; + labelPassword.Location = new Point(12, 48); + labelPassword.Name = "labelPassword"; + labelPassword.Size = new Size(62, 20); + labelPassword.TabIndex = 1; + labelPassword.Text = "Пароль"; + // + // labelWorkExperience + // + labelWorkExperience.AutoSize = true; + labelWorkExperience.Location = new Point(12, 81); + labelWorkExperience.Name = "labelWorkExperience"; + labelWorkExperience.Size = new Size(99, 20); + labelWorkExperience.TabIndex = 2; + labelWorkExperience.Text = "Стаж работы"; + // + // labelQualification + // + labelQualification.AutoSize = true; + labelQualification.Location = new Point(12, 114); + labelQualification.Name = "labelQualification"; + labelQualification.Size = new Size(111, 20); + labelQualification.TabIndex = 3; + labelQualification.Text = "Квалификация"; + // + // textBoxPassword + // + textBoxPassword.Location = new Point(129, 45); + textBoxPassword.Name = "textBoxPassword"; + textBoxPassword.Size = new Size(241, 27); + textBoxPassword.TabIndex = 4; + // + // textBoxFIO + // + textBoxFIO.Location = new Point(129, 12); + textBoxFIO.Name = "textBoxFIO"; + textBoxFIO.Size = new Size(241, 27); + textBoxFIO.TabIndex = 5; + // + // textBoxWorkExperience + // + textBoxWorkExperience.Location = new Point(129, 78); + textBoxWorkExperience.Name = "textBoxWorkExperience"; + textBoxWorkExperience.Size = new Size(134, 27); + textBoxWorkExperience.TabIndex = 6; + // + // textBoxQualification + // + textBoxQualification.Location = new Point(129, 111); + textBoxQualification.Name = "textBoxQualification"; + textBoxQualification.Size = new Size(134, 27); + textBoxQualification.TabIndex = 7; + // + // buttonSave + // + buttonSave.Location = new Point(168, 146); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(102, 29); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(276, 146); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // FormImplementer + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(382, 187); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxQualification); + Controls.Add(textBoxWorkExperience); + Controls.Add(textBoxFIO); + Controls.Add(textBoxPassword); + Controls.Add(labelQualification); + Controls.Add(labelWorkExperience); + Controls.Add(labelPassword); + Controls.Add(labelFIO); + Name = "FormImplementer"; + StartPosition = FormStartPosition.CenterParent; + Text = "Исполнитель"; + Load += FormImplementer_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelFIO; + private Label labelPassword; + private Label labelWorkExperience; + private Label labelQualification; + private TextBox textBoxPassword; + private TextBox textBoxFIO; + private TextBox textBoxWorkExperience; + private TextBox textBoxQualification; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/Typography/TypographyView/FormImplementer.cs b/Typography/TypographyView/FormImplementer.cs new file mode 100644 index 0000000..beea7ac --- /dev/null +++ b/Typography/TypographyView/FormImplementer.cs @@ -0,0 +1,92 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using TypographyContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace TypographyView +{ + 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 FormImplementer_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + try + { + _logger.LogInformation("Получение исполнителя"); + var view = _logic.ReadElement(new ImplementerSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxFIO.Text = view.ImplementerFIO; + textBoxPassword.Text = view.Password; + textBoxWorkExperience.Text = view.WorkExperience.ToString(); + textBoxQualification.Text = view.Qualification.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(textBoxFIO.Text)) + { + MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxPassword.Text)) + { + MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение исполнителя"); + try + { + var model = new ImplementerBindingModel + { + Id = _id ?? 0, + ImplementerFIO = textBoxFIO.Text, + Password = textBoxPassword.Text, + WorkExperience = Convert.ToInt32(textBoxWorkExperience.Text), + Qualification = Convert.ToInt32(textBoxQualification.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(); + } + } +} diff --git a/Typography/TypographyView/FormImplementer.resx b/Typography/TypographyView/FormImplementer.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Typography/TypographyView/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/Typography/TypographyView/FormImplementers.Designer.cs b/Typography/TypographyView/FormImplementers.Designer.cs new file mode 100644 index 0000000..19e7b86 --- /dev/null +++ b/Typography/TypographyView/FormImplementers.Designer.cs @@ -0,0 +1,118 @@ +namespace TypographyView +{ + 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() + { + dataGridViewImplementers = new DataGridView(); + buttonRef = new Button(); + buttonDel = new Button(); + buttonUpd = new Button(); + buttonAdd = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridViewImplementers).BeginInit(); + SuspendLayout(); + // + // dataGridViewImplementers + // + dataGridViewImplementers.BackgroundColor = SystemColors.ControlLightLight; + dataGridViewImplementers.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewImplementers.Location = new Point(1, 1); + dataGridViewImplementers.Name = "dataGridViewImplementers"; + dataGridViewImplementers.RowHeadersVisible = false; + dataGridViewImplementers.RowHeadersWidth = 51; + dataGridViewImplementers.RowTemplate.Height = 29; + dataGridViewImplementers.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridViewImplementers.Size = new Size(650, 402); + dataGridViewImplementers.TabIndex = 0; + // + // buttonRef + // + buttonRef.Location = new Point(668, 117); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(102, 29); + buttonRef.TabIndex = 1; + buttonRef.Text = "Обновить"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += ButtonRef_Click; + // + // buttonDel + // + buttonDel.Location = new Point(668, 82); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(102, 29); + buttonDel.TabIndex = 2; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += ButtonDel_Click; + // + // buttonUpd + // + buttonUpd.Location = new Point(668, 47); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(102, 29); + buttonUpd.TabIndex = 3; + buttonUpd.Text = "Изменить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += ButtonUpd_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(668, 12); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(102, 29); + buttonAdd.TabIndex = 4; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // FormImplementers + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(782, 403); + Controls.Add(buttonAdd); + Controls.Add(buttonUpd); + Controls.Add(buttonDel); + Controls.Add(buttonRef); + Controls.Add(dataGridViewImplementers); + Name = "FormImplementers"; + StartPosition = FormStartPosition.CenterParent; + Text = "Исполнители"; + Load += FormImplementers_Load; + ((System.ComponentModel.ISupportInitialize)dataGridViewImplementers).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridViewImplementers; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + } +} \ No newline at end of file diff --git a/Typography/TypographyView/FormImplementers.cs b/Typography/TypographyView/FormImplementers.cs new file mode 100644 index 0000000..a159582 --- /dev/null +++ b/Typography/TypographyView/FormImplementers.cs @@ -0,0 +1,103 @@ +using TypographyContracts.BindingModels; +using TypographyContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace TypographyView +{ + 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 FormImplementers_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridViewImplementers.DataSource = list; + dataGridViewImplementers.Columns["Id"].Visible = false; + dataGridViewImplementers.Columns["ImplementerFIO"].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(FormImplementer)); + if (service is FormImplementer form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + if (dataGridViewImplementers.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + if (service is FormImplementer form) + { + form.Id = Convert.ToInt32(dataGridViewImplementers.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridViewImplementers.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == + DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridViewImplementers.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 ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/Typography/TypographyView/FormImplementers.resx b/Typography/TypographyView/FormImplementers.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Typography/TypographyView/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/Typography/TypographyView/FormMain.Designer.cs b/Typography/TypographyView/FormMain.Designer.cs index f5d0d22..ab5ba55 100644 --- a/Typography/TypographyView/FormMain.Designer.cs +++ b/Typography/TypographyView/FormMain.Designer.cs @@ -20,194 +20,190 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #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() - { - buttonCreateOrder = new Button(); - buttonTakeOrderInWork = new Button(); - buttonIssuedOrder = new Button(); - dataGridViewOrders = new DataGridView(); - buttonRef = new Button(); - buttonOrderReady = new Button(); - menuStrip = new MenuStrip(); - directoriesToolStripMenuItem = new ToolStripMenuItem(); - componentsToolStripMenuItem = new ToolStripMenuItem(); - printedsToolStripMenuItem = new ToolStripMenuItem(); - clientsToolStripMenuItem = new ToolStripMenuItem(); - reportsToolStripMenuItem = new ToolStripMenuItem(); - printedsListToolStripMenuItem = new ToolStripMenuItem(); - componentPrintedsToolStripMenuItem = new ToolStripMenuItem(); - ordersListToolStripMenuItem = new ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)dataGridViewOrders).BeginInit(); - menuStrip.SuspendLayout(); - SuspendLayout(); - // - // buttonCreateOrder - // - buttonCreateOrder.Location = new Point(1267, 31); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(203, 29); - buttonCreateOrder.TabIndex = 0; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += ButtonCreateOrder_Click; - // - // buttonTakeOrderInWork - // - buttonTakeOrderInWork.Location = new Point(1267, 66); - buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(203, 29); - buttonTakeOrderInWork.TabIndex = 1; - buttonTakeOrderInWork.Text = "Отдать на выполнение"; - buttonTakeOrderInWork.UseVisualStyleBackColor = true; - buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; - // - // buttonIssuedOrder - // - buttonIssuedOrder.Location = new Point(1267, 136); - buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(203, 29); - buttonIssuedOrder.TabIndex = 2; - buttonIssuedOrder.Text = "Заказ выдан"; - buttonIssuedOrder.UseVisualStyleBackColor = true; - buttonIssuedOrder.Click += ButtonIssuedOrder_Click; - // - // dataGridViewOrders - // - dataGridViewOrders.BackgroundColor = SystemColors.ControlLightLight; - dataGridViewOrders.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewOrders.Location = new Point(0, 31); - dataGridViewOrders.Name = "dataGridViewOrders"; - dataGridViewOrders.RowHeadersVisible = false; - dataGridViewOrders.RowHeadersWidth = 51; - dataGridViewOrders.RowTemplate.Height = 29; - dataGridViewOrders.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridViewOrders.Size = new Size(1252, 402); - dataGridViewOrders.TabIndex = 3; - // - // buttonRef - // - buttonRef.Location = new Point(1267, 171); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(203, 29); - buttonRef.TabIndex = 4; - buttonRef.Text = "Обновить список"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; - // - // buttonOrderReady - // - buttonOrderReady.Location = new Point(1267, 101); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(203, 29); - buttonOrderReady.TabIndex = 5; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += ButtonOrderReady_Click; - // - // menuStrip - // - menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { directoriesToolStripMenuItem, reportsToolStripMenuItem }); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1482, 28); - menuStrip.TabIndex = 6; - menuStrip.Text = "menuStrip1"; - // - // directoriesToolStripMenuItem - // - directoriesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, printedsToolStripMenuItem, clientsToolStripMenuItem }); - directoriesToolStripMenuItem.Name = "directoriesToolStripMenuItem"; - directoriesToolStripMenuItem.Size = new Size(117, 24); - directoriesToolStripMenuItem.Text = "Справочники"; - // - // componentsToolStripMenuItem - // - componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; - componentsToolStripMenuItem.Size = new Size(237, 26); - componentsToolStripMenuItem.Text = "Компоненты"; - componentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; - // - // printedsToolStripMenuItem - // - printedsToolStripMenuItem.Name = "printedsToolStripMenuItem"; - printedsToolStripMenuItem.Size = new Size(237, 26); - printedsToolStripMenuItem.Text = "Печатная продукция"; - printedsToolStripMenuItem.Click += PrintedsToolStripMenuItem_Click; - // - // clientsToolStripMenuItem - // - clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; - clientsToolStripMenuItem.Size = new Size(237, 26); - clientsToolStripMenuItem.Text = "Клиенты"; - clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; - // - // reportsToolStripMenuItem - // - reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { printedsListToolStripMenuItem, componentPrintedsToolStripMenuItem, ordersListToolStripMenuItem }); - reportsToolStripMenuItem.Name = "reportsToolStripMenuItem"; - reportsToolStripMenuItem.Size = new Size(73, 24); - reportsToolStripMenuItem.Text = "Отчеты"; - // - // printedsListToolStripMenuItem - // - printedsListToolStripMenuItem.Name = "printedsListToolStripMenuItem"; - printedsListToolStripMenuItem.Size = new Size(332, 26); - printedsListToolStripMenuItem.Text = "Список печатной продукции"; - printedsListToolStripMenuItem.Click += PrintedsListToolStripMenuItem_Click; - // - // componentPrintedsToolStripMenuItem - // - componentPrintedsToolStripMenuItem.Name = "componentPrintedsToolStripMenuItem"; - componentPrintedsToolStripMenuItem.Size = new Size(332, 26); - componentPrintedsToolStripMenuItem.Text = "Компоненты печатной продукции"; - componentPrintedsToolStripMenuItem.Click += ComponentPrintedsToolStripMenuItem_Click; - // - // ordersListToolStripMenuItem - // - ordersListToolStripMenuItem.Name = "ordersListToolStripMenuItem"; - ordersListToolStripMenuItem.Size = new Size(332, 26); - ordersListToolStripMenuItem.Text = "Список заказов"; - ordersListToolStripMenuItem.Click += OrdersListToolStripMenuItem_Click; - // - // FormMain - // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1482, 433); - Controls.Add(buttonOrderReady); - Controls.Add(buttonRef); - Controls.Add(dataGridViewOrders); - Controls.Add(buttonIssuedOrder); - Controls.Add(buttonTakeOrderInWork); - Controls.Add(buttonCreateOrder); - Controls.Add(menuStrip); - MainMenuStrip = menuStrip; - Name = "FormMain"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Типография"; - Load += FormMain_Load; - ((System.ComponentModel.ISupportInitialize)dataGridViewOrders).EndInit(); - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + buttonCreateOrder = new Button(); + buttonIssuedOrder = new Button(); + dataGridViewOrders = new DataGridView(); + buttonRef = new Button(); + menuStrip = new MenuStrip(); + directoriesToolStripMenuItem = new ToolStripMenuItem(); + componentsToolStripMenuItem = new ToolStripMenuItem(); + printedsToolStripMenuItem = new ToolStripMenuItem(); + clientsToolStripMenuItem = new ToolStripMenuItem(); + implementersToolStripMenuItem = new ToolStripMenuItem(); + reportsToolStripMenuItem = new ToolStripMenuItem(); + printedsListToolStripMenuItem = new ToolStripMenuItem(); + componentPrintedsToolStripMenuItem = new ToolStripMenuItem(); + ordersListToolStripMenuItem = new ToolStripMenuItem(); + workLaunchToolStripMenuItem = new ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)dataGridViewOrders).BeginInit(); + menuStrip.SuspendLayout(); + SuspendLayout(); + // + // buttonCreateOrder + // + buttonCreateOrder.Location = new Point(2059, 50); + buttonCreateOrder.Margin = new Padding(5, 5, 5, 5); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(330, 46); + buttonCreateOrder.TabIndex = 0; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += ButtonCreateOrder_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Location = new Point(2059, 106); + buttonIssuedOrder.Margin = new Padding(5, 5, 5, 5); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(330, 46); + buttonIssuedOrder.TabIndex = 2; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += ButtonIssuedOrder_Click; + // + // dataGridViewOrders + // + dataGridViewOrders.BackgroundColor = SystemColors.ControlLightLight; + dataGridViewOrders.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridViewOrders.Location = new Point(0, 50); + dataGridViewOrders.Margin = new Padding(5, 5, 5, 5); + dataGridViewOrders.Name = "dataGridViewOrders"; + dataGridViewOrders.RowHeadersVisible = false; + dataGridViewOrders.RowHeadersWidth = 51; + dataGridViewOrders.RowTemplate.Height = 29; + dataGridViewOrders.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridViewOrders.Size = new Size(2034, 643); + dataGridViewOrders.TabIndex = 3; + // + // buttonRef + // + buttonRef.Location = new Point(2059, 162); + buttonRef.Margin = new Padding(5, 5, 5, 5); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(330, 46); + buttonRef.TabIndex = 4; + buttonRef.Text = "Обновить список"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += ButtonRef_Click; + // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { directoriesToolStripMenuItem, reportsToolStripMenuItem, workLaunchToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Padding = new Padding(10, 3, 0, 3); + menuStrip.Size = new Size(2408, 44); + menuStrip.TabIndex = 6; + menuStrip.Text = "menuStrip1"; + // + // directoriesToolStripMenuItem + // + directoriesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, printedsToolStripMenuItem, clientsToolStripMenuItem, implementersToolStripMenuItem }); + directoriesToolStripMenuItem.Name = "directoriesToolStripMenuItem"; + directoriesToolStripMenuItem.Size = new Size(184, 38); + directoriesToolStripMenuItem.Text = "Справочники"; + // + // componentsToolStripMenuItem + // + componentsToolStripMenuItem.Name = "componentsToolStripMenuItem"; + componentsToolStripMenuItem.Size = new Size(377, 44); + componentsToolStripMenuItem.Text = "Компоненты"; + componentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; + // + // printedsToolStripMenuItem + // + printedsToolStripMenuItem.Name = "printedsToolStripMenuItem"; + printedsToolStripMenuItem.Size = new Size(377, 44); + printedsToolStripMenuItem.Text = "Печатная продукция"; + printedsToolStripMenuItem.Click += PrintedsToolStripMenuItem_Click; + // + // clientsToolStripMenuItem + // + clientsToolStripMenuItem.Name = "clientsToolStripMenuItem"; + clientsToolStripMenuItem.Size = new Size(377, 44); + clientsToolStripMenuItem.Text = "Клиенты"; + clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click; + // + // implementersToolStripMenuItem + // + implementersToolStripMenuItem.Name = "implementersToolStripMenuItem"; + implementersToolStripMenuItem.Size = new Size(377, 44); + implementersToolStripMenuItem.Text = "Исполнители"; + implementersToolStripMenuItem.Click += ImplementersToolStripMenuItem_Click; + // + // reportsToolStripMenuItem + // + reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { printedsListToolStripMenuItem, componentPrintedsToolStripMenuItem, ordersListToolStripMenuItem }); + reportsToolStripMenuItem.Name = "reportsToolStripMenuItem"; + reportsToolStripMenuItem.Size = new Size(116, 38); + reportsToolStripMenuItem.Text = "Отчеты"; + // + // printedsListToolStripMenuItem + // + printedsListToolStripMenuItem.Name = "printedsListToolStripMenuItem"; + printedsListToolStripMenuItem.Size = new Size(528, 44); + printedsListToolStripMenuItem.Text = "Список печатной продукции"; + printedsListToolStripMenuItem.Click += PrintedsListToolStripMenuItem_Click; + // + // componentPrintedsToolStripMenuItem + // + componentPrintedsToolStripMenuItem.Name = "componentPrintedsToolStripMenuItem"; + componentPrintedsToolStripMenuItem.Size = new Size(528, 44); + componentPrintedsToolStripMenuItem.Text = "Компоненты печатной продукции"; + componentPrintedsToolStripMenuItem.Click += ComponentPrintedsToolStripMenuItem_Click; + // + // ordersListToolStripMenuItem + // + ordersListToolStripMenuItem.Name = "ordersListToolStripMenuItem"; + ordersListToolStripMenuItem.Size = new Size(528, 44); + ordersListToolStripMenuItem.Text = "Список заказов"; + ordersListToolStripMenuItem.Click += OrdersListToolStripMenuItem_Click; + // + // workLaunchToolStripMenuItem + // + workLaunchToolStripMenuItem.Name = "workLaunchToolStripMenuItem"; + workLaunchToolStripMenuItem.Size = new Size(179, 38); + workLaunchToolStripMenuItem.Text = "Запуск работ"; + workLaunchToolStripMenuItem.Click += WorkLaunchToolStripMenuItem_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(13F, 32F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(2408, 693); + Controls.Add(buttonRef); + Controls.Add(dataGridViewOrders); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonCreateOrder); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; + Margin = new Padding(5, 5, 5, 5); + Name = "FormMain"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Типография"; + Load += FormMain_Load; + ((System.ComponentModel.ISupportInitialize)dataGridViewOrders).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private Button buttonCreateOrder; - private Button buttonTakeOrderInWork; + private Button buttonCreateOrder; private Button buttonIssuedOrder; private DataGridView dataGridViewOrders; private Button buttonRef; - private Button buttonOrderReady; private MenuStrip menuStrip; private ToolStripMenuItem directoriesToolStripMenuItem; private ToolStripMenuItem componentsToolStripMenuItem; @@ -217,5 +213,7 @@ private ToolStripMenuItem componentPrintedsToolStripMenuItem; private ToolStripMenuItem ordersListToolStripMenuItem; private ToolStripMenuItem clientsToolStripMenuItem; + private ToolStripMenuItem implementersToolStripMenuItem; + private ToolStripMenuItem workLaunchToolStripMenuItem; } } \ No newline at end of file diff --git a/Typography/TypographyView/FormMain.cs b/Typography/TypographyView/FormMain.cs index c87f589..f6308c7 100644 --- a/Typography/TypographyView/FormMain.cs +++ b/Typography/TypographyView/FormMain.cs @@ -1,189 +1,161 @@ -using TypographyDataModels.Enums; -using TypographyContracts.BindingModels; +using TypographyContracts.BindingModels; using TypographyContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; -using TypographyBusinessLogic.BusinessLogics; namespace TypographyView { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - private readonly IReportLogic _reportLogic; + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; + private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - _reportLogic = reportLogic; - } + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + _reportLogic = reportLogic; + _workProcess = workProcess; + } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } - private void LoadData() - { - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridViewOrders.DataSource = list; - dataGridViewOrders.Columns["ClientId"].Visible = false; - dataGridViewOrders.Columns["PrintedId"].Visible = false; - dataGridViewOrders.Columns["PrintedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + private void LoadData() + { + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridViewOrders.DataSource = list; + dataGridViewOrders.Columns["ClientId"].Visible = false; + dataGridViewOrders.Columns["ImplementerId"].Visible = false; + dataGridViewOrders.Columns["PrintedId"].Visible = false; + dataGridViewOrders.Columns["PrintedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } - } + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); + if (service is FormComponents form) + { + form.ShowDialog(); + } + } - private void PrintedsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormPrinteds)); - if (service is FormPrinteds form) - { - form.ShowDialog(); - } - } + private void PrintedsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormPrinteds)); + if (service is FormPrinteds form) + { + form.ShowDialog(); + } + } - private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } - } + private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + if (service is FormClients form) + { + form.ShowDialog(); + } + } - private void PrintedsListToolStripMenuItem_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - _reportLogic.SavePrintedsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } + private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + if (service is FormImplementers form) + { + form.ShowDialog(); + } + } - private void ComponentPrintedsToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportPrintedComponents)); - if (service is FormReportPrintedComponents form) - { - form.ShowDialog(); - } - } + private void PrintedsListToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SavePrintedsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } - private void OrdersListToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } - } + private void ComponentPrintedsToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportPrintedComponents)); + if (service is FormReportPrintedComponents 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 OrdersListToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } - private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) - { - if (dataGridViewOrders.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridViewOrders.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 WorkLaunchToolStripMenuItem_Click(object sender, EventArgs e) + { + _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } - private void ButtonOrderReady_Click(object sender, EventArgs e) - { - if (dataGridViewOrders.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridViewOrders.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 ButtonCreateOrder_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); + if (service is FormCreateOrder form) + { + form.ShowDialog(); + LoadData(); + } + } - private void ButtonIssuedOrder_Click(object sender, EventArgs e) - { - if (dataGridViewOrders.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridViewOrders.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 ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridViewOrders.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridViewOrders.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(); - } - } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + + + } } \ No newline at end of file diff --git a/Typography/TypographyView/FormMain.resx b/Typography/TypographyView/FormMain.resx index 81a9e3d..6c82d08 100644 --- a/Typography/TypographyView/FormMain.resx +++ b/Typography/TypographyView/FormMain.resx @@ -1,4 +1,64 @@ - + + + diff --git a/Typography/TypographyView/Program.cs b/Typography/TypographyView/Program.cs index 63d736b..60f12f4 100644 --- a/Typography/TypographyView/Program.cs +++ b/Typography/TypographyView/Program.cs @@ -13,7 +13,6 @@ namespace TypographyView { internal static class Program { - private static ServiceProvider? _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider; @@ -43,12 +42,15 @@ namespace TypographyView 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(); @@ -62,6 +64,8 @@ namespace TypographyView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); }