diff --git a/Confectionery/Confectionery.sln b/Confectionery/Confectionery.sln
index 52d0699..312640a 100644
--- a/Confectionery/Confectionery.sln
+++ b/Confectionery/Confectionery.sln
@@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryContracts", "C
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryView", "ConfectioneryView\ConfectioneryView.csproj", "{B222E04E-D0E7-49F4-8747-426125645B93}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryBusinessLogic", "ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj", "{40859695-0BD6-49A8-8997-AD76F6984144}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryBusinessLogic", "ConfectioneryBusinessLogic\ConfectioneryBusinessLogic.csproj", "{40859695-0BD6-49A8-8997-AD76F6984144}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryListImplement", "ConfectioneryListImplement\ConfectioneryListImplement.csproj", "{8B6BFE3A-CA63-4FCB-B7AC-DB3F28E0F7A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConfectioneryListImplement", "ConfectioneryListImplement\ConfectioneryListImplement.csproj", "{8B6BFE3A-CA63-4FCB-B7AC-DB3F28E0F7A7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfectioneryFileImplement", "ConfectioneryFileImplement\ConfectioneryFileImplement.csproj", "{2DA79E40-423F-4DEA-9FF1-F99F3A2A4DC9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{8B6BFE3A-CA63-4FCB-B7AC-DB3F28E0F7A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B6BFE3A-CA63-4FCB-B7AC-DB3F28E0F7A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B6BFE3A-CA63-4FCB-B7AC-DB3F28E0F7A7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2DA79E40-423F-4DEA-9FF1-F99F3A2A4DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2DA79E40-423F-4DEA-9FF1-F99F3A2A4DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2DA79E40-423F-4DEA-9FF1-F99F3A2A4DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2DA79E40-423F-4DEA-9FF1-F99F3A2A4DC9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj
new file mode 100644
index 0000000..41b6c3e
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..7e069db
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/DataFileSingleton.cs
@@ -0,0 +1,54 @@
+using ConfectioneryFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement
+{
+ internal class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string PastryFileName = "Pastry.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Pastries { 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 SavePastries() => SaveData(Pastries, PastryFileName, "Pastries", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
+ Pastries = LoadData(PastryFileName, "Pastry", x => Pastry.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/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..c20dab8
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,78 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryFileImplement.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/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..459f8a1
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,96 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryFileImplement.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.Pastries)
+ {
+ if (comp.Id == order.PastryId)
+ {
+ viewModel.PastryName = comp.PastryName;
+ break;
+ }
+ }
+ return viewModel;
+ }
+ }
+}
diff --git a/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs b/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs
new file mode 100644
index 0000000..19128cf
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Implements/PastryStorage.cs
@@ -0,0 +1,83 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.SearchModels;
+using ConfectioneryContracts.StoragesContracts;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryFileImplement.Models;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ConfectioneryFileImplement.Implements
+{
+ public class PastryStorage : IPastryStorage
+ {
+ private readonly DataFileSingleton source;
+
+ public PastryStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public PastryViewModel? GetElement(PastrySearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.PastryName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Pastries.FirstOrDefault(x => (!string.IsNullOrEmpty(model.PastryName) && x.PastryName == model.PastryName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public List GetFilteredList(PastrySearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.PastryName))
+ {
+ return new();
+ }
+ return source.Pastries.Where(x => x.PastryName.Contains(model.PastryName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public List GetFullList()
+ {
+ return source.Pastries.Select(x => x.GetViewModel).ToList();
+ }
+
+ public PastryViewModel? Insert(PastryBindingModel model)
+ {
+ model.Id = source.Pastries.Count > 0 ? source.Pastries.Max(x => x.Id) + 1 : 1;
+ var newDoc = Pastry.Create(model);
+ if (newDoc == null)
+ {
+ return null;
+ }
+ source.Pastries.Add(newDoc);
+ source.SavePastries();
+ return newDoc.GetViewModel;
+ }
+
+ public PastryViewModel? Update(PastryBindingModel model)
+ {
+ var document = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
+ if (document == null)
+ {
+ return null;
+ }
+ document.Update(model);
+ source.SavePastries();
+ return document.GetViewModel;
+ }
+ public PastryViewModel? Delete(PastryBindingModel model)
+ {
+ var document = source.Pastries.FirstOrDefault(x => x.Id == model.Id);
+ if (document == null)
+ {
+ return null;
+ }
+ document.Update(model);
+ source.SavePastries();
+ return document.GetViewModel;
+ }
+ }
+}
diff --git a/Confectionery/ConfectioneryFileImplement/Models/Component.cs b/Confectionery/ConfectioneryFileImplement/Models/Component.cs
new file mode 100644
index 0000000..872b16e
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Component.cs
@@ -0,0 +1,69 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ internal 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 model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Component()
+ {
+ Id = Convert.ToInt32(model.Attribute("Id")!.Value),
+ ComponentName = model.Element("ComponentName")!.Value,
+ Cost = Convert.ToDouble(model.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/Confectionery/ConfectioneryFileImplement/Models/Order.cs b/Confectionery/ConfectioneryFileImplement/Models/Order.cs
new file mode 100644
index 0000000..efd19a7
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Order.cs
@@ -0,0 +1,110 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Enums;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+
+ public int PastryId { get; private set; }
+
+ public int Count { get; private set; }
+
+ public double Sum { get; private set; }
+
+ public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
+
+ public DateTime DateCreate { get; set; } = DateTime.Now;
+
+ public DateTime? DateImplement { get; set; }
+
+ public static Order? Create(OrderBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+
+ return new Order()
+ {
+ Id = model.Id,
+ PastryId = model.PastryId,
+ 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),
+ PastryId = Convert.ToInt32(element.Element("PastryId")!.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;
+ }
+
+ PastryId = model.PastryId;
+ Count = model.Count;
+ Sum = model.Sum;
+ Status = model.Status;
+ DateCreate = model.DateCreate;
+ DateImplement = model.DateImplement;
+ }
+
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ PastryId = PastryId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement
+ };
+
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("PastryId", PastryId),
+ 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/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs b/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs
new file mode 100644
index 0000000..399f1bc
--- /dev/null
+++ b/Confectionery/ConfectioneryFileImplement/Models/Pastry.cs
@@ -0,0 +1,98 @@
+using ConfectioneryContracts.BindingModels;
+using ConfectioneryContracts.ViewModels;
+using ConfectioneryDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace ConfectioneryFileImplement.Models
+{
+ public class Pastry : IPastryModel
+ {
+ public int Id { get; private set; }
+
+ public string PastryName { get; private set; } = string.Empty;
+
+ public double Price { get; private set; }
+
+ public Dictionary Components { get; private set; } = new();
+
+ private Dictionary? _pastryComponents = null;
+
+
+ public Dictionary PastryComponents
+ {
+ get
+ {
+ if (_pastryComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _pastryComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value));
+ }
+ return _pastryComponents;
+ }
+ }
+
+ public static Pastry? Create(PastryBindingModel? model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Pastry()
+ {
+ Id = model.Id,
+ PastryName = model.PastryName,
+ Price = model.Price,
+ Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2)
+ };
+ }
+
+ public static Pastry? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Pastry()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ PastryName = element.Element("PastryName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components = element.Element("PastryComponents")!.Elements("PastryComponent").ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+
+ public void Update(PastryBindingModel? model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ PastryName = model.PastryName;
+ Price = model.Price;
+ Components = model.PastryComponents.ToDictionary(x => x.Key, x => x.Value.Item2);
+ _pastryComponents = null;
+ }
+
+ public PastryViewModel GetViewModel => new()
+ {
+ Id = Id,
+ PastryName = PastryName,
+ Price = Price,
+ PastryComponents = PastryComponents
+ };
+
+ public XElement GetXElement => new("Pastry",
+ new XAttribute("Id", Id),
+ new XElement("PastryName", PastryName),
+ new XElement("Price", Price.ToString()),
+ new XElement("PastryComponents", Components.Select(x =>
+ new XElement("PastryComponent",
+ new XElement("Key", x.Key),
+ new XElement("Value", x.Value))).ToArray()));
+ }
+}
diff --git a/Confectionery/ConfectioneryView/ConfectioneryView.csproj b/Confectionery/ConfectioneryView/ConfectioneryView.csproj
index 33aee06..c0ca3be 100644
--- a/Confectionery/ConfectioneryView/ConfectioneryView.csproj
+++ b/Confectionery/ConfectioneryView/ConfectioneryView.csproj
@@ -17,6 +17,7 @@
+
diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs
index c12e3a7..5fe890f 100644
--- a/Confectionery/ConfectioneryView/FormMain.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs
@@ -149,6 +149,7 @@
this.MainMenuStrip = this.menuStrip1;
this.Name = "FormMain";
this.Text = "Кондитерская";
+ this.Load += new System.EventHandler(this.FormMain_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
diff --git a/Confectionery/ConfectioneryView/FormPastries.Designer.cs b/Confectionery/ConfectioneryView/FormPastries.Designer.cs
index c3a9ef1..9de906b 100644
--- a/Confectionery/ConfectioneryView/FormPastries.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormPastries.Designer.cs
@@ -97,6 +97,7 @@
this.Controls.Add(this.dataGridView);
this.Name = "FormPastries";
this.Text = "Кондитерские изделия";
+ this.Load += new System.EventHandler(this.FormPastries_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
diff --git a/Confectionery/ConfectioneryView/FormPastries.cs b/Confectionery/ConfectioneryView/FormPastries.cs
index f08263a..eaeec26 100644
--- a/Confectionery/ConfectioneryView/FormPastries.cs
+++ b/Confectionery/ConfectioneryView/FormPastries.cs
@@ -26,6 +26,11 @@ namespace ConfectioneryView
_logic = logic;
}
+ private void FormPastries_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+
private void LoadData()
{
try
@@ -106,6 +111,6 @@ namespace ConfectioneryView
private void ButtonRef_Click(object sender, EventArgs e)
{
LoadData();
- }
+ }
}
}
diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs
index b98db1c..2d29ab3 100644
--- a/Confectionery/ConfectioneryView/Program.cs
+++ b/Confectionery/ConfectioneryView/Program.cs
@@ -1,7 +1,7 @@
using ConfectioneryBusinessLogic.BusinessLogics;
using ConfectioneryContracts.BusinessLogicsContracts;
using ConfectioneryContracts.StoragesContracts;
-using ConfectioneryListImplement.Implements;
+using ConfectioneryFileImplement.Implements;
using ConfectioneryView;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;