From b00571a4ac507d9608219e3a6222feda134307fd Mon Sep 17 00:00:00 2001 From: Zyzf Date: Thu, 6 Apr 2023 16:05:07 +0400 Subject: [PATCH] many changes + not ended businessLogic --- .../BusinessLogics/FurnitureModuleLogic.cs | 112 ++++++ .../BusinessLogics/OrderLogic.cs | 104 ++++++ .../BusinessLogics/ReportLogic.cs | 123 +++++++ .../BusinessLogics/RoleLogic.cs | 108 ++++++ .../BusinessLogics/SetLogic.cs | 112 ++++++ .../BusinessLogics/UserLogic.cs | 108 +++++- .../OfficePackage/AbstractSaveToExcel.cs | 100 ++++++ .../OfficePackage/AbstractSaveToPdf.cs | 107 ++++++ .../OfficePackage/AbstractSaveToWord.cs | 60 ++++ .../HelperEnums/ExcelStyleInfoType.cs | 15 + .../HelperEnums/PdfParagraphAlignmentType.cs | 15 + .../HelperEnums/WordJustificationType.cs | 14 + .../HelperModels/ExcelCellParameters.cs | 18 + .../OfficePackage/HelperModels/ExcelInfo.cs | 20 ++ .../HelperModels/ExcelMergeParameters.cs | 15 + .../OfficePackage/HelperModels/PdfInfo.cs | 18 + .../HelperModels/PdfParagraph.cs | 16 + .../HelperModels/PdfRowParameters.cs | 16 + .../OfficePackage/HelperModels/WordInfo.cs | 16 + .../HelperModels/WordParagraph.cs | 14 + .../HelperModels/WordTextProperties.cs | 16 + .../OfficePackage/Implements/SaveToExcel.cs | 319 ++++++++++++++++++ .../OfficePackage/Implements/SaveToPdf.cs | 105 ++++++ .../OfficePackage/Implements/SaveToWord.cs | 123 +++++++ .../BindingModels/OrderBindingModel.cs | 1 + .../BusinessLogicContracts/IReportLogic.cs | 8 +- .../SearchModels/UserSearchModel.cs | 1 + .../ViewModels/OrderViewModel.cs | 2 + .../ViewModels/ReportOrdersViewModel.cs | 4 +- ...s => ReportSetFurnitureModuleViewModel.cs} | 4 +- .../Models/IOrderModel.cs | 1 + .../Implements/UserStorage.cs | 25 +- .../Models/Order.cs | 4 + 33 files changed, 1694 insertions(+), 30 deletions(-) create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/FurnitureModuleLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/OrderLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/ReportLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/RoleLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/SetLogic.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToExcel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToPdf.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToWord.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordInfo.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToExcel.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToPdf.cs create mode 100644 FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToWord.cs rename FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/{ReportSetMaterialViewModel.cs => ReportSetFurnitureModuleViewModel.cs} (66%) diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/FurnitureModuleLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/FurnitureModuleLogic.cs new file mode 100644 index 0000000..4529cf8 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/FurnitureModuleLogic.cs @@ -0,0 +1,112 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics +{ + public class FurnitureModuleLogic : IFurnitureModuleLogic + { + private readonly ILogger _logger; + private readonly IFurnitureModuleStorage _furnitureModuleStorage; + public FurnitureModuleLogic(ILogger logger, IFurnitureModuleStorage furnitureModuleStorage) + { + _logger = logger; + _furnitureModuleStorage = furnitureModuleStorage; + } + public List? ReadList(FurnitureModuleSearchModel? model) + { + _logger.LogInformation("ReadList. FurnitureModuleName:{Name}. Id:{Id}", model?.Name, model?.Id); + var list = model == null ? _furnitureModuleStorage.GetFullList() : _furnitureModuleStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public FurnitureModuleViewModel? ReadElement(FurnitureModuleSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. FurnitureModuleName:{Name}. Id:{Id}", model.Name, model.Id); + var element = _furnitureModuleStorage.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(FurnitureModuleBindingModel model) + { + CheckModel(model); + if (_furnitureModuleStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(FurnitureModuleBindingModel model) + { + CheckModel(model); + if (_furnitureModuleStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(FurnitureModuleBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_furnitureModuleStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(FurnitureModuleBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.Name)) + { + throw new ArgumentNullException("Нет названия мебельного модуля", nameof(model.Name)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена мебельного модуля должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("FurnitureModule. Name:{Name}. Cost:{Cost}. Id:{Id}", model.Name, model.Cost, model.Id); + var element = _furnitureModuleStorage.GetElement(new FurnitureModuleSearchModel + { + Name = model.Name + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Мебельный модуль с таким названием уже есть"); + } + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/OrderLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/OrderLogic.cs new file mode 100644 index 0000000..b0c164d --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/OrderLogic.cs @@ -0,0 +1,104 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics +{ + public class OrderLogic : IOrderLogic + { + private readonly ILogger _logger; + private readonly IOrderStorage _orderStorage; + public OrderLogic(ILogger logger, IOrderStorage orderStorage) + { + _logger = logger; + _orderStorage = orderStorage; + } + public List? ReadList(OrderSearchModel? model) + { + _logger.LogInformation("ReadList. OrderId:{Id}", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public OrderViewModel? ReadElement(OrderSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. OrderId:{ Id}", 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 Create(OrderBindingModel model) + { + CheckModel(model); + if (_orderStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(OrderBindingModel model) + { + CheckModel(model); + if (_orderStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(OrderBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_orderStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(OrderBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.SetId < 0) + { + throw new ArgumentNullException("Некорректный идентификатор гарнитура", nameof(model.SetId)); + } + if (model.Sum < 0) + { + throw new ArgumentNullException("Сумма заказа должна быть больше 0", nameof(model.Sum)); + } + _logger.LogInformation("Order. Id: {Id}. SetId: {SetId}", model.Id, model.SetId); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/ReportLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/ReportLogic.cs new file mode 100644 index 0000000..a55eac5 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/ReportLogic.cs @@ -0,0 +1,123 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics +{ + public class ReportLogic : IReportLogic + { + private readonly IFurnitureModuleStorage _furnitureModuleStorage; + private readonly ISetStorage _setStorage; + private readonly IOrderStorage _orderStorage; + private readonly AbstractSaveToExcel _saveToExcel; + private readonly AbstractSaveToWord _saveToWord; + private readonly AbstractSaveToPdf _saveToPdf; + public ReportLogic(ISetStorage setStorage, IFurnitureModuleStorage furnitureModuleStorage, IOrderStorage orderStorage, + AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) + { + _setStorage = setStorage; + _furnitureModuleStorage = furnitureModuleStorage; + _orderStorage = orderStorage; + _saveToExcel = saveToExcel; + _saveToWord = saveToWord; + _saveToPdf = saveToPdf; + } + /// + /// Получение списка мебельных модулей с указанием, в каких гарнитурах используются + /// + /// + public List GetSetFurnitureModule() + { + var furnitureModules = _furnitureModuleStorage.GetFullList(); + var sets = _setStorage.GetFullList(); + var list = new List(); + + foreach (var set in sets) + { + var record = new ReportSetFurnitureModuleViewModel + { + SetName = set.Name, + FurnitureModules = new List<(string, int)>(), + TotalCount = 0 + }; + foreach (var furnitureModule in furnitureModules) + { + if (set.SetFurnitureModules.ContainsKey(furnitureModule.Id)) + { + record.FurnitureModules.Add(new(furnitureModule.Name, set.SetFurnitureModules[furnitureModule.Id].Item2)); + record.TotalCount += set.SetFurnitureModules[furnitureModule.Id].Item2; + } + } + list.Add(record); + } + + return list; + } + /// + /// Получение списка заказов за определенный период + /// + /// + /// + public List GetOrders(ReportBindingModel model) + { + return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) + .Select(x => new ReportOrdersViewModel + { + Id = x.Id, + DateCreate = x.DateCreate, + SetName = x.SetName, + Sum = x.Sum, + + }) + .ToList(); + } + /// + /// Сохранение компонент в файл-Word + /// + /// + public void SaveFurnitureModulesToWordFile(ReportBindingModel model) + { + _saveToWord.CreateDoc(new WordInfo + { + FileName = model.FileName, + Title = "Список компонент", + Sets = _setStorage.GetFullList() + }); + } + /// + /// Сохранение компонент с указаеним продуктов в файл-Excel + /// + /// + public void SaveSetFurnitureModuleToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Список компонент", + SetFurnitureModules = GetSetFurnitureModule() + }); + } + /// + /// Сохранение заказов в файл-Pdf + /// + /// + public void SaveOrdersToPdfFile(ReportBindingModel model) + { + _saveToPdf.CreateDoc(new PdfInfo + { + FileName = model.FileName, + Title = "Список заказов", + DateFrom = model.DateFrom!.Value, + DateTo = model.DateTo!.Value, + Orders = GetOrders(model) + }); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/RoleLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/RoleLogic.cs new file mode 100644 index 0000000..860c605 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/RoleLogic.cs @@ -0,0 +1,108 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics +{ + public class RoleLogic : IRoleLogic + { + private readonly ILogger _logger; + private readonly IRoleStorage _roleStorage; + public RoleLogic(ILogger logger, IRoleStorage roleStorage) + { + _logger = logger; + _roleStorage = roleStorage; + } + public List? ReadList(RoleSearchModel? model) + { + _logger.LogInformation("ReadList. RoleName:{Name}. Id:{Id}", model?.Name, model?.Id); + var list = model == null ? _roleStorage.GetFullList() : _roleStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public RoleViewModel? ReadElement(RoleSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. RoleName:{Name}. Id:{Id}", model.Name, model.Id); + var element = _roleStorage.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(RoleBindingModel model) + { + CheckModel(model); + if (_roleStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(RoleBindingModel model) + { + CheckModel(model); + if (_roleStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(RoleBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_roleStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(RoleBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.Name)) + { + throw new ArgumentNullException("Нет имени роли", nameof(model.Name)); + } + _logger.LogInformation("Role. Name:{Name}. Id:{Id}", model.Name, model.Id); + var element = _roleStorage.GetElement(new RoleSearchModel + { + Name = model.Name + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Роль с таким названием уже есть"); + } + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/SetLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/SetLogic.cs new file mode 100644 index 0000000..9db683e --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/SetLogic.cs @@ -0,0 +1,112 @@ +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics +{ + public class SetLogic : ISetLogic + { + private readonly ILogger _logger; + private readonly ISetStorage _SetStorage; + public SetLogic(ILogger logger, ISetStorage SetStorage) + { + _logger = logger; + _SetStorage = SetStorage; + } + public List? ReadList(SetSearchModel? model) + { + _logger.LogInformation("ReadList. SetName:{Name}.Id:{ Id}", model?.Name, model?.Id); + var list = model == null ? _SetStorage.GetFullList() : _SetStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public SetViewModel? ReadElement(SetSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. SetName:{Name}.Id:{ Id}", model.Name, model.Id); + var element = _SetStorage.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(SetBindingModel model) + { + CheckModel(model); + if (_SetStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(SetBindingModel model) + { + CheckModel(model); + if (_SetStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(SetBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_SetStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(SetBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.Name)) + { + throw new ArgumentNullException("Нет названия гарнитура", nameof(model.Name)); + } + if (model.Cost <= 0) + { + throw new ArgumentNullException("Цена гарнитура должна быть больше 0", nameof(model.Cost)); + } + _logger.LogInformation("Set. Name:{Name}. Cost:{Cost}. Id:{Id}", model.Name, model.Cost, model.Id); + var element = _SetStorage.GetElement(new SetSearchModel + { + Name = model.Name + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Гарнитур с таким названием уже есть"); + } + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/UserLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/UserLogic.cs index 8af6e3b..fd85d59 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/UserLogic.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/BusinessLogics/UserLogic.cs @@ -1,4 +1,10 @@ -using System; +using FurnitureAssembly_WorkerContracts.BindingModels; +using FurnitureAssembly_WorkerContracts.BusinessLogicContracts; +using FurnitureAssembly_WorkerContracts.SearchModels; +using FurnitureAssembly_WorkerContracts.StorageContracts; +using FurnitureAssembly_WorkerContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +12,105 @@ using System.Threading.Tasks; namespace FurnitureAssembly_WorkerBusinessLogic.BusinessLogics { - internal class UserLogic + internal class UserLogic : IUserLogic { + private readonly ILogger _logger; + private readonly IUserStorage _userStorage; + public UserLogic(ILogger logger, IUserStorage userStorage) + { + _logger = logger; + _userStorage = userStorage; + } + public List? ReadList(UserSearchModel? model) + { + _logger.LogInformation("ReadList. UserName:{Name}. Id:{Id}", model?.Name, model?.Id); + var list = model == null ? _userStorage.GetFullList() : _userStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + public UserViewModel? ReadElement(UserSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. UserName:{Name}. Id:{Id}", model.Name, model.Id); + var element = _userStorage.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(UserBindingModel model) + { + CheckModel(model); + if (_userStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + public bool Update(UserBindingModel model) + { + CheckModel(model); + if (_userStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(UserBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_userStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + private void CheckModel(UserBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.Name)) + { + throw new ArgumentNullException("Нет имени клиента", nameof(model.Name)); + } + if (string.IsNullOrEmpty(model.Login)) + { + throw new ArgumentNullException("Нет логина клиента", nameof(model.Name)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля учетной записи клиента", nameof(model.Name)); + } + _logger.LogInformation("User. Name:{Name}. Login:{Login}. Password:{Password}. Id:{Id}", model.Name, model.Login, model.Password, model.Id); + var element = _userStorage.GetElement(new UserSearchModel + { + Login = model.Login + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Клиент с таким логином уже есть"); + } + } } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToExcel.cs new file mode 100644 index 0000000..e8b94a7 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -0,0 +1,100 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcel + { + /// + /// Создание отчета + /// + /// + public void CreateReport(ExcelInfo info) + { + CreateExcel(info); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + uint rowIndex = 2; + foreach (var set in info.SetFurnitureModules) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = set.SetName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + foreach (var furnitureModule in set.FurnitureModules) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = furnitureModule.Item1, + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = furnitureModule.Count.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + rowIndex++; + } + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = set.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + } + SaveExcel(info); + } + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfo info); + /// + /// Добавляем новую ячейку в лист + /// + /// + protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); + /// + /// Объединение ячеек + /// + /// + protected abstract void MergeCells(ExcelMergeParameters excelParams); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveExcel(ExcelInfo info); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToPdf.cs new file mode 100644 index 0000000..d5e4e5d --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -0,0 +1,107 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using MigraDoc.DocumentObjectModel; +using MigraDoc.Rendering; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToPdf + { + public void CreateDoc(PdfInfo info) + { + CreatePdf(info); + CreateParagraph(new PdfParagraph + { + Text = info.Title, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + CreateParagraph(new PdfParagraph + { + Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var order in info.Orders) + { + CreateParagraph(new PdfParagraph + { + Text = order.SetName, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "3cm" }); + CreateRow(new PdfRowParameters + { + Texts = new List { "Номер", "Дата заказа", "Мебельный модуль", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var furnitureModule in order.) + { + CreateRow(new PdfRowParameters + { + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SetName, order.Sum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + } + CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "3cm" }); + CreateRow(new PdfRowParameters + { + Texts = new List { "Номер", "Дата заказа", "Изделие", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var order in info.Orders) + { + CreateRow(new PdfRowParameters + { + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SetName, order.Sum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + CreateParagraph(new PdfParagraph + { + Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Rigth + }); + SavePdf(info); + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreatePdf(PdfInfo info); + /// + /// Создание параграфа с текстом + /// + /// + /// + protected abstract void CreateParagraph(PdfParagraph paragraph); + /// + /// Создание таблицы + /// + /// + /// + protected abstract void CreateTable(List columns); + /// + /// Создание и заполнение строки + /// + /// + protected abstract void CreateRow(PdfRowParameters rowParameters); + /// + /// Сохранение файла + /// + /// + protected abstract void SavePdf(PdfInfo info); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToWord.cs new file mode 100644 index 0000000..4408238 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -0,0 +1,60 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWord + { + public void CreateDoc(WordInfo info) + { + CreateWord(info); + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Center + } + }); + foreach (var set in info.Sets) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { + (set.Name, new WordTextProperties { Bold = true, Size = "24", }), + (", price: " + set.Cost.ToString(), new WordTextProperties { Size = "24", }) + }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + } + SaveWord(info); + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreateWord(WordInfo info); + /// + /// Создание абзаца с текстом + /// + /// + /// + protected abstract void CreateParagraph(WordParagraph paragraph); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveWord(WordInfo info); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs new file mode 100644 index 0000000..0661cc3 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + Text, + TextWithBroder + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs new file mode 100644 index 0000000..3693dad --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums +{ + public enum PdfParagraphAlignmentType + { + Center, + Left, + Rigth + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs new file mode 100644 index 0000000..dd9ba9a --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + Both + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs new file mode 100644 index 0000000..63e24c4 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs @@ -0,0 +1,18 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelCellParameters + { + public string ColumnName { get; set; } = string.Empty; + public uint RowIndex { get; set; } + public string Text { get; set; } = string.Empty; + public string CellReference => $"{ColumnName}{RowIndex}"; + public ExcelStyleInfoType StyleInfo { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs new file mode 100644 index 0000000..6b54a0e --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -0,0 +1,20 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List SetFurnitureModules + { + get; + set; + } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs new file mode 100644 index 0000000..eeeeea5 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelMergeParameters + { + public string CellFromName { get; set; } = string.Empty; + public string CellToName { get; set; } = string.Empty; + public string Merge => $"{CellFromName}:{CellToName}"; + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs new file mode 100644 index 0000000..c554e4a --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -0,0 +1,18 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class PdfInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public DateTime DateFrom { get; set; } + public DateTime DateTo { get; set; } + public List Orders { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs new file mode 100644 index 0000000..072b6ee --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs @@ -0,0 +1,16 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class PdfParagraph + { + public string Text { get; set; } = string.Empty; + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs new file mode 100644 index 0000000..75903e3 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs @@ -0,0 +1,16 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class PdfRowParameters + { + public List Texts { get; set; } = new(); + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordInfo.cs new file mode 100644 index 0000000..faf1db1 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -0,0 +1,16 @@ +using FurnitureAssembly_WorkerContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List Sets { get; set; } = new(); + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs new file mode 100644 index 0000000..cab78bb --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + public WordTextProperties? TextProperties { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs new file mode 100644 index 0000000..3983d9c --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs @@ -0,0 +1,16 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels +{ + public class WordTextProperties + { + public string Size { get; set; } = string.Empty; + public bool Bold { get; set; } + public WordJustificationType JustificationType { get; set; } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToExcel.cs new file mode 100644 index 0000000..7830d8b --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -0,0 +1,319 @@ +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcel : AbstractSaveToExcel + { + private SpreadsheetDocument? _spreadsheetDocument; + private SharedStringTablePart? _shareStringPart; + private Worksheet? _worksheet; + /// + /// Настройка стилей для файла + /// + /// + private static void CreateStyles(WorkbookPart workbookpart) + { + var sp = workbookpart.AddNewPart(); + sp.Stylesheet = new Stylesheet(); + var fonts = new Fonts() { Count = 2U, KnownFonts = true }; + var fontUsual = new Font(); + fontUsual.Append(new FontSize() { Val = 12D }); + fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontUsual.Append(new FontName() { Val = "Times New Roman" }); + fontUsual.Append(new FontFamilyNumbering() { Val = 2 }); + fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + var fontTitle = new Font(); + fontTitle.Append(new Bold()); + fontTitle.Append(new FontSize() { Val = 14D }); + fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontTitle.Append(new FontName() { Val = "Times New Roman" }); + fontTitle.Append(new FontFamilyNumbering() { Val = 2 }); + fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + fonts.Append(fontUsual); + fonts.Append(fontTitle); + var fills = new Fills() { Count = 2U }; + var fill1 = new Fill(); + fill1.Append(new PatternFill() { PatternType = PatternValues.None }); + var fill2 = new Fill(); + fill2.Append(new PatternFill() + { + PatternType = PatternValues.Gray125 + }); + fills.Append(fill1); + fills.Append(fill2); + var borders = new Borders() { Count = 2U }; + var borderNoBorder = new Border(); + borderNoBorder.Append(new LeftBorder()); + borderNoBorder.Append(new RightBorder()); + borderNoBorder.Append(new TopBorder()); + borderNoBorder.Append(new BottomBorder()); + borderNoBorder.Append(new DiagonalBorder()); + var borderThin = new Border(); + var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }; + leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + var rightBorder = new RightBorder() + { + Style = BorderStyleValues.Thin + }; + rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + var topBorder = new TopBorder() { Style = BorderStyleValues.Thin }; + topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + var bottomBorder = new BottomBorder() + { + Style = BorderStyleValues.Thin + }; + bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + borderThin.Append(leftBorder); + borderThin.Append(rightBorder); + borderThin.Append(topBorder); + borderThin.Append(bottomBorder); + borderThin.Append(new DiagonalBorder()); + borders.Append(borderNoBorder); + borders.Append(borderThin); + var cellStyleFormats = new CellStyleFormats() { Count = 1U }; + var cellFormatStyle = new CellFormat() + { + NumberFormatId = 0U, + FontId = 0U, + FillId = 0U, + BorderId = 0U + }; + cellStyleFormats.Append(cellFormatStyle); + var cellFormats = new CellFormats() { Count = 3U }; + var cellFormatFont = new CellFormat() + { + NumberFormatId = 0U, + FontId = 0U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + ApplyFont = true + }; + var cellFormatFontAndBorder = new CellFormat() + { + NumberFormatId = 0U, + FontId = 0U, + FillId = 0U, + BorderId = 1U, + FormatId = 0U, + ApplyFont = true, + ApplyBorder = true + }; + var cellFormatTitle = new CellFormat() + { + NumberFormatId = 0U, + FontId = 1U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + Alignment = new Alignment() + { + Vertical = VerticalAlignmentValues.Center, + WrapText = true, + Horizontal = HorizontalAlignmentValues.Center + }, + ApplyFont = true + }; + cellFormats.Append(cellFormatFont); + cellFormats.Append(cellFormatFontAndBorder); + cellFormats.Append(cellFormatTitle); + var cellStyles = new CellStyles() { Count = 1U }; + cellStyles.Append(new CellStyle() + { + Name = "Normal", + FormatId = 0U, + BuiltinId = 0U + }); + var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U }; + var tableStyles = new TableStyles() + { + Count = 0U, + DefaultTableStyle = "TableStyleMedium2", + DefaultPivotStyle = "PivotStyleLight16" + }; + var stylesheetExtensionList = new StylesheetExtensionList(); + var stylesheetExtension1 = new StylesheetExtension() + { + Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" + }; + stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"); + stylesheetExtension1.Append(new SlicerStyles() + { + DefaultSlicerStyle = "SlicerStyleLight1" + }); + var stylesheetExtension2 = new StylesheetExtension() + { + Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" + }; + stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"); + stylesheetExtension2.Append(new TimelineStyles() + { + DefaultTimelineStyle = "TimeSlicerStyleLight1" + }); + stylesheetExtensionList.Append(stylesheetExtension1); + stylesheetExtensionList.Append(stylesheetExtension2); + sp.Stylesheet.Append(fonts); + sp.Stylesheet.Append(fills); + sp.Stylesheet.Append(borders); + sp.Stylesheet.Append(cellStyleFormats); + sp.Stylesheet.Append(cellFormats); + sp.Stylesheet.Append(cellStyles); + sp.Stylesheet.Append(differentialFormats); + sp.Stylesheet.Append(tableStyles); + sp.Stylesheet.Append(stylesheetExtensionList); + } + /// + /// Получение номера стиля из типа + /// + /// + /// + private static uint GetStyleValue(ExcelStyleInfoType styleInfo) + { + return styleInfo switch + { + ExcelStyleInfoType.Title => 2U, + ExcelStyleInfoType.TextWithBroder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + protected override void CreateExcel(ExcelInfo info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook); + // Создаем книгу (в ней хранятся листы) + var workbookpart = _spreadsheetDocument.AddWorkbookPart(); + workbookpart.Workbook = new Workbook(); + CreateStyles(workbookpart); + // Получаем/создаем хранилище текстов для книги + _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any() + ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First() + : _spreadsheetDocument.WorkbookPart.AddNewPart(); + // Создаем SharedStringTable, если его нет + if (_shareStringPart.SharedStringTable == null) + { + _shareStringPart.SharedStringTable = new SharedStringTable(); + } + // Создаем лист в книгу + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(new SheetData()); + // Добавляем лист в книгу + var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист" + }; + sheets.Append(sheet); + _worksheet = worksheetPart.Worksheet; + } + protected override void InsertCellInWorksheet(ExcelCellParameters excelParams) + { + if (_worksheet == null || _shareStringPart == null) + { + return; + } + var sheetData = _worksheet.GetFirstChild(); + if (sheetData == null) + { + return; + } + // Ищем строку, либо добавляем ее + Row row; + if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any()) + { + row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First(); + } + else + { + row = new Row() { RowIndex = excelParams.RowIndex }; + sheetData.Append(row); + } + // Ищем нужную ячейку + Cell cell; + if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any()) + { + cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First(); + } + else + { + // Все ячейки должны быть последовательно друг за другом расположены + // нужно определить, после какой вставлять + Cell? refCell = null; + foreach (Cell rowCell in row.Elements()) + { + if (string.Compare(rowCell.CellReference!.Value, + excelParams.CellReference, true) > 0) + { + refCell = rowCell; + break; + } + } + var newCell = new Cell() + { + CellReference = excelParams.CellReference + }; + row.InsertBefore(newCell, refCell); + cell = newCell; + } + // вставляем новый текст + _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text))); + _shareStringPart.SharedStringTable.Save(); + cell.CellValue = new + CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString()); + cell.DataType = new EnumValue(CellValues.SharedString); + cell.StyleIndex = GetStyleValue(excelParams.StyleInfo); + } + protected override void MergeCells(ExcelMergeParameters excelParams) + { + if (_worksheet == null) + { + return; + } + MergeCells mergeCells; + if (_worksheet.Elements().Any()) + { + mergeCells = _worksheet.Elements().First(); + } + else + { + mergeCells = new MergeCells(); + if (_worksheet.Elements().Any()) + { + _worksheet.InsertAfter(mergeCells, + _worksheet.Elements().First()); + } + else + { + _worksheet.InsertAfter(mergeCells, + _worksheet.Elements().First()); + } + } + var mergeCell = new MergeCell() + { + Reference = new StringValue(excelParams.Merge) + }; + mergeCells.Append(mergeCell); + } + protected override void SaveExcel(ExcelInfo info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Close(); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToPdf.cs new file mode 100644 index 0000000..a202213 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -0,0 +1,105 @@ +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using MigraDoc.DocumentObjectModel; +using MigraDoc.Rendering; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.Implements +{ + public class SaveToPdf : AbstractSaveToPdf + { + private Document? _document; + private Section? _section; + private Table? _table; + private static ParagraphAlignment + GetParagraphAlignment(PdfParagraphAlignmentType type) + { + return type switch + { + PdfParagraphAlignmentType.Center => ParagraphAlignment.Center, + PdfParagraphAlignmentType.Left => ParagraphAlignment.Left, + PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right, + _ => ParagraphAlignment.Justify, + }; + } + /// + /// Создание стилей для документа + /// + /// + private static void DefineStyles(Document document) + { + var style = document.Styles["Normal"]; + style.Font.Name = "Times New Roman"; + style.Font.Size = 14; + style = document.Styles.AddStyle("NormalTitle", "Normal"); + style.Font.Bold = true; + } + protected override void CreatePdf(PdfInfo info) + { + _document = new Document(); + DefineStyles(_document); + _section = _document.AddSection(); + } + protected override void CreateParagraph(PdfParagraph pdfParagraph) + { + if (_section == null) + { + return; + } + var paragraph = _section.AddParagraph(pdfParagraph.Text); + paragraph.Format.SpaceAfter = "1cm"; + paragraph.Format.Alignment = + GetParagraphAlignment(pdfParagraph.ParagraphAlignment); + paragraph.Style = pdfParagraph.Style; + } + protected override void CreateTable(List columns) + { + if (_document == null) + { + return; + } + _table = _document.LastSection.AddTable(); + foreach (var elem in columns) + { + _table.AddColumn(elem); + } + } + protected override void CreateRow(PdfRowParameters rowParameters) + { + if (_table == null) + { + return; + } + var row = _table.AddRow(); + for (int i = 0; i < rowParameters.Texts.Count; ++i) + { + row.Cells[i].AddParagraph(rowParameters.Texts[i]); + if (!string.IsNullOrEmpty(rowParameters.Style)) + { + row.Cells[i].Style = rowParameters.Style; + } + Unit borderWidth = 0.5; + row.Cells[i].Borders.Left.Width = borderWidth; + row.Cells[i].Borders.Right.Width = borderWidth; + row.Cells[i].Borders.Top.Width = borderWidth; + row.Cells[i].Borders.Bottom.Width = borderWidth; + row.Cells[i].Format.Alignment = + GetParagraphAlignment(rowParameters.ParagraphAlignment); + row.Cells[i].VerticalAlignment = VerticalAlignment.Center; + } + } + protected override void SavePdf(PdfInfo info) + { + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + renderer.RenderDocument(); + renderer.PdfDocument.Save(info.FileName); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToWord.cs new file mode 100644 index 0000000..87add72 --- /dev/null +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -0,0 +1,123 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperEnums; +using FurnitureAssembly_WorkerBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureAssembly_WorkerBusinessLogic.OfficePackage.Implements +{ + public class SaveToWord : AbstractSaveToWord + { + private WordprocessingDocument? _wordDocument; + private Body? _docBody; + /// + /// Получение типа выравнивания + /// + /// + /// + private static JustificationValues GetJustificationValues(WordJustificationType type) + { + return type switch + { + WordJustificationType.Both => JustificationValues.Both, + WordJustificationType.Center => JustificationValues.Center, + _ => JustificationValues.Left, + }; + } + /// + /// Настройки страницы + /// + /// + private static SectionProperties CreateSectionProperties() + { + var properties = new SectionProperties(); + var pageSize = new PageSize + { + Orient = PageOrientationValues.Portrait + }; + properties.AppendChild(pageSize); + return properties; + } + /// + /// Задание форматирования для абзаца + /// + /// + /// + private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties) + { + if (paragraphProperties == null) + { + return null; + } + var properties = new ParagraphProperties(); + properties.AppendChild(new Justification() + { + Val = GetJustificationValues(paragraphProperties.JustificationType) + }); + properties.AppendChild(new SpacingBetweenLines + { + LineRule = LineSpacingRuleValues.Auto + }); + properties.AppendChild(new Indentation()); + var paragraphMarkRunProperties = new ParagraphMarkRunProperties(); + if (!string.IsNullOrEmpty(paragraphProperties.Size)) + { + paragraphMarkRunProperties.AppendChild(new FontSize + { + Val = paragraphProperties.Size + }); + } + properties.AppendChild(paragraphMarkRunProperties); + return properties; + } + protected override void CreateWord(WordInfo info) + { + _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + protected override void CreateParagraph(WordParagraph paragraph) + { + if (_docBody == null || paragraph == null) + { + return; + } + var docParagraph = new Paragraph(); + docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties)); + foreach (var run in paragraph.Texts) + { + var docRun = new Run(); + var properties = new RunProperties(); + properties.AppendChild(new FontSize { Val = run.Item2.Size }); + if (run.Item2.Bold) + { + properties.AppendChild(new Bold()); + } + docRun.AppendChild(properties); + docRun.AppendChild(new Text + { + Text = run.Item1, + Space = SpaceProcessingModeValues.Preserve + }); + docParagraph.AppendChild(docRun); + } + _docBody.AppendChild(docParagraph); + } + protected override void SaveWord(WordInfo info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + _wordDocument.MainDocumentPart!.Document.Save(); + _wordDocument.Close(); + } + } +} diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs index 703e7c8..1944338 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BindingModels/OrderBindingModel.cs @@ -17,6 +17,7 @@ namespace FurnitureAssembly_WorkerContracts.BindingModels public PaymentType PaymentType { get; set; } = PaymentType.Неизвестен; public int SetId { get; set; } public DateTime DateCreate { get; set; } + public double Sum { get; set; } public int UserId { get; set; } } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs index dc9e020..012b3d4 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/BusinessLogicContracts/IReportLogic.cs @@ -11,10 +11,10 @@ namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts public interface IReportLogic { /// - /// Получение списка материалов с указанием, в каких мебельных модулей используются + /// Получение списка мебельных модулей с указанием, в каких гарнитурах используются /// /// - List GetSetMaterial(); + List GetSetFurnitureModule(); /// /// Получение списка заказов за определенный период /// @@ -25,12 +25,12 @@ namespace FurnitureAssembly_WorkerContracts.BusinessLogicContracts /// Сохранение материалов в файл-Word /// /// - void SaveMaterialToWordFile(ReportBindingModel model); + void SaveFurnitureModuleToWordFile(ReportBindingModel model); /// /// Сохранение материалов с указаеним мебельных модулей в файл-Excel /// /// - void SaveSetMaterialToExcelFile(ReportBindingModel model); + void SaveSetFurnitureModuleToExcelFile(ReportBindingModel model); /// /// Сохранение заказов в файл-Pdf /// diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs index 5ac5184..b29de90 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/SearchModels/UserSearchModel.cs @@ -11,6 +11,7 @@ namespace FurnitureAssembly_WorkerContracts.SearchModels public int? Id { get; set; } public int? RoleId { get; set; } public string? Login { get; set; } + public string? Name { get; set; } public string? Password { get; set; } } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs index adbe6a6..02b5402 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/OrderViewModel.cs @@ -22,6 +22,8 @@ namespace FurnitureAssembly_WorkerContracts.ViewModels public string SetName { get; set; } = string.Empty; [DisplayName("Дата создания")] public DateTime DateCreate { get; set; } + [DisplayName("Сумма")] + public double Sum { get; set; } public int UserId { get; set; } [DisplayName("Менеджер")] public string UserName { get; set; } = string.Empty; diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs index 283dfd9..6645d64 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportOrdersViewModel.cs @@ -10,8 +10,8 @@ namespace FurnitureAssembly_WorkerContracts.ViewModels { public int Id { get; set; } public DateTime DateCreate { get; set; } - public string ManufactureName { get; set; } = string.Empty; + public string SetName { get; set; } = string.Empty; + public List<(string FurnitureModule, int Count)> FurnitureModules { get; set; } = new(); public double Sum { get; set; } - public string Status { get; set; } = string.Empty; } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetFurnitureModuleViewModel.cs similarity index 66% rename from FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs rename to FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetFurnitureModuleViewModel.cs index 518b94d..46f4920 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetMaterialViewModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerContracts/ViewModels/ReportSetFurnitureModuleViewModel.cs @@ -6,10 +6,10 @@ using System.Threading.Tasks; namespace FurnitureAssembly_WorkerContracts.ViewModels { - public class ReportSetMaterialViewModel + public class ReportSetFurnitureModuleViewModel { public string SetName { get; set; } = string.Empty; public int TotalCount { get; set; } - public List<(string Material, int Count)> Materials { get; set; } = new(); + public List<(string FurnitureModule, int Count)> FurnitureModules { get; set; } = new(); } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs index 75bc09b..da65247 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDataModels/Models/IOrderModel.cs @@ -13,6 +13,7 @@ namespace FurnitureAssembly_WorkerDataModels.Models PaymentType PaymentType { get; } int SetId { get; } int UserId { get; } + double Sum { get; } DateTime DateCreate { get; } } } diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Implements/UserStorage.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Implements/UserStorage.cs index b1cc06b..cf258c5 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Implements/UserStorage.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Implements/UserStorage.cs @@ -17,8 +17,8 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Implements public UserViewModel? Delete(UserBindingModel model) { using var context = new FurnitureAssemblyDatabase(); - var element = context - .Users.FirstOrDefault(rec => rec.Id == model.Id); + var element = context.Users + .FirstOrDefault(rec => rec.Id == model.Id); if (element != null) { var deletedElement = context.Users @@ -54,7 +54,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Implements public List GetFilteredList(UserSearchModel model) { using var context = new FurnitureAssemblyDatabase(); - if (model.Id.HasValue) + if (!string.IsNullOrEmpty(model.Login)) { return context.Users .Include(x => x.Sets) @@ -62,26 +62,11 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Implements .Include(x => x.FurnitureModules) .Include(x => x.Furnitures) .Include(x => x.Materials) - .Where(x => x.Id == model.Id) + .Where(x => x.Login.Contains(model.Login)) .Select(x => x.GetViewModel) .ToList(); } - else if (model.RoleId.HasValue) - { - return context.Users - .Include(x => x.Sets) - .Include(x => x.Orders) - .Include(x => x.FurnitureModules) - .Include(x => x.Furnitures) - .Include(x => x.Materials) - .Where(x => x.RoleId == model.RoleId) - .Select(x => x.GetViewModel) - .ToList(); - } - else - { - return new(); - } + return new(); } public List GetFullList() { diff --git a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Order.cs b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Order.cs index f832285..a06e1f0 100644 --- a/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Order.cs +++ b/FurnitureAssembly_Worker/FurnitureAssembly_WorkerDatabaseImplement/Models/Order.cs @@ -24,6 +24,8 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Models [Required] public DateTime DateCreate { get; set; } [Required] + public double Sum { get; set; } + [Required] public int UserId { get; set; } public virtual User User { get; set; } public static Order? Create(OrderBindingModel? model) @@ -38,6 +40,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Models CustomerName = model.CustomerName, PaymentType = model.PaymentType, SetId = model.SetId, + Sum = model.Sum, DateCreate = model.DateCreate, UserId = model.UserId }; @@ -61,6 +64,7 @@ namespace FurnitureAssembly_WorkerDatabaseImplement.Models SetId = SetId, SetName = Set.Name, DateCreate = DateCreate, + Sum = Sum, UserId = UserId, UserName = User.Name };