diff --git a/CarpentryWorkshop/CarpentryWorkshop.sln b/CarpentryWorkshop/CarpentryWorkshop.sln
index ce305a2..ca80d14 100644
--- a/CarpentryWorkshop/CarpentryWorkshop.sln
+++ b/CarpentryWorkshop/CarpentryWorkshop.sln
@@ -5,13 +5,15 @@ VisualStudioVersion = 17.3.32825.248
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopView", "CarpentryWorkshopView\CarpentryWorkshopView.csproj", "{43AFB0D7-3079-4A9D-9281-C7021D27E058}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarpentryWorkshopDataModels", "CarpentryWorkshopDataModels\CarpentryWorkshopDataModels.csproj", "{3E2B6F30-00E0-4593-9A0C-86E949FDEBFB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopDataModels", "CarpentryWorkshopDataModels\CarpentryWorkshopDataModels.csproj", "{3E2B6F30-00E0-4593-9A0C-86E949FDEBFB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarpentryWorkshopContracts", "CarpentryWorkshopContracts\CarpentryWorkshopContracts.csproj", "{B9C39E74-DD6C-4503-B85C-2960E3DDA8AF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopContracts", "CarpentryWorkshopContracts\CarpentryWorkshopContracts.csproj", "{B9C39E74-DD6C-4503-B85C-2960E3DDA8AF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarpentryWorkshopListImplement", "CarpentryWorkshopListImplement\CarpentryWorkshopListImplement.csproj", "{F42723D6-5F7E-4956-B2F2-50353AF6D9BF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopListImplement", "CarpentryWorkshopListImplement\CarpentryWorkshopListImplement.csproj", "{F42723D6-5F7E-4956-B2F2-50353AF6D9BF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarpentryWorkshopBusinessLogic", "CarpentryWorkshopBusinessLogic\CarpentryWorkshopBusinessLogic.csproj", "{D550ED8D-31C0-42D2-A129-5BB96EDEBF3F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarpentryWorkshopBusinessLogic", "CarpentryWorkshopBusinessLogic\CarpentryWorkshopBusinessLogic.csproj", "{D550ED8D-31C0-42D2-A129-5BB96EDEBF3F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarpentryWorkshopFileImplement", "CarpentryWorkshopFileImplement\CarpentryWorkshopFileImplement.csproj", "{EFC90D78-298D-457A-9959-09FC58632F75}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{D550ED8D-31C0-42D2-A129-5BB96EDEBF3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D550ED8D-31C0-42D2-A129-5BB96EDEBF3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D550ED8D-31C0-42D2-A129-5BB96EDEBF3F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EFC90D78-298D-457A-9959-09FC58632F75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EFC90D78-298D-457A-9959-09FC58632F75}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EFC90D78-298D-457A-9959-09FC58632F75}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EFC90D78-298D-457A-9959-09FC58632F75}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj
new file mode 100644
index 0000000..6003264
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/CarpentryWorkshopFileImplement.csproj
@@ -0,0 +1,15 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/DataFileSingleton.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..b3c1dc9
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,57 @@
+using CarpentryWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace CarpentryWorkshopFileImplement
+{
+ public class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+
+ private readonly string ComponentFileName = "Component.xml";
+
+ private readonly string OrderFileName = "Order.xml";
+
+ private readonly string WoodFileName = "Wood.xml";
+
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Woods { 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 SaveWoods() => SaveData(Woods, WoodFileName, "Woods", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+ Woods = LoadData(WoodFileName, "Wood", x => Wood.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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ComponentStorage.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..93faa16
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,85 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.SearchModels;
+using CarpentryWorkshopContracts.StoragesContracts;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarpentryWorkshopFileImplement.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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..a1dc706
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,90 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.SearchModels;
+using CarpentryWorkshopContracts.StoragesContracts;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarpentryWorkshopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Orders.Select(x => GetFullOrder(x.GetViewModel)).ToList();
+ }
+
+ public List GetFilteredList(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return new();
+ }
+ return source.Orders.Where(x => x.Id == model.Id).Select(x => GetFullOrder(x.GetViewModel)).ToList();
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ return GetFullOrder(source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel);
+ }
+
+ public OrderViewModel? Delete(OrderBindingModel model)
+ {
+ var element = source.Orders.FirstOrDefault(x => x.Id == model.Id);
+ if (element != null)
+ {
+ source.Orders.Remove(element);
+ source.SaveOrders();
+ return GetFullOrder(element.GetViewModel);
+ }
+ return null;
+ }
+
+ 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 GetFullOrder(newOrder.GetViewModel);
+ }
+
+ 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 GetFullOrder(order.GetViewModel);
+ }
+
+ public OrderViewModel GetFullOrder(OrderViewModel model)
+ {
+ string? WoodName = source.Woods.FirstOrDefault(x => x.Id == model.WoodId)?.WoodName;
+ model.WoodName = WoodName;
+ return model;
+ }
+ }
+}
diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/WoodStorage.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/WoodStorage.cs
new file mode 100644
index 0000000..427479a
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/WoodStorage.cs
@@ -0,0 +1,83 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.SearchModels;
+using CarpentryWorkshopContracts.StoragesContracts;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarpentryWorkshopFileImplement.Implements
+{
+ public class WoodStorage : IWoodStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public WoodStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Woods.Select(x => x.GetViewModel).ToList();
+ }
+
+ public List GetFilteredList(WoodSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.WoodName))
+ {
+ return new();
+ }
+ return source.Woods.Where(x => x.WoodName.Contains(model.WoodName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public WoodViewModel? GetElement(WoodSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.WoodName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Woods.FirstOrDefault(x => (!string.IsNullOrEmpty(model.WoodName) && x.WoodName == model.WoodName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public WoodViewModel? Delete(WoodBindingModel model)
+ {
+ var element = source.Woods.FirstOrDefault(x => x.Id == model.Id);
+ if (element != null)
+ {
+ source.Woods.Remove(element);
+ source.SaveWoods();
+ return element.GetViewModel;
+ }
+ return null;
+ }
+
+ public WoodViewModel? Insert(WoodBindingModel model)
+ {
+ model.Id = source.Woods.Count > 0 ? source.Woods.Max(x => x.Id) + 1 : 1;
+ var newWood = Wood.Create(model);
+ if (newWood == null)
+ {
+ return null;
+ }
+ source.Woods.Add(newWood);
+ source.SaveWoods();
+ return newWood.GetViewModel;
+ }
+
+ public WoodViewModel? Update(WoodBindingModel model)
+ {
+ var wood = source.Woods.FirstOrDefault(x => x.Id == model.Id);
+ if (wood == null)
+ {
+ return null;
+ }
+ wood.Update(model);
+ source.SaveWoods();
+ return wood.GetViewModel;
+ }
+ }
+}
diff --git a/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..61b7cee
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Component.cs
@@ -0,0 +1,69 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace CarpentryWorkshopFileImplement.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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..504699f
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Order.cs
@@ -0,0 +1,88 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopDataModels.Enums;
+using CarpentryWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace CarpentryWorkshopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+ public int WoodId { 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,
+ WoodId = model.WoodId,
+ 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),
+ WoodId = Convert.ToInt32(element.Element("WoodId")!.Value),
+ Count = Convert.ToInt32(element.Element("Count")!.Value),
+ Sum = Convert.ToDouble(element.Element("Sum")!.Value),
+ Status = Enum.Parse(element.Element("Status")!.Value),
+ DateCreate = DateTime.ParseExact(element.Element("DateCreate")!.Value, "G", null),
+ DateImplement = !string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? DateTime.ParseExact(element.Element("DateImplement")!.Value, "G", null) : null
+ };
+ }
+
+ public void Update(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ Status = model.Status;
+ DateImplement = model.DateImplement;
+ }
+
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ WoodId = WoodId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement
+ };
+
+ public XElement GetXElement => new("Order", new XAttribute("Id", Id),
+ new XElement("WoodId", WoodId), 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/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs
new file mode 100644
index 0000000..7bbfeb5
--- /dev/null
+++ b/CarpentryWorkshop/CarpentryWorkshopFileImplement/Models/Wood.cs
@@ -0,0 +1,88 @@
+using CarpentryWorkshopContracts.BindingModels;
+using CarpentryWorkshopContracts.ViewModels;
+using CarpentryWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace CarpentryWorkshopFileImplement.Models
+{
+ public class Wood : IWoodModel
+ {
+ public int Id { get; private set; }
+ public string WoodName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+
+ private Dictionary? _woodComponents = null;
+
+ public Dictionary WoodComponents {
+ get {
+ if (_woodComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _woodComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+ }
+ return _woodComponents;
+ }
+ }
+
+ public static Wood? Create(WoodBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Wood()
+ {
+ Id = model.Id,
+ WoodName = model.WoodName,
+ Price = model.Price,
+ Components = model.WoodComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+ };
+ }
+
+ public static Wood? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Wood()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ WoodName = element.Element("WoodName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components = element.Element("WoodComponents")!.Elements("WoodComponent")
+ .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+
+ public void Update(WoodBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ WoodName = model.WoodName;
+ Price = model.Price;
+ Components = model.WoodComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+ _woodComponents = null;
+ }
+ public WoodViewModel GetViewModel => new()
+ {
+ Id = Id,
+ WoodName = WoodName,
+ Price = Price,
+ WoodComponents = WoodComponents
+ };
+
+ public XElement GetXElement => new("Wood", new XAttribute("Id", Id),
+ new XElement("WoodName", WoodName), new XElement("Price", Price.ToString()),
+ new XElement("WoodComponents", Components.Select(x => new XElement("WoodComponent",
+ new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()));
+ }
+}
diff --git a/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj b/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj
index 3db30dd..a3a6577 100644
--- a/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj
+++ b/CarpentryWorkshop/CarpentryWorkshopView/CarpentryWorkshopView.csproj
@@ -28,6 +28,7 @@
+
diff --git a/CarpentryWorkshop/CarpentryWorkshopView/FormComponents.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopView/FormComponents.Designer.cs
index 4f237a9..960fa43 100644
--- a/CarpentryWorkshop/CarpentryWorkshopView/FormComponents.Designer.cs
+++ b/CarpentryWorkshop/CarpentryWorkshopView/FormComponents.Designer.cs
@@ -105,6 +105,7 @@
this.Controls.Add(this.dataGridView);
this.Name = "FormComponents";
this.Text = "Компоненты";
+ this.Load += new System.EventHandler(this.FormComponents_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
diff --git a/CarpentryWorkshop/CarpentryWorkshopView/FormCreateOrder.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopView/FormCreateOrder.Designer.cs
index ab8e97d..18fa2b1 100644
--- a/CarpentryWorkshop/CarpentryWorkshopView/FormCreateOrder.Designer.cs
+++ b/CarpentryWorkshop/CarpentryWorkshopView/FormCreateOrder.Designer.cs
@@ -130,6 +130,7 @@
this.Controls.Add(this.label1);
this.Name = "FormCreateOrder";
this.Text = "Заказ";
+ this.Load += new System.EventHandler(this.FormCreateOrder_Load);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs b/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs
index 7d8ce28..1f0aeb8 100644
--- a/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs
+++ b/CarpentryWorkshop/CarpentryWorkshopView/FormMain.Designer.cs
@@ -163,6 +163,7 @@
this.MainMenuStrip = this.menuStrip1;
this.Name = "FormMain";
this.Text = "Столярная мастерская";
+ this.Load += new System.EventHandler(this.FormMain_Load);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
diff --git a/CarpentryWorkshop/CarpentryWorkshopView/Program.cs b/CarpentryWorkshop/CarpentryWorkshopView/Program.cs
index 435a020..8e97d60 100644
--- a/CarpentryWorkshop/CarpentryWorkshopView/Program.cs
+++ b/CarpentryWorkshop/CarpentryWorkshopView/Program.cs
@@ -1,7 +1,7 @@
using CarpentryWorkshopBusinessLogic.BusinessLogics;
using CarpentryWorkshopContracts.BusinessLogicsContracts;
using CarpentryWorkshopContracts.StoragesContracts;
-using CarpentryWorkshopListImplement.Implements;
+using CarpentryWorkshopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;