From 14aa029893a99af845144bc7ceca0060d4d7602b Mon Sep 17 00:00:00 2001 From: frog24 Date: Sat, 24 Feb 2024 02:50:09 +0400 Subject: [PATCH 1/4] lab2 --- .../ComputersShopFileImplements.csproj} | 0 .../DataFileSingleton.cs | 58 +++++++++++ .../Implements/ComponentStorage.cs | 82 ++++++++++++++++ .../Implements/ComputerStorage.cs | 82 ++++++++++++++++ .../Implements/OrderStorage.cs | 86 +++++++++++++++++ .../Models/Component.cs | 64 +++++++++++++ .../Models/Computer.cs | 92 ++++++++++++++++++ .../Models/Order.cs | 95 +++++++++++++++++++ ComputersShop/ComputersShop.sln | 12 ++- .../ComputersShop/ComputersShop.csproj | 3 +- ComputersShop/ComputersShop/Program.cs | 2 +- .../ComputersShopListImplements.csproj | 14 +++ 12 files changed, 585 insertions(+), 5 deletions(-) rename ComputersShop/{ComputersShopListImplement/ComputersShopListImplement.csproj => ComputerShopFileImplements/ComputersShopFileImplements.csproj} (100%) create mode 100644 ComputersShop/ComputerShopFileImplements/DataFileSingleton.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Implements/ComponentStorage.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Implements/ComputerStorage.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Models/Component.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Models/Computer.cs create mode 100644 ComputersShop/ComputerShopFileImplements/Models/Order.cs create mode 100644 ComputersShop/ComputersShopListImplement/ComputersShopListImplements.csproj diff --git a/ComputersShop/ComputersShopListImplement/ComputersShopListImplement.csproj b/ComputersShop/ComputerShopFileImplements/ComputersShopFileImplements.csproj similarity index 100% rename from ComputersShop/ComputersShopListImplement/ComputersShopListImplement.csproj rename to ComputersShop/ComputerShopFileImplements/ComputersShopFileImplements.csproj diff --git a/ComputersShop/ComputerShopFileImplements/DataFileSingleton.cs b/ComputersShop/ComputerShopFileImplements/DataFileSingleton.cs new file mode 100644 index 0000000..d50c7e9 --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/DataFileSingleton.cs @@ -0,0 +1,58 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopFileImplements.Models; +using System.Xml.Linq; + +namespace ComputersShopFileImplements +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + public readonly string ComponentFileName = "Component.xml"; + public readonly string OrderFileName = "Order.xml"; + public readonly string ComputerFileName = "Computer.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Computers { 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 SaveComputers() => SaveData(Computers, ComputerFileName, + "Computers", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, + "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Computers = LoadData(ComputerFileName, "Computer", x => Computer.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/ComputersShop/ComputerShopFileImplements/Implements/ComponentStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/ComponentStorage.cs new file mode 100644 index 0000000..7372322 --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Implements/ComponentStorage.cs @@ -0,0 +1,82 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopFileImplements.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplements.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 GetFiltredList(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/ComputersShop/ComputerShopFileImplements/Implements/ComputerStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/ComputerStorage.cs new file mode 100644 index 0000000..e43a273 --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Implements/ComputerStorage.cs @@ -0,0 +1,82 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopFileImplements.Models; +using ComputersShopContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplements.Implements +{ + public class ComputerStorage : IComputerStorage + { + private readonly DataFileSingleton source; + public ComputerStorage() + { + source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return source.Computers.Select(x => x.GetViewModel).ToList(); + } + public List GetFiltredList(ComputerSearchModel model) + { + if (string.IsNullOrEmpty(model.ComputerName)) + { + return new(); + } + return source.Computers + .Where(x => x.ComputerName.Contains(model.ComputerName)) + .Select(x => x.GetViewModel) + .ToList(); + } + public ComputerViewModel? GetElement(ComputerSearchModel model) + { + if (!string.IsNullOrEmpty(model.ComputerName) && !model.Id.HasValue) + { + return null; + } + return source.Computers + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComputerName) && + x.ComputerName == model.ComputerName) || (model.Id.HasValue && + x.Id == model.Id))?.GetViewModel; + } + public ComputerViewModel? Insert(ComputerBindingModel model) + { + model.Id = source.Computers.Count > 0 ? source.Components.Max(x => x.Id) + 1 : 1; + var newComputer = Computer.Create(model); + if (newComputer == null) + { + return null; + } + source.Computers.Add(newComputer); + source.SaveComputers(); + return newComputer.GetViewModel; + } + public ComputerViewModel? Update(ComputerBindingModel model) + { + var computer = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (computer == null) + { + return null; + } + computer.Update(model); + source.SaveComputers(); + return computer.GetViewModel; + } + public ComputerViewModel? Delete(ComputerBindingModel model) + { + var element = source.Computers.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Computers.Remove(element); + source.SaveComputers(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs new file mode 100644 index 0000000..b016eb7 --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs @@ -0,0 +1,86 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.SearchModels; +using ComputersShopContracts.StoragesContracts; +using ComputersShopContracts.ViewModels; +using ComputersShopFileImplements.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ComputersShopFileImplements.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 GetFiltredList(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 GetViewModel(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); + } + 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? 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? Delete(OrderBindingModel model) + { + var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + source.Orders.Remove(order); + source.SaveOrders(); + return GetViewModel(order); + } + private OrderViewModel GetViewModel(Order order) + { + var viewModel = order.GetViewModel; + var bouquet = source.Computers.FirstOrDefault(x => x.Id == order.ComputerId); + if (bouquet != null) + { + viewModel.ComputerName = bouquet.ComputerName; + } + return viewModel; + } + } +} diff --git a/ComputersShop/ComputerShopFileImplements/Models/Component.cs b/ComputersShop/ComputerShopFileImplements/Models/Component.cs new file mode 100644 index 0000000..5bbd7e7 --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Models/Component.cs @@ -0,0 +1,64 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using System.Xml.Linq; + +namespace ComputersShopFileImplements.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())); + } +} diff --git a/ComputersShop/ComputerShopFileImplements/Models/Computer.cs b/ComputersShop/ComputerShopFileImplements/Models/Computer.cs new file mode 100644 index 0000000..cf52c1e --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Models/Computer.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Models; +using System.Xml.Linq; + +namespace ComputersShopFileImplements.Models +{ + public class Computer: IComputerModel + { + public int Id { get; private set; } + public string ComputerName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _computerComponents = null; + public Dictionary ComputerComponents + { + get + { + if (_computerComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _computerComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, + y.Value)); + } + return _computerComponents; + } + } + public static Computer? Create(ComputerBindingModel model) + { + if (model == null) + { + return null; + } + return new Computer() + { + Id = model.Id, + ComputerName = model.ComputerName, + Price = model.Price, + Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Computer? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Computer() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComputerName = element.Element("ComputerName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = + element.Element("ComputerComponents")!.Elements("ComputerComponent") + .ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + public void Update(ComputerBindingModel model) + { + if (model == null) + { + return; + } + ComputerName = model.ComputerName; + Price = model.Price; + Components = model.ComputerComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _computerComponents = null; + } + public ComputerViewModel GetViewModel => new() + { + Id = Id, + ComputerName = ComputerName, + Price = Price, + ComputerComponents = ComputerComponents + }; + public XElement GetXElement => new("Computer", + new XAttribute("Id", Id), + new XElement("ComputerName", ComputerName), + new XElement("Price", Price.ToString()), + new XElement("ComputerComponents", Components.Select(x => + new XElement("ComputerComponent", new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/ComputersShop/ComputerShopFileImplements/Models/Order.cs b/ComputersShop/ComputerShopFileImplements/Models/Order.cs new file mode 100644 index 0000000..542230d --- /dev/null +++ b/ComputersShop/ComputerShopFileImplements/Models/Order.cs @@ -0,0 +1,95 @@ +using ComputersShopContracts.BindingModels; +using ComputersShopContracts.ViewModels; +using ComputersShopDataModels.Enums; +using ComputersShopDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace ComputersShopFileImplements.Models +{ + public class Order: IOrderModel + { + public int Id { get; private set; } + public int ComputerId { 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, + ComputerId = model.ComputerId, + 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; + } + var id = Convert.ToInt32(element.Attribute("Id")!.Value); + var computerId = Convert.ToInt32(element.Element("ComputerId")!.Value); + var sum = Convert.ToDouble(element.Element("Sum")!.Value); + var count = Convert.ToInt32(element.Element("Count")!.Value); + var status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value); + var dateCreate = Convert.ToDateTime(element.Element("DateCreate")!.Value); + var dateImplement = DateTime.Now; + + return new Order() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ComputerId = Convert.ToInt32(element.Element("ComputerId")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.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; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + ComputerId = ComputerId, + Sum = Sum, + Count = Count, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + public XElement GetXElement => new( + "Order", + new XAttribute("Id", Id), + new XElement("ComputerId", ComputerId.ToString()), + 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/ComputersShop/ComputersShop.sln b/ComputersShop/ComputersShop.sln index bfc313b..5e96ca8 100644 --- a/ComputersShop/ComputersShop.sln +++ b/ComputersShop/ComputersShop.sln @@ -7,11 +7,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShop", "ComputersS EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopDataModels", "ComputersShopDataModels\ComputersShopDataModels.csproj", "{34C63637-6E52-4576-99D5-DA7524F73EA0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{1761A1DB-696C-4C00-B05F-FD00E768594B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{1761A1DB-696C-4C00-B05F-FD00E768594B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{93D47C23-DA56-4179-8918-9D70A1012048}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{93D47C23-DA56-4179-8918-9D70A1012048}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{8AF31165-C031-42B2-88D4-A1A89EFCDC59}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopListImplements", "ComputersShopListImplement\ComputersShopListImplements.csproj", "{8AF31165-C031-42B2-88D4-A1A89EFCDC59}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopFileImplements", "ComputerShopFileImplements\ComputersShopFileImplements.csproj", "{47B30693-D73D-49A1-B41A-740454667ABF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Debug|Any CPU.Build.0 = Debug|Any CPU {8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Release|Any CPU.ActiveCfg = Release|Any CPU {8AF31165-C031-42B2-88D4-A1A89EFCDC59}.Release|Any CPU.Build.0 = Release|Any CPU + {47B30693-D73D-49A1-B41A-740454667ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47B30693-D73D-49A1-B41A-740454667ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47B30693-D73D-49A1-B41A-740454667ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47B30693-D73D-49A1-B41A-740454667ABF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ComputersShop/ComputersShop/ComputersShop.csproj b/ComputersShop/ComputersShop/ComputersShop.csproj index 925cc89..d5465a9 100644 --- a/ComputersShop/ComputersShop/ComputersShop.csproj +++ b/ComputersShop/ComputersShop/ComputersShop.csproj @@ -15,9 +15,10 @@ + - + diff --git a/ComputersShop/ComputersShop/Program.cs b/ComputersShop/ComputersShop/Program.cs index 7facdfa..6af3e5d 100644 --- a/ComputersShop/ComputersShop/Program.cs +++ b/ComputersShop/ComputersShop/Program.cs @@ -1,7 +1,7 @@ using ComputersShopBusinessLogic.BusinessLogics; using ComputersShopContracts.BuisnessLogicsContracts; using ComputersShopContracts.StoragesContracts; -using ComputersShopListImplement.Implements; +using ComputersShopFileImplements.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/ComputersShop/ComputersShopListImplement/ComputersShopListImplements.csproj b/ComputersShop/ComputersShopListImplement/ComputersShopListImplements.csproj new file mode 100644 index 0000000..8eb14fb --- /dev/null +++ b/ComputersShop/ComputersShopListImplement/ComputersShopListImplements.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + -- 2.25.1 From 142f5d8b5f26b72617dbc3e2bd88c9c43103403a Mon Sep 17 00:00:00 2001 From: frog24 Date: Sat, 24 Feb 2024 09:28:05 +0400 Subject: [PATCH 2/4] =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D1=81?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D1=83=20=D0=B2=D1=81=D0=B5=20=D0=B1=D1=8B?= =?UTF-8?q?=D0=BB=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComputersShop/ComputersShop/FormMain.Designer.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ComputersShop/ComputersShop/FormMain.Designer.cs b/ComputersShop/ComputersShop/FormMain.Designer.cs index 72ca113..dca394b 100644 --- a/ComputersShop/ComputersShop/FormMain.Designer.cs +++ b/ComputersShop/ComputersShop/FormMain.Designer.cs @@ -153,6 +153,7 @@ MainMenuStrip = menuStrip; Name = "FormMain"; Text = "Компьютерный магазин"; + Load += FormMain_Load; menuStrip.ResumeLayout(false); menuStrip.PerformLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); -- 2.25.1 From 4dc24a7b2a34e9b2468b6d524ad52145fe3dcf17 Mon Sep 17 00:00:00 2001 From: frog24 Date: Fri, 8 Mar 2024 18:22:09 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComputerShopFileImplements/Implements/OrderStorage.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs index b016eb7..181861d 100644 --- a/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs +++ b/ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs @@ -75,11 +75,8 @@ namespace ComputersShopFileImplements.Implements private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; - var bouquet = source.Computers.FirstOrDefault(x => x.Id == order.ComputerId); - if (bouquet != null) - { - viewModel.ComputerName = bouquet.ComputerName; - } + var computer = source.Computers.FirstOrDefault(x => x.Id == order.ComputerId); + viewModel.ComputerName = computer?.ComputerName; return viewModel; } } -- 2.25.1 From 62c1d47261a4c5045b93bc041903a8fea7f411e7 Mon Sep 17 00:00:00 2001 From: frog24 Date: Fri, 8 Mar 2024 18:32:37 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=D0=B4=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ComputersShop/ComputersShopListImplement/Models/Order.cs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ComputersShop/ComputersShopListImplement/Models/Order.cs b/ComputersShop/ComputersShopListImplement/Models/Order.cs index 0696681..d639a82 100644 --- a/ComputersShop/ComputersShopListImplement/Models/Order.cs +++ b/ComputersShop/ComputersShopListImplement/Models/Order.cs @@ -43,12 +43,7 @@ namespace ComputersShopListImplement.Models { return; } - Id = model.Id; - ComputerId = model.ComputerId; - Count = model.Count; - Sum = model.Sum; Status = model.Status; - DateCreate = model.DateCreate; DateImplement = model.DateImplement; } public OrderViewModel GetViewModel => new() -- 2.25.1