From 3190a9da85aa27f90b1a7bfd5bf1f8d8330936ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?10=D0=93=20=D0=95=D0=B3=D0=BE=D1=80=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Tue, 7 Mar 2023 13:58:15 +0400 Subject: [PATCH] Revert "Final" This reverts commit ad16a7ca87f6261d560f26630fd71a7794f2ab0c. --- SecuritySystem/Program.cs | 6 +- SecuritySystem/SecuritySystem.sln | 14 +-- SecuritySystem/SecuritySystemView.csproj | 1 - .../DataFileSingletone.cs | 54 ---------- .../Implements/ComponentStorage.cs | 87 ---------------- .../Implements/ManufactureStorage.cs | 84 ---------------- .../Implements/OrderStorage.cs | 94 ------------------ .../Models/Component.cs | 65 ------------ .../Models/Manufacture.cs | 93 ------------------ SecuritySystemFileImplement/Models/Order.cs | 98 ------------------- .../SecuritySystemFileImplement.csproj | 14 --- SecuritySystemListImplement/Models/Order.cs | 5 + 12 files changed, 13 insertions(+), 602 deletions(-) delete mode 100644 SecuritySystemFileImplement/DataFileSingletone.cs delete mode 100644 SecuritySystemFileImplement/Implements/ComponentStorage.cs delete mode 100644 SecuritySystemFileImplement/Implements/ManufactureStorage.cs delete mode 100644 SecuritySystemFileImplement/Implements/OrderStorage.cs delete mode 100644 SecuritySystemFileImplement/Models/Component.cs delete mode 100644 SecuritySystemFileImplement/Models/Manufacture.cs delete mode 100644 SecuritySystemFileImplement/Models/Order.cs delete mode 100644 SecuritySystemFileImplement/SecuritySystemFileImplement.csproj diff --git a/SecuritySystem/Program.cs b/SecuritySystem/Program.cs index 5e291f3..f6d0b1d 100644 --- a/SecuritySystem/Program.cs +++ b/SecuritySystem/Program.cs @@ -1,12 +1,14 @@ using SecuritySystemView; using SecuritySystemBusinessLogic.BusinessLogics; +using SecuritySystemListImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; -using SecuritySystemFileImplement.Implements; +using OrdersShopListImplement.Implements; using SecuritySystemBusinessLogic; using SecuritySystemContracts.BusinessLogicsContracts; using SecuritySystemContracts.StoragesContracts; +using System; namespace SecuritySystem { @@ -40,9 +42,9 @@ namespace SecuritySystem services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); diff --git a/SecuritySystem/SecuritySystem.sln b/SecuritySystem/SecuritySystem.sln index 14f83ce..d169da1 100644 --- a/SecuritySystem/SecuritySystem.sln +++ b/SecuritySystem/SecuritySystem.sln @@ -5,15 +5,13 @@ VisualStudioVersion = 17.3.32922.545 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemView", "SecuritySystemView.csproj", "{39A7185D-F1F5-4892-BE6F-72B1A849CA84}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SystemSecurityBusinessLogic", "..\SystemSecurityBusinessLogic\SystemSecurityBusinessLogic.csproj", "{D8EF10A4-F934-461B-BE3C-BCCCF266B8D9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemSecurityBusinessLogic", "..\SystemSecurityBusinessLogic\SystemSecurityBusinessLogic.csproj", "{D8EF10A4-F934-461B-BE3C-BCCCF266B8D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemContracts", "..\SecuritySystemContracts\SecuritySystemContracts.csproj", "{C1C491F5-4CB7-4B6B-92CE-41688769709A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecuritySystemContracts", "..\SecuritySystemContracts\SecuritySystemContracts.csproj", "{C1C491F5-4CB7-4B6B-92CE-41688769709A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemDataModels", "..\SecuritySystemDataModels\SecuritySystemDataModels.csproj", "{D12D1329-4362-472B-B6E6-D62B0FF00C63}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecuritySystemDataModels", "..\SecuritySystemDataModels\SecuritySystemDataModels.csproj", "{D12D1329-4362-472B-B6E6-D62B0FF00C63}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SecuritySystemListImplement", "..\SecuritySystemListImplement\SecuritySystemListImplement.csproj", "{A5A3381B-3592-41B6-880F-333C2502DF02}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecuritySystemFileImplement", "..\SecuritySystemFileImplement\SecuritySystemFileImplement.csproj", "{88EDB793-0A3D-4B04-BE39-DB9C317ADEE6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SecuritySystemListImplement", "..\SecuritySystemListImplement\SecuritySystemListImplement.csproj", "{A5A3381B-3592-41B6-880F-333C2502DF02}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,10 +39,6 @@ Global {A5A3381B-3592-41B6-880F-333C2502DF02}.Debug|Any CPU.Build.0 = Debug|Any CPU {A5A3381B-3592-41B6-880F-333C2502DF02}.Release|Any CPU.ActiveCfg = Release|Any CPU {A5A3381B-3592-41B6-880F-333C2502DF02}.Release|Any CPU.Build.0 = Release|Any CPU - {88EDB793-0A3D-4B04-BE39-DB9C317ADEE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {88EDB793-0A3D-4B04-BE39-DB9C317ADEE6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {88EDB793-0A3D-4B04-BE39-DB9C317ADEE6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {88EDB793-0A3D-4B04-BE39-DB9C317ADEE6}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/SecuritySystem/SecuritySystemView.csproj b/SecuritySystem/SecuritySystemView.csproj index ed51d3d..e65dd63 100644 --- a/SecuritySystem/SecuritySystemView.csproj +++ b/SecuritySystem/SecuritySystemView.csproj @@ -14,7 +14,6 @@ - diff --git a/SecuritySystemFileImplement/DataFileSingletone.cs b/SecuritySystemFileImplement/DataFileSingletone.cs deleted file mode 100644 index 6f66c1e..0000000 --- a/SecuritySystemFileImplement/DataFileSingletone.cs +++ /dev/null @@ -1,54 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using SecuritySystemFileImplement.Models; -using System.Xml.Linq; - -namespace SecuritySystemFileImplement -{ - public class DataFileSingleton - { - private static DataFileSingleton? instance; - private readonly string ComponentFileName = "Component.xml"; - private readonly string OrderFileName = "Order.xml"; - private readonly string ManufactureFileName = "Manufacture.xml"; - public List Components { get; private set; } - public List Orders { get; private set; } - public List Manufactures { 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 SaveManufactures() => SaveData(Manufactures, ManufactureFileName, "Manufactures", x => x.GetXElement); - public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); - private DataFileSingleton() - { - Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; - Manufactures = LoadData(ManufactureFileName, "Manufacture", x => Manufacture.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/SecuritySystemFileImplement/Implements/ComponentStorage.cs b/SecuritySystemFileImplement/Implements/ComponentStorage.cs deleted file mode 100644 index c62adcd..0000000 --- a/SecuritySystemFileImplement/Implements/ComponentStorage.cs +++ /dev/null @@ -1,87 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.SearchModels; -using SecuritySystemContracts.StoragesContracts; -using SecuritySystemContracts.ViewModels; -using SecuritySystemFileImplement.Models; -using SecuritySystemFileImplement; - -namespace SecuritySystemFileImplement.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; - } - } -} \ No newline at end of file diff --git a/SecuritySystemFileImplement/Implements/ManufactureStorage.cs b/SecuritySystemFileImplement/Implements/ManufactureStorage.cs deleted file mode 100644 index 09c4fda..0000000 --- a/SecuritySystemFileImplement/Implements/ManufactureStorage.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Numerics; -using System.Text; -using System.Threading.Tasks; - -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.SearchModels; -using SecuritySystemContracts.StoragesContracts; -using SecuritySystemContracts.ViewModels; -using SecuritySystemFileImplement.Models; -using SecuritySystemFileImplement; - -namespace SecuritySystemFileImplement.Implements -{ - public class ManufactureStorage : IManufactureStorage - { - private readonly DataFileSingleton source; - public ManufactureStorage() - { - source = DataFileSingleton.GetInstance(); - } - public ManufactureViewModel? GetElement(ManufactureSearchModel model) - { - if (string.IsNullOrEmpty(model.ManufactureName) && !model.Id.HasValue) - { - return null; - } - return source.Manufactures.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ManufactureName) && x.ManufactureName == model.ManufactureName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } - public List GetFilteredList(ManufactureSearchModel model) - { - if (string.IsNullOrEmpty(model.ManufactureName)) - { - return new(); - } - return source.Manufactures - .Where(x => x.ManufactureName.Contains(model.ManufactureName)) - .Select(x => x.GetViewModel) - .ToList(); - } - public List GetFullList() - { - return source.Manufactures.Select(x => x.GetViewModel).ToList(); - } - public ManufactureViewModel? Insert(ManufactureBindingModel model) - { - model.Id = source.Manufactures.Count > 0 ? source.Manufactures.Max(x => x.Id) + 1 : 1; - var newManufacture = Manufacture.Create(model); - if (newManufacture == null) - { - return null; - } - source.Manufactures.Add(newManufacture); - source.SaveManufactures(); - return newManufacture.GetViewModel; - } - public ManufactureViewModel? Update(ManufactureBindingModel model) - { - var manufacture = source.Manufactures.FirstOrDefault(x => x.Id == model.Id); - if (manufacture == null) - { - return null; - } - manufacture.Update(model); - source.SaveManufactures(); - return manufacture.GetViewModel; - } - public ManufactureViewModel? Delete(ManufactureBindingModel model) - { - var manufacture = source.Manufactures.FirstOrDefault(x => x.Id == model.Id); - if (manufacture == null) - { - return null; - } - manufacture.Update(model); - source.SaveManufactures(); - return manufacture.GetViewModel; - } - - } -} diff --git a/SecuritySystemFileImplement/Implements/OrderStorage.cs b/SecuritySystemFileImplement/Implements/OrderStorage.cs deleted file mode 100644 index 53fd709..0000000 --- a/SecuritySystemFileImplement/Implements/OrderStorage.cs +++ /dev/null @@ -1,94 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.SearchModels; -using SecuritySystemContracts.StoragesContracts; -using SecuritySystemContracts.ViewModels; -using SecuritySystemFileImplement.Models; -using SecuritySystemFileImplement; - -namespace SecuritySystemFileImplement.Implements -{ - public class OrderStorage : IOrderStorage - { - private readonly DataFileSingleton source; - public OrderStorage() - { - source = DataFileSingleton.GetInstance(); - } - 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 List GetFullList() - { - return source.Orders.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; - } - 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 order = source.Orders.FirstOrDefault(x => x.Id == model.Id); - if (order == null) - { - return null; - } - order.Update(model); - source.SaveOrders(); - return GetViewModel(order); - } - private OrderViewModel GetViewModel(Order order) - { - var viewModel = order.GetViewModel; - foreach (var manufacture in source.Manufactures) - { - if (manufacture.Id == order.ManufactureId) - { - viewModel.ManufactureName = manufacture.ManufactureName; - break; - } - } - return viewModel; - } - } -} diff --git a/SecuritySystemFileImplement/Models/Component.cs b/SecuritySystemFileImplement/Models/Component.cs deleted file mode 100644 index d345360..0000000 --- a/SecuritySystemFileImplement/Models/Component.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.ViewModels; -using SecuritySystemDataModels.Models; -using System.Xml.Linq; - -namespace SecuritySystemFileImplement.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/SecuritySystemFileImplement/Models/Manufacture.cs b/SecuritySystemFileImplement/Models/Manufacture.cs deleted file mode 100644 index 04f48b2..0000000 --- a/SecuritySystemFileImplement/Models/Manufacture.cs +++ /dev/null @@ -1,93 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using System.Xml.Linq; -using SecuritySystemDataModels.Models; -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.ViewModels; -using SecuritySystemFileImplement; - -namespace SecuritySystemFileImplement.Models -{ - public class Manufacture : IManufactureModel - { - public int Id { get; private set; } - public string ManufactureName { get; private set; } = string.Empty; - public double Price { get; private set; } - public Dictionary Components { get; private set; } = new(); - private Dictionary? _manufactureComponents = null; - public Dictionary ManufactureComponents - { - get - { - if (_manufactureComponents == null) - { - var source = DataFileSingleton.GetInstance(); - _manufactureComponents = Components.ToDictionary(x => x.Key, y => - ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); - } - return _manufactureComponents; - } - } - public static Manufacture? Create(ManufactureBindingModel model) - { - if (model == null) - { - return null; - } - return new Manufacture() - { - Id = model.Id, - ManufactureName = model.ManufactureName, - Price = model.Price, - Components = model.ManufactureComponents.ToDictionary(x => x.Key, x => x.Value.Item2) - }; - } - public static Manufacture? Create(XElement element) - { - if (element == null) - { - return null; - } - return new Manufacture() - { - Id = Convert.ToInt32(element.Attribute("Id")!.Value), - ManufactureName = element.Element("ManufactureName")!.Value, - Price = Convert.ToDouble(element.Element("Price")!.Value), - Components = - element.Element("ManufactureComponents")!.Elements("ManufactureComponent").ToDictionary(x =>Convert.ToInt32(x.Element("Key")?.Value), - x =>Convert.ToInt32(x.Element("Value")?.Value)) - }; - } - public void Update(ManufactureBindingModel model) - { - if (model == null) - { - return; - } - ManufactureName = model.ManufactureName; - Price = model.Price; - Components = model.ManufactureComponents.ToDictionary(x => x.Key, x => x.Value.Item2); - _manufactureComponents = null; - } - public ManufactureViewModel GetViewModel => new() - { - Id = Id, - ManufactureName = ManufactureName, - Price = Price, - ManufactureComponents = ManufactureComponents - }; - public XElement GetXElement => new("Manufacture", - new XAttribute("Id", Id), - new XElement("ManufactureName", ManufactureName), - new XElement("Price", Price.ToString()), - new XElement("ManufactureComponents", Components.Select(x => - new XElement("ManufactureComponent", - new XElement("Key", x.Key), - new XElement("Value", x.Value))) - .ToArray())); - } -} diff --git a/SecuritySystemFileImplement/Models/Order.cs b/SecuritySystemFileImplement/Models/Order.cs deleted file mode 100644 index b5996d8..0000000 --- a/SecuritySystemFileImplement/Models/Order.cs +++ /dev/null @@ -1,98 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -using System.Xml.Linq; -using SecuritySystemContracts.BindingModels; -using SecuritySystemContracts.ViewModels; -using SecuritySystemDataModels.Enums; -using SecuritySystemDataModels.Models; - -namespace SecuritySystemFileImplement.Models -{ - public class Order : IOrderModel - { - public int Id { get; private set; } - public int ManufactureId { get; private set; } - public string ManufactureName { get; private set; } = string.Empty; - 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, - ManufactureId = model.ManufactureId, - ManufactureName = model.ManufactureName, - 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), - ManufactureId = Convert.ToInt32(element.Element("ManufactureId")!.Value), - ManufactureName = element.Element("ManufactureName")!.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, - ManufactureId = ManufactureId, - ManufactureName = ManufactureName, - Count = Count, - Sum = Sum, - Status = Status, - DateCreate = DateCreate, - DateImplement = DateImplement - }; - - public XElement GetXElement => new( - "Order", - new XAttribute("Id", Id), - new XElement("ManufactureId", ManufactureId.ToString()), - new XElement("ManufactureName", ManufactureName.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/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj b/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj deleted file mode 100644 index 7037095..0000000 --- a/SecuritySystemFileImplement/SecuritySystemFileImplement.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - diff --git a/SecuritySystemListImplement/Models/Order.cs b/SecuritySystemListImplement/Models/Order.cs index 4ad41a3..88a2e68 100644 --- a/SecuritySystemListImplement/Models/Order.cs +++ b/SecuritySystemListImplement/Models/Order.cs @@ -53,7 +53,12 @@ namespace SecuritySystemListImplement.Models { return; } + ManufactureId = model.ManufactureId; + ManufactureName = model.ManufactureName; + Count = model.Count; + Sum = model.Sum; Status = model.Status; + DateCreate = model.DateCreate; DateImplement = model.DateImplement; } public OrderViewModel GetViewModel => new()