From 7a09fe916079ea498dee4f5b924b5d1acec367b9 Mon Sep 17 00:00:00 2001
From: maxnes3 <112558334+maxnes3@users.noreply.github.com>
Date: Mon, 27 Feb 2023 02:55:55 +0400
Subject: [PATCH 1/2] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ComputersShop/ComputersShop.sln | 10 +-
.../ComputersShopFileImplement.csproj | 14 +++
.../DataFileSingleton.cs | 54 +++++++++
.../Implements/ComponentStorage.cs | 78 +++++++++++++
.../Implements/ComputerStorage.cs | 82 +++++++++++++
.../Implements/OrderStorage.cs | 96 ++++++++++++++++
.../Models/Component.cs | 64 +++++++++++
.../Models/Computer.cs | 95 +++++++++++++++
.../Models/Order.cs | 108 ++++++++++++++++++
.../ComputersShopView.csproj | 2 +-
ComputersShop/ComputersShopView/Program.cs | 3 +-
ComputersShop/Temp.txt | 1 +
12 files changed, 602 insertions(+), 5 deletions(-)
create mode 100644 ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj
create mode 100644 ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Component.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Computer.cs
create mode 100644 ComputersShop/ComputersShopFileImplement/Models/Order.cs
create mode 100644 ComputersShop/Temp.txt
diff --git a/ComputersShop/ComputersShop.sln b/ComputersShop/ComputersShop.sln
index a517877..b51e620 100644
--- a/ComputersShop/ComputersShop.sln
+++ b/ComputersShop/ComputersShop.sln
@@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopDataModels", "
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopContracts", "ComputersShopContracts\ComputersShopContracts.csproj", "{7404526F-8C94-457B-BF18-85445EADC75F}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{5270DCF9-79F8-45B5-90F4-D460B0F0F571}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopBusinessLogic", "ComputersShopBusinessLogic\ComputersShopBusinessLogic.csproj", "{5270DCF9-79F8-45B5-90F4-D460B0F0F571}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{F4C10F5F-A602-48E7-9820-C26B774203E7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ComputersShopListImplement", "ComputersShopListImplement\ComputersShopListImplement.csproj", "{F4C10F5F-A602-48E7-9820-C26B774203E7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComputersShopFileImplement", "ComputersShopFileImplement\ComputersShopFileImplement.csproj", "{AC4BC639-3B3F-48B1-87D2-22601554F418}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{F4C10F5F-A602-48E7-9820-C26B774203E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F4C10F5F-A602-48E7-9820-C26B774203E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F4C10F5F-A602-48E7-9820-C26B774203E7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AC4BC639-3B3F-48B1-87D2-22601554F418}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AC4BC639-3B3F-48B1-87D2-22601554F418}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AC4BC639-3B3F-48B1-87D2-22601554F418}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AC4BC639-3B3F-48B1-87D2-22601554F418}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj
new file mode 100644
index 0000000..8eb14fb
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/ComputersShopFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..f59fd2a
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,54 @@
+using ComputersShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplement
+{
+ public class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private 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/ComputersShopFileImplement/Implements/ComponentStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..93aa931
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,78 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopContracts.ViewModels;
+using ComputersShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplement.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/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs
new file mode 100644
index 0000000..2c77fba
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Implements/ComputerStorage.cs
@@ -0,0 +1,82 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopContracts.ViewModels;
+using ComputersShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplement.Implements
+{
+ public class ComputerStorage : IComputerStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public ComputerStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ 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 List GetFilteredList(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 List GetFullList()
+ {
+ return source.Computers.Select(x => x.GetViewModel).ToList();
+ }
+
+ public ComputerViewModel? Insert(ComputerBindingModel model)
+ {
+ model.Id = source.Computers.Count > 0 ? source.Computers.Max(x => x.Id) + 1 : 1;
+ var newDoc = Computer.Create(model);
+ if (newDoc == null)
+ {
+ return null;
+ }
+ source.Computers.Add(newDoc);
+ source.SaveComputers();
+ return newDoc.GetViewModel;
+ }
+
+ public ComputerViewModel? Update(ComputerBindingModel model)
+ {
+ var document = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+ if (document == null)
+ {
+ return null;
+ }
+ document.Update(model);
+ source.SaveComputers();
+ return document.GetViewModel;
+ }
+ public ComputerViewModel? Delete(ComputerBindingModel model)
+ {
+ var document = source.Computers.FirstOrDefault(x => x.Id == model.Id);
+ if (document == null)
+ {
+ return null;
+ }
+ document.Update(model);
+ source.SaveComputers();
+ return document.GetViewModel;
+ }
+ }
+}
diff --git a/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..b9ad9eb
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,96 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.SearchModels;
+using ComputersShopContracts.StoragesContracts;
+using ComputersShopContracts.ViewModels;
+using ComputersShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ComputersShopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ 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 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? 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 comp in source.Computers)
+ {
+ if (comp.Id == order.ComputerId)
+ {
+ viewModel.ComputerName = comp.ComputerName;
+ break;
+ }
+ }
+ return viewModel;
+ }
+ }
+}
diff --git a/ComputersShop/ComputersShopFileImplement/Models/Component.cs b/ComputersShop/ComputersShopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..c25e38b
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Models/Component.cs
@@ -0,0 +1,64 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.ViewModels;
+using ComputersShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplement.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/ComputersShopFileImplement/Models/Computer.cs b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs
new file mode 100644
index 0000000..5854244
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Models/Computer.cs
@@ -0,0 +1,95 @@
+using ComputersShopContracts.BindingModels;
+using ComputersShopContracts.ViewModels;
+using ComputersShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ComputersShopFileImplement.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/ComputersShopFileImplement/Models/Order.cs b/ComputersShop/ComputersShopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..24382c4
--- /dev/null
+++ b/ComputersShop/ComputersShopFileImplement/Models/Order.cs
@@ -0,0 +1,108 @@
+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 ComputersShopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ 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 int Id { 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 order = new Order()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ ComputerId = Convert.ToInt32(element.Element("ComputerId")!.Value),
+ Count = Convert.ToInt32(element.Element("Count")!.Value),
+ Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+ DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
+ };
+ DateTime.TryParse(element.Element("DateImplement")!.Value, out DateTime dateImpl);
+
+ order.DateImplement = dateImpl;
+
+ if (!Enum.TryParse(element.Element("Status")!.Value, out OrderStatus status))
+ {
+ return null;
+ }
+ order.Status = status;
+ return order;
+ }
+
+ public void Update(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ComputerId = model.ComputerId;
+ Count = model.Count;
+ Sum = model.Sum;
+ Status = model.Status;
+ DateCreate = model.DateCreate;
+ DateImplement = model.DateImplement;
+ }
+
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ComputerId = ComputerId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement
+ };
+
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("ComputerId", ComputerId),
+ 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/ComputersShopView/ComputersShopView.csproj b/ComputersShop/ComputersShopView/ComputersShopView.csproj
index b5f4f28..ea5d5cb 100644
--- a/ComputersShop/ComputersShopView/ComputersShopView.csproj
+++ b/ComputersShop/ComputersShopView/ComputersShopView.csproj
@@ -18,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/ComputersShop/ComputersShopView/Program.cs b/ComputersShop/ComputersShopView/Program.cs
index a93980f..9a8e87a 100644
--- a/ComputersShop/ComputersShopView/Program.cs
+++ b/ComputersShop/ComputersShopView/Program.cs
@@ -1,11 +1,10 @@
using ComputersShopBusinessLogic.BusinessLogics;
using ComputersShopContracts.BusinessLogicContracts;
using ComputersShopContracts.StoragesContracts;
-using ComputersShopListImplement.Implements;
+using ComputersShopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
-using OrdersShopListImplement.Implements;
namespace ComputersShopView
{
diff --git a/ComputersShop/Temp.txt b/ComputersShop/Temp.txt
new file mode 100644
index 0000000..5f28270
--- /dev/null
+++ b/ComputersShop/Temp.txt
@@ -0,0 +1 @@
+
\ No newline at end of file
--
2.25.1
From 44235082c6d50283be61af3ef0ea7cd3463ce042 Mon Sep 17 00:00:00 2001
From: maxnes3 <112558334+maxnes3@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:22:04 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D0=9A=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB?=
=?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ComputersShop/ComputersShopFileImplement/Models/Order.cs | 4 ----
ComputersShop/Temp.txt | 1 -
2 files changed, 5 deletions(-)
delete mode 100644 ComputersShop/Temp.txt
diff --git a/ComputersShop/ComputersShopFileImplement/Models/Order.cs b/ComputersShop/ComputersShopFileImplement/Models/Order.cs
index 24382c4..e41250c 100644
--- a/ComputersShop/ComputersShopFileImplement/Models/Order.cs
+++ b/ComputersShop/ComputersShopFileImplement/Models/Order.cs
@@ -77,11 +77,7 @@ namespace ComputersShopFileImplement.Models
{
return;
}
- ComputerId = model.ComputerId;
- Count = model.Count;
- Sum = model.Sum;
Status = model.Status;
- DateCreate = model.DateCreate;
DateImplement = model.DateImplement;
}
diff --git a/ComputersShop/Temp.txt b/ComputersShop/Temp.txt
deleted file mode 100644
index 5f28270..0000000
--- a/ComputersShop/Temp.txt
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
--
2.25.1