From 793a09fb2cd661709b903a702b505c695d9ebf32 Mon Sep 17 00:00:00 2001 From: bulatova_karina Date: Tue, 26 Mar 2024 20:07:16 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=D1=8C?= =?UTF-8?q?=20=D1=8D=D1=82=D0=BE=20=D0=B2=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ComponentLogic.cs | 2 +- .../BusinessLogics/ComputerLogic.cs | 2 +- .../BusinessLogics/OrderLogic.cs | 2 +- .../BusinessLogics/ShopLogic.cs | 172 +++++++++++++++ .../BindingModels/ShopBindingModel.cs | 19 ++ .../IComponentLogic.cs | 2 +- .../BusinessLogicsContracts/IComputerLogic.cs | 2 +- .../BusinessLogicsContracts/IOrderLogic.cs | 2 +- .../BusinessLogicsContracts/IShopLogic.cs | 23 ++ .../SearchModels/ShopSearchModel.cs | 14 ++ .../StoragesContracts/IShopStorage.cs | 22 ++ .../ViewModels/ShopViewModel.cs | 23 ++ .../Models/IShopModel.cs | 16 ++ .../DataListSingleton.cs | 2 + .../Implements/ShopStorage.cs | 109 ++++++++++ .../ComputersShopListImplement/Models/Shop.cs | 56 +++++ .../ComputersShopView/FormComponent.cs | 2 +- .../ComputersShopView/FormComponents.cs | 2 +- .../ComputersShopView/FormComputer.cs | 2 +- .../FormComputerComponent.cs | 2 +- .../ComputersShopView/FormComputers.cs | 2 +- .../ComputersShopView/FormCreateOrder.cs | 2 +- .../ComputersShopView/FormMain.Designer.cs | 26 ++- ComputersShop/ComputersShopView/FormMain.cs | 18 +- .../ComputersShopView/FormShop.Designer.cs | 198 ++++++++++++++++++ ComputersShop/ComputersShopView/FormShop.cs | 123 +++++++++++ ComputersShop/ComputersShopView/FormShop.resx | 84 ++++++++ .../ComputersShopView/FormShops.Designer.cs | 115 ++++++++++ ComputersShop/ComputersShopView/FormShops.cs | 113 ++++++++++ .../ComputersShopView/FormShops.resx | 60 ++++++ .../ComputersShopView/FormSupply.Designer.cs | 142 +++++++++++++ ComputersShop/ComputersShopView/FormSupply.cs | 151 +++++++++++++ .../ComputersShopView/FormSupply.resx | 60 ++++++ ComputersShop/ComputersShopView/Program.cs | 12 +- 34 files changed, 1562 insertions(+), 20 deletions(-) create mode 100644 ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs create mode 100644 ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs create mode 100644 ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs create mode 100644 ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs create mode 100644 ComputersShop/ComputersShopContracts/StoragesContracts/IShopStorage.cs create mode 100644 ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs create mode 100644 ComputersShop/ComputersShopDataModels/Models/IShopModel.cs create mode 100644 ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs create mode 100644 ComputersShop/ComputersShopListImplement/Models/Shop.cs create mode 100644 ComputersShop/ComputersShopView/FormShop.Designer.cs create mode 100644 ComputersShop/ComputersShopView/FormShop.cs create mode 100644 ComputersShop/ComputersShopView/FormShop.resx create mode 100644 ComputersShop/ComputersShopView/FormShops.Designer.cs create mode 100644 ComputersShop/ComputersShopView/FormShops.cs create mode 100644 ComputersShop/ComputersShopView/FormShops.resx create mode 100644 ComputersShop/ComputersShopView/FormSupply.Designer.cs create mode 100644 ComputersShop/ComputersShopView/FormSupply.cs create mode 100644 ComputersShop/ComputersShopView/FormSupply.resx diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComponentLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComponentLogic.cs index 35a0d59..37626aa 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComponentLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComponentLogic.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.BindingModels; using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComputerLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComputerLogic.cs index 36a308c..75d2a93 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComputerLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ComputerLogic.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; using ComputersShopContracts.ViewModels; diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs index 0070a56..b21f70a 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; using ComputersShopContracts.ViewModels; diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..c6ee924 --- /dev/null +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,172 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.BusinessLogicsContracts; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace ComputersShopBusinessLogic.BusinessLogics +{ + public class ShopLogic : IShopLogic + { + private readonly ILogger _logger; + private readonly IShopStorage _shopStorage; + + public ShopLogic(ILogger logger, IShopStorage shopStorage) + { + _logger = logger; + _shopStorage = shopStorage; + } + + public List ReadList(ShopSearchModel model) + { + _logger.LogInformation("ReadList. ShopName:{Name}. Id:{ Id}", model?.Name, model?.Id); + var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); + return list; + + } + + public bool MakeSupply(ShopSearchModel model, IComputerModel Computer, int count) + { + _logger.LogInformation("Try to supply shop. ShopName:{ShopName}. Id:{Id}", model.Name, model.Id); + if (model == null) + { + _logger.LogWarning("Read operation failed"); + throw new ArgumentNullException(nameof(model)); + } + if (Computer == null) + { + _logger.LogWarning("Read operation failed"); + throw new ArgumentNullException(nameof(Computer)); + } + if (count <= 0) + { + _logger.LogWarning("Read operation failed"); + throw new ArgumentNullException("Количество должно быть положительным числом"); + } + ShopViewModel curModel = ReadElement(model); + if (curModel == null) + { + _logger.LogWarning("Read operation failed"); + throw new ArgumentNullException(nameof(curModel)); + } + if (curModel.ShopComputers.TryGetValue(Computer.Id, out var pair)) + { + curModel.ShopComputers[Computer.Id] = (pair.Item1, pair.Item2 + count); + } + else + { + curModel.ShopComputers.Add(Computer.Id, (Computer, count)); + } + Update(new() + { + Id = curModel.Id, + ShopName = curModel.ShopName, + DateOpen = curModel.DateOpen, + Address = curModel.Address, + ShopComputers = curModel.ShopComputers, + }); + _logger.LogInformation("Success. ComputerName:{ComputerName}. Id:{Id}. Supply:{count}", Computer.ComputerName, Computer.Id, count); + return true; + } + + public ShopViewModel ReadElement(ShopSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.Name, model.Id); + var element = _shopStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); + return element; + } + + public bool Create(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ShopBindingModel model) + { + CheckModel(model); + if (_shopStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + public bool Delete(ShopBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_shopStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ShopBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ShopName)) + { + throw new ArgumentNullException("Нет названия магазина", + nameof(model.ShopName)); + } + if (string.IsNullOrEmpty(model.Address)) + { + throw new ArgumentNullException("Нет адресса магазина", + nameof(model.Address)); + } + if (model.DateOpen == null) + { + throw new ArgumentNullException("Нет даты открытия магазина", + nameof(model.DateOpen)); + } + _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", model.ShopName, model.Address, model.DateOpen, model.Id); + var element = _shopStorage.GetElement(new ShopSearchModel + { + Name = model.ShopName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Магазин с таким названием уже есть"); + } + } + } +} diff --git a/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..cbb3518 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; + +namespace ComputersShopContracts.BindingModels +{ + public class ShopBindingModel : IShopModel + { + public int Id { get; set; } + public string ShopName { get; set; } + public string Address { get; set; } + public DateTime DateOpen { get; set; } + public Dictionary ShopComputers { get; set; } = new(); + } +} diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComponentLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComponentLogic.cs index 42896d2..817e191 100644 --- a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComponentLogic.cs +++ b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComponentLogic.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ComputersShopContracts.BuisnessLogicsContracts +namespace ComputersShopContracts.BusinessLogicsContracts { public interface IComponentLogic { diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComputerLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComputerLogic.cs index f2cd941..6a80a33 100644 --- a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComputerLogic.cs +++ b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IComputerLogic.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ComputersShopContracts.BuisnessLogicsContracts +namespace ComputersShopContracts.BusinessLogicsContracts { public interface IComputerLogic { diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IOrderLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IOrderLogic.cs index 54f9079..8c8da36 100644 --- a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IOrderLogic.cs +++ b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IOrderLogic.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ComputersShopContracts.BuisnessLogicsContracts +namespace ComputersShopContracts.BusinessLogicsContracts { public interface IOrderLogic { diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs new file mode 100644 index 0000000..85bc165 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; + +namespace ComputersShopContracts.BusinessLogicsContracts +{ + public interface IShopLogic + { + List? ReadList(ShopSearchModel? model); + ShopViewModel? ReadElement(ShopSearchModel model); + bool Create(ShopBindingModel model); + bool Update(ShopBindingModel model); + bool Delete(ShopBindingModel model); + bool MakeSupply(ShopSearchModel model, IComputerModel computer, int count); + } +} diff --git a/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs b/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..228bd84 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + public string? Name { get; set; } + } +} diff --git a/ComputersShop/ComputersShopContracts/StoragesContracts/IShopStorage.cs b/ComputersShop/ComputersShopContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..9d10aa7 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; + +namespace ComputersShopContracts.StoragesContracts +{ + public interface IShopStorage + { + List GetFullList(); + List GetFilteredList(ShopSearchModel model); + ShopViewModel? GetElement(ShopSearchModel model); + ShopViewModel? Insert(ShopBindingModel model); + ShopViewModel? Update(ShopBindingModel model); + ShopViewModel? Delete(ShopBindingModel model); + } +} diff --git a/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..cf398a8 --- /dev/null +++ b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; + +namespace ComputersShopContracts.ViewModels +{ + public class ShopViewModel : IShopModel + { + public int Id { get; set; } + [DisplayName("Название магазина")] + public string ShopName { get; set; } + [DisplayName("Адрес магазина")] + public string Address { get; set; } + [DisplayName("Дата открытия")] + public DateTime DateOpen { get; set; } + public Dictionary ShopComputers { get; set; } = new(); + } +} diff --git a/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs b/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..ab57ac3 --- /dev/null +++ b/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopDataModels.Models +{ + public interface IShopModel : IId + { + string ShopName { get; } + string Address { get; } + DateTime DateOpen { get; } + Dictionary ShopComputers { get; } + } +} diff --git a/ComputersShop/ComputersShopListImplement/DataListSingleton.cs b/ComputersShop/ComputersShopListImplement/DataListSingleton.cs index 3337082..e413d1f 100644 --- a/ComputersShop/ComputersShopListImplement/DataListSingleton.cs +++ b/ComputersShop/ComputersShopListImplement/DataListSingleton.cs @@ -13,11 +13,13 @@ namespace AbstractShopListImplement public List Components { get; set; } public List Orders { get; set; } public List Computers { get; set; } + public List Shops { get; set; } private DataListSingleton() { Components = new List(); Orders = new List(); Computers = new List(); + Shops = new List(); } public static DataListSingleton GetInstance() { diff --git a/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..93ed65f --- /dev/null +++ b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AbstractShopListImplement; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; +using ComputersShopListImplement.Models; + +namespace ComputersShopListImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataListSingleton _source; + public ShopStorage() + { + _source = DataListSingleton.GetInstance(); + } + public List GetFullList() + { + var result = new List(); + foreach (var shop in _source.Shops) + { + result.Add(shop.GetViewModel); + } + return result; + } + public List GetFilteredList(ShopSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.Name)) + { + return result; + } + foreach (var shop in _source.Shops) + { + if (shop.ShopName.Contains(model.Name)) + { + result.Add(shop.GetViewModel); + } + } + return result; + } + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue) + { + return null; + } + foreach (var shop in _source.Shops) + { + if ((!string.IsNullOrEmpty(model.Name) && + shop.ShopName == model.Name) || + (model.Id.HasValue && shop.Id == model.Id)) + { + return shop.GetViewModel; + } + } + return null; + } + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = 1; + foreach (var shop in _source.Shops) + { + if (model.Id <= shop.Id) + { + model.Id = shop.Id + 1; + } + } + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + _source.Shops.Add(newShop); + return newShop.GetViewModel; + } + public ShopViewModel? Update(ShopBindingModel model) + { + foreach (var shop in _source.Shops) + { + if (shop.Id == model.Id) + { + shop.Update(model); + return shop.GetViewModel; + } + } + return null; + } + public ShopViewModel? Delete(ShopBindingModel model) + { + for (int i = 0; i < _source.Shops.Count; ++i) + { + if (_source.Shops[i].Id == model.Id) + { + var element = _source.Shops[i]; + _source.Shops.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/ComputersShop/ComputersShopListImplement/Models/Shop.cs b/ComputersShop/ComputersShopListImplement/Models/Shop.cs new file mode 100644 index 0000000..7aa9430 --- /dev/null +++ b/ComputersShop/ComputersShopListImplement/Models/Shop.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; + +namespace ComputersShopListImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + public string ShopName { get; private set; } + public string Address { get; private set; } + public DateTime DateOpen { get; private set; } + public Dictionary ShopComputers { get; private set; } = new(); + + public static Shop? Create(ShopBindingModel model) + { + if (model == null) + return null; + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpen = model.DateOpen, + ShopComputers = new() + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpen = model.DateOpen; + ShopComputers = model.ShopComputers; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpen = DateOpen, + ShopComputers = ShopComputers + }; + } +} diff --git a/ComputersShop/ComputersShopView/FormComponent.cs b/ComputersShop/ComputersShopView/FormComponent.cs index 70045f5..14fee43 100644 --- a/ComputersShop/ComputersShopView/FormComponent.cs +++ b/ComputersShop/ComputersShopView/FormComponent.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using Microsoft.Extensions.Logging; diff --git a/ComputersShop/ComputersShopView/FormComponents.cs b/ComputersShop/ComputersShopView/FormComponents.cs index d8a97c4..5dd3e12 100644 --- a/ComputersShop/ComputersShopView/FormComponents.cs +++ b/ComputersShop/ComputersShopView/FormComponents.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; diff --git a/ComputersShop/ComputersShopView/FormComputer.cs b/ComputersShop/ComputersShopView/FormComputer.cs index 3633451..eec94a6 100644 --- a/ComputersShop/ComputersShopView/FormComputer.cs +++ b/ComputersShop/ComputersShopView/FormComputer.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using ComputersShopDataModels.Models; using Microsoft.Extensions.Logging; diff --git a/ComputersShop/ComputersShopView/FormComputerComponent.cs b/ComputersShop/ComputersShopView/FormComputerComponent.cs index 595a604..b87b816 100644 --- a/ComputersShop/ComputersShopView/FormComputerComponent.cs +++ b/ComputersShop/ComputersShopView/FormComputerComponent.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.ViewModels; using ComputersShopDataModels.Models; diff --git a/ComputersShop/ComputersShopView/FormComputers.cs b/ComputersShop/ComputersShopView/FormComputers.cs index f481724..835777d 100644 --- a/ComputersShop/ComputersShopView/FormComputers.cs +++ b/ComputersShop/ComputersShopView/FormComputers.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using Microsoft.Extensions.Logging; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; namespace ComputersShopView { diff --git a/ComputersShop/ComputersShopView/FormCreateOrder.cs b/ComputersShop/ComputersShopView/FormCreateOrder.cs index 6734fa3..e61c225 100644 --- a/ComputersShop/ComputersShopView/FormCreateOrder.cs +++ b/ComputersShop/ComputersShopView/FormCreateOrder.cs @@ -8,7 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using Microsoft.Extensions.Logging; diff --git a/ComputersShop/ComputersShopView/FormMain.Designer.cs b/ComputersShop/ComputersShopView/FormMain.Designer.cs index 72c4b76..3511353 100644 --- a/ComputersShop/ComputersShopView/FormMain.Designer.cs +++ b/ComputersShop/ComputersShopView/FormMain.Designer.cs @@ -32,6 +32,8 @@ this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.изделияToolStripMenuItem = 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(); @@ -57,7 +59,9 @@ // this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.компонентыToolStripMenuItem, - this.изделияToolStripMenuItem}); + this.изделияToolStripMenuItem, + this.магазиныToolStripMenuItem, + this.поставкиToolStripMenuItem}); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24); this.справочникиToolStripMenuItem.Text = "Справочники"; @@ -65,17 +69,31 @@ // компонентыToolStripMenuItem // this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(182, 26); + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.компонентыToolStripMenuItem.Text = "Компоненты"; this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); // // изделияToolStripMenuItem // this.изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - this.изделияToolStripMenuItem.Size = new System.Drawing.Size(182, 26); + this.изделияToolStripMenuItem.Size = new System.Drawing.Size(224, 26); this.изделияToolStripMenuItem.Text = "Изделия"; this.изделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); // + // магазиныToolStripMenuItem + // + this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.магазиныToolStripMenuItem.Text = "Магазины"; + this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.МагазиныToolStripMenuItem_Click); + // + // поставкиToolStripMenuItem + // + this.поставкиToolStripMenuItem.Name = "поставкиToolStripMenuItem"; + this.поставкиToolStripMenuItem.Size = new System.Drawing.Size(224, 26); + this.поставкиToolStripMenuItem.Text = "Поставки"; + this.поставкиToolStripMenuItem.Click += new System.EventHandler(this.ПоставкиToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -175,5 +193,7 @@ private Button buttonRef; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem поставкиToolStripMenuItem; } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormMain.cs b/ComputersShop/ComputersShopView/FormMain.cs index dbaadbf..f9ed2e6 100644 --- a/ComputersShop/ComputersShopView/FormMain.cs +++ b/ComputersShop/ComputersShopView/FormMain.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using ComputersShopBusinessLogic.BusinessLogics; using ComputersShopContracts.BindingModels; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; namespace ComputersShopView @@ -64,6 +64,22 @@ namespace ComputersShopView form.ShowDialog(); } } + private void МагазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } + private void ПоставкиToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSupply)); + if (service is FormSupply form) + { + form.ShowDialog(); + } + } private void ButtonCreateOrder_Click(object sender, EventArgs e) { var service = diff --git a/ComputersShop/ComputersShopView/FormShop.Designer.cs b/ComputersShop/ComputersShopView/FormShop.Designer.cs new file mode 100644 index 0000000..26688e2 --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShop.Designer.cs @@ -0,0 +1,198 @@ +namespace ComputersShopView +{ + partial class FormShop + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); + this.textBoxAdress = new System.Windows.Forms.TextBox(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ComputerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(12, 22); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(80, 20); + this.label1.TabIndex = 0; + this.label1.Text = "Название:"; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(12, 61); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(54, 20); + this.label2.TabIndex = 1; + this.label2.Text = "Адрес:"; + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(12, 102); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(44, 20); + this.label3.TabIndex = 2; + this.label3.Text = "Дата:"; + // + // dateTimePicker + // + this.dateTimePicker.Location = new System.Drawing.Point(104, 97); + this.dateTimePicker.Name = "dateTimePicker"; + this.dateTimePicker.Size = new System.Drawing.Size(403, 27); + this.dateTimePicker.TabIndex = 3; + // + // textBoxAdress + // + this.textBoxAdress.Location = new System.Drawing.Point(104, 61); + this.textBoxAdress.Name = "textBoxAdress"; + this.textBoxAdress.Size = new System.Drawing.Size(403, 27); + this.textBoxAdress.TabIndex = 4; + this.textBoxAdress.TextChanged += new System.EventHandler(this.FormShop_Load); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(104, 22); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(403, 27); + this.textBoxName.TabIndex = 5; + // + // dataGridView + // + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.id, + this.ComputerName, + this.Price, + this.Count}); + this.dataGridView.Location = new System.Drawing.Point(23, 156); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 51; + this.dataGridView.RowTemplate.Height = 29; + this.dataGridView.Size = new System.Drawing.Size(507, 173); + this.dataGridView.TabIndex = 6; + // + // id + // + this.id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.id.HeaderText = "Id"; + this.id.MinimumWidth = 6; + this.id.Name = "id"; + this.id.Visible = false; + // + // ComputerName + // + this.ComputerName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ComputerName.HeaderText = "Название"; + this.ComputerName.MinimumWidth = 6; + this.ComputerName.Name = "ComputerName"; + // + // Price + // + this.Price.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Price.HeaderText = "Цена"; + this.Price.MinimumWidth = 6; + this.Price.Name = "Price"; + // + // Count + // + this.Count.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Count.HeaderText = "Количество"; + this.Count.MinimumWidth = 6; + this.Count.Name = "Count"; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(319, 354); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(94, 29); + this.buttonSave.TabIndex = 7; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(436, 354); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(94, 29); + this.buttonCancel.TabIndex = 8; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormShop + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(546, 395); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.dataGridView); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.textBoxAdress); + this.Controls.Add(this.dateTimePicker); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Name = "FormShop"; + this.Text = "Магазин"; + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label label1; + private Label label2; + private Label label3; + private DateTimePicker dateTimePicker; + private TextBox textBoxAdress; + private TextBox textBoxName; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn id; + private DataGridViewTextBoxColumn ComputerName; + private DataGridViewTextBoxColumn Price; + private DataGridViewTextBoxColumn Count; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShop.cs b/ComputersShop/ComputersShopView/FormShop.cs new file mode 100644 index 0000000..6b9788c --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShop.cs @@ -0,0 +1,123 @@ +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 ComputersShopContracts.BindingModels; +using ComputersShopContracts.BusinessLogicsContracts; +using ComputersShopContracts.SearchModels; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace ComputersShopView +{ + public partial class FormShop : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _logic; + public int? _id; + private Dictionary _Computers; + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка магазина"); + try + { + var shop = _logic.ReadElement(new ShopSearchModel { Id = _id }); + if (shop != null) + { + textBoxName.Text = shop.ShopName; + textBoxAdress.Text = shop.Address; + dateTimePicker.Text = shop.DateOpen.ToString(); + _Computers = shop.ShopComputers; + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Загрузка товаров магазина"); + try + { + if (_Computers != null) + { + foreach (var Computer in _Computers) + { + dataGridView.Rows.Add(new object[] { Computer.Key, Computer.Value.Item1.ComputerName, Computer.Value.Item1.Price, Computer.Value.Item2 }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки компьютеров магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxName.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxAdress.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAdress.Text, + DateOpen = dateTimePicker.Value.Date, + ShopComputers = _Computers + }; + var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } +} diff --git a/ComputersShop/ComputersShopView/FormShop.resx b/ComputersShop/ComputersShopView/FormShop.resx new file mode 100644 index 0000000..14c1c77 --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShop.resx @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShops.Designer.cs b/ComputersShop/ComputersShopView/FormShops.Designer.cs new file mode 100644 index 0000000..e8fdfde --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShops.Designer.cs @@ -0,0 +1,115 @@ +namespace ComputersShopView +{ + partial class FormShops + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.dataGridViewShops = new System.Windows.Forms.DataGridView(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.buttonUpdate = new System.Windows.Forms.Button(); + this.buttonDelete = new System.Windows.Forms.Button(); + this.buttonRefresh = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShops)).BeginInit(); + this.SuspendLayout(); + // + // dataGridViewShops + // + this.dataGridViewShops.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewShops.Location = new System.Drawing.Point(1, 0); + this.dataGridViewShops.Name = "dataGridViewShops"; + this.dataGridViewShops.RowHeadersWidth = 51; + this.dataGridViewShops.RowTemplate.Height = 29; + this.dataGridViewShops.Size = new System.Drawing.Size(415, 453); + this.dataGridViewShops.TabIndex = 0; + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(434, 39); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(94, 29); + this.buttonAdd.TabIndex = 1; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // buttonUpdate + // + this.buttonUpdate.Location = new System.Drawing.Point(434, 94); + this.buttonUpdate.Name = "buttonUpdate"; + this.buttonUpdate.Size = new System.Drawing.Size(94, 29); + this.buttonUpdate.TabIndex = 2; + this.buttonUpdate.Text = "Изменить"; + this.buttonUpdate.UseVisualStyleBackColor = true; + this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click); + // + // buttonDelete + // + this.buttonDelete.Location = new System.Drawing.Point(434, 143); + this.buttonDelete.Name = "buttonDelete"; + this.buttonDelete.Size = new System.Drawing.Size(94, 29); + this.buttonDelete.TabIndex = 3; + this.buttonDelete.Text = "Удалить"; + this.buttonDelete.UseVisualStyleBackColor = true; + this.buttonDelete.Click += new System.EventHandler(this.ButtonDelete_Click); + // + // buttonRefresh + // + this.buttonRefresh.Location = new System.Drawing.Point(434, 195); + this.buttonRefresh.Name = "buttonRefresh"; + this.buttonRefresh.Size = new System.Drawing.Size(94, 29); + this.buttonRefresh.TabIndex = 4; + this.buttonRefresh.Text = "Обновить"; + this.buttonRefresh.UseVisualStyleBackColor = true; + this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); + // + // FormShops + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(554, 450); + this.Controls.Add(this.buttonRefresh); + this.Controls.Add(this.buttonDelete); + this.Controls.Add(this.buttonUpdate); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridViewShops); + this.Name = "FormShops"; + this.Text = "Магазины"; + this.Load += new System.EventHandler(this.FormShops_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShops)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView dataGridViewShops; + private Button buttonAdd; + private Button buttonUpdate; + private Button buttonDelete; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShops.cs b/ComputersShop/ComputersShopView/FormShops.cs new file mode 100644 index 0000000..a84cfb8 --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShops.cs @@ -0,0 +1,113 @@ +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 ComputersShopContracts.BindingModels; +using ComputersShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace ComputersShopView +{ + public partial class FormShops : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _logic; + public FormShops(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridViewShops.DataSource = list; + dataGridViewShops.Columns["Id"].Visible = false; + dataGridViewShops.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridViewShops.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridViewShops.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridViewShops.Columns["ShopComputers"].Visible = false; + } + _logger.LogInformation("Загрузка магазинов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void FormShops_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void ButtonAdd_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void ButtonUpdate_Click(object sender, EventArgs e) + { + if (dataGridViewShops.SelectedRows.Count == 1) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (service is FormShop form) + { + var tmp = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); + form._id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void ButtonRefresh_Click(object sender, EventArgs e) + { + LoadData(); + } + + private void ButtonDelete_Click(object sender, EventArgs e) + { + if (dataGridViewShops.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление магазина"); + try + { + if (!_logic.Delete(new ShopBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + } +} diff --git a/ComputersShop/ComputersShopView/FormShops.resx b/ComputersShop/ComputersShopView/FormShops.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ComputersShop/ComputersShopView/FormShops.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormSupply.Designer.cs b/ComputersShop/ComputersShopView/FormSupply.Designer.cs new file mode 100644 index 0000000..238a7ad --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSupply.Designer.cs @@ -0,0 +1,142 @@ +namespace ComputersShopView +{ + partial class FormSupply + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.labelShop = new System.Windows.Forms.Label(); + this.labelComputer = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.comboBoxComputer = new System.Windows.Forms.ComboBox(); + this.comboBoxShop = new System.Windows.Forms.ComboBox(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // labelShop + // + this.labelShop.AutoSize = true; + this.labelShop.Location = new System.Drawing.Point(28, 46); + this.labelShop.Name = "labelShop"; + this.labelShop.Size = new System.Drawing.Size(72, 20); + this.labelShop.TabIndex = 0; + this.labelShop.Text = "Магазин:"; + // + // labelComputer + // + this.labelComputer.AutoSize = true; + this.labelComputer.Location = new System.Drawing.Point(28, 96); + this.labelComputer.Name = "labelComputer"; + this.labelComputer.Size = new System.Drawing.Size(93, 20); + this.labelComputer.TabIndex = 1; + this.labelComputer.Text = "Компьютер:"; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(28, 146); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(93, 20); + this.labelCount.TabIndex = 2; + this.labelCount.Text = "Количество:"; + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(142, 139); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(349, 27); + this.textBoxCount.TabIndex = 3; + // + // comboBoxComputer + // + this.comboBoxComputer.FormattingEnabled = true; + this.comboBoxComputer.Location = new System.Drawing.Point(142, 88); + this.comboBoxComputer.Name = "comboBoxComputer"; + this.comboBoxComputer.Size = new System.Drawing.Size(349, 28); + this.comboBoxComputer.TabIndex = 4; + // + // comboBoxShop + // + this.comboBoxShop.FormattingEnabled = true; + this.comboBoxShop.Location = new System.Drawing.Point(142, 38); + this.comboBoxShop.Name = "comboBoxShop"; + this.comboBoxShop.Size = new System.Drawing.Size(349, 28); + this.comboBoxShop.TabIndex = 5; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(328, 186); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(94, 29); + this.buttonSave.TabIndex = 6; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(446, 186); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(94, 29); + this.buttonCancel.TabIndex = 7; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormSupply + // + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(552, 227); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.comboBoxShop); + this.Controls.Add(this.comboBoxComputer); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.labelComputer); + this.Controls.Add(this.labelShop); + this.Name = "FormSupply"; + this.Text = "Поставки"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private Label labelShop; + private Label labelComputer; + private Label labelCount; + private TextBox textBoxCount; + private ComboBox comboBoxComputer; + private ComboBox comboBoxShop; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormSupply.cs b/ComputersShop/ComputersShopView/FormSupply.cs new file mode 100644 index 0000000..855b76c --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSupply.cs @@ -0,0 +1,151 @@ +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 ComputersShopBusinessLogic.BusinessLogics; +using ComputersShopContracts.BusinessLogicsContracts; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels; +using ComputersShopDataModels.Models; + +namespace ComputersShopView +{ + public partial class FormSupply : Form + { + private readonly List? _ComputerList; + private readonly List? _shopsList; + IShopLogic _shopLogic; + IComputerLogic _ComputerLogic; + public int ShopId + { + get + { + return Convert.ToInt32(comboBoxShop.SelectedValue); + } + set + { + comboBoxShop.SelectedValue = value; + } + } + public int ComputerId + { + get + { + return + Convert.ToInt32(comboBoxComputer.SelectedValue); + } + set + { + comboBoxComputer.SelectedValue = value; + } + } + + public IComputerModel? ComputerModel + { + get + { + if (_ComputerList == null) + { + return null; + } + foreach (var elem in _ComputerList) + { + if (elem.Id == ComputerId) + { + return elem; + } + } + return null; + } + } + + + public int Count + { + get { return Convert.ToInt32(textBoxCount.Text); } + set + { textBoxCount.Text = value.ToString(); } + } + public FormSupply(IComputerLogic ComputerLogic, IShopLogic shopLogic) + { + InitializeComponent(); + _shopLogic = shopLogic; + _ComputerLogic = ComputerLogic; + _ComputerList = ComputerLogic.ReadList(null); + _shopsList = shopLogic.ReadList(null); + if (_ComputerList != null) + { + comboBoxComputer.DisplayMember = "ComputerName"; + comboBoxComputer.ValueMember = "Id"; + comboBoxComputer.DataSource = _ComputerList; + comboBoxComputer.SelectedItem = null; + } + if (_shopsList != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = _shopsList; + comboBoxShop.SelectedItem = null; + } + } + private void ButtonSave_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxComputer.SelectedValue == null) + { + MessageBox.Show("Выберите компьютер", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxShop.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + try + { + int count = Convert.ToInt32(textBoxCount.Text); + + bool res = _shopLogic.MakeSupply( + new ShopSearchModel() { Id = Convert.ToInt32(comboBoxShop.SelectedValue) }, + _ComputerLogic.ReadElement(new() { Id = Convert.ToInt32(comboBoxComputer.SelectedValue) }), + count + ); + + if (!res) + { + throw new Exception("Ошибка при пополнении. Дополнительная информация в логах"); + } + + MessageBox.Show("Пополнение прошло успешно"); + DialogResult = DialogResult.OK; + Close(); + + } + catch (Exception err) + { + MessageBox.Show("Ошибка пополнения"); + return; + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/ComputersShop/ComputersShopView/FormSupply.resx b/ComputersShop/ComputersShopView/FormSupply.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/ComputersShop/ComputersShopView/FormSupply.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs index 6e41552..53aab15 100644 --- a/ComputersShop/ComputersShopView/Program.cs +++ b/ComputersShop/ComputersShopView/Program.cs @@ -1,5 +1,5 @@ using ComputersShopBusinessLogic.BusinessLogics; -using ComputersShopContracts.BuisnessLogicsContracts; +using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.StoragesContracts; using ComputersShopListImplement.Implements; using Microsoft.Extensions.DependencyInjection; @@ -14,7 +14,7 @@ namespace ComputersShopView 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() @@ -37,11 +37,11 @@ namespace ComputersShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); - + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,6 +49,10 @@ namespace ComputersShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } + } } \ No newline at end of file From b6dc101d9c397592f2566f539d0ae722ef3e37b9 Mon Sep 17 00:00:00 2001 From: bulatova_karina Date: Mon, 8 Apr 2024 21:11:09 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20(=D0=BD=D0=B5=20?= =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8=D1=82=20=D1=86=D0=B5=D0=BD?= =?UTF-8?q?=D1=83=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ShopLogic.cs | 125 ++++++------- .../BindingModels/ShopBindingModel.cs | 12 +- .../BusinessLogicsContracts/IShopLogic.cs | 3 +- .../SearchModels/ShopSearchModel.cs | 2 +- .../ViewModels/ShopViewModel.cs | 12 +- .../Models/IShopModel.cs | 2 +- .../DataListSingleton.cs | 1 + .../Implements/ShopStorage.cs | 14 +- .../ComputersShopListImplement/Models/Shop.cs | 29 +-- .../ComputersShopView/FormShop.Designer.cs | 47 ++--- ComputersShop/ComputersShopView/FormShop.cs | 52 +++--- ComputersShop/ComputersShopView/FormShops.cs | 5 +- .../ComputersShopView/FormSupply.Designer.cs | 23 +-- ComputersShop/ComputersShopView/FormSupply.cs | 165 ++++++++---------- ComputersShop/ComputersShopView/Program.cs | 24 ++- 15 files changed, 255 insertions(+), 261 deletions(-) diff --git a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs index c6ee924..47bbef5 100644 --- a/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/ComputersShop/ComputersShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -8,7 +8,6 @@ using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; using ComputersShopContracts.StoragesContracts; using ComputersShopContracts.ViewModels; -using ComputersShopDataModels; using ComputersShopDataModels.Models; using Microsoft.Extensions.Logging; @@ -18,91 +17,48 @@ namespace ComputersShopBusinessLogic.BusinessLogics { private readonly ILogger _logger; private readonly IShopStorage _shopStorage; - public ShopLogic(ILogger logger, IShopStorage shopStorage) { _logger = logger; _shopStorage = shopStorage; } - - public List ReadList(ShopSearchModel model) + public List? ReadList(ShopSearchModel? model) { - _logger.LogInformation("ReadList. ShopName:{Name}. Id:{ Id}", model?.Name, model?.Id); + _logger.LogInformation("ReadList. ShopName:{ShopName}.Id:{ Id}", model?.ShopName, model?.Id); + var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model); if (list == null) { _logger.LogWarning("ReadList return null list"); return null; } + _logger.LogInformation("ReadList. Count:{Count}", list.Count); return list; - } - - public bool MakeSupply(ShopSearchModel model, IComputerModel Computer, int count) - { - _logger.LogInformation("Try to supply shop. ShopName:{ShopName}. Id:{Id}", model.Name, model.Id); - if (model == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(model)); - } - if (Computer == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(Computer)); - } - if (count <= 0) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException("Количество должно быть положительным числом"); - } - ShopViewModel curModel = ReadElement(model); - if (curModel == null) - { - _logger.LogWarning("Read operation failed"); - throw new ArgumentNullException(nameof(curModel)); - } - if (curModel.ShopComputers.TryGetValue(Computer.Id, out var pair)) - { - curModel.ShopComputers[Computer.Id] = (pair.Item1, pair.Item2 + count); - } - else - { - curModel.ShopComputers.Add(Computer.Id, (Computer, count)); - } - Update(new() - { - Id = curModel.Id, - ShopName = curModel.ShopName, - DateOpen = curModel.DateOpen, - Address = curModel.Address, - ShopComputers = curModel.ShopComputers, - }); - _logger.LogInformation("Success. ComputerName:{ComputerName}. Id:{Id}. Supply:{count}", Computer.ComputerName, Computer.Id, count); - return true; - } - - public ShopViewModel ReadElement(ShopSearchModel model) + public ShopViewModel? ReadElement(ShopSearchModel model) { if (model == null) { throw new ArgumentNullException(nameof(model)); } - _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.Name, model.Id); + + _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); + var element = _shopStorage.GetElement(model); if (element == null) { _logger.LogWarning("ReadElement element not found"); return null; } + _logger.LogInformation("ReadElement find. Id:{Id}", element.Id); return element; } - public bool Create(ShopBindingModel model) { CheckModel(model); + if (_shopStorage.Insert(model) == null) { _logger.LogWarning("Insert operation failed"); @@ -110,10 +66,10 @@ namespace ComputersShopBusinessLogic.BusinessLogics } return true; } - public bool Update(ShopBindingModel model) { CheckModel(model); + if (_shopStorage.Update(model) == null) { _logger.LogWarning("Update operation failed"); @@ -125,6 +81,7 @@ namespace ComputersShopBusinessLogic.BusinessLogics { CheckModel(model, false); _logger.LogInformation("Delete. Id:{Id}", model.Id); + if (_shopStorage.Delete(model) == null) { _logger.LogWarning("Delete operation failed"); @@ -132,7 +89,46 @@ namespace ComputersShopBusinessLogic.BusinessLogics } return true; } + public bool AddComputerInShop(ShopSearchModel model, IComputerModel computer, int count) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (count <= 0) + { + throw new ArgumentException("Кол-во изделий должно быть больше 0", nameof(count)); + } + _logger.LogInformation("AddComputerInShop. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id); + var element = _shopStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("AddComputerInShop element not found"); + return false; + } + _logger.LogInformation("AddComputerInShop find. Id:{Id}", element.Id); + if (element.ShopComputers.TryGetValue(computer.Id, out var pair)) + { + element.ShopComputers[computer.Id] = (computer, count + pair.Item2); + _logger.LogInformation("AddComputerInShop. Added {count} {computer} to '{ShopName}' shop", count, computer.ComputerName, element.ShopName); + } + else + { + element.ShopComputers[computer.Id] = (computer, count); + _logger.LogInformation("AddComputerInShop. Added {count} new computer {computer} to '{ShopName}' shop", count, computer.ComputerName, element.ShopName); + } + + _shopStorage.Update(new() + { + Id = element.Id, + Address = element.Address, + ShopName = element.ShopName, + DateOpening = element.DateOpening, + ShopComputers = element.ShopComputers + }); + return true; + } private void CheckModel(ShopBindingModel model, bool withParams = true) { if (model == null) @@ -145,25 +141,14 @@ namespace ComputersShopBusinessLogic.BusinessLogics } if (string.IsNullOrEmpty(model.ShopName)) { - throw new ArgumentNullException("Нет названия магазина", - nameof(model.ShopName)); + throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName)); } - if (string.IsNullOrEmpty(model.Address)) - { - throw new ArgumentNullException("Нет адресса магазина", - nameof(model.Address)); - } - if (model.DateOpen == null) - { - throw new ArgumentNullException("Нет даты открытия магазина", - nameof(model.DateOpen)); - } - _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}", model.ShopName, model.Address, model.DateOpen, model.Id); + _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{ Address}. Id:{ Id}", model.ShopName, model.Address, model.Id); var element = _shopStorage.GetElement(new ShopSearchModel { - Name = model.ShopName + ShopName = model.ShopName }); - if (element != null && element.Id != model.Id) + if (element != null && element.Id != model.Id && element.ShopName == model.ShopName) { throw new InvalidOperationException("Магазин с таким названием уже есть"); } diff --git a/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs index cbb3518..a284603 100644 --- a/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs +++ b/ComputersShop/ComputersShopContracts/BindingModels/ShopBindingModel.cs @@ -11,9 +11,13 @@ namespace ComputersShopContracts.BindingModels public class ShopBindingModel : IShopModel { public int Id { get; set; } - public string ShopName { get; set; } - public string Address { get; set; } - public DateTime DateOpen { get; set; } - public Dictionary ShopComputers { get; set; } = new(); + public string ShopName { get; set; } = string.Empty; + public string Address { get; set; } = string.Empty; + public DateTime DateOpening { get; set; } = DateTime.Now; + public Dictionary ShopComputers + { + get; + set; + } = new(); } } diff --git a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs index 85bc165..d17e847 100644 --- a/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/ComputersShop/ComputersShopContracts/BusinessLogicsContracts/IShopLogic.cs @@ -6,7 +6,6 @@ using System.Threading.Tasks; using ComputersShopContracts.BindingModels; using ComputersShopContracts.SearchModels; using ComputersShopContracts.ViewModels; -using ComputersShopDataModels; using ComputersShopDataModels.Models; namespace ComputersShopContracts.BusinessLogicsContracts @@ -18,6 +17,6 @@ namespace ComputersShopContracts.BusinessLogicsContracts bool Create(ShopBindingModel model); bool Update(ShopBindingModel model); bool Delete(ShopBindingModel model); - bool MakeSupply(ShopSearchModel model, IComputerModel computer, int count); + bool AddComputerInShop(ShopSearchModel model, IComputerModel computer, int count); } } diff --git a/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs b/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs index 228bd84..1c39237 100644 --- a/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs +++ b/ComputersShop/ComputersShopContracts/SearchModels/ShopSearchModel.cs @@ -9,6 +9,6 @@ namespace ComputersShopContracts.SearchModels public class ShopSearchModel { public int? Id { get; set; } - public string? Name { get; set; } + public string? ShopName { get; set; } } } diff --git a/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs index cf398a8..0dfb1e6 100644 --- a/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs +++ b/ComputersShop/ComputersShopContracts/ViewModels/ShopViewModel.cs @@ -13,11 +13,15 @@ namespace ComputersShopContracts.ViewModels { public int Id { get; set; } [DisplayName("Название магазина")] - public string ShopName { get; set; } + public string ShopName { get; set; } = string.Empty; [DisplayName("Адрес магазина")] - public string Address { get; set; } + public string Address { get; set; } = string.Empty; [DisplayName("Дата открытия")] - public DateTime DateOpen { get; set; } - public Dictionary ShopComputers { get; set; } = new(); + public DateTime DateOpening { get; set; } = DateTime.Now; + public Dictionary ShopComputers + { + get; + set; + } = new(); } } diff --git a/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs b/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs index ab57ac3..a76615d 100644 --- a/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs +++ b/ComputersShop/ComputersShopDataModels/Models/IShopModel.cs @@ -10,7 +10,7 @@ namespace ComputersShopDataModels.Models { string ShopName { get; } string Address { get; } - DateTime DateOpen { get; } + DateTime DateOpening { get; } Dictionary ShopComputers { get; } } } diff --git a/ComputersShop/ComputersShopListImplement/DataListSingleton.cs b/ComputersShop/ComputersShopListImplement/DataListSingleton.cs index e413d1f..834470f 100644 --- a/ComputersShop/ComputersShopListImplement/DataListSingleton.cs +++ b/ComputersShop/ComputersShopListImplement/DataListSingleton.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Numerics; using System.Text; using System.Threading.Tasks; using ComputersShopListImplement.Models; diff --git a/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs index 93ed65f..272a04c 100644 --- a/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs +++ b/ComputersShop/ComputersShopListImplement/Implements/ShopStorage.cs @@ -32,13 +32,14 @@ namespace ComputersShopListImplement.Implements public List GetFilteredList(ShopSearchModel model) { var result = new List(); - if (string.IsNullOrEmpty(model.Name)) + if (string.IsNullOrEmpty(model.ShopName)) { return result; } + foreach (var shop in _source.Shops) { - if (shop.ShopName.Contains(model.Name)) + if (shop.ShopName.Contains(model.ShopName)) { result.Add(shop.GetViewModel); } @@ -47,15 +48,14 @@ namespace ComputersShopListImplement.Implements } public ShopViewModel? GetElement(ShopSearchModel model) { - if (string.IsNullOrEmpty(model.Name) && !model.Id.HasValue) + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) { return null; } + foreach (var shop in _source.Shops) { - if ((!string.IsNullOrEmpty(model.Name) && - shop.ShopName == model.Name) || - (model.Id.HasValue && shop.Id == model.Id)) + if ((!string.IsNullOrEmpty(model.ShopName) && shop.ShopName == model.ShopName) || (model.Id.HasValue && shop.Id == model.Id)) { return shop.GetViewModel; } @@ -72,11 +72,13 @@ namespace ComputersShopListImplement.Implements model.Id = shop.Id + 1; } } + var newShop = Shop.Create(model); if (newShop == null) { return null; } + _source.Shops.Add(newShop); return newShop.GetViewModel; } diff --git a/ComputersShop/ComputersShopListImplement/Models/Shop.cs b/ComputersShop/ComputersShopListImplement/Models/Shop.cs index 7aa9430..7263885 100644 --- a/ComputersShop/ComputersShopListImplement/Models/Shop.cs +++ b/ComputersShop/ComputersShopListImplement/Models/Shop.cs @@ -13,43 +13,48 @@ namespace ComputersShopListImplement.Models public class Shop : IShopModel { public int Id { get; private set; } - public string ShopName { get; private set; } - public string Address { get; private set; } - public DateTime DateOpen { get; private set; } - public Dictionary ShopComputers { get; private set; } = new(); - - public static Shop? Create(ShopBindingModel model) + public string ShopName { get; private set; } = string.Empty; + public string Address { get; private set; } = string.Empty; + public DateTime DateOpening { get; private set; } + public Dictionary ShopComputers + { + get; + private set; + } = new Dictionary(); + public static Shop? Create(ShopBindingModel? model) { if (model == null) + { return null; + } + return new Shop() { Id = model.Id, ShopName = model.ShopName, Address = model.Address, - DateOpen = model.DateOpen, - ShopComputers = new() + DateOpening = model.DateOpening, + ShopComputers = model.ShopComputers }; } - public void Update(ShopBindingModel? model) { if (model == null) { return; } + ShopName = model.ShopName; Address = model.Address; - DateOpen = model.DateOpen; + DateOpening = model.DateOpening; ShopComputers = model.ShopComputers; } - public ShopViewModel GetViewModel => new() { Id = Id, ShopName = ShopName, Address = Address, - DateOpen = DateOpen, + DateOpening = DateOpening, ShopComputers = ShopComputers }; } diff --git a/ComputersShop/ComputersShopView/FormShop.Designer.cs b/ComputersShop/ComputersShopView/FormShop.Designer.cs index 26688e2..90d9bcd 100644 --- a/ComputersShop/ComputersShopView/FormShop.Designer.cs +++ b/ComputersShop/ComputersShopView/FormShop.Designer.cs @@ -32,16 +32,16 @@ this.label2 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label(); this.dateTimePicker = new System.Windows.Forms.DateTimePicker(); - this.textBoxAdress = new System.Windows.Forms.TextBox(); + this.textBoxAddress = new System.Windows.Forms.TextBox(); this.textBoxName = new System.Windows.Forms.TextBox(); - this.dataGridView = new System.Windows.Forms.DataGridView(); + this.dataGridViewShop = new System.Windows.Forms.DataGridView(); this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ComputerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).BeginInit(); this.SuspendLayout(); // // label1 @@ -78,13 +78,13 @@ this.dateTimePicker.Size = new System.Drawing.Size(403, 27); this.dateTimePicker.TabIndex = 3; // - // textBoxAdress + // textBoxAddress // - this.textBoxAdress.Location = new System.Drawing.Point(104, 61); - this.textBoxAdress.Name = "textBoxAdress"; - this.textBoxAdress.Size = new System.Drawing.Size(403, 27); - this.textBoxAdress.TabIndex = 4; - this.textBoxAdress.TextChanged += new System.EventHandler(this.FormShop_Load); + this.textBoxAddress.Location = new System.Drawing.Point(104, 61); + this.textBoxAddress.Name = "textBoxAddress"; + this.textBoxAddress.Size = new System.Drawing.Size(403, 27); + this.textBoxAddress.TabIndex = 4; + this.textBoxAddress.TextChanged += new System.EventHandler(this.FormShop_Load); // // textBoxName // @@ -93,20 +93,20 @@ this.textBoxName.Size = new System.Drawing.Size(403, 27); this.textBoxName.TabIndex = 5; // - // dataGridView + // dataGridViewShop // - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dataGridViewShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.id, this.ComputerName, this.Price, this.Count}); - this.dataGridView.Location = new System.Drawing.Point(23, 156); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowHeadersWidth = 51; - this.dataGridView.RowTemplate.Height = 29; - this.dataGridView.Size = new System.Drawing.Size(507, 173); - this.dataGridView.TabIndex = 6; + this.dataGridViewShop.Location = new System.Drawing.Point(23, 156); + this.dataGridViewShop.Name = "dataGridViewShop"; + this.dataGridViewShop.RowHeadersWidth = 51; + this.dataGridViewShop.RowTemplate.Height = 29; + this.dataGridViewShop.Size = new System.Drawing.Size(507, 173); + this.dataGridViewShop.TabIndex = 6; // // id // @@ -164,16 +164,17 @@ this.ClientSize = new System.Drawing.Size(546, 395); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); - this.Controls.Add(this.dataGridView); + this.Controls.Add(this.dataGridViewShop); this.Controls.Add(this.textBoxName); - this.Controls.Add(this.textBoxAdress); + this.Controls.Add(this.textBoxAddress); this.Controls.Add(this.dateTimePicker); this.Controls.Add(this.label3); this.Controls.Add(this.label2); this.Controls.Add(this.label1); this.Name = "FormShop"; this.Text = "Магазин"; - ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.Load += new System.EventHandler(this.FormShop_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -185,9 +186,9 @@ private Label label2; private Label label3; private DateTimePicker dateTimePicker; - private TextBox textBoxAdress; + private TextBox textBoxAddress; private TextBox textBoxName; - private DataGridView dataGridView; + private DataGridView dataGridViewShop; private DataGridViewTextBoxColumn id; private DataGridViewTextBoxColumn ComputerName; private DataGridViewTextBoxColumn Price; diff --git a/ComputersShop/ComputersShopView/FormShop.cs b/ComputersShop/ComputersShopView/FormShop.cs index 6b9788c..1cec395 100644 --- a/ComputersShop/ComputersShopView/FormShop.cs +++ b/ComputersShop/ComputersShopView/FormShop.cs @@ -10,7 +10,6 @@ using System.Windows.Forms; using ComputersShopContracts.BindingModels; using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.SearchModels; -using ComputersShopDataModels; using ComputersShopDataModels.Models; using Microsoft.Extensions.Logging; @@ -20,13 +19,16 @@ namespace ComputersShopView { private readonly ILogger _logger; private readonly IShopLogic _logic; - public int? _id; - private Dictionary _Computers; + private int? _id; + public int Id { set { _id = value; } } + private Dictionary _shopComputers; public FormShop(ILogger logger, IShopLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; + _shopComputers = new Dictionary(); + } private void FormShop_Load(object sender, EventArgs e) { @@ -35,43 +37,47 @@ namespace ComputersShopView _logger.LogInformation("Загрузка магазина"); try { - var shop = _logic.ReadElement(new ShopSearchModel { Id = _id }); - if (shop != null) + var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value }); + if (view != null) { - textBoxName.Text = shop.ShopName; - textBoxAdress.Text = shop.Address; - dateTimePicker.Text = shop.DateOpen.ToString(); - _Computers = shop.ShopComputers; + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address; + dateTimePicker.Text = view.DateOpening.ToString(); + _shopComputers = view.ShopComputers ?? new Dictionary(); + LoadData(); } - 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("Загрузка товаров магазина"); + _logger.LogInformation("Загрузка изделий магазина"); try { - if (_Computers != null) + if (_shopComputers != null) { - foreach (var Computer in _Computers) + dataGridViewShop.Rows.Clear(); + foreach (var elem in _shopComputers) { - dataGridView.Rows.Add(new object[] { Computer.Key, Computer.Value.Item1.ComputerName, Computer.Value.Item1.Price, Computer.Value.Item2 }); + dataGridViewShop.Rows.Add(new object[] + { + elem.Key, + elem.Value.Item1.ComputerName, + elem.Value.Item2 + }); } } } 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); } } @@ -88,7 +94,7 @@ namespace ComputersShopView MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (string.IsNullOrEmpty(textBoxAdress.Text)) + if (string.IsNullOrEmpty(textBoxAddress.Text)) { MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -100,9 +106,9 @@ namespace ComputersShopView { Id = _id ?? 0, ShopName = textBoxName.Text, - Address = textBoxAdress.Text, - DateOpen = dateTimePicker.Value.Date, - ShopComputers = _Computers + Address = textBoxAddress.Text, + DateOpening = dateTimePicker.Value.Date, + ShopComputers = _shopComputers }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); if (!operationResult) diff --git a/ComputersShop/ComputersShopView/FormShops.cs b/ComputersShop/ComputersShopView/FormShops.cs index a84cfb8..e508fef 100644 --- a/ComputersShop/ComputersShopView/FormShops.cs +++ b/ComputersShop/ComputersShopView/FormShops.cs @@ -33,8 +33,6 @@ namespace ComputersShopView dataGridViewShops.DataSource = list; dataGridViewShops.Columns["Id"].Visible = false; dataGridViewShops.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridViewShops.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridViewShops.Columns["DateOpen"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; dataGridViewShops.Columns["ShopComputers"].Visible = false; } _logger.LogInformation("Загрузка магазинов"); @@ -70,8 +68,7 @@ namespace ComputersShopView var service = Program.ServiceProvider?.GetService(typeof(FormShop)); if (service is FormShop form) { - var tmp = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); - form._id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); + form.Id = Convert.ToInt32(dataGridViewShops.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); diff --git a/ComputersShop/ComputersShopView/FormSupply.Designer.cs b/ComputersShop/ComputersShopView/FormSupply.Designer.cs index 238a7ad..220fd24 100644 --- a/ComputersShop/ComputersShopView/FormSupply.Designer.cs +++ b/ComputersShop/ComputersShopView/FormSupply.Designer.cs @@ -31,11 +31,12 @@ this.labelShop = new System.Windows.Forms.Label(); this.labelComputer = new System.Windows.Forms.Label(); this.labelCount = new System.Windows.Forms.Label(); - this.textBoxCount = new System.Windows.Forms.TextBox(); this.comboBoxComputer = new System.Windows.Forms.ComboBox(); this.comboBoxShop = new System.Windows.Forms.ComboBox(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); + this.numericUpDownCount = new System.Windows.Forms.NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit(); this.SuspendLayout(); // // labelShop @@ -65,13 +66,6 @@ this.labelCount.TabIndex = 2; this.labelCount.Text = "Количество:"; // - // textBoxCount - // - this.textBoxCount.Location = new System.Drawing.Point(142, 139); - this.textBoxCount.Name = "textBoxCount"; - this.textBoxCount.Size = new System.Drawing.Size(349, 27); - this.textBoxCount.TabIndex = 3; - // // comboBoxComputer // this.comboBoxComputer.FormattingEnabled = true; @@ -108,21 +102,30 @@ this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); // + // numericUpDownCount + // + this.numericUpDownCount.Location = new System.Drawing.Point(142, 139); + this.numericUpDownCount.Name = "numericUpDownCount"; + this.numericUpDownCount.Size = new System.Drawing.Size(348, 27); + this.numericUpDownCount.TabIndex = 8; + // // FormSupply // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(552, 227); + this.Controls.Add(this.numericUpDownCount); this.Controls.Add(this.buttonCancel); this.Controls.Add(this.buttonSave); this.Controls.Add(this.comboBoxShop); this.Controls.Add(this.comboBoxComputer); - this.Controls.Add(this.textBoxCount); this.Controls.Add(this.labelCount); this.Controls.Add(this.labelComputer); this.Controls.Add(this.labelShop); this.Name = "FormSupply"; this.Text = "Поставки"; + this.Load += new System.EventHandler(this.FormSupply_Load); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -133,10 +136,10 @@ private Label labelShop; private Label labelComputer; private Label labelCount; - private TextBox textBoxCount; private ComboBox comboBoxComputer; private ComboBox comboBoxShop; private Button buttonSave; private Button buttonCancel; + private NumericUpDown numericUpDownCount; } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormSupply.cs b/ComputersShop/ComputersShopView/FormSupply.cs index 855b76c..5c58220 100644 --- a/ComputersShop/ComputersShopView/FormSupply.cs +++ b/ComputersShop/ComputersShopView/FormSupply.cs @@ -13,132 +13,105 @@ using ComputersShopContracts.SearchModels; using ComputersShopContracts.ViewModels; using ComputersShopDataModels; using ComputersShopDataModels.Models; +using Microsoft.Extensions.Logging; namespace ComputersShopView { public partial class FormSupply : Form { - private readonly List? _ComputerList; - private readonly List? _shopsList; - IShopLogic _shopLogic; - IComputerLogic _ComputerLogic; - public int ShopId - { - get - { - return Convert.ToInt32(comboBoxShop.SelectedValue); - } - set - { - comboBoxShop.SelectedValue = value; - } - } - public int ComputerId - { - get - { - return - Convert.ToInt32(comboBoxComputer.SelectedValue); - } - set - { - comboBoxComputer.SelectedValue = value; - } - } + private readonly ILogger _logger; + private readonly IShopLogic _logicS; + private readonly IComputerLogic _logicC; - public IComputerModel? ComputerModel - { - get - { - if (_ComputerList == null) - { - return null; - } - foreach (var elem in _ComputerList) - { - if (elem.Id == ComputerId) - { - return elem; - } - } - return null; - } - } - - - public int Count - { - get { return Convert.ToInt32(textBoxCount.Text); } - set - { textBoxCount.Text = value.ToString(); } - } - public FormSupply(IComputerLogic ComputerLogic, IShopLogic shopLogic) + public FormSupply(ILogger logger, IShopLogic logicS, IComputerLogic logicC) { InitializeComponent(); - _shopLogic = shopLogic; - _ComputerLogic = ComputerLogic; - _ComputerList = ComputerLogic.ReadList(null); - _shopsList = shopLogic.ReadList(null); - if (_ComputerList != null) + _logger = logger; + _logicS = logicS; + _logicC = logicC; + } + private void FormSupply_Load(object sender, EventArgs e) + { + _logger.LogInformation("Загрузка магазинов"); + try { - comboBoxComputer.DisplayMember = "ComputerName"; - comboBoxComputer.ValueMember = "Id"; - comboBoxComputer.DataSource = _ComputerList; - comboBoxComputer.SelectedItem = null; + var listShops = _logicS.ReadList(null); + if (listShops != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = listShops; + comboBoxShop.SelectedItem = null; + } + } - if (_shopsList != null) + catch (Exception ex) { - comboBoxShop.DisplayMember = "ShopName"; - comboBoxShop.ValueMember = "Id"; - comboBoxShop.DataSource = _shopsList; - comboBoxShop.SelectedItem = null; + _logger.LogError(ex, "Ошибка загрузки списка магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + _logger.LogInformation("Загрузка изделий"); + try + { + var listComputers = _logicC.ReadList(null); + if (listComputers != null) + { + comboBoxComputer.DisplayMember = "ComputerName"; + comboBoxComputer.ValueMember = "Id"; + comboBoxComputer.DataSource = listComputers; + comboBoxComputer.SelectedItem = null; + } + + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } private void ButtonSave_Click(object sender, EventArgs e) { - if (string.IsNullOrEmpty(textBoxCount.Text)) + if (comboBoxShop.SelectedValue == null) { - MessageBox.Show("Заполните поле Количество", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } if (comboBoxComputer.SelectedValue == null) { - MessageBox.Show("Выберите компьютер", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - if (comboBoxShop.SelectedValue == null) - { - MessageBox.Show("Выберите магазин", "Ошибка", - MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - + _logger.LogInformation("Добавление изделия в магазин"); try { - int count = Convert.ToInt32(textBoxCount.Text); - - bool res = _shopLogic.MakeSupply( - new ShopSearchModel() { Id = Convert.ToInt32(comboBoxShop.SelectedValue) }, - _ComputerLogic.ReadElement(new() { Id = Convert.ToInt32(comboBoxComputer.SelectedValue) }), - count - ); - - if (!res) + var computer = _logicC.ReadElement(new() { - throw new Exception("Ошибка при пополнении. Дополнительная информация в логах"); + Id = (int)comboBoxComputer.SelectedValue + }); + if (computer == null) + { + throw new Exception("Не найдено изделие. Дополнительная информация в логах."); } - - MessageBox.Show("Пополнение прошло успешно"); + var resultOperation = _logicS.AddComputerInShop( + new ShopSearchModel + { + Id = (int)comboBoxShop.SelectedValue + }, + computer, + (int)numericUpDownCount.Value + ); + if (!resultOperation) + { + throw new Exception("Ошибка при добавлении. Дополнительная информация в логах."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); DialogResult = DialogResult.OK; Close(); - } - catch (Exception err) + catch (Exception ex) { - MessageBox.Show("Ошибка пополнения"); - return; + _logger.LogError(ex, "Ошибка добавления поступления"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs index 53aab15..bcdd41f 100644 --- a/ComputersShop/ComputersShopView/Program.cs +++ b/ComputersShop/ComputersShopView/Program.cs @@ -1,7 +1,8 @@ -using ComputersShopBusinessLogic.BusinessLogics; +using ComputersShopBusinessLogic.BusinessLogics; using ComputersShopContracts.BusinessLogicsContracts; using ComputersShopContracts.StoragesContracts; using ComputersShopListImplement.Implements; +using ComputersShopView; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; @@ -11,10 +12,14 @@ namespace ComputersShopView { internal static class Program { + /// + /// IoC-êîíòåéíåð + /// 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() @@ -22,11 +27,18 @@ namespace ComputersShopView // 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); _serviceProvider = services.BuildServiceProvider(); + Application.Run(_serviceProvider.GetRequiredService()); } + + /// + /// Íàñòðîéêà IoC-êîíòåéíåðà è ëîããåðà + /// + /// private static void ConfigureServices(ServiceCollection services) { services.AddLogging(option => @@ -34,14 +46,17 @@ namespace ComputersShopView option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); + services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,10 +64,9 @@ namespace ComputersShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); } - } } \ No newline at end of file From e12423c8c79689bf87d104546100072b13e4c69d Mon Sep 17 00:00:00 2001 From: bulatova_karina Date: Mon, 8 Apr 2024 22:06:35 +0400 Subject: [PATCH 3/3] full 1 lab hard --- .../ComputersShopView/FormShop.Designer.cs | 66 ++++++++----------- ComputersShop/ComputersShopView/FormShop.resx | 15 ----- 2 files changed, 28 insertions(+), 53 deletions(-) diff --git a/ComputersShop/ComputersShopView/FormShop.Designer.cs b/ComputersShop/ComputersShopView/FormShop.Designer.cs index 90d9bcd..a1c7aa7 100644 --- a/ComputersShop/ComputersShopView/FormShop.Designer.cs +++ b/ComputersShop/ComputersShopView/FormShop.Designer.cs @@ -35,12 +35,11 @@ this.textBoxAddress = new System.Windows.Forms.TextBox(); this.textBoxName = new System.Windows.Forms.TextBox(); this.dataGridViewShop = new System.Windows.Forms.DataGridView(); - this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ComputerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Price = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.buttonSave = new System.Windows.Forms.Button(); this.buttonCancel = new System.Windows.Forms.Button(); + this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ComputerName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewShop)).BeginInit(); this.SuspendLayout(); // @@ -99,7 +98,6 @@ this.dataGridViewShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.id, this.ComputerName, - this.Price, this.Count}); this.dataGridViewShop.Location = new System.Drawing.Point(23, 156); this.dataGridViewShop.Name = "dataGridViewShop"; @@ -108,35 +106,6 @@ this.dataGridViewShop.Size = new System.Drawing.Size(507, 173); this.dataGridViewShop.TabIndex = 6; // - // id - // - this.id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.id.HeaderText = "Id"; - this.id.MinimumWidth = 6; - this.id.Name = "id"; - this.id.Visible = false; - // - // ComputerName - // - this.ComputerName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.ComputerName.HeaderText = "Название"; - this.ComputerName.MinimumWidth = 6; - this.ComputerName.Name = "ComputerName"; - // - // Price - // - this.Price.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.Price.HeaderText = "Цена"; - this.Price.MinimumWidth = 6; - this.Price.Name = "Price"; - // - // Count - // - this.Count.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.Count.HeaderText = "Количество"; - this.Count.MinimumWidth = 6; - this.Count.Name = "Count"; - // // buttonSave // this.buttonSave.Location = new System.Drawing.Point(319, 354); @@ -157,6 +126,28 @@ this.buttonCancel.UseVisualStyleBackColor = true; this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); // + // id + // + this.id.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.id.HeaderText = "Id"; + this.id.MinimumWidth = 6; + this.id.Name = "id"; + this.id.Visible = false; + // + // ComputerName + // + this.ComputerName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ComputerName.HeaderText = "Название"; + this.ComputerName.MinimumWidth = 6; + this.ComputerName.Name = "ComputerName"; + // + // Count + // + this.Count.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.Count.HeaderText = "Количество"; + this.Count.MinimumWidth = 6; + this.Count.Name = "Count"; + // // FormShop // this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); @@ -189,11 +180,10 @@ private TextBox textBoxAddress; private TextBox textBoxName; private DataGridView dataGridViewShop; - private DataGridViewTextBoxColumn id; - private DataGridViewTextBoxColumn ComputerName; - private DataGridViewTextBoxColumn Price; - private DataGridViewTextBoxColumn Count; private Button buttonSave; private Button buttonCancel; + private DataGridViewTextBoxColumn id; + private DataGridViewTextBoxColumn ComputerName; + private DataGridViewTextBoxColumn Count; } } \ No newline at end of file diff --git a/ComputersShop/ComputersShopView/FormShop.resx b/ComputersShop/ComputersShopView/FormShop.resx index 14c1c77..e510a0c 100644 --- a/ComputersShop/ComputersShopView/FormShop.resx +++ b/ComputersShop/ComputersShopView/FormShop.resx @@ -63,21 +63,6 @@ True - - True - - - True - - - True - - - True - - - True - True