diff --git a/LawFirm/LawFirmBusinessLogic/LawFirmBusinessLogic.csproj b/LawFirm/AbstractLawFirmBusinessLogic/AbstractLawFirmBusinessLogic.csproj similarity index 68% rename from LawFirm/LawFirmBusinessLogic/LawFirmBusinessLogic.csproj rename to LawFirm/AbstractLawFirmBusinessLogic/AbstractLawFirmBusinessLogic.csproj index 426ab2e..e7fbd8e 100644 --- a/LawFirm/LawFirmBusinessLogic/LawFirmBusinessLogic.csproj +++ b/LawFirm/AbstractLawFirmBusinessLogic/AbstractLawFirmBusinessLogic.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ComponentLogic.cs b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ComponentLogic.cs similarity index 79% rename from LawFirm/LawFirmBusinessLogic/BusinessLogics/ComponentLogic.cs rename to LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ComponentLogic.cs index fcba8e0..e62b209 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ComponentLogic.cs +++ b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ComponentLogic.cs @@ -1,27 +1,30 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmContracts.ViewModels; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmBusinessLogic.BusinessLogics +namespace AbstractLawFirmBusinessLogic.BusinessLogic { public class ComponentLogic : IComponentLogic { private readonly ILogger _logger; - private readonly IComponentStorage _componentStorage; - - public ComponentLogic(ILogger logger, IComponentStorage componentStorage) + public ComponentLogic(ILogger logger, IComponentStorage + componentStorage) { _logger = logger; _componentStorage = componentStorage; } - public List? ReadList(ComponentSearchModel? model) { - _logger.LogInformation("ReadList. ComponentName:{ComponentName}. Id:{Id}", model?.ComponentName, model?.Id); + _logger.LogInformation("ReadList. ComponentName:{ComponentName}.Id:{ Id}", model?.ComponentName, model?.Id); var list = model == null ? _componentStorage.GetFullList() : _componentStorage.GetFilteredList(model); if (list == null) { @@ -31,14 +34,13 @@ namespace LawFirmBusinessLogic.BusinessLogics _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; } - public ComponentViewModel? ReadElement(ComponentSearchModel model) { if (model == null) { throw new ArgumentNullException(nameof(model)); } - _logger.LogInformation("ReadElement. ComponentName:{ComponentName}. Id:{Id}", model.ComponentName, model.Id); + _logger.LogInformation("ReadElement. ComponentName:{ComponentName}.Id:{ Id}", model.ComponentName, model.Id); var element = _componentStorage.GetElement(model); if (element == null) { @@ -48,7 +50,6 @@ namespace LawFirmBusinessLogic.BusinessLogics _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } - public bool Create(ComponentBindingModel model) { CheckModel(model); @@ -59,7 +60,6 @@ namespace LawFirmBusinessLogic.BusinessLogics } return true; } - public bool Update(ComponentBindingModel model) { CheckModel(model); @@ -70,7 +70,6 @@ namespace LawFirmBusinessLogic.BusinessLogics } return true; } - public bool Delete(ComponentBindingModel model) { CheckModel(model, false); @@ -82,8 +81,8 @@ namespace LawFirmBusinessLogic.BusinessLogics } return true; } - - private void CheckModel(ComponentBindingModel model, bool withParams = true) + private void CheckModel(ComponentBindingModel model, bool withParams = + true) { if (model == null) { @@ -95,21 +94,23 @@ namespace LawFirmBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.ComponentName)) { - throw new ArgumentNullException("Нет названия компонента", nameof(model.ComponentName)); + throw new ArgumentNullException("Нет названия компонента", + nameof(model.ComponentName)); } if (model.Cost <= 0) { throw new ArgumentNullException("Цена компонента должна быть больше 0", nameof(model.Cost)); } - _logger.LogInformation("Component. ComponentName:{ComponentName}. Cost:{Cost}. Id:{Id}", model.ComponentName, model.Cost, model.Id); - var element = _componentStorage.GetElement(new ComponentSearchModel + _logger.LogInformation("Component. ComponentName:{ComponentName}.Cost:{ Cost}. Id: { Id}", model.ComponentName, model.Cost, model.Id); + var element = _componentStorage.GetElement(new ComponentSearchModel { - ComponentName = model.ComponentName + ComponentName = model.ComponentName }); if (element != null && element.Id != model.Id) { throw new InvalidOperationException("Компонент с таким названием уже есть"); } } + } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/DocumentLogic.cs b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/DocumentLogic.cs similarity index 72% rename from LawFirm/LawFirmBusinessLogic/BusinessLogics/DocumentLogic.cs rename to LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/DocumentLogic.cs index f8742a9..60eb54e 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/DocumentLogic.cs +++ b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/DocumentLogic.cs @@ -1,26 +1,30 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmContracts.ViewModels; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmBusinessLogic.BusinessLogics +namespace AbstractLawFirmBusinessLogic.BusinessLogic { public class DocumentLogic : IDocumentLogic { private readonly ILogger _logger; - private readonly IDocumentStorage _documentStorage; - - public DocumentLogic(ILogger logger, IDocumentStorage documentStorage) + public DocumentLogic(ILogger logger, IDocumentStorage + documentStorage) { _logger = logger; _documentStorage = documentStorage; } public List? ReadList(DocumentSearchModel? model) { - _logger.LogInformation("ReadList. DocumentName:{DocumentName}. Id:{Id}", model?.DocumentName, model?.Id); + _logger.LogInformation("ReadList. DocumentName:{DocumentName}.Id:{ Id}", model?.DocumentName, model?.Id); var list = model == null ? _documentStorage.GetFullList() : _documentStorage.GetFilteredList(model); if (list == null) { @@ -36,7 +40,7 @@ namespace LawFirmBusinessLogic.BusinessLogics { throw new ArgumentNullException(nameof(model)); } - _logger.LogInformation("ReadElement. ComponentName:{DocumentName}. Id:{Id}", model.DocumentName, model.Id); + _logger.LogInformation("ReadElement. DocumentName:{DocumentName}.Id:{ Id}", model.DocumentName, model.Id); var element = _documentStorage.GetElement(model); if (element == null) { @@ -56,7 +60,16 @@ namespace LawFirmBusinessLogic.BusinessLogics } return true; } - + public bool Update(DocumentBindingModel model) + { + CheckModel(model); + if (_documentStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } public bool Delete(DocumentBindingModel model) { CheckModel(model, false); @@ -68,17 +81,6 @@ namespace LawFirmBusinessLogic.BusinessLogics } return true; } - - public bool Update(DocumentBindingModel model) - { - CheckModel(model); - if (_documentStorage.Update(model) == null) - { - _logger.LogWarning("Update operation failed"); - return false; - } - return true; - } private void CheckModel(DocumentBindingModel model, bool withParams = true) { if (model == null) @@ -91,17 +93,22 @@ namespace LawFirmBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.DocumentName)) { - throw new ArgumentNullException("Нет названия компонента", nameof(model.DocumentName)); + throw new ArgumentNullException("Нет названия пакета документов", + nameof(model.DocumentName)); } - _logger.LogInformation("Component. ComponentName:{ComponentName}. Id:{Id}", model.DocumentName, model.Id); + if (model.Price <= 0) + { + throw new ArgumentNullException("Цена пакета документов должна быть больше 0", nameof(model.Price)); + } + _logger.LogInformation("Document. DocumentName:{DocumentName}.Cost:{ Cost}. Id: { Id}", model.DocumentName, model.Price, model.Id); var element = _documentStorage.GetElement(new DocumentSearchModel { DocumentName = model.DocumentName }); if (element != null && element.Id != model.Id) { - throw new InvalidOperationException("Компонент с таким названием уже есть"); + throw new InvalidOperationException("Пакет документов с таким названием уже есть"); } } } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/OrderLogic.cs b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/OrderLogic.cs new file mode 100644 index 0000000..cf6376c --- /dev/null +++ b/LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/OrderLogic.cs @@ -0,0 +1,111 @@ +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmDataModels.Enums; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmBusinessLogic.BusinessLogic +{ + 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. Id:{ Id}", model?.Id); + var list = model == null ? _orderStorage.GetFullList() : + _orderStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + } + + public bool CreateOrder(OrderBindingModel model) + { + CheckModel(model); + if (model.Status != OrderStatus.Неизвестен) return false; + model.Status = OrderStatus.Принят; + if (_orderStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool ChangeStatus(OrderBindingModel model, OrderStatus status) + { + CheckModel(model); + var element = _orderStorage.GetElement(new OrderSearchModel { Id = model.Id }); + if (element == null) + { + _logger.LogWarning("Read operation failed"); + return false; + } + if (element.Status != status - 1) + { + _logger.LogWarning("Status change operation failed"); + throw new InvalidOperationException("Текущий статус заказа не может быть переведен в выбранный"); + } + model.Status = status; + if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now; + _orderStorage.Update(model); + return true; + } + + public bool TakeOrderInWork(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Выполняется); + } + + public bool FinishOrder(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Готов); + } + + public bool DeliveryOrder(OrderBindingModel model) + { + return ChangeStatus(model, OrderStatus.Выдан); + } + + private void CheckModel(OrderBindingModel model, bool withParams = +true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (model.Sum <= 0) + { + throw new ArgumentNullException("Цена заказа должна быть больше 0", nameof(model.Sum)); + } + if (model.Count <= 0) + { + throw new ArgumentNullException("Количество элементов в заказе должно быть больше 0", nameof(model.Count)); + } + _logger.LogInformation("Order. Sum:{ Cost}. Id: { Id}", model.Sum, model.Id); + } + } +} diff --git a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj b/LawFirm/AbstractLawFirmBusinessLogic/LawFirmBusinessLogic.csproj similarity index 59% rename from LawFirm/LawFirmListImplement/LawFirmListImplement.csproj rename to LawFirm/AbstractLawFirmBusinessLogic/LawFirmBusinessLogic.csproj index 77fe5b1..b7b3431 100644 --- a/LawFirm/LawFirmListImplement/LawFirmListImplement.csproj +++ b/LawFirm/AbstractLawFirmBusinessLogic/LawFirmBusinessLogic.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -7,8 +7,11 @@ - - + + + + + diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts.sln b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts.sln new file mode 100644 index 0000000..9570f3b --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33122.133 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractLawFirmContracts", "AbstractLawFirmContracts\AbstractLawFirmContracts.csproj", "{32D95EAA-926F-4BFA-A0A9-128BA0260A66}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {32D95EAA-926F-4BFA-A0A9-128BA0260A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32D95EAA-926F-4BFA-A0A9-128BA0260A66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32D95EAA-926F-4BFA-A0A9-128BA0260A66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32D95EAA-926F-4BFA-A0A9-128BA0260A66}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EA33641B-AC1E-42E6-BA74-A1A91DAF198E} + EndGlobalSection +EndGlobal diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/AbstractLawFirmContracts.csproj b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/AbstractLawFirmContracts.csproj new file mode 100644 index 0000000..74a87d8 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/AbstractLawFirmContracts.csproj @@ -0,0 +1,13 @@ + + + + net6.0 + enable + enable + + + + + + + diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/ComponentBindingModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..0546eb8 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,16 @@ +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.BindingModels.BindingModels +{ + public class ComponentBindingModel : IComponentModel + { + public int Id { get; set; } + public string ComponentName { get; set; } = string.Empty; + public double Cost { get; set; } + } +} diff --git a/LawFirm/LawFirmContracts/BindingModels/DocumentBindingModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/DocumentBindingModel.cs similarity index 51% rename from LawFirm/LawFirmContracts/BindingModels/DocumentBindingModel.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/DocumentBindingModel.cs index 5b549f4..d4c2535 100644 --- a/LawFirm/LawFirmContracts/BindingModels/DocumentBindingModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/DocumentBindingModel.cs @@ -1,15 +1,17 @@ -using LawFirmDataModels.Models; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.BindingModels +namespace AbstractLawFirmContracts.BindingModels { public class DocumentBindingModel : IDocumentModel { public int Id { get; set; } - public string DocumentName { get; set; } = string.Empty; - - public double Price { get; set; } - + public double Price { get; set; } public Dictionary DocumentComponents { get; set; } = new(); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/BindingModels/OrderBindingModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/OrderBindingModel.cs similarity index 63% rename from LawFirm/LawFirmContracts/BindingModels/OrderBindingModel.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/OrderBindingModel.cs index 1f646b8..e3fa2fd 100644 --- a/LawFirm/LawFirmContracts/BindingModels/OrderBindingModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/OrderBindingModel.cs @@ -1,22 +1,21 @@ -using LawFirmDataModels.Enums; -using LawFirmDataModels.Models; +using AbstractLawFirmDataModels.Enums; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.BindingModels +namespace AbstractLawFirmContracts.BindingModels { public class OrderBindingModel : IOrderModel { public int Id { get; set; } - public int DocumentId { get; set; } - public int Count { get; set; } - public double Sum { get; set; } - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; set; } = DateTime.Now; - public DateTime? DateImplement { get; set; } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs similarity index 51% rename from LawFirm/LawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs index 703d5e8..ec69938 100644 --- a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IComponentLogic.cs @@ -1,19 +1,20 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.BusinessLogicsContracts +namespace AbstractLawFirmContracts.BusinessLogicsContracts { public interface IComponentLogic { List? ReadList(ComponentSearchModel? model); - ComponentViewModel? ReadElement(ComponentSearchModel model); - bool Create(ComponentBindingModel model); - bool Update(ComponentBindingModel model); - bool Delete(ComponentBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs similarity index 51% rename from LawFirm/LawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs index 7de6882..38550db 100644 --- a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IDocumentLogic.cs @@ -1,19 +1,20 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.BusinessLogicsContracts +namespace AbstractLawFirmContracts.BusinessLogicsContracts { public interface IDocumentLogic { List? ReadList(DocumentSearchModel? model); - DocumentViewModel? ReadElement(DocumentSearchModel model); - bool Create(DocumentBindingModel model); - bool Update(DocumentBindingModel model); - bool Delete(DocumentBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs similarity index 50% rename from LawFirm/LawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs index e657776..ab78985 100644 --- a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -1,19 +1,20 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.BusinessLogicsContracts +namespace AbstractLawFirmContracts.BusinessLogicsContracts { public interface IOrderLogic { List? ReadList(OrderSearchModel? model); - bool CreateOrder(OrderBindingModel model); - bool TakeOrderInWork(OrderBindingModel model); - bool FinishOrder(OrderBindingModel model); - bool DeliveryOrder(OrderBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/LawFirmContracts.csproj b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/LawFirmContracts.csproj similarity index 70% rename from LawFirm/LawFirmContracts/LawFirmContracts.csproj rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/LawFirmContracts.csproj index 86bc8fd..975ba62 100644 --- a/LawFirm/LawFirmContracts/LawFirmContracts.csproj +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/LawFirmContracts.csproj @@ -7,7 +7,7 @@ - + diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/ComponentSearchModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/ComponentSearchModel.cs new file mode 100644 index 0000000..378b6ab --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/ComponentSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.SearchModels +{ + public class ComponentSearchModel + { + public int? Id { get; set; } + public string? ComponentName { get; set; } + } +} diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/DocumentSearchModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/DocumentSearchModel.cs new file mode 100644 index 0000000..9481c87 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/DocumentSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.SearchModels +{ + public class DocumentSearchModel + { + public int? Id { get; set; } + public string? DocumentName { get; set; } + } +} diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/OrderSearchModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/OrderSearchModel.cs new file mode 100644 index 0000000..d568495 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/SearchModels/OrderSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.SearchModels +{ + public class OrderSearchModel + { + public int? Id { get; set; } + } +} diff --git a/LawFirm/LawFirmContracts/StoragesContracts/IComponentStorage.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IComponentStorage.cs similarity index 57% rename from LawFirm/LawFirmContracts/StoragesContracts/IComponentStorage.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IComponentStorage.cs index 3e235e3..a1932c8 100644 --- a/LawFirm/LawFirmContracts/StoragesContracts/IComponentStorage.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IComponentStorage.cs @@ -1,21 +1,21 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.StoragesContracts +namespace AbstractLawFirmContracts.StoragesContracts { public interface IComponentStorage { List GetFullList(); - List GetFilteredList(ComponentSearchModel model); - ComponentViewModel? GetElement(ComponentSearchModel model); - ComponentViewModel? Insert(ComponentBindingModel model); - ComponentViewModel? Update(ComponentBindingModel model); - ComponentViewModel? Delete(ComponentBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/StoragesContracts/IDocumentStorage.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IDocumentStorage.cs similarity index 58% rename from LawFirm/LawFirmContracts/StoragesContracts/IDocumentStorage.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IDocumentStorage.cs index 5f52f51..4e8e876 100644 --- a/LawFirm/LawFirmContracts/StoragesContracts/IDocumentStorage.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IDocumentStorage.cs @@ -1,21 +1,21 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.StoragesContracts +namespace AbstractLawFirmContracts.StoragesContracts { public interface IDocumentStorage { List GetFullList(); - List GetFilteredList(DocumentSearchModel model); - DocumentViewModel? GetElement(DocumentSearchModel model); - DocumentViewModel? Insert(DocumentBindingModel model); - DocumentViewModel? Update(DocumentBindingModel model); - DocumentViewModel? Delete(DocumentBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/StoragesContracts/IOrderStorage.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IOrderStorage.cs similarity index 56% rename from LawFirm/LawFirmContracts/StoragesContracts/IOrderStorage.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IOrderStorage.cs index c3eab23..60e7dc1 100644 --- a/LawFirm/LawFirmContracts/StoragesContracts/IOrderStorage.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/StoragesContracts/IOrderStorage.cs @@ -1,21 +1,21 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.ViewModels; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.StoragesContracts +namespace AbstractLawFirmContracts.StoragesContracts { public interface IOrderStorage { List GetFullList(); - List GetFilteredList(OrderSearchModel model); - OrderViewModel? GetElement(OrderSearchModel model); - OrderViewModel? Insert(OrderBindingModel model); - OrderViewModel? Update(OrderBindingModel model); - OrderViewModel? Delete(OrderBindingModel model); } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs similarity index 62% rename from LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs index 9851b47..0843b72 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ComponentViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs @@ -1,16 +1,19 @@ -using LawFirmDataModels.Models; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.ViewModels +namespace AbstractLawFirmContracts.ViewModels { public class ComponentViewModel : IComponentModel { public int Id { get; set; } - [DisplayName("Название компонента")] public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] public double Cost { get; set; } } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs new file mode 100644 index 0000000..74d0e5f --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs @@ -0,0 +1,25 @@ +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.ViewModels +{ + public class DocumentViewModel : IDocumentModel + { + public int Id { get; set; } + [DisplayName("Название пакета документов")] + public string DocumentName { get; set; } = string.Empty; + [DisplayName("Цена")] + public double Price { get; set; } + public Dictionary DocumentComponents + { + get; + set; + } = new(); + + } +} diff --git a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs similarity index 71% rename from LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs rename to LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs index 2740b47..2acfb53 100644 --- a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs @@ -1,32 +1,30 @@ -using LawFirmDataModels.Enums; -using LawFirmDataModels.Models; +using AbstractLawFirmDataModels.Enums; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmContracts.ViewModels +namespace AbstractLawFirmContracts.ViewModels { public class OrderViewModel : IOrderModel { [DisplayName("Номер")] public int Id { get; set; } - public int DocumentId { get; set; } - - [DisplayName("Изделие")] + [DisplayName("Пакет документов")] public string DocumentName { get; set; } = string.Empty; - [DisplayName("Количество")] public int Count { get; set; } - [DisplayName("Сумма")] public double Sum { get; set; } - [DisplayName("Статус")] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] public DateTime? DateImplement { get; set; } } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels.sln b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels.sln new file mode 100644 index 0000000..3c428c6 --- /dev/null +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.4.33122.133 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractLawFirmDataModels", "AbstractLawFirmDataModels\AbstractLawFirmDataModels.csproj", "{9CA9492B-F2F5-40A3-821B-F7EC14AEFE5D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9CA9492B-F2F5-40A3-821B-F7EC14AEFE5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9CA9492B-F2F5-40A3-821B-F7EC14AEFE5D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9CA9492B-F2F5-40A3-821B-F7EC14AEFE5D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9CA9492B-F2F5-40A3-821B-F7EC14AEFE5D}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3F1F2B80-1FE8-42C3-9167-E2E50274FE15} + EndGlobalSection +EndGlobal diff --git a/LawFirm/LawFirmDataModels/LawFirmDataModels.csproj b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/AbstractLawFirmDataModels.csproj similarity index 100% rename from LawFirm/LawFirmDataModels/LawFirmDataModels.csproj rename to LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/AbstractLawFirmDataModels.csproj diff --git a/LawFirm/LawFirmDataModels/Enums/OrderStatus.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Enums/OrderStatus.cs similarity index 53% rename from LawFirm/LawFirmDataModels/Enums/OrderStatus.cs rename to LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Enums/OrderStatus.cs index 8f77b64..6837f42 100644 --- a/LawFirm/LawFirmDataModels/Enums/OrderStatus.cs +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Enums/OrderStatus.cs @@ -1,15 +1,17 @@ -namespace LawFirmDataModels.Enums +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmDataModels.Enums { public enum OrderStatus { Неизвестен = -1, - Принят = 0, - Выполняется = 1, - Готов = 2, - Выдан = 3 } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/IId.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/IId.cs new file mode 100644 index 0000000..52061ba --- /dev/null +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/IId.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmDataModels +{ + public interface IId + { + int Id { get; } + } +} diff --git a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/LawFirmDataModels.csproj b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/LawFirmDataModels.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/LawFirmDataModels.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IComponentModel.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IComponentModel.cs new file mode 100644 index 0000000..d2e8e39 --- /dev/null +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IComponentModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AbstractLawFirmDataModels; + +namespace AbstractLawFirmDataModels.Models +{ + public interface IComponentModel : IId + { + string ComponentName { get; } + double Cost { get; } + + } +} diff --git a/LawFirm/LawFirmDataModels/Models/IDocumentModel.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IDocumentModel.cs similarity index 50% rename from LawFirm/LawFirmDataModels/Models/IDocumentModel.cs rename to LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IDocumentModel.cs index 26a5389..3e330c3 100644 --- a/LawFirm/LawFirmDataModels/Models/IDocumentModel.cs +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IDocumentModel.cs @@ -1,11 +1,16 @@ -namespace LawFirmDataModels.Models +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AbstractLawFirmDataModels; + +namespace AbstractLawFirmDataModels.Models { public interface IDocumentModel : IId { string DocumentName { get; } - double Price { get; } - Dictionary DocumentComponents { get; } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmDataModels/Models/IOrderModel.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IOrderModel.cs similarity index 52% rename from LawFirm/LawFirmDataModels/Models/IOrderModel.cs rename to LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IOrderModel.cs index d6df7a4..126df76 100644 --- a/LawFirm/LawFirmDataModels/Models/IOrderModel.cs +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IOrderModel.cs @@ -1,19 +1,21 @@ -using LawFirmDataModels.Enums; +using AbstractLawFirmDataModels; +using AbstractLawFirmDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmDataModels.Models +namespace AbstractLawFirmDataModels.Models { public interface IOrderModel : IId { int DocumentId { get; } - int Count { get; } - double Sum { get; } - OrderStatus Status { get; } - DateTime DateCreate { get; } - DateTime? DateImplement { get; } + } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj b/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj new file mode 100644 index 0000000..f54052f --- /dev/null +++ b/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/LawFirm/LawFirmListImplement/DataListSingleton.cs b/LawFirm/AbstractLawFirmListImplement/DataListSingleton.cs similarity index 72% rename from LawFirm/LawFirmListImplement/DataListSingleton.cs rename to LawFirm/AbstractLawFirmListImplement/DataListSingleton.cs index 2e41d2a..ca1efab 100644 --- a/LawFirm/LawFirmListImplement/DataListSingleton.cs +++ b/LawFirm/AbstractLawFirmListImplement/DataListSingleton.cs @@ -1,32 +1,31 @@ -using LawFirmListImplement.Models; +using AbstractLawFirmListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement +namespace AbstractLawFirmListImplement { - internal class DataListSingleton + public class DataListSingleton { private static DataListSingleton? _instance; - public List Components { get; set; } - public List Orders { get; set; } - public List Documents { get; set; } - private DataListSingleton() { Components = new List(); Orders = new List(); Documents = new List(); } - public static DataListSingleton GetInstance() { if (_instance == null) { _instance = new DataListSingleton(); } - return _instance; } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmListImplement/Implements/ComponentStorage.cs b/LawFirm/AbstractLawFirmListImplement/Implements/ComponentStorage.cs similarity index 81% rename from LawFirm/LawFirmListImplement/Implements/ComponentStorage.cs rename to LawFirm/AbstractLawFirmListImplement/Implements/ComponentStorage.cs index 31ab4e1..4ef797e 100644 --- a/LawFirm/LawFirmListImplement/Implements/ComponentStorage.cs +++ b/LawFirm/AbstractLawFirmListImplement/Implements/ComponentStorage.cs @@ -1,20 +1,23 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; -using LawFirmListImplement.Models; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Implements +namespace AbstractLawFirmListImplement.Implements { public class ComponentStorage : IComponentStorage { private readonly DataListSingleton _source; - public ComponentStorage() { _source = DataListSingleton.GetInstance(); } - public List GetFullList() { var result = new List(); @@ -24,8 +27,8 @@ namespace LawFirmListImplement.Implements } return result; } - - public List GetFilteredList(ComponentSearchModel model) + public List GetFilteredList(ComponentSearchModel + model) { var result = new List(); if (string.IsNullOrEmpty(model.ComponentName)) @@ -41,7 +44,6 @@ namespace LawFirmListImplement.Implements } return result; } - public ComponentViewModel? GetElement(ComponentSearchModel model) { if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) @@ -50,15 +52,15 @@ namespace LawFirmListImplement.Implements } foreach (var component in _source.Components) { - if ((!string.IsNullOrEmpty(model.ComponentName) && component.ComponentName == model.ComponentName) || + if ((!string.IsNullOrEmpty(model.ComponentName) && + component.ComponentName == model.ComponentName) || (model.Id.HasValue && component.Id == model.Id)) - { - return component.GetViewModel; - } + { + return component.GetViewModel; + } } return null; } - public ComponentViewModel? Insert(ComponentBindingModel model) { model.Id = 1; @@ -77,7 +79,6 @@ namespace LawFirmListImplement.Implements _source.Components.Add(newComponent); return newComponent.GetViewModel; } - public ComponentViewModel? Update(ComponentBindingModel model) { foreach (var component in _source.Components) @@ -90,7 +91,6 @@ namespace LawFirmListImplement.Implements } return null; } - public ComponentViewModel? Delete(ComponentBindingModel model) { for (int i = 0; i < _source.Components.Count; ++i) @@ -105,4 +105,4 @@ namespace LawFirmListImplement.Implements return null; } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmListImplement/Implements/DocumentStorage.cs b/LawFirm/AbstractLawFirmListImplement/Implements/DocumentStorage.cs similarity index 61% rename from LawFirm/LawFirmListImplement/Implements/DocumentStorage.cs rename to LawFirm/AbstractLawFirmListImplement/Implements/DocumentStorage.cs index d5d948c..40ffe93 100644 --- a/LawFirm/LawFirmListImplement/Implements/DocumentStorage.cs +++ b/LawFirm/AbstractLawFirmListImplement/Implements/DocumentStorage.cs @@ -1,10 +1,16 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; -using LawFirmListImplement.Models; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Implements +namespace AbstractLawFirmListImplement.Implements { public class DocumentStorage : IDocumentStorage { @@ -16,24 +22,25 @@ namespace LawFirmListImplement.Implements public List GetFullList() { var result = new List(); - foreach (var sushi in _source.Documents) + foreach (var document in _source.Documents) { - result.Add(sushi.GetViewModel); + result.Add(document.GetViewModel); } return result; } - public List GetFilteredList(DocumentSearchModel model) + public List GetFilteredList(DocumentSearchModel + model) { var result = new List(); if (string.IsNullOrEmpty(model.DocumentName)) { return result; } - foreach (var sushi in _source.Documents) + foreach (var document in _source.Documents) { - if (sushi.DocumentName.Contains(model.DocumentName)) + if (document.DocumentName.Contains(model.DocumentName)) { - result.Add(sushi.GetViewModel); + result.Add(document.GetViewModel); } } return result; @@ -44,13 +51,13 @@ namespace LawFirmListImplement.Implements { return null; } - foreach (var sushi in _source.Documents) + foreach (var document in _source.Documents) { if ((!string.IsNullOrEmpty(model.DocumentName) && - sushi.DocumentName == model.DocumentName) || - (model.Id.HasValue && sushi.Id == model.Id)) + document.DocumentName == model.DocumentName) || + (model.Id.HasValue && document.Id == model.Id)) { - return sushi.GetViewModel; + return document.GetViewModel; } } return null; @@ -58,11 +65,11 @@ namespace LawFirmListImplement.Implements public DocumentViewModel? Insert(DocumentBindingModel model) { model.Id = 1; - foreach (var sushi in _source.Documents) + foreach (var document in _source.Documents) { - if (model.Id <= sushi.Id) + if (model.Id <= document.Id) { - model.Id = sushi.Id + 1; + model.Id = document.Id + 1; } } var newDocument = Document.Create(model); @@ -75,12 +82,12 @@ namespace LawFirmListImplement.Implements } public DocumentViewModel? Update(DocumentBindingModel model) { - foreach (var sushi in _source.Documents) + foreach (var document in _source.Documents) { - if (sushi.Id == model.Id) + if (document.Id == model.Id) { - sushi.Update(model); - return sushi.GetViewModel; + document.Update(model); + return document.GetViewModel; } } return null; @@ -99,4 +106,4 @@ namespace LawFirmListImplement.Implements return null; } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs b/LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs similarity index 64% rename from LawFirm/LawFirmListImplement/Implements/OrderStorage.cs rename to LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs index 5c61841..82a0ece 100644 --- a/LawFirm/LawFirmListImplement/Implements/OrderStorage.cs +++ b/LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs @@ -1,14 +1,19 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; -using LawFirmListImplement.Models; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmListImplement.Models; +using AbstractLawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Implements +namespace AbstractLawFirmListImplement.Implements { public class OrderStorage : IOrderStorage { - private readonly DataListSingleton _source; + private readonly DataListSingleton _source; public OrderStorage() { _source = DataListSingleton.GetInstance(); @@ -18,13 +23,25 @@ namespace LawFirmListImplement.Implements var result = new List(); foreach (var order in _source.Orders) { - result.Add(order.GetViewModel); + result.Add(AccessDocumentStorage(order.GetViewModel)); } return result; } - public List GetFilteredList(OrderSearchModel model) + public List GetFilteredList(OrderSearchModel + model) { var result = new List(); + if (!model.Id.HasValue) + { + return result; + } + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AccessDocumentStorage(order.GetViewModel)); + } + } return result; } public OrderViewModel? GetElement(OrderSearchModel model) @@ -85,5 +102,17 @@ namespace LawFirmListImplement.Implements } return null; } + public OrderViewModel AccessDocumentStorage(OrderViewModel model) + { + foreach (var document in _source.Documents) + { + if (document.Id == model.DocumentId) + { + model.DocumentName = document.DocumentName; + break; + } + } + return model; + } } -} \ No newline at end of file +} diff --git a/LawFirm/AbstractLawFirmListImplement/LawFirmListImplement.csproj b/LawFirm/AbstractLawFirmListImplement/LawFirmListImplement.csproj new file mode 100644 index 0000000..c0efba3 --- /dev/null +++ b/LawFirm/AbstractLawFirmListImplement/LawFirmListImplement.csproj @@ -0,0 +1,15 @@ + + + + net6.0 + enable + enable + + + + + + + + + diff --git a/LawFirm/LawFirmListImplement/Models/Component.cs b/LawFirm/AbstractLawFirmListImplement/Models/Component.cs similarity index 72% rename from LawFirm/LawFirmListImplement/Models/Component.cs rename to LawFirm/AbstractLawFirmListImplement/Models/Component.cs index 2f02f7a..f30a28d 100644 --- a/LawFirm/LawFirmListImplement/Models/Component.cs +++ b/LawFirm/AbstractLawFirmListImplement/Models/Component.cs @@ -1,17 +1,19 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.ViewModels; -using LawFirmDataModels.Models; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Models +namespace AbstractLawFirmListImplement.Models { - internal class Component : IComponentModel + public class Component : IComponentModel { public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } - public static Component? Create(ComponentBindingModel? model) { if (model == null) @@ -25,7 +27,6 @@ namespace LawFirmListImplement.Models Cost = model.Cost }; } - public void Update(ComponentBindingModel? model) { if (model == null) @@ -35,12 +36,12 @@ namespace LawFirmListImplement.Models ComponentName = model.ComponentName; Cost = model.Cost; } - public ComponentViewModel GetViewModel => new() { Id = Id, ComponentName = ComponentName, Cost = Cost }; + } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmListImplement/Models/Document.cs b/LawFirm/AbstractLawFirmListImplement/Models/Document.cs similarity index 71% rename from LawFirm/LawFirmListImplement/Models/Document.cs rename to LawFirm/AbstractLawFirmListImplement/Models/Document.cs index b207d4c..9569f94 100644 --- a/LawFirm/LawFirmListImplement/Models/Document.cs +++ b/LawFirm/AbstractLawFirmListImplement/Models/Document.cs @@ -1,19 +1,24 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.ViewModels; -using LawFirmDataModels.Models; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Models +namespace AbstractLawFirmListImplement.Models { - internal class Document : IDocumentModel + public class Document : IDocumentModel { public int Id { get; private set; } - public string DocumentName { get; private set; } = string.Empty; - public double Price { get; private set; } - - public Dictionary DocumentComponents { get; private set; } = new Dictionary(); - + public Dictionary DocumentComponents + { + get; + private set; + } = new Dictionary(); public static Document? Create(DocumentBindingModel? model) { if (model == null) @@ -22,13 +27,13 @@ namespace LawFirmListImplement.Models } return new Document() { + Id = model.Id, DocumentName = model.DocumentName, Price = model.Price, DocumentComponents = model.DocumentComponents }; } - public void Update(DocumentBindingModel? model) { if (model == null) @@ -39,7 +44,6 @@ namespace LawFirmListImplement.Models Price = model.Price; DocumentComponents = model.DocumentComponents; } - public DocumentViewModel GetViewModel => new() { Id = Id, @@ -48,4 +52,4 @@ namespace LawFirmListImplement.Models DocumentComponents = DocumentComponents }; } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmListImplement/Models/Order.cs b/LawFirm/AbstractLawFirmListImplement/Models/Order.cs similarity index 71% rename from LawFirm/LawFirmListImplement/Models/Order.cs rename to LawFirm/AbstractLawFirmListImplement/Models/Order.cs index d76fc1c..f2c291d 100644 --- a/LawFirm/LawFirmListImplement/Models/Order.cs +++ b/LawFirm/AbstractLawFirmListImplement/Models/Order.cs @@ -1,9 +1,14 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.ViewModels; -using LawFirmDataModels.Enums; -using LawFirmDataModels.Models; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmDataModels.Enums; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -namespace LawFirmListImplement.Models +namespace AbstractLawFirmListImplement.Models { public class Order : IOrderModel { @@ -11,7 +16,7 @@ namespace LawFirmListImplement.Models public int DocumentId { get; private set; } public int Count { get; private set; } public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public OrderStatus Status { get; private set; } public DateTime DateCreate { get; private set; } public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) @@ -28,7 +33,7 @@ namespace LawFirmListImplement.Models Sum = model.Sum, Status = model.Status, DateCreate = model.DateCreate, - DateImplement = model.DateImplement + DateImplement = model.DateImplement, }; } public void Update(OrderBindingModel? model) @@ -37,10 +42,12 @@ namespace LawFirmListImplement.Models { return; } + Id = model.Id; DocumentId = model.DocumentId; Count = model.Count; Sum = model.Sum; Status = model.Status; + DateCreate = model.DateCreate; DateImplement = model.DateImplement; } public OrderViewModel GetViewModel => new() @@ -51,7 +58,8 @@ namespace LawFirmListImplement.Models Sum = Sum, Status = Status, DateCreate = DateCreate, - DateImplement = DateImplement + DateImplement = DateImplement, }; + } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirm.sln b/LawFirm/LawFirm.sln index 48ef7e7..09da4ff 100644 --- a/LawFirm/LawFirm.sln +++ b/LawFirm/LawFirm.sln @@ -1,17 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.2.32616.157 +VisualStudioVersion = 17.4.33122.133 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmView", "LawFirmView\LawFirmView.csproj", "{30272FA6-ABB7-4436-AFC6-50478DF2B878}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmView", "LawFirmView\LawFirmView.csproj", "{32CEC3FF-22BE-4DCD-8955-E3B14953EA67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmDataModels", "LawFirmDataModels\LawFirmDataModels.csproj", "{E47BFE5D-69E3-4A3F-85BE-251F10EAFA02}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbstractLawFirmDataModels", "AbstractLawFirmDataModels\AbstractLawFirmDataModels\AbstractLawFirmDataModels.csproj", "{99CE17B9-0CCE-42B6-B73F-61E8D49F1AAB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmContracts", "LawFirmContracts\LawFirmContracts.csproj", "{9AD66AC2-51DF-4E16-83E9-35C1CA19E774}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbstractLawFirmContracts", "AbstractLawFirmContracts\AbstractLawFirmContracts\AbstractLawFirmContracts.csproj", "{C0155B2E-5974-4835-996B-6FDF0F5BC06B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmListImplement", "LawFirmListImplement\LawFirmListImplement.csproj", "{74283CE4-7CE6-42AC-AA8D-EE4497E08D61}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractLawFirmBusinessLogic", "AbstractLawFirmBusinessLogic\AbstractLawFirmBusinessLogic.csproj", "{E48808B1-5381-4774-97B6-CDB107DCF98C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LawFirmBusinessLogic", "LawFirmBusinessLogic\LawFirmBusinessLogic.csproj", "{9A10E59F-081B-4C4D-AB16-15A777B66502}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractLawFirmListImplement", "AbstractLawFirmListImplement\AbstractLawFirmListImplement.csproj", "{86D5FC6F-B262-44A0-9D30-970F9EA93E0A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,31 +19,31 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {30272FA6-ABB7-4436-AFC6-50478DF2B878}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30272FA6-ABB7-4436-AFC6-50478DF2B878}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30272FA6-ABB7-4436-AFC6-50478DF2B878}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30272FA6-ABB7-4436-AFC6-50478DF2B878}.Release|Any CPU.Build.0 = Release|Any CPU - {E47BFE5D-69E3-4A3F-85BE-251F10EAFA02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E47BFE5D-69E3-4A3F-85BE-251F10EAFA02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E47BFE5D-69E3-4A3F-85BE-251F10EAFA02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E47BFE5D-69E3-4A3F-85BE-251F10EAFA02}.Release|Any CPU.Build.0 = Release|Any CPU - {9AD66AC2-51DF-4E16-83E9-35C1CA19E774}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AD66AC2-51DF-4E16-83E9-35C1CA19E774}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AD66AC2-51DF-4E16-83E9-35C1CA19E774}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AD66AC2-51DF-4E16-83E9-35C1CA19E774}.Release|Any CPU.Build.0 = Release|Any CPU - {74283CE4-7CE6-42AC-AA8D-EE4497E08D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74283CE4-7CE6-42AC-AA8D-EE4497E08D61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74283CE4-7CE6-42AC-AA8D-EE4497E08D61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74283CE4-7CE6-42AC-AA8D-EE4497E08D61}.Release|Any CPU.Build.0 = Release|Any CPU - {9A10E59F-081B-4C4D-AB16-15A777B66502}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9A10E59F-081B-4C4D-AB16-15A777B66502}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9A10E59F-081B-4C4D-AB16-15A777B66502}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9A10E59F-081B-4C4D-AB16-15A777B66502}.Release|Any CPU.Build.0 = Release|Any CPU + {32CEC3FF-22BE-4DCD-8955-E3B14953EA67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {32CEC3FF-22BE-4DCD-8955-E3B14953EA67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {32CEC3FF-22BE-4DCD-8955-E3B14953EA67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {32CEC3FF-22BE-4DCD-8955-E3B14953EA67}.Release|Any CPU.Build.0 = Release|Any CPU + {99CE17B9-0CCE-42B6-B73F-61E8D49F1AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99CE17B9-0CCE-42B6-B73F-61E8D49F1AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99CE17B9-0CCE-42B6-B73F-61E8D49F1AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99CE17B9-0CCE-42B6-B73F-61E8D49F1AAB}.Release|Any CPU.Build.0 = Release|Any CPU + {C0155B2E-5974-4835-996B-6FDF0F5BC06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C0155B2E-5974-4835-996B-6FDF0F5BC06B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C0155B2E-5974-4835-996B-6FDF0F5BC06B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C0155B2E-5974-4835-996B-6FDF0F5BC06B}.Release|Any CPU.Build.0 = Release|Any CPU + {E48808B1-5381-4774-97B6-CDB107DCF98C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E48808B1-5381-4774-97B6-CDB107DCF98C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E48808B1-5381-4774-97B6-CDB107DCF98C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E48808B1-5381-4774-97B6-CDB107DCF98C}.Release|Any CPU.Build.0 = Release|Any CPU + {86D5FC6F-B262-44A0-9D30-970F9EA93E0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86D5FC6F-B262-44A0-9D30-970F9EA93E0A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86D5FC6F-B262-44A0-9D30-970F9EA93E0A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86D5FC6F-B262-44A0-9D30-970F9EA93E0A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D1C13B06-DBB7-43DC-A4E9-5DAD170460D6} + SolutionGuid = {F9226BA1-1E7A-4E32-A0D3-BB8E1CF929E3} EndGlobalSection EndGlobal diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs deleted file mode 100644 index 616f408..0000000 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs +++ /dev/null @@ -1,60 +0,0 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; -using LawFirmContracts.StoragesContracts; -using LawFirmContracts.ViewModels; -using LawFirmDataModels.Enums; -using Microsoft.Extensions.Logging; - -namespace LawFirmBusinessLogic.BusinessLogics -{ - public class OrderLogic : IOrderLogic - { - private readonly ILogger _logger; - - private readonly IOrderStorage _orderStorage; - - public OrderLogic(ILogger logger, IOrderStorage orderStorage) - { - _logger = logger; - _orderStorage = orderStorage; - } - public bool CreateOrder(OrderBindingModel model) - { - if (_orderStorage.Insert(model) == null) - { - _logger.LogWarning("Insert operation failed"); - return false; - } - model.Status = OrderStatus.Неизвестен; - return true; - } - - public bool DeliveryOrder(OrderBindingModel model) - { - _logger.LogInformation("Delivery. Id:{Id}", model.Id); - model.Status = OrderStatus.Готов; - return _orderStorage.Update(model) != null; - } - - public bool FinishOrder(OrderBindingModel model) - { - model.Status = OrderStatus.Выдан; - return _orderStorage.Update(model) != null; - } - - public bool TakeOrderInWork(OrderBindingModel model) - { - model.Status = OrderStatus.Выполняется; - return _orderStorage.Update(model) != null; - } - public List? ReadList(OrderSearchModel? model) - { - if (model == null) - { - return _orderStorage.GetFullList(); - } - return _orderStorage.GetFilteredList(model); - } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/BindingModels/ComponentBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/ComponentBindingModel.cs deleted file mode 100644 index 339ef97..0000000 --- a/LawFirm/LawFirmContracts/BindingModels/ComponentBindingModel.cs +++ /dev/null @@ -1,13 +0,0 @@ -using LawFirmDataModels.Models; - -namespace LawFirmContracts.BindingModels -{ - public class ComponentBindingModel : IComponentModel - { - public int Id { get; set; } - - public string ComponentName { get; set; } = string.Empty; - - public double Cost { get; set; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/SearchModels/ComponentSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/ComponentSearchModel.cs deleted file mode 100644 index 2901699..0000000 --- a/LawFirm/LawFirmContracts/SearchModels/ComponentSearchModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace LawFirmContracts.SearchModels -{ - public class ComponentSearchModel - { - public int? Id { get; set; } - - public string? ComponentName { get; set; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/SearchModels/DocumentSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/DocumentSearchModel.cs deleted file mode 100644 index fee5d15..0000000 --- a/LawFirm/LawFirmContracts/SearchModels/DocumentSearchModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace LawFirmContracts.SearchModels -{ - public class DocumentSearchModel - { - public int? Id { get; set; } - - public string? DocumentName { get; set; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs b/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs deleted file mode 100644 index b73aafe..0000000 --- a/LawFirm/LawFirmContracts/SearchModels/OrderSearchModel.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace LawFirmContracts.SearchModels -{ - public class OrderSearchModel - { - public int? Id { get; set; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs deleted file mode 100644 index 8949b45..0000000 --- a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using LawFirmDataModels.Models; -using System.ComponentModel; - -namespace LawFirmContracts.ViewModels -{ - public class DocumentViewModel : IDocumentModel - { - public int Id { get; set; } - - [DisplayName("Название изделия")] - public string DocumentName { get; set; } = string.Empty; - - [DisplayName("Цена")] - public double Price { get; set; } - - public Dictionary DocumentComponents { get; set; } = new(); - } -} diff --git a/LawFirm/LawFirmDataModels/IId.cs b/LawFirm/LawFirmDataModels/IId.cs deleted file mode 100644 index a2c0f6a..0000000 --- a/LawFirm/LawFirmDataModels/IId.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace LawFirmDataModels -{ - public interface IId - { - int Id { get; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmDataModels/Models/IComponentModel.cs b/LawFirm/LawFirmDataModels/Models/IComponentModel.cs deleted file mode 100644 index 21a0ca5..0000000 --- a/LawFirm/LawFirmDataModels/Models/IComponentModel.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace LawFirmDataModels.Models -{ - public interface IComponentModel : IId - { - string ComponentName { get; } - - double Cost { get; } - } -} \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormComponent.cs b/LawFirm/LawFirmView/FormComponent.cs index 83b58d2..9e6014b 100644 --- a/LawFirm/LawFirmView/FormComponent.cs +++ b/LawFirm/LawFirmView/FormComponent.cs @@ -1,20 +1,25 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.SearchModels; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormComponent : Form { private readonly ILogger _logger; - private readonly IComponentLogic _logic; - private int? _id; - public int Id { set { _id = value; } } - public FormComponent(ILogger logger, IComponentLogic logic) { InitializeComponent(); @@ -29,7 +34,11 @@ namespace LawFirmView try { _logger.LogInformation("Получение компонента"); - var view = _logic.ReadElement(new ComponentSearchModel { Id = _id.Value }); + var view = _logic.ReadElement(new ComponentSearchModel + { + Id = + _id.Value + }); if (view != null) { textBoxName.Text = view.ComponentName; @@ -39,16 +48,18 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка получения компонента"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } - private void ButtonSave_Click(object sender, EventArgs e) + private void buttonSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxName.Text)) { - MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните название", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Сохранение компонента"); @@ -60,26 +71,30 @@ namespace LawFirmView ComponentName = textBoxName.Text, Cost = Convert.ToDouble(textBoxCost.Text) }; - var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + var operationResult = _id.HasValue ? _logic.Update(model) : + _logic.Create(model); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); } catch (Exception ex) { _logger.LogError(ex, "Ошибка сохранения компонента"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } + } - private void ButtonCancel_Click(object sender, EventArgs e) + private void buttonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormComponent.designer.cs b/LawFirm/LawFirmView/FormComponent.designer.cs index fedcf60..2704664 100644 --- a/LawFirm/LawFirmView/FormComponent.designer.cs +++ b/LawFirm/LawFirmView/FormComponent.designer.cs @@ -28,86 +28,78 @@ /// private void InitializeComponent() { - this.buttonCancel = new System.Windows.Forms.Button(); - this.buttonSave = new System.Windows.Forms.Button(); this.textBoxName = new System.Windows.Forms.TextBox(); - this.labelName = new System.Windows.Forms.Label(); this.textBoxCost = new System.Windows.Forms.TextBox(); - this.labelCost = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); this.SuspendLayout(); // - // buttonCancel - // - this.buttonCancel.Location = new System.Drawing.Point(257, 71); - this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(88, 27); - this.buttonCancel.TabIndex = 5; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); - // - // buttonSave - // - this.buttonSave.Location = new System.Drawing.Point(162, 71); - this.buttonSave.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(88, 27); - this.buttonSave.TabIndex = 4; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); - // // textBoxName // - this.textBoxName.Location = new System.Drawing.Point(91, 7); - this.textBoxName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxName.Location = new System.Drawing.Point(72, 12); this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(252, 23); - this.textBoxName.TabIndex = 1; - // - // labelName - // - this.labelName.AutoSize = true; - this.labelName.Location = new System.Drawing.Point(14, 10); - this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(62, 15); - this.labelName.TabIndex = 0; - this.labelName.Text = "Название:"; + this.textBoxName.Size = new System.Drawing.Size(267, 23); + this.textBoxName.TabIndex = 0; // // textBoxCost // - this.textBoxCost.Location = new System.Drawing.Point(91, 36); - this.textBoxCost.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + this.textBoxCost.Location = new System.Drawing.Point(72, 55); this.textBoxCost.Name = "textBoxCost"; - this.textBoxCost.Size = new System.Drawing.Size(129, 23); - this.textBoxCost.TabIndex = 3; + this.textBoxCost.Size = new System.Drawing.Size(143, 23); + this.textBoxCost.TabIndex = 1; // - // labelCost + // label1 // - this.labelCost.AutoSize = true; - this.labelCost.Location = new System.Drawing.Point(14, 39); - this.labelCost.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.labelCost.Name = "labelCost"; - this.labelCost.Size = new System.Drawing.Size(38, 15); - this.labelCost.TabIndex = 2; - this.labelCost.Text = "Цена:"; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(2, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(62, 15); + this.label1.TabIndex = 2; + this.label1.Text = "Название:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 55); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(38, 15); + this.label2.TabIndex = 3; + this.label2.Text = "Цена:"; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(159, 101); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 4; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(264, 101); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // FormComponent // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(360, 110); - this.Controls.Add(this.textBoxCost); - this.Controls.Add(this.labelCost); + this.ClientSize = new System.Drawing.Size(456, 139); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBoxCost); this.Controls.Add(this.textBoxName); - this.Controls.Add(this.labelName); - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.Name = "FormComponent"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Компонент"; this.Load += new System.EventHandler(this.FormComponent_Load); this.ResumeLayout(false); @@ -117,11 +109,11 @@ #endregion - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.TextBox textBoxName; - private System.Windows.Forms.Label labelName; + private TextBox textBoxName; private TextBox textBoxCost; - private Label labelCost; + private Label label1; + private Label label2; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormComponent.resx b/LawFirm/LawFirmView/FormComponent.resx index 1af7de1..f298a7b 100644 --- a/LawFirm/LawFirmView/FormComponent.resx +++ b/LawFirm/LawFirmView/FormComponent.resx @@ -1,64 +1,4 @@ - - - + diff --git a/LawFirm/LawFirmView/FormComponents.cs b/LawFirm/LawFirmView/FormComponents.cs index 9297493..b5111e9 100644 --- a/LawFirm/LawFirmView/FormComponents.cs +++ b/LawFirm/LawFirmView/FormComponents.cs @@ -1,27 +1,34 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.BindingModels.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using Microsoft.VisualBasic.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormComponents : Form { private readonly ILogger _logger; - private readonly IComponentLogic _logic; - public FormComponents(ILogger logger, IComponentLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; } - private void FormComponents_Load(object sender, EventArgs e) { LoadData(); - } + } private void LoadData() { try @@ -31,18 +38,20 @@ namespace LawFirmView { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ComponentName"].AutoSizeMode = + DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки компонентов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } - private void ButtonAdd_Click(object sender, EventArgs e) + private void buttonAdd_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); if (service is FormComponent form) @@ -54,33 +63,41 @@ namespace LawFirmView } } - private void ButtonUpd_Click(object sender, EventArgs e) + private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); + var service = + Program.ServiceProvider?.GetService(typeof(FormComponent)); if (service is FormComponent form) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + form.Id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { - LoadData(); + LoadData(); } } } + } - private void ButtonDel_Click(object sender, EventArgs e) + private void buttonDel_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); _logger.LogInformation("Удаление компонента"); try { - if (!_logic.Delete(new ComponentBindingModel { Id = id })) + if (!_logic.Delete(new ComponentBindingModel + { + Id = id + })) { throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); } @@ -89,15 +106,19 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка удаления компонента"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); } } } + } - private void ButtonRef_Click(object sender, EventArgs e) + private void buttonRef_Click(object sender, EventArgs e) { LoadData(); } + + } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormComponents.designer.cs b/LawFirm/LawFirmView/FormComponents.designer.cs index a750271..5c5db9f 100644 --- a/LawFirm/LawFirmView/FormComponents.designer.cs +++ b/LawFirm/LawFirmView/FormComponents.designer.cs @@ -28,83 +28,75 @@ /// private void InitializeComponent() { - this.buttonRef = new System.Windows.Forms.Button(); - this.buttonDel = new System.Windows.Forms.Button(); - this.buttonUpd = new System.Windows.Forms.Button(); - this.buttonAdd = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); // - // buttonRef + // dataGridView // - this.buttonRef.Location = new System.Drawing.Point(370, 132); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(75, 23); - this.buttonRef.TabIndex = 4; - this.buttonRef.Text = "Обновить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); - // - // buttonDel - // - this.buttonDel.Location = new System.Drawing.Point(370, 91); - this.buttonDel.Name = "buttonDel"; - this.buttonDel.Size = new System.Drawing.Size(75, 23); - this.buttonDel.TabIndex = 3; - this.buttonDel.Text = "Удалить"; - this.buttonDel.UseVisualStyleBackColor = true; - this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); - // - // buttonUpd - // - this.buttonUpd.Location = new System.Drawing.Point(370, 50); - this.buttonUpd.Name = "buttonUpd"; - this.buttonUpd.Size = new System.Drawing.Size(75, 23); - this.buttonUpd.TabIndex = 2; - this.buttonUpd.Text = "Изменить"; - this.buttonUpd.UseVisualStyleBackColor = true; - this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(439, 442); + this.dataGridView.TabIndex = 0; // // buttonAdd // - this.buttonAdd.Location = new System.Drawing.Point(370, 12); + this.buttonAdd.Location = new System.Drawing.Point(486, 12); this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.Size = new System.Drawing.Size(102, 40); this.buttonAdd.TabIndex = 1; this.buttonAdd.Text = "Добавить"; this.buttonAdd.UseVisualStyleBackColor = true; - this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); // - // dataGridView + // buttonUpd // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.dataGridView.Location = new System.Drawing.Point(0, 0); - this.dataGridView.MultiSelect = false; - this.dataGridView.Name = "dataGridView"; - this.dataGridView.ReadOnly = true; - this.dataGridView.RowHeadersVisible = false; - this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView.Size = new System.Drawing.Size(350, 312); - this.dataGridView.TabIndex = 0; + this.buttonUpd.Location = new System.Drawing.Point(486, 58); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(102, 41); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(486, 105); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(102, 42); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(486, 153); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(102, 39); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); // // FormComponents // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(464, 312); + this.ClientSize = new System.Drawing.Size(632, 443); this.Controls.Add(this.buttonRef); this.Controls.Add(this.buttonDel); this.Controls.Add(this.buttonUpd); this.Controls.Add(this.buttonAdd); this.Controls.Add(this.dataGridView); this.Name = "FormComponents"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Компоненты"; + this.Text = "FormComponents"; this.Load += new System.EventHandler(this.FormComponents_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); @@ -113,10 +105,10 @@ #endregion - private System.Windows.Forms.Button buttonRef; - private System.Windows.Forms.Button buttonDel; - private System.Windows.Forms.Button buttonUpd; - private System.Windows.Forms.Button buttonAdd; - private System.Windows.Forms.DataGridView dataGridView; + private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpd; + private Button buttonDel; + private Button buttonRef; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormComponents.resx b/LawFirm/LawFirmView/FormComponents.resx index 1af7de1..f298a7b 100644 --- a/LawFirm/LawFirmView/FormComponents.resx +++ b/LawFirm/LawFirmView/FormComponents.resx @@ -1,64 +1,4 @@ - - - + diff --git a/LawFirm/LawFirmView/FormCreateOrder.cs b/LawFirm/LawFirmView/FormCreateOrder.cs index 285586b..6f6a410 100644 --- a/LawFirm/LawFirmView/FormCreateOrder.cs +++ b/LawFirm/LawFirmView/FormCreateOrder.cs @@ -1,72 +1,108 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using AbstractLawFirmContracts.SearchModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using AbstractLawFirmContracts.BindingModels; namespace LawFirmView { public partial class FormCreateOrder : Form { private readonly ILogger _logger; - - private readonly IDocumentLogic _logicP; - + private readonly IDocumentLogic _logicD; private readonly IOrderLogic _logicO; - - public FormCreateOrder(ILogger logger, IDocumentLogic logicP, IOrderLogic logicO) + public FormCreateOrder(ILogger logger, IDocumentLogic logicD, IOrderLogic logicO) { InitializeComponent(); _logger = logger; - _logicP = logicP; + _logicD = logicD; _logicO = logicO; } private void FormCreateOrder_Load(object sender, EventArgs e) { - _logger.LogInformation("Загрузка изделий для заказа"); - // прописать логику + _logger.LogInformation("Загрузка пакетов документов для заказа"); + try + { + var list = _logicD.ReadList(null); + if (list != null) + { + comboBoxDocument.DisplayMember = "DocumentName"; + comboBoxDocument.ValueMember = "Id"; + comboBoxDocument.DataSource = list; + comboBoxDocument.SelectedItem = null; + } + _logger.LogInformation("Пакеты документов загружены"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки пакетов документов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } } - private void CalcSum() { - if (comboBoxProduct.SelectedValue != null && !string.IsNullOrEmpty(textBoxCount.Text)) + if (comboBoxDocument.SelectedValue != null && + !string.IsNullOrEmpty(textBoxCount.Text)) { try { - int id = Convert.ToInt32(comboBoxProduct.SelectedValue); - var product = _logicP.ReadElement(new DocumentSearchModel { Id = id }); + int id = Convert.ToInt32(comboBoxDocument.SelectedValue); + var product = _logicD.ReadElement(new DocumentSearchModel + { + Id + = id + }); int count = Convert.ToInt32(textBoxCount.Text); - textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), 2).ToString(); + textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), + 2).ToString(); _logger.LogInformation("Расчет суммы заказа"); } catch (Exception ex) { _logger.LogError(ex, "Ошибка расчета суммы заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } - private void TextBoxCount_TextChanged(object sender, EventArgs e) + private void textBoxCount_TextChanged(object sender, EventArgs e) { CalcSum(); } - private void ComboBoxProduct_SelectedIndexChanged(object sender, EventArgs e) + private void comboBoxDocument_SelectedIndexChanged(object sender, EventArgs e) { CalcSum(); } - private void ButtonSave_Click(object sender, EventArgs e) + private void textBoxSum_TextChanged(object sender, EventArgs e) + { + CalcSum(); + } + + private void buttonSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxCount.Text)) { - MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (comboBoxProduct.SelectedValue == null) + if (comboBoxDocument.SelectedValue == null) { - MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите пакет документов", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Создание заказа"); @@ -74,7 +110,7 @@ namespace LawFirmView { var operationResult = _logicO.CreateOrder(new OrderBindingModel { - DocumentId = Convert.ToInt32(comboBoxProduct.SelectedValue), + DocumentId = Convert.ToInt32(comboBoxDocument.SelectedValue), Count = Convert.ToInt32(textBoxCount.Text), Sum = Convert.ToDouble(textBoxSum.Text) }); @@ -82,7 +118,8 @@ namespace LawFirmView { throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); } @@ -91,12 +128,13 @@ namespace LawFirmView _logger.LogError(ex, "Ошибка создания заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } + } - private void ButtonCancel_Click(object sender, EventArgs e) + private void buttonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormCreateOrder.designer.cs b/LawFirm/LawFirmView/FormCreateOrder.designer.cs index e7bc4f6..4145c5f 100644 --- a/LawFirm/LawFirmView/FormCreateOrder.designer.cs +++ b/LawFirm/LawFirmView/FormCreateOrder.designer.cs @@ -28,104 +28,102 @@ /// private void InitializeComponent() { - this.labelCount = new System.Windows.Forms.Label(); - this.comboBoxProduct = new System.Windows.Forms.ComboBox(); - this.buttonCancel = new System.Windows.Forms.Button(); - this.buttonSave = new System.Windows.Forms.Button(); + this.comboBoxDocument = new System.Windows.Forms.ComboBox(); this.textBoxCount = new System.Windows.Forms.TextBox(); - this.labelProduct = new System.Windows.Forms.Label(); - this.labelSum = new System.Windows.Forms.Label(); this.textBoxSum = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); this.SuspendLayout(); // - // labelCount + // comboBoxDocument // - this.labelCount.AutoSize = true; - this.labelCount.Location = new System.Drawing.Point(12, 36); - this.labelCount.Name = "labelCount"; - this.labelCount.Size = new System.Drawing.Size(69, 13); - this.labelCount.TabIndex = 2; - this.labelCount.Text = "Количество:"; + this.comboBoxDocument.FormattingEnabled = true; + this.comboBoxDocument.Location = new System.Drawing.Point(116, 12); + this.comboBoxDocument.Name = "comboBoxDocument"; + this.comboBoxDocument.Size = new System.Drawing.Size(198, 23); + this.comboBoxDocument.TabIndex = 0; + this.comboBoxDocument.SelectedIndexChanged += new System.EventHandler(this.comboBoxDocument_SelectedIndexChanged); // - // comboBoxProduct + // textBoxCount // - this.comboBoxProduct.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxProduct.FormattingEnabled = true; - this.comboBoxProduct.Location = new System.Drawing.Point(87, 6); - this.comboBoxProduct.Name = "comboBoxProduct"; - this.comboBoxProduct.Size = new System.Drawing.Size(217, 21); - this.comboBoxProduct.TabIndex = 1; - this.comboBoxProduct.SelectedIndexChanged += new System.EventHandler(this.ComboBoxProduct_SelectedIndexChanged); + this.textBoxCount.Location = new System.Drawing.Point(116, 41); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(198, 23); + this.textBoxCount.TabIndex = 1; + this.textBoxCount.TextChanged += new System.EventHandler(this.textBoxCount_TextChanged); // - // buttonCancel + // textBoxSum // - this.buttonCancel.Location = new System.Drawing.Point(219, 85); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 7; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + this.textBoxSum.Location = new System.Drawing.Point(116, 70); + this.textBoxSum.Name = "textBoxSum"; + this.textBoxSum.Size = new System.Drawing.Size(198, 23); + this.textBoxSum.TabIndex = 2; + this.textBoxSum.TextChanged += new System.EventHandler(this.textBoxSum_TextChanged); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(3, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(110, 15); + this.label1.TabIndex = 3; + this.label1.Text = "Пакет документов:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 44); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 15); + this.label2.TabIndex = 4; + this.label2.Text = "Количество:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 70); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(48, 15); + this.label3.TabIndex = 5; + this.label3.Text = "Сумма:"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(138, 85); + this.buttonSave.Location = new System.Drawing.Point(180, 122); this.buttonSave.Name = "buttonSave"; this.buttonSave.Size = new System.Drawing.Size(75, 23); this.buttonSave.TabIndex = 6; this.buttonSave.Text = "Сохранить"; this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); // - // textBoxCount + // buttonCancel // - this.textBoxCount.Location = new System.Drawing.Point(87, 33); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(217, 20); - this.textBoxCount.TabIndex = 3; - this.textBoxCount.TextChanged += new System.EventHandler(this.TextBoxCount_TextChanged); - // - // labelProduct - // - this.labelProduct.AutoSize = true; - this.labelProduct.Location = new System.Drawing.Point(12, 9); - this.labelProduct.Name = "labelProduct"; - this.labelProduct.Size = new System.Drawing.Size(54, 13); - this.labelProduct.TabIndex = 0; - this.labelProduct.Text = "Изделие:"; - // - // labelSum - // - this.labelSum.AutoSize = true; - this.labelSum.Location = new System.Drawing.Point(12, 62); - this.labelSum.Name = "labelSum"; - this.labelSum.Size = new System.Drawing.Size(44, 13); - this.labelSum.TabIndex = 4; - this.labelSum.Text = "Сумма:"; - // - // textBoxSum - // - this.textBoxSum.Location = new System.Drawing.Point(87, 59); - this.textBoxSum.Name = "textBoxSum"; - this.textBoxSum.ReadOnly = true; - this.textBoxSum.Size = new System.Drawing.Size(217, 20); - this.textBoxSum.TabIndex = 5; + this.buttonCancel.Location = new System.Drawing.Point(282, 122); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // FormCreateOrder // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(318, 118); - this.Controls.Add(this.labelSum); - this.Controls.Add(this.textBoxSum); - this.Controls.Add(this.labelCount); - this.Controls.Add(this.comboBoxProduct); + this.ClientSize = new System.Drawing.Size(445, 158); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBoxSum); this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.labelProduct); + this.Controls.Add(this.comboBoxDocument); this.Name = "FormCreateOrder"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Заказ"; this.Load += new System.EventHandler(this.FormCreateOrder_Load); this.ResumeLayout(false); @@ -134,13 +132,14 @@ } #endregion - private System.Windows.Forms.Label labelCount; - private System.Windows.Forms.ComboBox comboBoxProduct; - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.TextBox textBoxCount; - private System.Windows.Forms.Label labelProduct; - private System.Windows.Forms.Label labelSum; - private System.Windows.Forms.TextBox textBoxSum; + + private ComboBox comboBoxDocument; + private TextBox textBoxCount; + private TextBox textBoxSum; + private Label label1; + private Label label2; + private Label label3; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormCreateOrder.resx b/LawFirm/LawFirmView/FormCreateOrder.resx index 1af7de1..f298a7b 100644 --- a/LawFirm/LawFirmView/FormCreateOrder.resx +++ b/LawFirm/LawFirmView/FormCreateOrder.resx @@ -1,64 +1,4 @@ - - - + diff --git a/LawFirm/LawFirmView/FormDocument.cs b/LawFirm/LawFirmView/FormDocument.cs index b8874f9..62697b2 100644 --- a/LawFirm/LawFirmView/FormDocument.cs +++ b/LawFirm/LawFirmView/FormDocument.cs @@ -1,66 +1,77 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; -using LawFirmDataModels.Models; +using AbstractLawFirmDataModels.Models; using Microsoft.Extensions.Logging; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.SearchModels; +using AbstractLawFirmContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormDocument : Form { private readonly ILogger _logger; - private readonly IDocumentLogic _logic; - private int? _id; - - private Dictionary _productComponents; - + private Dictionary _documentComponents; public int Id { set { _id = value; } } - public FormDocument(ILogger logger, IDocumentLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; - _productComponents = new Dictionary(); + _documentComponents = new Dictionary(); } - private void FormProduct_Load(object sender, EventArgs e) + private void FormDocument_Load(object sender, EventArgs e) { if (_id.HasValue) { _logger.LogInformation("Загрузка изделия"); try { - var view = _logic.ReadElement(new DocumentSearchModel { Id = _id.Value }); + var view = _logic.ReadElement(new DocumentSearchModel + { + Id = + _id.Value + }); if (view != null) { textBoxName.Text = view.DocumentName; textBoxPrice.Text = view.Price.ToString(); - _productComponents = view.DocumentComponents ?? new Dictionary(); + _documentComponents = view.DocumentComponents ?? new + Dictionary(); LoadData(); } } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки изделия"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } - } + } private void LoadData() { _logger.LogInformation("Загрузка компонент изделия"); try { - if (_productComponents != null) + if (_documentComponents != null) { dataGridView.Rows.Clear(); - foreach (var pc in _productComponents) + foreach (var pc in _documentComponents) { - dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); + dataGridView.Rows.Add(new object[] { pc.Key, +pc.Value.Item1.ComponentName, pc.Value.Item2 }); } textBoxPrice.Text = CalcPrice().ToString(); } @@ -68,99 +79,114 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки компонент изделия"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } - private void ButtonAdd_Click(object sender, EventArgs e) + private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); + var service = + Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); if (service is FormDocumentComponent form) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) { return; } - _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - if (_productComponents.ContainsKey(form.Id)) + _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + if (_documentComponents.ContainsKey(form.Id)) { - _productComponents[form.Id] = (form.ComponentModel, form.Count); + _documentComponents[form.Id] = (form.ComponentModel, + form.Count); } else { - _productComponents.Add(form.Id, (form.ComponentModel, form.Count)); + _documentComponents.Add(form.Id, (form.ComponentModel, + form.Count)); } LoadData(); } } + } - private void ButtonUpd_Click(object sender, EventArgs e) + private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); + var service = + Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); if (service is FormDocumentComponent form) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); form.Id = id; - form.Count = _productComponents[id].Item2; + form.Count = _documentComponents[id].Item2; if (form.ShowDialog() == DialogResult.OK) { if (form.ComponentModel == null) { return; } - _logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); - _productComponents[form.Id] = (form.ComponentModel, form.Count); + _logger.LogInformation("Изменение компонента:{ ComponentName - { Count}", form.ComponentModel.ComponentName, form.Count); + _documentComponents[form.Id] = (form.ComponentModel,form.Count); LoadData(); } } } + } - private void ButtonDel_Click(object sender, EventArgs e) + private void buttonDel_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + if (MessageBox.Show("Удалить запись?", "Вопрос", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { try { - _logger.LogInformation("Удаление компонента: {ComponentName} - {Count}", dataGridView.SelectedRows[0].Cells[1].Value); - _productComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + _logger.LogInformation("Удаление компонента: { ComponentName} - { Count} ", dataGridView.SelectedRows[0].Cells[1].Value); + + _documentComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) { - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); } LoadData(); } } + } - private void ButtonRef_Click(object sender, EventArgs e) + private void buttonRef_Click(object sender, EventArgs e) { LoadData(); } - private void ButtonSave_Click(object sender, EventArgs e) + private void buttonSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxName.Text)) { - MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните название", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (string.IsNullOrEmpty(textBoxPrice.Text)) { - MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); return; } - if (_productComponents == null || _productComponents.Count == 0) + if (_documentComponents == null || _documentComponents.Count == 0) { - MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните компоненты", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } _logger.LogInformation("Сохранение изделия"); @@ -171,14 +197,16 @@ namespace LawFirmView Id = _id ?? 0, DocumentName = textBoxName.Text, Price = Convert.ToDouble(textBoxPrice.Text), - DocumentComponents = _productComponents + DocumentComponents = _documentComponents }; - var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + var operationResult = _id.HasValue ? _logic.Update(model) : + _logic.Create(model); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); } - MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + MessageBox.Show("Сохранение прошло успешно", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); } @@ -187,22 +215,22 @@ namespace LawFirmView _logger.LogError(ex, "Ошибка сохранения изделия"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } + } - private void ButtonCancel_Click(object sender, EventArgs e) + private void buttonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); } - private double CalcPrice() { double price = 0; - foreach (var elem in _productComponents) + foreach (var elem in _documentComponents) { price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); } return Math.Round(price * 1.1, 2); } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormDocument.designer.cs b/LawFirm/LawFirmView/FormDocument.designer.cs index a850302..106d77a 100644 --- a/LawFirm/LawFirmView/FormDocument.designer.cs +++ b/LawFirm/LawFirmView/FormDocument.designer.cs @@ -28,203 +28,177 @@ /// private void InitializeComponent() { - this.buttonCancel = new System.Windows.Forms.Button(); - this.buttonSave = new System.Windows.Forms.Button(); - this.textBoxName = new System.Windows.Forms.TextBox(); - this.labelName = new System.Windows.Forms.Label(); - this.textBoxPrice = new System.Windows.Forms.TextBox(); - this.labelPrice = new System.Windows.Forms.Label(); - this.groupBoxComponents = new System.Windows.Forms.GroupBox(); - this.buttonRef = new System.Windows.Forms.Button(); - this.buttonDel = new System.Windows.Forms.Button(); - this.buttonUpd = new System.Windows.Forms.Button(); - this.buttonAdd = new System.Windows.Forms.Button(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); this.dataGridView = new System.Windows.Forms.DataGridView(); - this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.groupBoxComponents.SuspendLayout(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.textBoxPrice = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); // - // buttonCancel + // groupBox1 // - this.buttonCancel.Location = new System.Drawing.Point(455, 362); - this.buttonCancel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(88, 27); - this.buttonCancel.TabIndex = 6; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); - // - // buttonSave - // - this.buttonSave.Location = new System.Drawing.Point(360, 362); - this.buttonSave.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonSave.Name = "buttonSave"; - this.buttonSave.Size = new System.Drawing.Size(88, 27); - this.buttonSave.TabIndex = 5; - this.buttonSave.Text = "Сохранить"; - this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); - // - // textBoxName - // - this.textBoxName.Location = new System.Drawing.Point(92, 7); - this.textBoxName.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBoxName.Name = "textBoxName"; - this.textBoxName.Size = new System.Drawing.Size(252, 23); - this.textBoxName.TabIndex = 1; - // - // labelName - // - this.labelName.AutoSize = true; - this.labelName.Location = new System.Drawing.Point(14, 10); - this.labelName.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.labelName.Name = "labelName"; - this.labelName.Size = new System.Drawing.Size(62, 15); - this.labelName.TabIndex = 0; - this.labelName.Text = "Название:"; - // - // textBoxPrice - // - this.textBoxPrice.Enabled = false; - this.textBoxPrice.Location = new System.Drawing.Point(92, 37); - this.textBoxPrice.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.textBoxPrice.Name = "textBoxPrice"; - this.textBoxPrice.Size = new System.Drawing.Size(147, 23); - this.textBoxPrice.TabIndex = 3; - // - // labelPrice - // - this.labelPrice.AutoSize = true; - this.labelPrice.Location = new System.Drawing.Point(14, 40); - this.labelPrice.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.labelPrice.Name = "labelPrice"; - this.labelPrice.Size = new System.Drawing.Size(70, 15); - this.labelPrice.TabIndex = 2; - this.labelPrice.Text = "Стоимость:"; - // - // groupBoxComponents - // - this.groupBoxComponents.Controls.Add(this.buttonRef); - this.groupBoxComponents.Controls.Add(this.buttonDel); - this.groupBoxComponents.Controls.Add(this.buttonUpd); - this.groupBoxComponents.Controls.Add(this.buttonAdd); - this.groupBoxComponents.Controls.Add(this.dataGridView); - this.groupBoxComponents.Location = new System.Drawing.Point(14, 67); - this.groupBoxComponents.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.groupBoxComponents.Name = "groupBoxComponents"; - this.groupBoxComponents.Padding = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.groupBoxComponents.Size = new System.Drawing.Size(558, 288); - this.groupBoxComponents.TabIndex = 4; - this.groupBoxComponents.TabStop = false; - this.groupBoxComponents.Text = "Компоненты"; - // - // buttonRef - // - this.buttonRef.Location = new System.Drawing.Point(441, 171); - this.buttonRef.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonRef.Name = "buttonRef"; - this.buttonRef.Size = new System.Drawing.Size(88, 27); - this.buttonRef.TabIndex = 4; - this.buttonRef.Text = "Обновить"; - this.buttonRef.UseVisualStyleBackColor = true; - this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); - // - // buttonDel - // - this.buttonDel.Location = new System.Drawing.Point(441, 123); - this.buttonDel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonDel.Name = "buttonDel"; - this.buttonDel.Size = new System.Drawing.Size(88, 27); - this.buttonDel.TabIndex = 3; - this.buttonDel.Text = "Удалить"; - this.buttonDel.UseVisualStyleBackColor = true; - this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); - // - // buttonUpd - // - this.buttonUpd.Location = new System.Drawing.Point(441, 76); - this.buttonUpd.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonUpd.Name = "buttonUpd"; - this.buttonUpd.Size = new System.Drawing.Size(88, 27); - this.buttonUpd.TabIndex = 2; - this.buttonUpd.Text = "Изменить"; - this.buttonUpd.UseVisualStyleBackColor = true; - this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); - // - // buttonAdd - // - this.buttonAdd.Location = new System.Drawing.Point(441, 32); - this.buttonAdd.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonAdd.Name = "buttonAdd"; - this.buttonAdd.Size = new System.Drawing.Size(88, 27); - this.buttonAdd.TabIndex = 1; - this.buttonAdd.Text = "Добавить"; - this.buttonAdd.UseVisualStyleBackColor = true; - this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + this.groupBox1.Controls.Add(this.buttonRef); + this.groupBox1.Controls.Add(this.buttonDel); + this.groupBox1.Controls.Add(this.buttonUpd); + this.groupBox1.Controls.Add(this.buttonAdd); + this.groupBox1.Controls.Add(this.dataGridView); + this.groupBox1.Location = new System.Drawing.Point(58, 98); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(605, 288); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Компоненты"; // // dataGridView // - this.dataGridView.AllowUserToAddRows = false; - this.dataGridView.AllowUserToDeleteRows = false; - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.ColumnId, - this.ColumnName, - this.ColumnCount}); - this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; - this.dataGridView.Location = new System.Drawing.Point(4, 19); - this.dataGridView.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.dataGridView.MultiSelect = false; + this.Column1, + this.Column2, + this.Column3}); + this.dataGridView.Location = new System.Drawing.Point(3, 19); this.dataGridView.Name = "dataGridView"; - this.dataGridView.ReadOnly = true; - this.dataGridView.RowHeadersVisible = false; - this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView.Size = new System.Drawing.Size(408, 266); + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(413, 254); this.dataGridView.TabIndex = 0; // - // ColumnId + // Column1 // - this.ColumnId.HeaderText = "Id"; - this.ColumnId.Name = "ColumnId"; - this.ColumnId.ReadOnly = true; - this.ColumnId.Visible = false; + this.Column1.HeaderText = "id"; + this.Column1.Name = "Column1"; + this.Column1.Visible = false; // - // ColumnName + // Column2 // - this.ColumnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.ColumnName.HeaderText = "Компонент"; - this.ColumnName.Name = "ColumnName"; - this.ColumnName.ReadOnly = true; + this.Column2.HeaderText = "Компонент"; + this.Column2.Name = "Column2"; // - // ColumnCount + // Column3 // - this.ColumnCount.HeaderText = "Количество"; - this.ColumnCount.Name = "ColumnCount"; - this.ColumnCount.ReadOnly = true; + this.Column3.HeaderText = "Количество"; + this.Column3.Name = "Column3"; // - // FormProduct + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(476, 19); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(75, 23); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(476, 61); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(75, 23); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(476, 108); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(75, 23); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(476, 156); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(75, 23); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(427, 403); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(75, 23); + this.buttonSave.TabIndex = 1; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(534, 403); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 2; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(102, 12); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(205, 23); + this.textBoxName.TabIndex = 3; + // + // textBoxPrice + // + this.textBoxPrice.Location = new System.Drawing.Point(102, 41); + this.textBoxPrice.Name = "textBoxPrice"; + this.textBoxPrice.Size = new System.Drawing.Size(151, 23); + this.textBoxPrice.TabIndex = 4; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(62, 15); + this.label1.TabIndex = 5; + this.label1.Text = "Название:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 41); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(70, 15); + this.label2.TabIndex = 6; + this.label2.Text = "Стоимость:"; + // + // FormDocument // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(586, 402); - this.Controls.Add(this.groupBoxComponents); + this.ClientSize = new System.Drawing.Size(691, 450); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); this.Controls.Add(this.textBoxPrice); - this.Controls.Add(this.labelPrice); + this.Controls.Add(this.textBoxName); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); - this.Controls.Add(this.textBoxName); - this.Controls.Add(this.labelName); - this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Name = "FormProduct"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Изделие"; - this.Load += new System.EventHandler(this.FormProduct_Load); - this.groupBoxComponents.ResumeLayout(false); + this.Controls.Add(this.groupBox1); + this.Name = "FormDocument"; + this.Text = "Пакет документов"; + this.Load += new System.EventHandler(this.FormDocument_Load); + this.groupBox1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -233,20 +207,20 @@ #endregion - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.TextBox textBoxName; - private System.Windows.Forms.Label labelName; - private System.Windows.Forms.TextBox textBoxPrice; - private System.Windows.Forms.Label labelPrice; - private System.Windows.Forms.GroupBox groupBoxComponents; - private System.Windows.Forms.Button buttonRef; - private System.Windows.Forms.Button buttonDel; - private System.Windows.Forms.Button buttonUpd; - private System.Windows.Forms.Button buttonAdd; - private System.Windows.Forms.DataGridView dataGridView; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnId; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnName; - private System.Windows.Forms.DataGridViewTextBoxColumn ColumnCount; + private GroupBox groupBox1; + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn Column1; + private DataGridViewTextBoxColumn Column2; + private DataGridViewTextBoxColumn Column3; + private Button buttonSave; + private Button buttonCancel; + private TextBox textBoxName; + private TextBox textBoxPrice; + private Label label1; + private Label label2; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormDocument.resx b/LawFirm/LawFirmView/FormDocument.resx index 1af7de1..a9dc853 100644 --- a/LawFirm/LawFirmView/FormDocument.resx +++ b/LawFirm/LawFirmView/FormDocument.resx @@ -1,64 +1,4 @@ - - - + @@ -117,4 +57,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormDocumentComponent.cs b/LawFirm/LawFirmView/FormDocumentComponent.cs index 15711c7..eed845a 100644 --- a/LawFirm/LawFirmView/FormDocumentComponent.cs +++ b/LawFirm/LawFirmView/FormDocumentComponent.cs @@ -1,15 +1,33 @@ -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.ViewModels; -using LawFirmDataModels.Models; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.ViewModels; +using AbstractLawFirmDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormDocumentComponent : Form { private readonly List? _list; - - public int Id { get { return Convert.ToInt32(comboBoxComponent.SelectedValue); } set { comboBoxComponent.SelectedValue = value; } } - + public int Id + { + get + { + return + Convert.ToInt32(comboBoxComponent.SelectedValue); + } + set + { + comboBoxComponent.SelectedValue = value; + } + } public IComponentModel? ComponentModel { get @@ -18,7 +36,7 @@ namespace LawFirmView { return null; } - foreach(var elem in _list) + foreach (var elem in _list) { if (elem.Id == Id) { @@ -28,13 +46,16 @@ namespace LawFirmView return null; } } - - public int Count { get { return Convert.ToInt32(textBoxCount.Text); } set { textBoxCount.Text = value.ToString(); } } + public int Count + { + get { return Convert.ToInt32(textBoxCount.Text); } + set + { textBoxCount.Text = value.ToString(); } + } public FormDocumentComponent(IComponentLogic logic) { InitializeComponent(); - _list = logic.ReadList(null); if (_list != null) { @@ -43,29 +64,32 @@ namespace LawFirmView comboBoxComponent.DataSource = _list; comboBoxComponent.SelectedItem = null; } + } - private void ButtonSave_Click(object sender, EventArgs e) + private void buttonSave_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxCount.Text)) { - MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (comboBoxComponent.SelectedValue == null) { - MessageBox.Show("Выберите компонент", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите компонент", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - DialogResult = DialogResult.OK; Close(); } - private void ButtonCancel_Click(object sender, EventArgs e) + private void buttonCancel_Click(object sender, EventArgs e) { DialogResult = DialogResult.Cancel; Close(); + } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormDocumentComponent.designer.cs b/LawFirm/LawFirmView/FormDocumentComponent.designer.cs index 7b19f2b..0fa5f66 100644 --- a/LawFirm/LawFirmView/FormDocumentComponent.designer.cs +++ b/LawFirm/LawFirmView/FormDocumentComponent.designer.cs @@ -28,82 +28,80 @@ /// private void InitializeComponent() { - this.buttonCancel = new System.Windows.Forms.Button(); - this.buttonSave = new System.Windows.Forms.Button(); - this.labelComponent = new System.Windows.Forms.Label(); - this.textBoxCount = new System.Windows.Forms.TextBox(); this.comboBoxComponent = new System.Windows.Forms.ComboBox(); - this.labelCount = new System.Windows.Forms.Label(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); this.SuspendLayout(); // - // buttonCancel + // comboBoxComponent // - this.buttonCancel.Location = new System.Drawing.Point(218, 59); - this.buttonCancel.Name = "buttonCancel"; - this.buttonCancel.Size = new System.Drawing.Size(75, 23); - this.buttonCancel.TabIndex = 5; - this.buttonCancel.Text = "Отмена"; - this.buttonCancel.UseVisualStyleBackColor = true; - this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + this.comboBoxComponent.FormattingEnabled = true; + this.comboBoxComponent.Location = new System.Drawing.Point(93, 12); + this.comboBoxComponent.Name = "comboBoxComponent"; + this.comboBoxComponent.Size = new System.Drawing.Size(215, 23); + this.comboBoxComponent.TabIndex = 0; + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(93, 50); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(146, 23); + this.textBoxCount.TabIndex = 1; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 12); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(72, 15); + this.label1.TabIndex = 2; + this.label1.Text = "Компонент:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 50); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(75, 15); + this.label2.TabIndex = 3; + this.label2.Text = "Количество:"; // // buttonSave // - this.buttonSave.Location = new System.Drawing.Point(137, 59); + this.buttonSave.Location = new System.Drawing.Point(164, 91); this.buttonSave.Name = "buttonSave"; this.buttonSave.Size = new System.Drawing.Size(75, 23); this.buttonSave.TabIndex = 4; this.buttonSave.Text = "Сохранить"; this.buttonSave.UseVisualStyleBackColor = true; - this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); // - // labelComponent + // buttonCancel // - this.labelComponent.AutoSize = true; - this.labelComponent.Location = new System.Drawing.Point(12, 9); - this.labelComponent.Name = "labelComponent"; - this.labelComponent.Size = new System.Drawing.Size(66, 13); - this.labelComponent.TabIndex = 0; - this.labelComponent.Text = "Компонент:"; - // - // textBoxCount - // - this.textBoxCount.Location = new System.Drawing.Point(87, 33); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(217, 20); - this.textBoxCount.TabIndex = 3; - // - // comboBoxComponent - // - this.comboBoxComponent.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.comboBoxComponent.FormattingEnabled = true; - this.comboBoxComponent.Location = new System.Drawing.Point(87, 6); - this.comboBoxComponent.Name = "comboBoxComponent"; - this.comboBoxComponent.Size = new System.Drawing.Size(217, 21); - this.comboBoxComponent.TabIndex = 1; - // - // labelCount - // - this.labelCount.AutoSize = true; - this.labelCount.Location = new System.Drawing.Point(12, 36); - this.labelCount.Name = "labelCount"; - this.labelCount.Size = new System.Drawing.Size(69, 13); - this.labelCount.TabIndex = 2; - this.labelCount.Text = "Количество:"; + this.buttonCancel.Location = new System.Drawing.Point(259, 91); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 23); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click); // // FormProductComponent // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(320, 96); - this.Controls.Add(this.labelCount); - this.Controls.Add(this.comboBoxComponent); + this.ClientSize = new System.Drawing.Size(384, 136); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); this.Controls.Add(this.textBoxCount); - this.Controls.Add(this.labelComponent); + this.Controls.Add(this.comboBoxComponent); this.Name = "FormProductComponent"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Компонент изделия"; + this.Text = "Компонент пакета документов"; this.ResumeLayout(false); this.PerformLayout(); @@ -111,11 +109,11 @@ #endregion - private System.Windows.Forms.Button buttonCancel; - private System.Windows.Forms.Button buttonSave; - private System.Windows.Forms.Label labelComponent; - private System.Windows.Forms.TextBox textBoxCount; - private System.Windows.Forms.ComboBox comboBoxComponent; - private System.Windows.Forms.Label labelCount; + private ComboBox comboBoxComponent; + private TextBox textBoxCount; + private Label label1; + private Label label2; + private Button buttonSave; + private Button buttonCancel; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormDocumentComponent.resx b/LawFirm/LawFirmView/FormDocumentComponent.resx index 1af7de1..f298a7b 100644 --- a/LawFirm/LawFirmView/FormDocumentComponent.resx +++ b/LawFirm/LawFirmView/FormDocumentComponent.resx @@ -1,64 +1,4 @@ - - - + diff --git a/LawFirm/LawFirmView/FormDocuments.Designer.cs b/LawFirm/LawFirmView/FormDocuments.Designer.cs index 18f4ca4..40c7ac6 100644 --- a/LawFirm/LawFirmView/FormDocuments.Designer.cs +++ b/LawFirm/LawFirmView/FormDocuments.Designer.cs @@ -28,98 +28,87 @@ /// private void InitializeComponent() { - buttonRef = new Button(); - buttonDel = new Button(); - buttonUpd = new Button(); - buttonAdd = new Button(); - dataGridView = new DataGridView(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // buttonRef - // - buttonRef.Location = new Point(597, 203); - buttonRef.Margin = new Padding(4, 5, 4, 5); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(100, 35); - buttonRef.TabIndex = 9; - buttonRef.Text = "Обновить"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; - // - // buttonDel - // - buttonDel.Location = new Point(597, 140); - buttonDel.Margin = new Padding(4, 5, 4, 5); - buttonDel.Name = "buttonDel"; - buttonDel.Size = new Size(100, 35); - buttonDel.TabIndex = 8; - buttonDel.Text = "Удалить"; - buttonDel.UseVisualStyleBackColor = true; - buttonDel.Click += ButtonDel_Click; - // - // buttonUpd - // - buttonUpd.Location = new Point(597, 77); - buttonUpd.Margin = new Padding(4, 5, 4, 5); - buttonUpd.Name = "buttonUpd"; - buttonUpd.Size = new Size(100, 35); - buttonUpd.TabIndex = 7; - buttonUpd.Text = "Изменить"; - buttonUpd.UseVisualStyleBackColor = true; - buttonUpd.Click += ButtonUpd_Click; - // - // buttonAdd - // - buttonAdd.Location = new Point(597, 18); - buttonAdd.Margin = new Padding(4, 5, 4, 5); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(100, 35); - buttonAdd.TabIndex = 6; - buttonAdd.Text = "Добавить"; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); // // dataGridView // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.BackgroundColor = SystemColors.ControlLightLight; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Dock = DockStyle.Left; - dataGridView.Location = new Point(0, 0); - dataGridView.Margin = new Padding(4, 5, 4, 5); - dataGridView.MultiSelect = false; - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.RowHeadersWidth = 51; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(467, 450); - dataGridView.TabIndex = 5; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(445, 420); + this.dataGridView.TabIndex = 0; + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(514, 22); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(95, 37); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(514, 80); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(95, 39); + this.buttonUpd.TabIndex = 2; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.buttonUpd_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(514, 142); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(95, 40); + this.buttonDel.TabIndex = 3; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.buttonDel_Click); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(514, 205); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(95, 39); + this.buttonRef.TabIndex = 4; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); // // FormDocuments // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(724, 450); - Controls.Add(buttonRef); - Controls.Add(buttonDel); - Controls.Add(buttonUpd); - Controls.Add(buttonAdd); - Controls.Add(dataGridView); - Name = "FormDocuments"; - Text = "Документы"; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(669, 432); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonDel); + this.Controls.Add(this.buttonUpd); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormDocuments"; + this.Text = "Пакеты документов"; + this.Load += new System.EventHandler(this.FormDocuments_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + } #endregion - private Button buttonRef; - private Button buttonDel; - private Button buttonUpd; - private Button buttonAdd; private DataGridView dataGridView; + private Button buttonAdd; + private Button buttonUpd; + private Button buttonDel; + private Button buttonRef; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormDocuments.cs b/LawFirm/LawFirmView/FormDocuments.cs index 7e26668..cbbdda6 100644 --- a/LawFirm/LawFirmView/FormDocuments.cs +++ b/LawFirm/LawFirmView/FormDocuments.cs @@ -1,27 +1,34 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.SearchModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; +using AbstractLawFirmContracts.BindingModels; +using Microsoft.VisualBasic.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormDocuments : Form { private readonly ILogger _logger; - private readonly IDocumentLogic _logic; - public FormDocuments(ILogger logger, IDocumentLogic logic) + public FormDocuments(ILogger logger, IDocumentLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; } - private void FormComponents_Load(object sender, EventArgs e) + private void FormDocuments_Load(object sender, EventArgs e) { LoadData(); } - private void LoadData() { try @@ -31,18 +38,21 @@ namespace LawFirmView { dataGridView.DataSource = list; dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["DocumentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["DocumentName"].AutoSizeMode = + DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["DocumentComponents"].Visible = false; } - _logger.LogInformation("Загрузка компонентов"); + _logger.LogInformation("Загрузка пакетов документов"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки компонентов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + _logger.LogError(ex, "Ошибка загрузки пакетов документов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } - private void ButtonAdd_Click(object sender, EventArgs e) + private void buttonAdd_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormDocument)); if (service is FormDocument form) @@ -54,7 +64,7 @@ namespace LawFirmView } } - private void ButtonUpd_Click(object sender, EventArgs e) + private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { @@ -70,17 +80,20 @@ namespace LawFirmView } } - private void ButtonDel_Click(object sender, EventArgs e) + private void buttonDel_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) { int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Удаление компонента"); + _logger.LogInformation("Удаление пакета документов"); try { - if (!_logic.Delete(new DocumentBindingModel { Id = id })) + if (!_logic.Delete(new DocumentBindingModel + { + Id = id + })) { throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); } @@ -88,14 +101,14 @@ namespace LawFirmView } catch (Exception ex) { - _logger.LogError(ex, "Ошибка удаления компонента"); + _logger.LogError(ex, "Ошибка удаления пакета документов"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } } } - private void ButtonRef_Click(object sender, EventArgs e) + private void buttonRef_Click(object sender, EventArgs e) { LoadData(); } diff --git a/LawFirm/LawFirmView/FormDocuments.resx b/LawFirm/LawFirmView/FormDocuments.resx index af32865..f298a7b 100644 --- a/LawFirm/LawFirmView/FormDocuments.resx +++ b/LawFirm/LawFirmView/FormDocuments.resx @@ -1,64 +1,4 @@ - - - + diff --git a/LawFirm/LawFirmView/FormMain.cs b/LawFirm/LawFirmView/FormMain.cs index 9b54968..134665b 100644 --- a/LawFirm/LawFirmView/FormMain.cs +++ b/LawFirm/LawFirmView/FormMain.cs @@ -1,15 +1,23 @@ -using LawFirmContracts.BindingModels; -using LawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.BindingModels; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmDataModels.Enums; using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; namespace LawFirmView { public partial class FormMain : Form { private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) { InitializeComponent(); @@ -21,23 +29,38 @@ namespace LawFirmView { LoadData(); } - private void LoadData() { _logger.LogInformation("Загрузка заказов"); - // прописать логику + try + { + var list = _orderLogic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["DocumentId"].Visible = false; + dataGridView.Columns["DocumentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } - private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e) + private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); if (service is FormComponents form) { form.ShowDialog(); } + } - private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) + private void пакетыДокументовToolStripMenuItem_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormDocuments)); if (service is FormDocuments form) @@ -46,7 +69,7 @@ namespace LawFirmView } } - private void ButtonCreateOrder_Click(object sender, EventArgs e) + private void buttonCreateOrder_Click(object sender, EventArgs e) { var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); if (service is FormCreateOrder form) @@ -54,17 +77,19 @@ namespace LawFirmView form.ShowDialog(); LoadData(); } + } - private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) + private void buttonTakeOrderInWork_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id); try { - var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel { Id = id }); + var operationResult = _orderLogic.TakeOrderInWork(CreateBindingModel(id)); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); @@ -74,20 +99,24 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка передачи заказа в работу"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } + } - private void ButtonOrderReady_Click(object sender, EventArgs e) + private void buttonOrderReady_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", + id); try { - var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id }); + var operationResult = _orderLogic.FinishOrder(CreateBindingModel(id)); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); @@ -97,20 +126,23 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка отметки о готовности заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + } - private void ButtonIssuedOrder_Click(object sender, EventArgs e) + private void buttonIssuedOrder_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", + id); try { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id }); + var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id)); if (!operationResult) { throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); @@ -121,14 +153,28 @@ namespace LawFirmView catch (Exception ex) { _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } + } - private void ButtonRef_Click(object sender, EventArgs e) + private void buttonRef_Click(object sender, EventArgs e) { LoadData(); } + private OrderBindingModel CreateBindingModel(int id, bool isDone = false) + { + return new OrderBindingModel + { + Id = id, + DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()), + }; + } } -} \ No newline at end of file +} diff --git a/LawFirm/LawFirmView/FormMain.designer.cs b/LawFirm/LawFirmView/FormMain.designer.cs index bd95298..6d9d80f 100644 --- a/LawFirm/LawFirmView/FormMain.designer.cs +++ b/LawFirm/LawFirmView/FormMain.designer.cs @@ -3,14 +3,14 @@ partial class FormMain { /// - /// Обязательная переменная конструктора. + /// 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)) @@ -20,175 +20,155 @@ base.Dispose(disposing); } - #region Код, автоматически созданный конструктором форм Windows + #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() { - menuStrip1 = new MenuStrip(); - справочникиToolStripMenuItem = new ToolStripMenuItem(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - изделияToolStripMenuItem = new ToolStripMenuItem(); - buttonIssuedOrder = new Button(); - buttonOrderReady = new Button(); - buttonTakeOrderInWork = new Button(); - buttonCreateOrder = new Button(); - dataGridView = new DataGridView(); - buttonRef = new Button(); - menuStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.toolStripMenuItemCatalogs = new System.Windows.Forms.ToolStripMenuItem(); + this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.пакетыДокументовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.buttonCreateOrder = new System.Windows.Forms.Button(); + this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); + this.buttonOrderReady = new System.Windows.Forms.Button(); + this.buttonIssuedOrder = new System.Windows.Forms.Button(); + this.buttonRef = new System.Windows.Forms.Button(); + this.menuStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); // // menuStrip1 // - menuStrip1.ImageScalingSize = new Size(20, 20); - menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem }); - menuStrip1.Location = new Point(0, 0); - menuStrip1.Name = "menuStrip1"; - menuStrip1.Padding = new Padding(8, 3, 0, 3); - menuStrip1.Size = new Size(1178, 30); - menuStrip1.TabIndex = 0; - menuStrip1.Text = "menuStrip1"; + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripMenuItemCatalogs}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(910, 24); + this.menuStrip1.TabIndex = 0; + this.menuStrip1.Text = "Справочники"; // - // справочникиToolStripMenuItem + // toolStripMenuItemCatalogs // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделияToolStripMenuItem }); - справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(117, 24); - справочникиToolStripMenuItem.Text = "Справочники"; + this.toolStripMenuItemCatalogs.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.компонентыToolStripMenuItem, + this.пакетыДокументовToolStripMenuItem}); + this.toolStripMenuItemCatalogs.Name = "toolStripMenuItemCatalogs"; + this.toolStripMenuItemCatalogs.Size = new System.Drawing.Size(94, 20); + this.toolStripMenuItemCatalogs.Text = "Справочники"; // // компонентыToolStripMenuItem // - компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(182, 26); - компонентыToolStripMenuItem.Text = "Компоненты"; - компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; + this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.компонентыToolStripMenuItem.Text = "Компоненты"; + this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click); // - // изделияToolStripMenuItem + // пакетыДокументовToolStripMenuItem // - изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(182, 26); - изделияToolStripMenuItem.Text = "Изделия"; - изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; - // - // buttonIssuedOrder - // - buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonIssuedOrder.Location = new Point(965, 308); - buttonIssuedOrder.Margin = new Padding(5, 4, 5, 4); - buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(199, 36); - buttonIssuedOrder.TabIndex = 4; - buttonIssuedOrder.Text = "Заказ выдан"; - buttonIssuedOrder.UseVisualStyleBackColor = true; - buttonIssuedOrder.Click += ButtonIssuedOrder_Click; - // - // buttonOrderReady - // - buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonOrderReady.Location = new Point(965, 228); - buttonOrderReady.Margin = new Padding(5, 4, 5, 4); - buttonOrderReady.Name = "buttonOrderReady"; - buttonOrderReady.Size = new Size(199, 36); - buttonOrderReady.TabIndex = 3; - buttonOrderReady.Text = "Заказ готов"; - buttonOrderReady.UseVisualStyleBackColor = true; - buttonOrderReady.Click += ButtonOrderReady_Click; - // - // buttonTakeOrderInWork - // - buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonTakeOrderInWork.Location = new Point(965, 156); - buttonTakeOrderInWork.Margin = new Padding(5, 4, 5, 4); - buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; - buttonTakeOrderInWork.Size = new Size(199, 36); - buttonTakeOrderInWork.TabIndex = 2; - buttonTakeOrderInWork.Text = "Отдать на выполнение"; - buttonTakeOrderInWork.UseVisualStyleBackColor = true; - buttonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; - // - // buttonCreateOrder - // - buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonCreateOrder.Location = new Point(965, 77); - buttonCreateOrder.Margin = new Padding(5, 4, 5, 4); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(199, 36); - buttonCreateOrder.TabIndex = 1; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += ButtonCreateOrder_Click; + this.пакетыДокументовToolStripMenuItem.Name = "пакетыДокументовToolStripMenuItem"; + this.пакетыДокументовToolStripMenuItem.Size = new System.Drawing.Size(183, 22); + this.пакетыДокументовToolStripMenuItem.Text = "Пакеты документов"; + this.пакетыДокументовToolStripMenuItem.Click += new System.EventHandler(this.пакетыДокументовToolStripMenuItem_Click); // // dataGridView // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - dataGridView.BackgroundColor = SystemColors.ControlLightLight; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 37); - dataGridView.Margin = new Padding(5, 4, 5, 4); - dataGridView.MultiSelect = false; - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersVisible = false; - dataGridView.RowHeadersWidth = 51; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(944, 424); - dataGridView.TabIndex = 0; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(0, 27); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowTemplate.Height = 25; + this.dataGridView.Size = new System.Drawing.Size(736, 411); + this.dataGridView.TabIndex = 1; + // + // buttonCreateOrder + // + this.buttonCreateOrder.Location = new System.Drawing.Point(742, 39); + this.buttonCreateOrder.Name = "buttonCreateOrder"; + this.buttonCreateOrder.Size = new System.Drawing.Size(156, 26); + this.buttonCreateOrder.TabIndex = 2; + this.buttonCreateOrder.Text = "Создать заказ"; + this.buttonCreateOrder.UseVisualStyleBackColor = true; + this.buttonCreateOrder.Click += new System.EventHandler(this.buttonCreateOrder_Click); + // + // buttonTakeOrderInWork + // + this.buttonTakeOrderInWork.Location = new System.Drawing.Point(742, 71); + this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; + this.buttonTakeOrderInWork.Size = new System.Drawing.Size(156, 23); + this.buttonTakeOrderInWork.TabIndex = 3; + this.buttonTakeOrderInWork.Text = "Отдать на выполнение"; + this.buttonTakeOrderInWork.UseVisualStyleBackColor = true; + this.buttonTakeOrderInWork.Click += new System.EventHandler(this.buttonTakeOrderInWork_Click); + // + // buttonOrderReady + // + this.buttonOrderReady.Location = new System.Drawing.Point(742, 100); + this.buttonOrderReady.Name = "buttonOrderReady"; + this.buttonOrderReady.Size = new System.Drawing.Size(156, 23); + this.buttonOrderReady.TabIndex = 4; + this.buttonOrderReady.Text = "Заказ готов"; + this.buttonOrderReady.UseVisualStyleBackColor = true; + this.buttonOrderReady.Click += new System.EventHandler(this.buttonOrderReady_Click); + // + // buttonIssuedOrder + // + this.buttonIssuedOrder.Location = new System.Drawing.Point(742, 129); + this.buttonIssuedOrder.Name = "buttonIssuedOrder"; + this.buttonIssuedOrder.Size = new System.Drawing.Size(156, 23); + this.buttonIssuedOrder.TabIndex = 5; + this.buttonIssuedOrder.Text = "Заказ выдан"; + this.buttonIssuedOrder.UseVisualStyleBackColor = true; + this.buttonIssuedOrder.Click += new System.EventHandler(this.buttonIssuedOrder_Click); // // buttonRef // - buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonRef.Location = new Point(965, 387); - buttonRef.Margin = new Padding(5, 4, 5, 4); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(199, 36); - buttonRef.TabIndex = 5; - buttonRef.Text = "Обновить список"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; + this.buttonRef.Location = new System.Drawing.Point(742, 158); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(156, 23); + this.buttonRef.TabIndex = 6; + this.buttonRef.Text = "Обновить список"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.buttonRef_Click); // // FormMain // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1178, 463); - Controls.Add(buttonRef); - Controls.Add(buttonIssuedOrder); - Controls.Add(buttonOrderReady); - Controls.Add(buttonTakeOrderInWork); - Controls.Add(buttonCreateOrder); - Controls.Add(dataGridView); - Controls.Add(menuStrip1); - MainMenuStrip = menuStrip1; - Margin = new Padding(5, 4, 5, 4); - Name = "FormMain"; - StartPosition = FormStartPosition.CenterScreen; - Text = "Юридическая фирма Все сидят"; - Load += FormMain_Load; - menuStrip1.ResumeLayout(false); - menuStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(910, 477); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonIssuedOrder); + this.Controls.Add(this.buttonOrderReady); + this.Controls.Add(this.buttonTakeOrderInWork); + this.Controls.Add(this.buttonCreateOrder); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.menuStrip1); + this.MainMenuStrip = this.menuStrip1; + this.Name = "FormMain"; + this.Text = "FormMain"; + this.Load += new System.EventHandler(this.FormMain_Load); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + } #endregion private MenuStrip menuStrip1; - private ToolStripMenuItem справочникиToolStripMenuItem; + private ToolStripMenuItem toolStripMenuItemCatalogs; private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem изделияToolStripMenuItem; - private Button buttonIssuedOrder; - private Button buttonOrderReady; - private Button buttonTakeOrderInWork; - private Button buttonCreateOrder; + private ToolStripMenuItem пакетыДокументовToolStripMenuItem; private DataGridView dataGridView; + private Button buttonCreateOrder; + private Button buttonTakeOrderInWork; + private Button buttonOrderReady; + private Button buttonIssuedOrder; private Button buttonRef; } -} - +} \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormMain.resx b/LawFirm/LawFirmView/FormMain.resx index a0623c8..05252e7 100644 --- a/LawFirm/LawFirmView/FormMain.resx +++ b/LawFirm/LawFirmView/FormMain.resx @@ -1,64 +1,4 @@ - - - + @@ -120,4 +60,7 @@ 17, 17 + + 25 + \ No newline at end of file diff --git a/LawFirm/LawFirmView/LawFirmView.csproj b/LawFirm/LawFirmView/LawFirmView.csproj index 83cfa95..b6cfc13 100644 --- a/LawFirm/LawFirmView/LawFirmView.csproj +++ b/LawFirm/LawFirmView/LawFirmView.csproj @@ -9,26 +9,13 @@ - + + - - Always - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/LawFirm/LawFirmView/Program.cs b/LawFirm/LawFirmView/Program.cs index 5c84245..ab37d8c 100644 --- a/LawFirm/LawFirmView/Program.cs +++ b/LawFirm/LawFirmView/Program.cs @@ -1,11 +1,11 @@ -using LawFirmBusinessLogic.BusinessLogics; -using LawFirmContracts.BusinessLogicsContracts; -using LawFirmContracts.StoragesContracts; -using LawFirmListImplement.Implements; +using AbstractLawFirmBusinessLogic.BusinessLogic; +using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmListImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -using System.Drawing; +using System; namespace LawFirmView { @@ -14,11 +14,13 @@ namespace LawFirmView private static ServiceProvider? _serviceProvider; public static ServiceProvider? ServiceProvider => _serviceProvider; /// - /// The main entry point for the application. + /// The main entry point for the application. /// [STAThread] static void Main() { + // To customize application configuration such as set high DPI settings or default font, + // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); var services = new ServiceCollection(); ConfigureServices(services); @@ -46,5 +48,6 @@ namespace LawFirmView services.AddTransient(); services.AddTransient(); } + } } \ No newline at end of file