diff --git a/FoodOrders/FoodOrders.sln b/FoodOrders/FoodOrders.sln
index 68f3899..57bc319 100644
--- a/FoodOrders/FoodOrders.sln
+++ b/FoodOrders/FoodOrders.sln
@@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FoodOrdersDataModels", "Foo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FoodOrdersContracts", "FoodOrdersContracts\FoodOrdersContracts.csproj", "{5527E07B-9B94-4735-93FB-49267F0B8038}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodOrdersBusinessLogic", "FoodOrdersBusinessLogic\FoodOrdersBusinessLogic.csproj", "{4C44A99E-7D02-4D07-9714-9414423B560E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FoodOrdersBusinessLogic", "FoodOrdersBusinessLogic\FoodOrdersBusinessLogic.csproj", "{4C44A99E-7D02-4D07-9714-9414423B560E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodOrdersListImplement", "FoodOrdersListImplement\FoodOrdersListImplement.csproj", "{A4012AB3-40FB-4FF6-A55A-E593AB80A153}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FoodOrdersListImplement", "FoodOrdersListImplement\FoodOrdersListImplement.csproj", "{A4012AB3-40FB-4FF6-A55A-E593AB80A153}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FoodOrdersFileImplement", "FoodOrdersFileImplement\FoodOrdersFileImplement.csproj", "{E5B30B3F-30CF-4D4D-80E6-22A2EA20CC9C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{A4012AB3-40FB-4FF6-A55A-E593AB80A153}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4012AB3-40FB-4FF6-A55A-E593AB80A153}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4012AB3-40FB-4FF6-A55A-E593AB80A153}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E5B30B3F-30CF-4D4D-80E6-22A2EA20CC9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E5B30B3F-30CF-4D4D-80E6-22A2EA20CC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E5B30B3F-30CF-4D4D-80E6-22A2EA20CC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E5B30B3F-30CF-4D4D-80E6-22A2EA20CC9C}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/FoodOrders/FoodOrders/FoodOrdersView.csproj b/FoodOrders/FoodOrders/FoodOrdersView.csproj
index d32249f..87aba5f 100644
--- a/FoodOrders/FoodOrders/FoodOrdersView.csproj
+++ b/FoodOrders/FoodOrders/FoodOrdersView.csproj
@@ -17,6 +17,7 @@
+
diff --git a/FoodOrders/FoodOrders/FormCreateOrder.cs b/FoodOrders/FoodOrders/FormCreateOrder.cs
index 14654f4..8ea24c8 100644
--- a/FoodOrders/FoodOrders/FormCreateOrder.cs
+++ b/FoodOrders/FoodOrders/FormCreateOrder.cs
@@ -45,12 +45,12 @@ namespace FoodOrdersView
try
{
int id = Convert.ToInt32(comboBoxDish.SelectedValue);
- var product = _logicS.ReadElement(new DishSearchModel
+ var dish = _logicS.ReadElement(new DishSearchModel
{
Id = id
});
int count = Convert.ToInt32(textBoxCount.Text);
- textBoxSum.Text = Math.Round(count * (product?.Price ?? 0), 2).ToString();
+ textBoxSum.Text = Math.Round(count * (dish?.Price ?? 0), 2).ToString();
_logger.LogInformation("Расчет суммы заказа");
}
catch (Exception ex)
diff --git a/FoodOrders/FoodOrders/Program.cs b/FoodOrders/FoodOrders/Program.cs
index 8ab0839..d33e584 100644
--- a/FoodOrders/FoodOrders/Program.cs
+++ b/FoodOrders/FoodOrders/Program.cs
@@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
using FoodOrdersView;
-using FoodOrdersListImplement.Implements;
+using FoodOrdersFileImplement.Implements;
using FoodOrdersBusinessLogic.BusinessLogics;
namespace FoodOrders
diff --git a/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs b/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..bbed037
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/DataFileSingleton.cs
@@ -0,0 +1,57 @@
+using FoodOrdersFileImplement.Models;
+using System.Xml.Linq;
+namespace FoodOrdersFileImplement
+{
+ public 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/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj
new file mode 100644
index 0000000..51e14c2
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/FoodOrdersFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/ComponentStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..161c77f
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,77 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersFileImplement.Models;
+using FoodOrdersFileImplement;
+
+namespace FoodOrdersFileImplement.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.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 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/FoodOrders/FoodOrdersFileImplement/Implements/DishStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/DishStorage.cs
new file mode 100644
index 0000000..b2c9824
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Implements/DishStorage.cs
@@ -0,0 +1,99 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersFileImplement.Models;
+using FoodOrdersFileImplement;
+
+namespace FoodOrdersListImplement.Implements
+{
+ public class DishStorage : IDishStorage
+ {
+ private readonly DataFileSingleton _source;
+ public DishStorage()
+ {
+ _source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Components.Select(x => x.GetViewModel).ToList();
+ }
+ public List GetFilteredList(DishSearchModel
+ model)
+ {
+ var result = new List();
+ if (string.IsNullOrEmpty(model.DishName))
+ {
+ return result;
+ }
+ foreach (var dish in _source.Dishes)
+ {
+ if (dish.DishName.Contains(model.DishName))
+ {
+ result.Add(dish.GetViewModel);
+ }
+ }
+ return result;
+ }
+ public DishViewModel? GetElement(DishSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.DishName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ foreach (var dish in _source.Dishes)
+ {
+ if ((!string.IsNullOrEmpty(model.DishName) &&
+ dish.DishName == model.DishName) ||
+ (model.Id.HasValue && dish.Id == model.Id))
+ {
+ return dish.GetViewModel;
+ }
+ }
+ return null;
+ }
+ public DishViewModel? Insert(DishBindingModel model)
+ {
+ model.Id = 1;
+ foreach (var dish in _source.Dishes)
+ {
+ if (model.Id <= dish.Id)
+ {
+ model.Id = dish.Id + 1;
+ }
+ }
+ var newDish = Dish.Create(model);
+ if (newDish == null)
+ {
+ return null;
+ }
+ _source.Dishes.Add(newDish);
+ return newDish.GetViewModel;
+ }
+ public DishViewModel? Update(DishBindingModel model)
+ {
+ foreach (var dish in _source.Dishes)
+ {
+ if (dish.Id == model.Id)
+ {
+ dish.Update(model);
+ return dish.GetViewModel;
+ }
+ }
+ return null;
+ }
+ public DishViewModel? Delete(DishBindingModel model)
+ {
+ for (int i = 0; i < _source.Dishes.Count; ++i)
+ {
+ if (_source.Dishes[i].Id == model.Id)
+ {
+ var element = _source.Dishes[i];
+ _source.Dishes.RemoveAt(i);
+ return element.GetViewModel;
+ }
+ }
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..04785c4
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,118 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.SearchModels;
+using FoodOrdersContracts.StoragesContracts;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersFileImplement;
+
+namespace FoodOrdersListImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton _source;
+ public OrderStorage()
+ {
+ _source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ var result = new List();
+ foreach (var order in _source.Orders)
+ {
+ result.Add(GetViewModel(order));
+ }
+ return result;
+ }
+ public List GetFilteredList(OrderSearchModel model)
+ {
+ var result = new List();
+ if (!model.Id.HasValue)
+ {
+ return result;
+ }
+ foreach (var order in _source.Orders)
+ {
+ if (order.Id == model.Id)
+ {
+ result.Add(GetViewModel(order));
+ }
+ }
+ return result;
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ foreach (var order in _source.Orders)
+ {
+ if (model.Id.HasValue && order.Id == model.Id)
+ {
+ return GetViewModel(order);
+ }
+ }
+ return null;
+ }
+
+ private OrderViewModel GetViewModel(Order order)
+ {
+ var viewModel = order.GetViewModel;
+ foreach (var iceCream in _source.Dish)
+ {
+ if (iceCream.Id == order.DishId)
+ {
+ viewModel.DishName = iceCream.DishName;
+ break;
+ }
+ }
+ return viewModel;
+ }
+
+ public OrderViewModel? Delete(OrderBindingModel model)
+ {
+ for (int i = 0; i < _source.Orders.Count; ++i)
+ {
+ if (_source.Orders[i].Id == model.Id)
+ {
+ var element = _source.Orders[i];
+ _source.Orders.RemoveAt(i);
+ return GetViewModel(element);
+ }
+ }
+ return null;
+ }
+
+ public OrderViewModel? Insert(OrderBindingModel model)
+ {
+ model.Id = 1;
+ foreach (var order in _source.Orders)
+ {
+ if (model.Id <= order.Id)
+ {
+ model.Id = order.Id + 1;
+ }
+ }
+ var newOrder = Order.Create(model);
+ if (newOrder == null)
+ {
+ return null;
+ }
+ _source.Orders.Add(newOrder);
+ return GetViewModel(newOrder);
+ }
+
+ public OrderViewModel? Update(OrderBindingModel model)
+ {
+ foreach (var order in _source.Orders)
+ {
+ if (order.Id == model.Id)
+ {
+ order.Update(model);
+ return GetViewModel(order);
+ }
+ }
+ return null;
+ }
+ }
+}
diff --git a/FoodOrders/FoodOrdersFileImplement/Models/Component.cs b/FoodOrders/FoodOrdersFileImplement/Models/Component.cs
new file mode 100644
index 0000000..8719134
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Models/Component.cs
@@ -0,0 +1,58 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+using System.Xml.Linq;
+namespace FoodOrdersFileImplement.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/FoodOrdersFileImplement/Models/Dish.cs b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs
new file mode 100644
index 0000000..c5fd8e7
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Models/Dish.cs
@@ -0,0 +1,95 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Models;
+using FoodOrdersFileImplement;
+using System.Xml.Linq;
+namespace FoodOrdersFileImplement.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/FoodOrdersFileImplement/Models/Order.cs b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs
new file mode 100644
index 0000000..38e5bc7
--- /dev/null
+++ b/FoodOrders/FoodOrdersFileImplement/Models/Order.cs
@@ -0,0 +1,68 @@
+using FoodOrdersContracts.BindingModels;
+using FoodOrdersContracts.ViewModels;
+using FoodOrdersDataModels.Enums;
+using FoodOrdersDataModels.Models;
+using System.Reflection.Metadata;
+using System.Xml.Linq;
+
+namespace FoodOrdersFileImplement.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; }
+ public DateTime DateCreate { get; private set; }
+ public DateTime? DateImplement { get; private set; }
+
+ 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("DocumentId")!.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 = Convert.ToDateTime(element.Element("DateCreate")!.Value)
+ };
+ }
+ public void Update(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Status = model.Status;
+ 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.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/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
index fbb7cd0..c9b2696 100644
--- a/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
+++ b/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
@@ -63,11 +63,11 @@ namespace FoodOrdersListImplement.Implements
private OrderViewModel GetViewModel(Order order)
{
var viewModel = order.GetViewModel;
- foreach (var iceCream in _source.Dish)
+ foreach (var dish in _source.Dish)
{
- if (iceCream.Id == order.DishId)
+ if (dish.Id == order.DishId)
{
- viewModel.DishName = iceCream.DishName;
+ viewModel.DishName = dish.DishName;
break;
}
}