From ab512d2177f691822fa6f4956f98dc2203e536d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D1=80=D1=82=D0=B5=D0=BC=20=D0=A5=D0=B0=D1=80=D0=BB?= =?UTF-8?q?=D0=B0=D0=BC=D0=BE=D0=B2?= Date: Fri, 2 Jun 2023 20:59:44 +0400 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8F=20=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=B0=D1=85=20-=20=D0=BB=D0=B0=D0=B1?= =?UTF-8?q?=E2=84=962."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit f3b58bb66f261d867f5c15a2ccde6eb487692e12. --- .../AbstractFoodOrdersFileImplement.csproj | 14 --- .../DataFileSingleton.cs | 63 ---------- .../Implements/ComponentStorage.cs | 81 ------------- .../Implements/DishStorage.cs | 86 -------------- .../Implements/OrderStorage.cs | 110 ------------------ .../Models/Component.cs | 60 ---------- .../AbstractShopFileImplement/Models/Dish.cs | 100 ---------------- .../AbstractShopFileImplement/Models/Order.cs | 92 --------------- FoodOrders/FoodOrders.sln | 6 - FoodOrders/FoodOrders/FoodOrders.csproj | 1 - .../FoodOrders/FormComponent.Designer.cs | 2 +- FoodOrders/FoodOrders/FormComponent.cs | 2 +- .../FoodOrders/FormComponents.Designer.cs | 2 +- FoodOrders/FoodOrders/FormComponents.cs | 2 +- FoodOrders/FoodOrders/FormMain.cs | 1 + FoodOrders/FoodOrders/Program.cs | 3 +- 16 files changed, 7 insertions(+), 618 deletions(-) delete mode 100644 FoodOrders/AbstractShopFileImplement/AbstractFoodOrdersFileImplement.csproj delete mode 100644 FoodOrders/AbstractShopFileImplement/DataFileSingleton.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Implements/ComponentStorage.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Implements/DishStorage.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Implements/OrderStorage.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Models/Component.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Models/Dish.cs delete mode 100644 FoodOrders/AbstractShopFileImplement/Models/Order.cs diff --git a/FoodOrders/AbstractShopFileImplement/AbstractFoodOrdersFileImplement.csproj b/FoodOrders/AbstractShopFileImplement/AbstractFoodOrdersFileImplement.csproj deleted file mode 100644 index 9d405d7..0000000 --- a/FoodOrders/AbstractShopFileImplement/AbstractFoodOrdersFileImplement.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - diff --git a/FoodOrders/AbstractShopFileImplement/DataFileSingleton.cs b/FoodOrders/AbstractShopFileImplement/DataFileSingleton.cs deleted file mode 100644 index a5b82d6..0000000 --- a/FoodOrders/AbstractShopFileImplement/DataFileSingleton.cs +++ /dev/null @@ -1,63 +0,0 @@ -using AbstractFoodOrdersFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; - -namespace AbstractFoodOrdersFileImplement -{ - internal class DataFileSingleton - { - private static DataFileSingleton? instance; - private readonly string ComponentFileName = "Component.xml"; - private readonly string OrderFileName = "Order.xml"; - private readonly string DishFileName = "Dish.xml"; - public List Components { get; private set; } - public List Orders { get; private set; } - public List Dishes { get; private set; } - public static DataFileSingleton GetInstance() - { - if (instance == null) - { - instance = new DataFileSingleton(); - } - return instance; - } - public void SaveComponents() => SaveData(Components, ComponentFileName, - "Components", x => x.GetXElement); - public void SaveDishes() => SaveData(Dishes, DishFileName, - "Dishes", x => x.GetXElement); - public void SaveOrders() => SaveData(Orders, OrderFileName, - "Orders", x => x.GetXElement); - private DataFileSingleton() - { - Components = LoadData(ComponentFileName, "Component", x => - Component.Create(x)!)!; - Dishes = LoadData(DishFileName, "Dish", x => - Dish.Create(x)!)!; - Orders = LoadData(OrderFileName, "Order", x => - Order.Create(x)!)!; - } - private static List? LoadData(string filename, string xmlNodeName, - Func selectFunction) - { - if (File.Exists(filename)) - { - return - XDocument.Load(filename)?.Root?.Elements(xmlNodeName)?.Select(selectFunction)?.ToList(); - } - return new List(); - } - private static void SaveData(List data, string filename, string - xmlNodeName, Func selectFunction) - { - if (data != null) - { - new XDocument(new XElement(xmlNodeName, - data.Select(selectFunction).ToArray())).Save(filename); - } - } - } -} diff --git a/FoodOrders/AbstractShopFileImplement/Implements/ComponentStorage.cs b/FoodOrders/AbstractShopFileImplement/Implements/ComponentStorage.cs deleted file mode 100644 index bcbbbad..0000000 --- a/FoodOrders/AbstractShopFileImplement/Implements/ComponentStorage.cs +++ /dev/null @@ -1,81 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.SearchModels; -using AbstractFoodOrdersContracts.StoragesContracts; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AbstractFoodOrdersFileImplement.Implements -{ - public class ComponentStorage : IComponentStorage - { - private readonly DataFileSingleton source; - public ComponentStorage() - { - source = DataFileSingleton.GetInstance(); - } - public List GetFullList() - { - return source.Components.Select(x => x.GetViewModel).ToList(); - } - public List GetFilteredList(ComponentSearchModel - model) - { - if (string.IsNullOrEmpty(model.ComponentName)) - { - return new(); - } - return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList(); - } - public ComponentViewModel? GetElement(ComponentSearchModel model) - { - if (string.IsNullOrEmpty(model.ComponentName) && !model.Id.HasValue) - { - return null; - } - return source.Components.FirstOrDefault(x =>(!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName == model.ComponentName) || - (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } - public ComponentViewModel? Insert(ComponentBindingModel model) - { - model.Id = source.Components.Count > 0 ? source.Components.Max(x => - x.Id) + 1 : 1; - var newComponent = Component.Create(model); - if (newComponent == null) - { - return null; - } - source.Components.Add(newComponent); - source.SaveComponents(); - return newComponent.GetViewModel; - } - public ComponentViewModel? Update(ComponentBindingModel model) - { - var component = source.Components.FirstOrDefault(x => x.Id == - model.Id); - if (component == null) - { - return null; - } - component.Update(model); - source.SaveComponents(); - return component.GetViewModel; - } - public ComponentViewModel? Delete(ComponentBindingModel model) - { - var element = source.Components.FirstOrDefault(x => x.Id == - model.Id); - if (element != null) - { - source.Components.Remove(element); - source.SaveComponents(); - return element.GetViewModel; - } - return null; - } - } -} diff --git a/FoodOrders/AbstractShopFileImplement/Implements/DishStorage.cs b/FoodOrders/AbstractShopFileImplement/Implements/DishStorage.cs deleted file mode 100644 index 97c04f4..0000000 --- a/FoodOrders/AbstractShopFileImplement/Implements/DishStorage.cs +++ /dev/null @@ -1,86 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.SearchModels; -using AbstractFoodOrdersContracts.StoragesContracts; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AbstractFoodOrdersFileImplement.Implements -{ - public class DishStorage : IDishStorage - { - private readonly DataFileSingleton source; - public DishStorage() - { - source = DataFileSingleton.GetInstance(); - } - public DishViewModel? Delete(DishBindingModel model) - { - var element = source.Dishes.FirstOrDefault(x => x.Id == - model.Id); - if (element != null) - { - source.Dishes.Remove(element); - source.SaveDishes(); - return element.GetViewModel; - } - return null; - } - - public DishViewModel? GetElement(DishSearchModel model) - { - if (string.IsNullOrEmpty(model.DishName) && !model.Id.HasValue) - { - return null; - } - return source.Dishes.FirstOrDefault(x =>(!string.IsNullOrEmpty(model.DishName) && x.DishName ==model.DishName) || - (model.Id.HasValue && x.Id == model.Id)) - ?.GetViewModel; - } - - public List GetFilteredList(DishSearchModel model) - { - if (string.IsNullOrEmpty(model.DishName)) - { - return new(); - } - return source.Dishes.Where(x => x.DishName.Contains(model.DishName)).Select(x => x.GetViewModel).ToList(); - } - - public List GetFullList() - { - return source.Dishes.Select(x => x.GetViewModel).ToList(); - } - - public DishViewModel? Insert(DishBindingModel model) - { - model.Id = source.Dishes.Count > 0 ? source.Dishes.Max(x => - x.Id) + 1 : 1; - var newComponent = Dish.Create(model); - if (newComponent == null) - { - return null; - } - source.Dishes.Add(newComponent); - source.SaveDishes(); - return newComponent.GetViewModel; - } - - public DishViewModel? Update(DishBindingModel model) - { - var component = source.Dishes.FirstOrDefault(x => x.Id == - model.Id); - if (component == null) - { - return null; - } - component.Update(model); - source.SaveDishes(); - return component.GetViewModel; - } - } -} diff --git a/FoodOrders/AbstractShopFileImplement/Implements/OrderStorage.cs b/FoodOrders/AbstractShopFileImplement/Implements/OrderStorage.cs deleted file mode 100644 index 8ac2333..0000000 --- a/FoodOrders/AbstractShopFileImplement/Implements/OrderStorage.cs +++ /dev/null @@ -1,110 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.SearchModels; -using AbstractFoodOrdersContracts.StoragesContracts; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersFileImplement.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AbstractFoodOrdersFileImplement.Implements -{ - public class OrderStorage : IOrderStorage - { - private readonly DataFileSingleton source; - - public OrderStorage() - { - source = DataFileSingleton.GetInstance(); - } - - public List GetFullList() - { - return source.Orders.Select(x => GetViewModel(x)).ToList(); - } - - public List GetFilteredList(OrderSearchModel model) - { - if (!model.Id.HasValue) - { - return new(); - } - - return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList(); - } - - public OrderViewModel? GetElement(OrderSearchModel model) - { - if (!model.Id.HasValue) - { - return null; - } - - return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } - - //для загрузки названий изделия в заказе - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; - - var manufacture = source.Dishes.FirstOrDefault(x => x.Id == order.DishId); - - if (manufacture != null) - { - viewModel.DishName = manufacture.DishName; - } - - return viewModel; - } - - public OrderViewModel? Insert(OrderBindingModel model) - { - model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; - - var newOrder = Order.Create(model); - - if (newOrder == null) - { - return null; - } - - source.Orders.Add(newOrder); - source.SaveOrders(); - - return GetViewModel(newOrder); - } - - public OrderViewModel? Update(OrderBindingModel model) - { - var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); - - if (order == null) - { - return null; - } - - order.Update(model); - source.SaveOrders(); - - return GetViewModel(order); - } - - public OrderViewModel? Delete(OrderBindingModel model) - { - var element = source.Orders.FirstOrDefault(x => x.Id == model.Id); - - if (element != null) - { - source.Orders.Remove(element); - source.SaveOrders(); - - return GetViewModel(element); - } - - return null; - } - } -} diff --git a/FoodOrders/AbstractShopFileImplement/Models/Component.cs b/FoodOrders/AbstractShopFileImplement/Models/Component.cs deleted file mode 100644 index 9a8b444..0000000 --- a/FoodOrders/AbstractShopFileImplement/Models/Component.cs +++ /dev/null @@ -1,60 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersDataModels.Models; -using System.Xml.Linq; - -namespace AbstractFoodOrdersFileImplement.Models -{ - public class Component : IComponentModel - { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } - public static Component? Create(ComponentBindingModel model) - { - if (model == null) - { - return null; - } - return new Component() - { - Id = model.Id, - ComponentName = model.ComponentName, - Cost = model.Cost - }; - } - public static Component? Create(XElement element) - { - if (element == null) - { - return null; - } - return new Component() - { - Id = Convert.ToInt32(element.Attribute("Id")!.Value), - ComponentName = element.Element("ComponentName")!.Value, - Cost = Convert.ToDouble(element.Element("Cost")!.Value) - }; - } - public void Update(ComponentBindingModel model) - { - if (model == null) - { - return; - } - ComponentName = model.ComponentName; - Cost = model.Cost; - } - public ComponentViewModel GetViewModel => new() - { - Id = Id, - ComponentName = ComponentName, - Cost = Cost - }; - public XElement GetXElement => new("Component", - new XAttribute("Id", Id), - new XElement("ComponentName", ComponentName), - new XElement("Cost", Cost.ToString())); - } - -} \ No newline at end of file diff --git a/FoodOrders/AbstractShopFileImplement/Models/Dish.cs b/FoodOrders/AbstractShopFileImplement/Models/Dish.cs deleted file mode 100644 index 3d65a46..0000000 --- a/FoodOrders/AbstractShopFileImplement/Models/Dish.cs +++ /dev/null @@ -1,100 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; - -namespace AbstractFoodOrdersFileImplement.Models -{ - public class Dish : IDishModel - { - public int Id { get; private set; } - public string DishName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary Components { get; private set; } = new(); - private Dictionary? _dishComponents = - null; - public Dictionary DishComponents - { - get - { - if (_dishComponents == null) - { - var source = DataFileSingleton.GetInstance(); - _dishComponents = Components.ToDictionary(x => x.Key, y => - ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, - y.Value)); - } - return _dishComponents; - } - } - public static Dish? Create(DishBindingModel model) - { - if (model == null) - { - return null; - } - return new Dish() - { - Id = model.Id, - DishName = model.DishName, - Price = model.Price, - Components = model.DishComponents.ToDictionary(x => x.Key, x - => x.Value.Item2) - }; - } - public static Dish? Create(XElement element) - { - if (element == null) - { - return null; - } - return new Dish() - { - Id = Convert.ToInt32(element.Attribute("Id")!.Value), - DishName = element.Element("DishName")!.Value, - Price = Convert.ToDouble(element.Element("Price")!.Value), - Components = - element.Element("DishComponents")!.Elements("DishComponent") - .ToDictionary(x => - Convert.ToInt32(x.Element("Key")?.Value), x => - Convert.ToInt32(x.Element("Value")?.Value)) - }; - } - public void Update(DishBindingModel model) - { - if (model == null) - { - return; - } - DishName = model.DishName; - Price = model.Price; - Components = model.DishComponents.ToDictionary(x => x.Key, x => - x.Value.Item2); - _dishComponents = null; - } - public DishViewModel GetViewModel => new() - { - Id = Id, - DishName = DishName, - Price = Price, - DishComponents = DishComponents - }; - public XElement GetXElement => new("Dish", - new XAttribute("Id", Id), - new XElement("DishName", DishName), - new XElement("Price", Price.ToString()), - new XElement("DishComponents", Components.Select(x => - new XElement("DishComponent", - - new XElement("Key", x.Key), - - new XElement("Value", x.Value))) - - .ToArray())); - } -} diff --git a/FoodOrders/AbstractShopFileImplement/Models/Order.cs b/FoodOrders/AbstractShopFileImplement/Models/Order.cs deleted file mode 100644 index 6f03184..0000000 --- a/FoodOrders/AbstractShopFileImplement/Models/Order.cs +++ /dev/null @@ -1,92 +0,0 @@ -using AbstractFoodOrdersContracts.BindingModels; -using AbstractFoodOrdersContracts.ViewModels; -using AbstractFoodOrdersDataModels.Enums; -using AbstractFoodOrdersDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; -using System.Xml.Linq; - -namespace AbstractFoodOrdersFileImplement.Models -{ - public class Order : IOrderModel - { - public int Id { get; private set; } - public int DishId { get; private set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } - - public static Order? Create(OrderBindingModel? model) - { - if (model == null) - { - return null; - } - return new Order() - { - Id = model.Id, - DishId = model.DishId, - Count = model.Count, - Sum = model.Sum, - Status = model.Status, - DateCreate = model.DateCreate, - DateImplement = model.DateImplement - }; - } - public static Order? Create(XElement element) - { - if (element == null) - { - return null; - } - return new Order() - { - Id = Convert.ToInt32(element.Attribute("Id")!.Value), - DishId = Convert.ToInt32(element.Element("DishId")!.Value), - Count = Convert.ToInt32(element.Element("Count")!.Value), - Sum = Convert.ToDouble(element.Element("Sum")!.Value), - Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), - DateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value), - DateImplement = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : - Convert.ToDateTime(element.Element("DateImplement")!.Value) - }; - } - public void Update(OrderBindingModel? model) - { - if (model == null) - { - return; - } - DishId = model.DishId; - Count = model.Count; - Sum = model.Sum; - Status = model.Status; - DateCreate = model.DateCreate; - DateImplement = model.DateImplement; - } - public OrderViewModel GetViewModel => new() - { - Id = Id, - DishId = DishId, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement, - }; - public XElement GetXElement => new("Order", - new XAttribute("Id", Id), - new XElement("DishId", DishId), - new XElement("Count", Count.ToString()), - new XElement("Sum", Sum.ToString()), - new XElement("Status", Status.ToString()), - new XElement("DateCreate", DateCreate.ToString()), - new XElement("DateImplement", DateImplement.ToString())); - } -} diff --git a/FoodOrders/FoodOrders.sln b/FoodOrders/FoodOrders.sln index 52df192..a185cde 100644 --- a/FoodOrders/FoodOrders.sln +++ b/FoodOrders/FoodOrders.sln @@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbstractFoodOrdersBusinessL EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbstractFoodOrdersListImplement", "AbstractFoodOrdersListImplement\AbstractFoodOrdersListImplement.csproj", "{275ED134-536F-4025-BE10-2718F66FBD10}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractFoodOrdersFileImplement", "AbstractShopFileImplement\AbstractFoodOrdersFileImplement.csproj", "{D0FC0C67-FFF7-4D2A-9194-A1466C82EDAB}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -41,10 +39,6 @@ Global {275ED134-536F-4025-BE10-2718F66FBD10}.Debug|Any CPU.Build.0 = Debug|Any CPU {275ED134-536F-4025-BE10-2718F66FBD10}.Release|Any CPU.ActiveCfg = Release|Any CPU {275ED134-536F-4025-BE10-2718F66FBD10}.Release|Any CPU.Build.0 = Release|Any CPU - {D0FC0C67-FFF7-4D2A-9194-A1466C82EDAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0FC0C67-FFF7-4D2A-9194-A1466C82EDAB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0FC0C67-FFF7-4D2A-9194-A1466C82EDAB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0FC0C67-FFF7-4D2A-9194-A1466C82EDAB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FoodOrders/FoodOrders/FoodOrders.csproj b/FoodOrders/FoodOrders/FoodOrders.csproj index d226432..ca31f64 100644 --- a/FoodOrders/FoodOrders/FoodOrders.csproj +++ b/FoodOrders/FoodOrders/FoodOrders.csproj @@ -18,7 +18,6 @@ - diff --git a/FoodOrders/FoodOrders/FormComponent.Designer.cs b/FoodOrders/FoodOrders/FormComponent.Designer.cs index fd8de72..3e57214 100644 --- a/FoodOrders/FoodOrders/FormComponent.Designer.cs +++ b/FoodOrders/FoodOrders/FormComponent.Designer.cs @@ -1,4 +1,4 @@ -namespace FoodOrders +namespace AbstractFoodOrdersView { partial class FormComponent { diff --git a/FoodOrders/FoodOrders/FormComponent.cs b/FoodOrders/FoodOrders/FormComponent.cs index 6bf0836..e21bedd 100644 --- a/FoodOrders/FoodOrders/FormComponent.cs +++ b/FoodOrders/FoodOrders/FormComponent.cs @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace FoodOrders +namespace AbstractFoodOrdersView { public partial class FormComponent : Form { diff --git a/FoodOrders/FoodOrders/FormComponents.Designer.cs b/FoodOrders/FoodOrders/FormComponents.Designer.cs index 49b2e19..2e7c196 100644 --- a/FoodOrders/FoodOrders/FormComponents.Designer.cs +++ b/FoodOrders/FoodOrders/FormComponents.Designer.cs @@ -1,4 +1,4 @@ -namespace FoodOrders +namespace AbstractFoodOrdersView { partial class FormComponents { diff --git a/FoodOrders/FoodOrders/FormComponents.cs b/FoodOrders/FoodOrders/FormComponents.cs index 17680cc..3112e3f 100644 --- a/FoodOrders/FoodOrders/FormComponents.cs +++ b/FoodOrders/FoodOrders/FormComponents.cs @@ -12,7 +12,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace FoodOrders +namespace AbstractFoodOrdersView { public partial class FormComponents : Form { diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs index 3708fd0..8208a68 100644 --- a/FoodOrders/FoodOrders/FormMain.cs +++ b/FoodOrders/FoodOrders/FormMain.cs @@ -1,5 +1,6 @@ using AbstractFoodOrdersContracts.BindingModels; using AbstractFoodOrdersContracts.BusinessLogicsContracts; +using AbstractFoodOrdersView; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; diff --git a/FoodOrders/FoodOrders/Program.cs b/FoodOrders/FoodOrders/Program.cs index 4a9cf92..51fefcc 100644 --- a/FoodOrders/FoodOrders/Program.cs +++ b/FoodOrders/FoodOrders/Program.cs @@ -1,7 +1,8 @@ using AbstractFoodOrdersBusinessLogic.BusinessLogics; using AbstractFoodOrdersContracts.BusinessLogicsContracts; using AbstractFoodOrdersContracts.StoragesContracts; -using AbstractFoodOrdersFileImplement.Implements; +using AbstractFoodOrdersListImplement.Implements; +using AbstractFoodOrdersView; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging;