diff --git a/FishFactory/FishFactory.csproj b/FishFactory/FishFactory.csproj index 854aa79..95274fe 100644 --- a/FishFactory/FishFactory.csproj +++ b/FishFactory/FishFactory.csproj @@ -16,6 +16,7 @@ + diff --git a/FishFactory/FishFactory.sln b/FishFactory/FishFactory.sln index 618643a..c761982 100644 --- a/FishFactory/FishFactory.sln +++ b/FishFactory/FishFactory.sln @@ -13,6 +13,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDataModel", "..\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryListImplement", "..\FishFactoryListImplement\FishFactoryListImplement.csproj", "{A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryFileImplement", "..\FishFactoryFileImplement\FishFactoryFileImplement.csproj", "{4EB943AB-67A8-4386-8874-FA0E3E98159C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,6 +63,14 @@ Global {A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|Any CPU.Build.0 = Release|Any CPU {A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|x86.ActiveCfg = Release|x86 {A507DACE-7D8D-4C0F-AB5D-764FE1A61EDC}.Release|x86.Build.0 = Release|x86 + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|x86.ActiveCfg = Debug|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Debug|x86.Build.0 = Debug|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|Any CPU.Build.0 = Release|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.ActiveCfg = Release|Any CPU + {4EB943AB-67A8-4386-8874-FA0E3E98159C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FishFactory/FormCanned.Designer.cs b/FishFactory/FormCanned.Designer.cs index db5feff..4ba1b94 100644 --- a/FishFactory/FormCanned.Designer.cs +++ b/FishFactory/FormCanned.Designer.cs @@ -35,14 +35,14 @@ buttonDel = new Button(); buttonRef = new Button(); dataGridView = new DataGridView(); - Number = new DataGridViewTextBoxColumn(); - Component = new DataGridViewTextBoxColumn(); - Count = new DataGridViewTextBoxColumn(); textBoxName = new TextBox(); textBoxPrice = new TextBox(); groupBox1 = new GroupBox(); buttonSave = new Button(); buttonCancel = new Button(); + Number = new DataGridViewTextBoxColumn(); + Component = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); groupBox1.SuspendLayout(); SuspendLayout(); @@ -124,27 +124,6 @@ dataGridView.Size = new Size(627, 443); dataGridView.TabIndex = 4; // - // Number - // - Number.HeaderText = "Номер"; - Number.MinimumWidth = 6; - Number.Name = "Number"; - Number.Width = 60; - // - // Component - // - Component.HeaderText = "Компонент"; - Component.MinimumWidth = 6; - Component.Name = "Component"; - Component.Width = 125; - // - // Count - // - Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - Count.HeaderText = "Количество"; - Count.MinimumWidth = 6; - Count.Name = "Count"; - // // textBoxName // textBoxName.Location = new Point(107, 18); @@ -201,6 +180,31 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += buttonCancel_Click; // + // Number + // + Number.HeaderText = "Номер"; + Number.MinimumWidth = 6; + Number.Name = "Number"; + Number.ReadOnly = true; + Number.Visible = false; + Number.Width = 60; + // + // Component + // + Component.HeaderText = "Компонент"; + Component.MinimumWidth = 6; + Component.Name = "Component"; + Component.ReadOnly = true; + Component.Width = 125; + // + // Count + // + Count.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + Count.HeaderText = "Количество"; + Count.MinimumWidth = 6; + Count.Name = "Count"; + Count.ReadOnly = true; + // // FormCanned // AutoScaleDimensions = new SizeF(8F, 20F); @@ -235,10 +239,10 @@ private TextBox textBoxName; private TextBox textBoxPrice; private GroupBox groupBox1; + private Button buttonSave; + private Button buttonCancel; private DataGridViewTextBoxColumn Number; private DataGridViewTextBoxColumn Component; private DataGridViewTextBoxColumn Count; - private Button buttonSave; - private Button buttonCancel; } } \ No newline at end of file diff --git a/FishFactory/Program.cs b/FishFactory/Program.cs index 08c8b2d..1aa0d38 100644 --- a/FishFactory/Program.cs +++ b/FishFactory/Program.cs @@ -2,7 +2,7 @@ using FishFactory.Forms; using FishFactoryContracts.BusinessLogicsContracts; using FishFactoryBusinessLogic.BusinessLogic; using FishFactoryContracts.StoragesContracts; -using FishFactoryListImplement.Implements; +using FishFactoryFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/FishFactoryFileImplement/DataFileSingleton.cs b/FishFactoryFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..2ea8d7f --- /dev/null +++ b/FishFactoryFileImplement/DataFileSingleton.cs @@ -0,0 +1,50 @@ + +using FishFactoryFileImplement.Models; +using System.Xml.Linq; + +namespace FishFactoryFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string CannedFileName = "Canned.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Canneds { 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 SaveCanneds() => SaveData(Canneds, CannedFileName, "Canneds", x => x.GetXElement); + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Canneds = LoadData(CannedFileName, "Canned", x => Canned.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/FishFactoryFileImplement/FishFactoryFileImplement.csproj b/FishFactoryFileImplement/FishFactoryFileImplement.csproj new file mode 100644 index 0000000..fa7ad45 --- /dev/null +++ b/FishFactoryFileImplement/FishFactoryFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/FishFactoryFileImplement/Implements/CannedStorage.cs b/FishFactoryFileImplement/Implements/CannedStorage.cs new file mode 100644 index 0000000..032c8b1 --- /dev/null +++ b/FishFactoryFileImplement/Implements/CannedStorage.cs @@ -0,0 +1,72 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.ViewModels; +using FishFactoryFileImplement.Models; + +namespace FishFactoryFileImplement.Implements +{ + public class CannedStorage : ICannedStorage + { + private readonly DataFileSingleton _source; + public CannedStorage() + { + _source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return _source.Canneds.Select(x => x.GetViewModel).ToList(); + } + public List GetFilteredList(CannedSearchModel model) + { + if (string.IsNullOrEmpty(model.CannedName)) + { + return new(); + } + return _source.Canneds.Where(x => x.CannedName.Contains(model.CannedName)).Select(x => x.GetViewModel).ToList(); + } + public CannedViewModel? GetElement(CannedSearchModel model) + { + if (string.IsNullOrEmpty(model.CannedName) && !model.Id.HasValue) + { + return null; + } + return _source.Canneds.FirstOrDefault + (x => (!string.IsNullOrEmpty(model.CannedName) && x.CannedName == model.CannedName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + public CannedViewModel? Insert(CannedBindingModel model) + { + model.Id = _source.Canneds.Count > 0 ? _source.Canneds.Max(x => x.Id) + 1 : 1; + var newCanned = Canned.Create(model); + if (newCanned == null) + { + return null; + } + _source.Canneds.Add(newCanned); + _source.SaveCanneds(); + return newCanned.GetViewModel; + } + public CannedViewModel? Update(CannedBindingModel model) + { + var canned = _source.Canneds.FirstOrDefault(x => x.Id == model.Id); + if (canned == null) + { + return null; + } + canned.Update(model); + _source.SaveCanneds(); + return canned.GetViewModel; + } + public CannedViewModel? Delete(CannedBindingModel model) + { + var element = _source.Canneds.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + _source.Canneds.Remove(element); + _source.SaveCanneds(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/FishFactoryFileImplement/Implements/ComponentStorage.cs b/FishFactoryFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..cef70ad --- /dev/null +++ b/FishFactoryFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,72 @@ +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.ViewModels; +using FishFactoryFileImplement.Models; + +namespace FishFactoryFileImplement.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/FishFactoryFileImplement/Implements/OrderStorage.cs b/FishFactoryFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..e4281d1 --- /dev/null +++ b/FishFactoryFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,84 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.SearchModels; +using FishFactoryContracts.StoragesContracts; +using FishFactoryContracts.ViewModels; +using FishFactoryFileImplement.Models; +using System.Xml.Linq; + +namespace FishFactoryFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton _source; + + public OrderStorage() + { + _source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return _source.Orders.Select(x => AttachCannedName(x)).ToList(); + } + public List GetFilteredList(OrderSearchModel model) + { + if (model == null || !model.Id.HasValue) + { + return new(); + } + return _source.Orders.Where(x => x.Id == model.Id).Select(x => AttachCannedName(x)).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return AttachCannedName(_source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)); + } + 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 AttachCannedName(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 AttachCannedName(order); + } + public OrderViewModel? Delete(OrderBindingModel model) + { + var order = _source.Orders.FirstOrDefault(x => x.Id == model.Id); + if (order == null) + { + return null; + } + _source.Orders.Remove(order); + _source.SaveOrders(); + return AttachCannedName(order); + } + private OrderViewModel AttachCannedName(Order order) + { + var viewModel = order.GetViewModel; + var canned = _source.Canneds.FirstOrDefault(x => x.Id == order.CannedId); + if (canned != null) + { + viewModel.CannedName = canned.CannedName; + } + return viewModel; + } + } +} diff --git a/FishFactoryFileImplement/Models/Canned.cs b/FishFactoryFileImplement/Models/Canned.cs new file mode 100644 index 0000000..551c2e9 --- /dev/null +++ b/FishFactoryFileImplement/Models/Canned.cs @@ -0,0 +1,88 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.ViewModels; +using FishFactoryDataModel.Models; +using FishFactoryFileImplement; +using System.Xml.Linq; + +namespace FishFactoryFileImplement.Models +{ + internal class Canned : ICannedModel + { + public int Id { get; private set; } + public string CannedName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _cannedComponents = null; + public Dictionary CannedComponents + { + get + { + if (_cannedComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _cannedComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); + } + return _cannedComponents; + } + } + public static Canned? Create(CannedBindingModel? model) + { + if (model == null) + { + return null; + } + return new Canned() + { + Id = model.Id, + CannedName = model.CannedName, + Price = model.Price, + Components = model.CannedComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + + public static Canned? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Canned() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + CannedName = element.Element("CannedName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("CannedComponents")!.Elements("CannedComponent").ToDictionary + (x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value))}; + } + + public void Update(CannedBindingModel? model) + { + if (model == null) + { + return; + } + CannedName = model.CannedName; + Price = model.Price; + Components = model.CannedComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _cannedComponents = null; + + } + public CannedViewModel GetViewModel => new() + { + Id = Id, + CannedName = CannedName, + Price = Price, + CannedComponents = CannedComponents + }; + public XElement GetXElement => new("Canned", + new XAttribute("Id", Id), + new XElement("CannedName", CannedName), + new XElement("Price", Price.ToString()), + new XElement("CannedComponents", Components.Select(x => + new XElement("CannedComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/FishFactoryFileImplement/Models/Component.cs b/FishFactoryFileImplement/Models/Component.cs new file mode 100644 index 0000000..66c5569 --- /dev/null +++ b/FishFactoryFileImplement/Models/Component.cs @@ -0,0 +1,62 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.ViewModels; +using FishFactoryDataModel.Models; +using System.Xml.Linq; + +namespace FishFactoryFileImplement.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/FishFactoryFileImplement/Models/Order.cs b/FishFactoryFileImplement/Models/Order.cs new file mode 100644 index 0000000..c6f0d63 --- /dev/null +++ b/FishFactoryFileImplement/Models/Order.cs @@ -0,0 +1,85 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.ViewModels; +using FishFactoryDataModel.Enums; +using FishFactoryDataModel.Models; +using System.Xml.Linq; + +namespace FishFactoryFileImplement.Models +{ + public class Order : IOrderModel + { + public int Id { get; private set; } + public int CannedId { 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), + CannedId = Convert.ToInt32(element.Element("CannedId")!.Value), + Count = Convert.ToInt32(element.Element("Count")!.Value), + Sum = Convert.ToDouble(element.Element("Sum")!.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 static Order? Create(OrderBindingModel? model) + { + if (model == null) + { + return null; + } + return new Order() + { + Id = model.Id, + CannedId = model.CannedId, + Count = model.Count, + Sum = model.Sum, + Status = model.Status, + DateCreate = model.DateCreate, + DateImplement = model.DateImplement, + }; + } + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + CannedId = model.CannedId; + Count = model.Count; + Sum = model.Sum; + Status = model.Status; + DateCreate = model.DateCreate; + DateImplement = model.DateImplement; + } + public OrderViewModel GetViewModel => new() + { + Id = Id, + CannedId = CannedId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement, + }; + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("CannedId", CannedId), + 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()) + ); + } +}