From 238b04bf5c1922878ae904d171b71e5df0051ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=B8=D0=BB=20=D0=9F=D1=83=D1=82?= =?UTF-8?q?=D0=B8=D0=BD=D1=86=D0=B5=D0=B2?= Date: Mon, 15 Apr 2024 23:43:49 +0400 Subject: [PATCH] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=202=20(=D1=83=D1=81=D0=BB=D0=BE=D0=B6=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=BD=D0=B0=D1=8F)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{FoodLogic.cs => DishLogic.cs} | 0 .../BusinessLogics/OrderLogic.cs | 86 ++++++++++- .../BusinessLogics/ShopLogic.cs | 10 ++ .../BindingModels/ShopBindingModel.cs | 2 + .../BusinessLogicsContracts/IShopLogic.cs | 2 + .../StoragesContracts/IShopStorage.cs | 3 + .../ViewModels/ShopViewModel.cs | 3 + .../FoodOrdersDataModels/Models/IShopModel.cs | 2 + .../DataFileSingleton.cs | 6 + .../FoodOrdersFileImplement.csproj | 4 + .../Implements/ShopStorage.cs | 137 ++++++++++++++++++ .../FoodOrdersFileImplement/Models/Shop.cs | 116 +++++++++++++++ .../Implements/ShopStorage.cs | 6 + .../FoodOrdersListImplement/Models/Shop.cs | 2 + .../FoodOrdersView/FormDishSale.Designer.cs | 128 ++++++++++++++++ FoodOrders/FoodOrdersView/FormDishSale.cs | 87 +++++++++++ FoodOrders/FoodOrdersView/FormDishSale.resx | 120 +++++++++++++++ FoodOrders/FoodOrdersView/FormMain.cs | 9 ++ .../FoodOrdersView/FormMain.designer.cs | 17 ++- .../FoodOrdersView/FormShop.Designer.cs | 100 ++++++++----- FoodOrders/FoodOrdersView/FormShop.cs | 7 + FoodOrders/FoodOrdersView/Program.cs | 1 + 22 files changed, 805 insertions(+), 43 deletions(-) rename FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/{FoodLogic.cs => DishLogic.cs} (100%) create mode 100644 FoodOrders/FoodOrdersFileImplement/Implements/ShopStorage.cs create mode 100644 FoodOrders/FoodOrdersFileImplement/Models/Shop.cs create mode 100644 FoodOrders/FoodOrdersView/FormDishSale.Designer.cs create mode 100644 FoodOrders/FoodOrdersView/FormDishSale.cs create mode 100644 FoodOrders/FoodOrdersView/FormDishSale.resx diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/FoodLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs similarity index 100% rename from FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/FoodLogic.cs rename to FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/DishLogic.cs diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs index b328bf2..b334e4a 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/OrderLogic.cs @@ -4,6 +4,7 @@ using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.StoragesContracts; using FoodOrdersContracts.ViewModels; using FoodOrdersDataModels.Enums; +using FoodOrdersDataModels.Models; using Microsoft.Extensions.Logging; namespace FoodOrdersBusinessLogic.BusinessLogics @@ -14,10 +15,19 @@ namespace FoodOrdersBusinessLogic.BusinessLogics private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private readonly IShopStorage _shopStorage; + + private readonly IShopLogic _shopLogic; + + private readonly IDishStorage _dishStorage; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IShopLogic shopLogic, IDishStorage dishStorage, IShopStorage shopStorage) { _logger = logger; _orderStorage = orderStorage; + _shopLogic = shopLogic; + _dishStorage = dishStorage; + _shopStorage = shopStorage; } public bool CreateOrder(OrderBindingModel model) @@ -90,7 +100,67 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogInformation("Order. Id: {Id}. Sum: {Sum}. DishId: {DishId}. DishCount: {Count}", model.Id, model.Sum, model.DishId, model.Count); } + public bool CheckThenMakeShipment(IDishModel dish, int count) + { + if (count <= 0) + { + _logger.LogWarning("Check then make shipment operation error. Dish count < 0."); + return false; + } + int freeSpace = 0; + foreach (var shop in _shopStorage.GetFullList()) + { + freeSpace += shop.MaxCountDishs; + foreach (var c in shop.ShopDishs) + { + freeSpace -= c.Value.Item2; + } + } + + if (freeSpace < count) + { + _logger.LogWarning("Check then supply operation error. There's no place for new dishs in shops."); + return false; + } + + foreach (var shop in _shopStorage.GetFullList()) + { + freeSpace = shop.MaxCountDishs; + + foreach (var c in shop.ShopDishs) + freeSpace -= c.Value.Item2; + + if (freeSpace <= 0) + continue; + + if (freeSpace >= count) + { + if (_shopLogic.MakeShipment(new ShopSearchModel() { Id = shop.Id }, dish, count)) + count = 0; + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + if (freeSpace < count) + { + if (_shopLogic.MakeShipment(new ShopSearchModel() { Id = shop.Id }, dish, freeSpace)) + count -= freeSpace; + else + { + _logger.LogWarning("Supply error"); + return false; + } + } + if (count <= 0) + { + return true; + } + } + return false; + } private bool ChangeStatus(OrderBindingModel model, OrderStatus newStatus) { CheckModel(model, false); @@ -106,6 +176,20 @@ namespace FoodOrdersBusinessLogic.BusinessLogics newStatus, order.Status); return false; } + if (newStatus == OrderStatus.Выдан) + { + var dish = _dishStorage.GetElement(new DishSearchModel() { Id = order.DishId }); + if (dish == null) + { + _logger.LogWarning("Change status operation failed. Dish not found"); + return false; + } + if (!CheckThenMakeShipment(dish, order.Count)) + { + _logger.LogWarning("Change status operation failed. Dishs delivery operation failed"); + return false; + } + } model.DishId = order.DishId; model.Count = order.Count; model.Sum = order.Sum; diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs index d018863..784b94f 100644 --- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ShopLogic.cs @@ -105,6 +105,11 @@ namespace FoodOrdersBusinessLogic.BusinessLogics _logger.LogWarning("MakeShipment(GetElement). Element not found"); return false; } + if (shop.MaxCountDishs - shop.ShopDishs.Sum(x => x.Value.Item2) < count) + { + _logger.LogWarning("MakeShipment error. No space for new dishs"); + return false; + } if (shop.ShopDishs.ContainsKey(dish.Id)) { var shopIC = shop.ShopDishs[dish.Id]; @@ -124,6 +129,7 @@ namespace FoodOrdersBusinessLogic.BusinessLogics Id = shop.Id, ShopName = shop.ShopName, Address = shop.Address, + MaxCountDishs = shop.MaxCountDishs, DateOpening = shop.DateOpening, ShopDishs = shop.ShopDishs, }) == null) @@ -162,5 +168,9 @@ namespace FoodOrdersBusinessLogic.BusinessLogics throw new InvalidOperationException("Магазин с таким названием уже есть"); } } + public bool SellDish(IDishModel dish, int count) + { + return _shopStorage.SellDish(dish, count); + } } } diff --git a/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs b/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs index cc31939..9ab8a11 100644 --- a/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs +++ b/FoodOrders/FoodOrdersContracts/BindingModels/ShopBindingModel.cs @@ -10,6 +10,8 @@ namespace FoodOrdersContracts.BindingModels public string Address { get; set; } = string.Empty; + public int MaxCountDishs { get; set; } + public DateTime DateOpening { get; set; } = DateTime.Now; public Dictionary ShopDishs diff --git a/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IShopLogic.cs b/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IShopLogic.cs index e405f1b..5b8d0dd 100644 --- a/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/FoodOrders/FoodOrdersContracts/BusinessLogicsContracts/IShopLogic.cs @@ -18,5 +18,7 @@ namespace FoodOrdersContracts.BusinessLogicsContracts bool Delete(ShopBindingModel model); bool MakeShipment(ShopSearchModel shopModel, IDishModel dish, int count); + + bool SellDish(IDishModel dish, int count); } } diff --git a/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs b/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs index affa849..6d4327b 100644 --- a/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs +++ b/FoodOrders/FoodOrdersContracts/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using FoodOrdersContracts.BindingModels; using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.ViewModels; +using FoodOrdersDataModels.Models; namespace FoodOrdersContracts.StoragesContracts { @@ -17,5 +18,7 @@ namespace FoodOrdersContracts.StoragesContracts ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + + bool SellDish(IDishModel model, int count); } } diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs index 22e3f12..158dff2 100644 --- a/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs +++ b/FoodOrders/FoodOrdersContracts/ViewModels/ShopViewModel.cs @@ -13,6 +13,9 @@ namespace FoodOrdersContracts.ViewModels [DisplayName("Адрес")] public string Address { get; set; } = string.Empty; + [DisplayName("Максимум блюд")] + public int MaxCountDishs { get; set; } + [DisplayName("Дата открытия")] public DateTime DateOpening { get; set; } = DateTime.Now; diff --git a/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs b/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs index 3a65e5b..93b0d1e 100644 --- a/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs +++ b/FoodOrders/FoodOrdersDataModels/Models/IShopModel.cs @@ -6,6 +6,8 @@ string Address { get; } + int MaxCountDishs { get; } + DateTime DateOpening { get; } Dictionary ShopDishs { get; } diff --git a/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs b/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs index e2c4e42..bf9ed14 100644 --- a/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs +++ b/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs @@ -13,12 +13,15 @@ namespace FoodOrdersFileImplement private readonly string DishFileName = "Dish.xml"; + private readonly string ShopFileName = "Shop.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Dishs { get; private set; } + public List Shops { get; private set; } + public static DataFileSingleton GetInstance() { if (instance == null) @@ -34,11 +37,14 @@ namespace FoodOrdersFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Dishs = LoadData(DishFileName, "Dish", x => Dish.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj index 51e14c2..61aa7a8 100644 --- a/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj +++ b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/ShopStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..a5f1a52 --- /dev/null +++ b/FoodOrders/FoodOrdersFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,137 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.SearchModels; +using FoodOrdersContracts.StoragesContracts; +using FoodOrdersContracts.ViewModels; +using FoodOrdersDataModels.Models; +using FoodOrdersFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FoodOrdersFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return source.Shops.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel; + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops + .Select(x => x.GetViewModel) + .Where(x => x.ShopName.Contains(model.ShopName ?? string.Empty)) + .ToList(); + } + + public List GetFullList() + { + return source.Shops.Select(shop => shop.GetViewModel).ToList(); + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + source.SaveShops(); + return shop.GetViewModel; + } + public ShopViewModel? Delete(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + source.Shops.Remove(shop); + source.SaveShops(); + return shop.GetViewModel; + } + + public bool SellDish(IDishModel model, int count) + { + var dish = source.Dishs.FirstOrDefault(x => x.Id == model.Id); + + if (dish == null) + { + return false; + } + + + var shopDishs = source.Shops.SelectMany(shop => shop.ShopDishs.Where(c => c.Value.Item1.Id == dish.Id)); + + int countStore = 0; + + foreach (var it in shopDishs) + countStore += it.Value.Item2; + + if (count > countStore) + return false; + + foreach (var shop in source.Shops) + { + var dishs = shop.ShopDishs; + + foreach (var c in dishs.Where(x => x.Value.Item1.Id == dish.Id)) + { + int min = Math.Min(c.Value.Item2, count); + dishs[c.Value.Item1.Id] = (c.Value.Item1, c.Value.Item2 - min); + count -= min; + + if (count <= 0) + break; + } + + shop.Update(new ShopBindingModel + { + Id = shop.Id, + ShopName = shop.ShopName, + Address = shop.Address, + MaxCountDishs = shop.MaxCountDishs, + DateOpening = shop.DateOpening, + ShopDishs = dishs + }); + + source.SaveShops(); + + if (count <= 0) + return true; + } + + return true; + } + } +} diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Shop.cs b/FoodOrders/FoodOrdersFileImplement/Models/Shop.cs new file mode 100644 index 0000000..33d1219 --- /dev/null +++ b/FoodOrders/FoodOrdersFileImplement/Models/Shop.cs @@ -0,0 +1,116 @@ +using FoodOrdersContracts.BindingModels; +using FoodOrdersContracts.ViewModels; +using FoodOrdersDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace FoodOrdersFileImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; private set; } + public string ShopName { get; private set; } = string.Empty; + public string Address { get; private set; } = string.Empty; + public int MaxCountDishs { get; private set; } + public DateTime DateOpening { get; private set; } + public Dictionary Dishs { get; private set; } = new(); + private Dictionary? _shopDishs = null; + + public Dictionary ShopDishs + { + get + { + if (_shopDishs == null) + { + var source = DataFileSingleton.GetInstance(); + _shopDishs = Dishs.ToDictionary( + x => x.Key, + y => ((source.Dishs.FirstOrDefault(z => z.Id == y.Key) as IDishModel)!, y.Value) + ); + } + return _shopDishs; + } + } + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + MaxCountDishs = model.MaxCountDishs, + DateOpening = model.DateOpening, + Dishs = model.ShopDishs.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Shop() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + Address = element.Element("Address")!.Value, + MaxCountDishs = Convert.ToInt32(element.Element("MaxCountDishs")!.Value), + DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value), + Dishs = element.Element("ShopDishs")!.Elements("ShopDish").ToDictionary( + x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value) + ) + }; + } + + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + MaxCountDishs = model.MaxCountDishs; + DateOpening = model.DateOpening; + if (model.ShopDishs.Count > 0) + { + Dishs = model.ShopDishs.ToDictionary(x => x.Key, x => x.Value.Item2); + _shopDishs = null; + } + } + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + MaxCountDishs = MaxCountDishs, + DateOpening = DateOpening, + ShopDishs = ShopDishs, + }; + + public XElement GetXElement => new( + "Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("MaxCountDishs", MaxCountDishs), + new XElement("DateOpening", DateOpening.ToString()), + new XElement("ShopDishs", Dishs.Select(x => + new XElement("ShopDish", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} diff --git a/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs index bdf6d75..094735f 100644 --- a/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs +++ b/FoodOrders/FoodOrdersListImplement/Implements/ShopStorage.cs @@ -2,12 +2,18 @@ using FoodOrdersContracts.SearchModels; using FoodOrdersContracts.StoragesContracts; using FoodOrdersContracts.ViewModels; +using FoodOrdersDataModels.Models; using FoodOrdersListImplement.Models; namespace FoodOrdersListImplement.Implements { public class ShopStorage : IShopStorage { + public bool SellDish(IDishModel dish, int count) + { + throw new NotImplementedException(); + } + private readonly DataListSingleton _source; public ShopStorage() diff --git a/FoodOrders/FoodOrdersListImplement/Models/Shop.cs b/FoodOrders/FoodOrdersListImplement/Models/Shop.cs index 8d9b1e9..1dce43b 100644 --- a/FoodOrders/FoodOrdersListImplement/Models/Shop.cs +++ b/FoodOrders/FoodOrdersListImplement/Models/Shop.cs @@ -12,6 +12,8 @@ namespace FoodOrdersListImplement.Models public string Address { get; private set; } = string.Empty; + public int MaxCountDishs { get; private set; } + public DateTime DateOpening { get; private set; } public Dictionary ShopDishs diff --git a/FoodOrders/FoodOrdersView/FormDishSale.Designer.cs b/FoodOrders/FoodOrdersView/FormDishSale.Designer.cs new file mode 100644 index 0000000..ac0d746 --- /dev/null +++ b/FoodOrders/FoodOrdersView/FormDishSale.Designer.cs @@ -0,0 +1,128 @@ +namespace FoodOrdersView +{ + partial class FormDishSale + { + /// + /// 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() + { + buttonCancel = new Button(); + buttonSale = new Button(); + textBoxCount = new TextBox(); + labelCount = new Label(); + comboBoxDish = new ComboBox(); + labelDish = new Label(); + SuspendLayout(); + // + // buttonCancel + // + buttonCancel.Location = new Point(289, 111); + buttonCancel.Margin = new Padding(5, 4, 5, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(101, 36); + buttonCancel.TabIndex = 17; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // buttonSale + // + buttonSale.Location = new Point(182, 111); + buttonSale.Margin = new Padding(5, 4, 5, 4); + buttonSale.Name = "buttonSale"; + buttonSale.Size = new Size(101, 36); + buttonSale.TabIndex = 16; + buttonSale.Text = "Продать"; + buttonSale.UseVisualStyleBackColor = true; + buttonSale.Click += ButtonSale_Click; + // + // textBoxCount + // + textBoxCount.Location = new Point(115, 68); + textBoxCount.Margin = new Padding(5, 4, 5, 4); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(287, 27); + textBoxCount.TabIndex = 15; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(15, 72); + labelCount.Margin = new Padding(5, 0, 5, 0); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(97, 20); + labelCount.TabIndex = 14; + labelCount.Text = "Количество :"; + // + // comboBoxDish + // + comboBoxDish.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxDish.FormattingEnabled = true; + comboBoxDish.Location = new Point(115, 20); + comboBoxDish.Margin = new Padding(5, 4, 5, 4); + comboBoxDish.Name = "comboBoxDish"; + comboBoxDish.Size = new Size(287, 28); + comboBoxDish.TabIndex = 13; + // + // labelDish + // + labelDish.AutoSize = true; + labelDish.Location = new Point(15, 23); + labelDish.Margin = new Padding(5, 0, 5, 0); + labelDish.Name = "labelDish"; + labelDish.Size = new Size(62, 20); + labelDish.TabIndex = 12; + labelDish.Text = "Блюдо :"; + // + // FormDishSale + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(426, 164); + Controls.Add(buttonCancel); + Controls.Add(buttonSale); + Controls.Add(textBoxCount); + Controls.Add(labelCount); + Controls.Add(comboBoxDish); + Controls.Add(labelDish); + Margin = new Padding(3, 4, 3, 4); + Name = "FormDishSale"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Продажа блюд"; + Load += FormDishSale_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonCancel; + private Button buttonSale; + private TextBox textBoxCount; + private Label labelCount; + private ComboBox comboBoxDish; + private Label labelDish; + } +} \ No newline at end of file diff --git a/FoodOrders/FoodOrdersView/FormDishSale.cs b/FoodOrders/FoodOrdersView/FormDishSale.cs new file mode 100644 index 0000000..c3cb5c4 --- /dev/null +++ b/FoodOrders/FoodOrdersView/FormDishSale.cs @@ -0,0 +1,87 @@ +using FoodOrdersContracts.BusinessLogicsContracts; +using FoodOrdersContracts.BindingModels; +using Microsoft.Extensions.Logging; + +namespace FoodOrdersView +{ + public partial class FormDishSale : Form + { + private readonly ILogger _logger; + + private readonly IDishLogic _logicDish; + + private readonly IShopLogic _logicShop; + + public FormDishSale(ILogger logger, IDishLogic logicDish, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicDish = logicDish; + _logicShop = logicShop; + } + + private void FormDishSale_Load(object sender, EventArgs e) + { + _logger.LogInformation("Dishs loading"); + try + { + var list = _logicDish.ReadList(null); + if (list != null) + { + comboBoxDish.DisplayMember = "DishName"; + comboBoxDish.ValueMember = "Id"; + comboBoxDish.DataSource = list; + comboBoxDish.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Dishs loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSale_Click(object sender, EventArgs e) + { + if (comboBoxDish.SelectedValue == null) + { + MessageBox.Show("Выберите блюдо", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Dish sale"); + try + { + var operationResult = _logicShop.SellDish( + new DishBindingModel + { + Id = Convert.ToInt32(comboBoxDish.SelectedValue) + }, + Convert.ToInt32(textBoxCount.Text) + ); + if (!operationResult) + { + throw new Exception("Ошибка при продаже."); + } + MessageBox.Show("Продажа прошла успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Dish sale error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/FoodOrders/FoodOrdersView/FormDishSale.resx b/FoodOrders/FoodOrdersView/FormDishSale.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/FoodOrders/FoodOrdersView/FormDishSale.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/FoodOrders/FoodOrdersView/FormMain.cs b/FoodOrders/FoodOrdersView/FormMain.cs index 7f53cc2..c20982d 100644 --- a/FoodOrders/FoodOrdersView/FormMain.cs +++ b/FoodOrders/FoodOrdersView/FormMain.cs @@ -162,5 +162,14 @@ namespace FoodOrdersView form.ShowDialog(); } } + + private void продажаБлюдToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormDishSale)); + if (service is FormDishSale form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersView/FormMain.designer.cs b/FoodOrders/FoodOrdersView/FormMain.designer.cs index 15f6287..6537ab2 100644 --- a/FoodOrders/FoodOrdersView/FormMain.designer.cs +++ b/FoodOrders/FoodOrdersView/FormMain.designer.cs @@ -40,6 +40,7 @@ buttonCreateOrder = new Button(); dataGridView = new DataGridView(); buttonUpd = new Button(); + продажаБлюдToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -47,7 +48,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(20, 20); - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, продажаБлюдToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Padding = new Padding(8, 3, 0, 3); @@ -65,21 +66,21 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(224, 26); + компонентыToolStripMenuItem.Size = new Size(182, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // блюдоToolStripMenuItem // блюдоToolStripMenuItem.Name = "блюдоToolStripMenuItem"; - блюдоToolStripMenuItem.Size = new Size(224, 26); + блюдоToolStripMenuItem.Size = new Size(182, 26); блюдоToolStripMenuItem.Text = "Еда"; блюдоToolStripMenuItem.Click += БлюдоToolStripMenuItem_Click; // // магазиныToolStripMenuItem // магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(224, 26); + магазиныToolStripMenuItem.Size = new Size(182, 26); магазиныToolStripMenuItem.Text = "Магазины"; магазиныToolStripMenuItem.Click += магазиныToolStripMenuItem_Click; // @@ -168,6 +169,13 @@ buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // + // продажаБлюдToolStripMenuItem + // + продажаБлюдToolStripMenuItem.Name = "продажаБлюдToolStripMenuItem"; + продажаБлюдToolStripMenuItem.Size = new Size(128, 24); + продажаБлюдToolStripMenuItem.Text = "Продажа блюд"; + продажаБлюдToolStripMenuItem.Click += продажаБлюдToolStripMenuItem_Click; + // // FormMain // AutoScaleDimensions = new SizeF(8F, 20F); @@ -207,6 +215,7 @@ private Button buttonUpd; private ToolStripMenuItem магазиныToolStripMenuItem; private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem продажаБлюдToolStripMenuItem; } } diff --git a/FoodOrders/FoodOrdersView/FormShop.Designer.cs b/FoodOrders/FoodOrdersView/FormShop.Designer.cs index f844a1b..52861a9 100644 --- a/FoodOrders/FoodOrdersView/FormShop.Designer.cs +++ b/FoodOrders/FoodOrdersView/FormShop.Designer.cs @@ -33,14 +33,16 @@ labelAddress = new Label(); textBoxAddress = new TextBox(); dateTimePicker = new DateTimePicker(); - labelOpeningDate = new Label(); + labelDateOpening = new Label(); groupBoxDishs = new GroupBox(); dataGridView = new DataGridView(); - buttonSave = new Button(); - buttonCancel = new Button(); ColumnId = new DataGridViewTextBoxColumn(); ColumnName = new DataGridViewTextBoxColumn(); ColumnCount = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + textBoxMaximum = new TextBox(); + labelMaximum = new Label(); groupBoxDishs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -89,24 +91,24 @@ dateTimePicker.Size = new Size(249, 27); dateTimePicker.TabIndex = 5; // - // labelOpeningDate + // labelDateOpening // - labelOpeningDate.AutoSize = true; - labelOpeningDate.Location = new Point(16, 92); - labelOpeningDate.Margin = new Padding(5, 0, 5, 0); - labelOpeningDate.Name = "labelOpeningDate"; - labelOpeningDate.Size = new Size(117, 20); - labelOpeningDate.TabIndex = 6; - labelOpeningDate.Text = "Дата открытия :"; + labelDateOpening.AutoSize = true; + labelDateOpening.Location = new Point(16, 92); + labelDateOpening.Margin = new Padding(5, 0, 5, 0); + labelDateOpening.Name = "labelDateOpening"; + labelDateOpening.Size = new Size(117, 20); + labelDateOpening.TabIndex = 6; + labelDateOpening.Text = "Дата открытия :"; // // groupBoxDishs // groupBoxDishs.Controls.Add(dataGridView); - groupBoxDishs.Location = new Point(5, 133); + groupBoxDishs.Location = new Point(5, 184); groupBoxDishs.Margin = new Padding(5, 4, 5, 4); groupBoxDishs.Name = "groupBoxDishs"; groupBoxDishs.Padding = new Padding(5, 4, 5, 4); - groupBoxDishs.Size = new Size(536, 384); + groupBoxDishs.Size = new Size(536, 333); groupBoxDishs.TabIndex = 7; groupBoxDishs.TabStop = false; groupBoxDishs.Text = "Блюдо"; @@ -127,31 +129,9 @@ dataGridView.RowHeadersVisible = false; dataGridView.RowHeadersWidth = 51; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(522, 356); + dataGridView.Size = new Size(522, 305); dataGridView.TabIndex = 0; // - // buttonSave - // - buttonSave.Location = new Point(291, 525); - buttonSave.Margin = new Padding(5, 4, 5, 4); - buttonSave.Name = "buttonSave"; - buttonSave.Size = new Size(101, 36); - buttonSave.TabIndex = 8; - buttonSave.Text = "Сохранить"; - buttonSave.UseVisualStyleBackColor = true; - buttonSave.Click += ButtonSave_Click; - // - // buttonCancel - // - buttonCancel.Location = new Point(410, 525); - buttonCancel.Margin = new Padding(5, 4, 5, 4); - buttonCancel.Name = "buttonCancel"; - buttonCancel.Size = new Size(101, 36); - buttonCancel.TabIndex = 9; - buttonCancel.Text = "Отмена"; - buttonCancel.UseVisualStyleBackColor = true; - buttonCancel.Click += ButtonCancel_Click; - // // ColumnId // ColumnId.HeaderText = "Id"; @@ -177,15 +157,57 @@ ColumnCount.ReadOnly = true; ColumnCount.Width = 125; // + // buttonSave + // + buttonSave.Location = new Point(291, 525); + buttonSave.Margin = new Padding(5, 4, 5, 4); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(101, 36); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(410, 525); + buttonCancel.Margin = new Padding(5, 4, 5, 4); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(101, 36); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // textBoxMaximum + // + textBoxMaximum.Location = new Point(193, 133); + textBoxMaximum.Margin = new Padding(5, 4, 5, 4); + textBoxMaximum.Name = "textBoxMaximum"; + textBoxMaximum.Size = new Size(199, 27); + textBoxMaximum.TabIndex = 13; + // + // labelMaximum + // + labelMaximum.AutoSize = true; + labelMaximum.Location = new Point(16, 137); + labelMaximum.Margin = new Padding(5, 0, 5, 0); + labelMaximum.Name = "labelMaximum"; + labelMaximum.Size = new Size(130, 20); + labelMaximum.TabIndex = 12; + labelMaximum.Text = "Максимум блюд :"; + // // FormShop // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(546, 576); + Controls.Add(textBoxMaximum); + Controls.Add(labelMaximum); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBoxDishs); - Controls.Add(labelOpeningDate); + Controls.Add(labelDateOpening); Controls.Add(dateTimePicker); Controls.Add(textBoxAddress); Controls.Add(labelAddress); @@ -209,7 +231,7 @@ private Label labelAddress; private TextBox textBoxAddress; private DateTimePicker dateTimePicker; - private Label labelOpeningDate; + private Label labelDateOpening; private GroupBox groupBoxDishs; private DataGridView dataGridView; private Button buttonSave; @@ -217,5 +239,7 @@ private DataGridViewTextBoxColumn ColumnId; private DataGridViewTextBoxColumn ColumnName; private DataGridViewTextBoxColumn ColumnCount; + private TextBox textBoxMaximum; + private Label labelMaximum; } } \ No newline at end of file diff --git a/FoodOrders/FoodOrdersView/FormShop.cs b/FoodOrders/FoodOrdersView/FormShop.cs index 92934da..027db01 100644 --- a/FoodOrders/FoodOrdersView/FormShop.cs +++ b/FoodOrders/FoodOrdersView/FormShop.cs @@ -39,6 +39,7 @@ namespace FoodOrdersView textBoxName.Text = view.ShopName; textBoxAddress.Text = view.Address; dateTimePicker.Value = view.DateOpening; + textBoxMaximum.Text = view.MaxCountDishs.ToString(); _shopDishs = view.ShopDishs ?? new Dictionary(); LoadData(); } @@ -89,6 +90,11 @@ namespace FoodOrdersView MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + if (string.IsNullOrEmpty(textBoxMaximum.Text)) + { + MessageBox.Show("Заполните максимальное количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } _logger.LogInformation("Shop saving"); try { @@ -98,6 +104,7 @@ namespace FoodOrdersView ShopName = textBoxName.Text, Address = textBoxAddress.Text, DateOpening = dateTimePicker.Value, + MaxCountDishs = Convert.ToInt32(textBoxMaximum.Text), ShopDishs = _shopDishs }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/FoodOrders/FoodOrdersView/Program.cs b/FoodOrders/FoodOrdersView/Program.cs index 2690dc0..39088e2 100644 --- a/FoodOrders/FoodOrdersView/Program.cs +++ b/FoodOrders/FoodOrdersView/Program.cs @@ -55,6 +55,7 @@ namespace FoodOrdersView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file