From c24396e2b005fde66dbedcfa13b5c65ad16abca4 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Sun, 19 Mar 2023 14:28:05 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?= =?UTF-8?q?=202=20=D0=BB=D0=B0=D0=B1.=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JewelryStore/JewelryStore.sln | 14 ++- .../JewelryStore/FormComponents.Designer.cs | 11 ++- .../JewelryStore/FormCreateOrder.Designer.cs | 1 + .../JewelryStore/FormJewel.Designer.cs | 2 + JewelryStore/JewelryStore/FormJewel.resx | 9 -- .../FormJewelComponent.Designer.cs | 1 + .../JewelryStore/FormMain.Designer.cs | 4 + JewelryStore/JewelryStore/JewelryStore.csproj | 7 ++ JewelryStore/JewelryStore/Program.cs | 2 +- .../DataFileSingleton.cs | 55 +++++++++++ .../Implements/ComponentStorage.cs | 90 ++++++++++++++++++ .../Implements/JewelStorage.cs | 85 +++++++++++++++++ .../Implements/OrderStorage.cs | 83 ++++++++++++++++ .../JewelryStoreFileImplement.csproj | 14 +++ .../Models/Component.cs | 69 ++++++++++++++ .../JewelryStoreFileImplement/Models/Jewel.cs | 93 ++++++++++++++++++ .../JewelryStoreFileImplement/Models/Order.cs | 95 +++++++++++++++++++ 17 files changed, 619 insertions(+), 16 deletions(-) create mode 100644 JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Implements/ComponentStorage.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Implements/JewelStorage.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj create mode 100644 JewelryStore/JewelryStoreFileImplement/Models/Component.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs create mode 100644 JewelryStore/JewelryStoreFileImplement/Models/Order.cs diff --git a/JewelryStore/JewelryStore.sln b/JewelryStore/JewelryStore.sln index a63adc3..dbdf571 100644 --- a/JewelryStore/JewelryStore.sln +++ b/JewelryStore/JewelryStore.sln @@ -3,15 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32819.101 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStore", "JewelryStore\JewelryStore.csproj", "{187BBC53-52AA-4C47-B98B-E119AE64ADA4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStore", "JewelryStore\JewelryStore.csproj", "{187BBC53-52AA-4C47-B98B-E119AE64ADA4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreDataModels", "JewelryShopDataModels\JewelryStoreDataModels.csproj", "{C6D79969-6DC9-4F60-BCC4-A679CB472595}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStoreDataModels", "JewelryShopDataModels\JewelryStoreDataModels.csproj", "{C6D79969-6DC9-4F60-BCC4-A679CB472595}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStoreContracts", "JewelryStoreContracts\JewelryStoreContracts.csproj", "{F7C956E1-26FC-4914-9ABC-71A16F88B7E8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreBusinessLogic", "JewelryStoreBusinessLogic\JewelryStoreBusinessLogic.csproj", "{B4D1E829-A99F-47D2-B06D-5042CE058CA9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStoreBusinessLogic", "JewelryStoreBusinessLogic\JewelryStoreBusinessLogic.csproj", "{B4D1E829-A99F-47D2-B06D-5042CE058CA9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreListImplement", "JewelryStoreListImplement\JewelryStoreListImplement.csproj", "{12C6B5CD-CE5C-4095-91B8-53A5CB08E780}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JewelryStoreListImplement", "JewelryStoreListImplement\JewelryStoreListImplement.csproj", "{12C6B5CD-CE5C-4095-91B8-53A5CB08E780}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JewelryStoreFileImplement", "JewelryStoreFileImplement\JewelryStoreFileImplement.csproj", "{12AA98A9-D1DA-4DC3-B98C-105004B8498A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Debug|Any CPU.Build.0 = Debug|Any CPU {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Release|Any CPU.ActiveCfg = Release|Any CPU {12C6B5CD-CE5C-4095-91B8-53A5CB08E780}.Release|Any CPU.Build.0 = Release|Any CPU + {12AA98A9-D1DA-4DC3-B98C-105004B8498A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12AA98A9-D1DA-4DC3-B98C-105004B8498A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12AA98A9-D1DA-4DC3-B98C-105004B8498A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12AA98A9-D1DA-4DC3-B98C-105004B8498A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/JewelryStore/JewelryStore/FormComponents.Designer.cs b/JewelryStore/JewelryStore/FormComponents.Designer.cs index 3977446..e35263a 100644 --- a/JewelryStore/JewelryStore/FormComponents.Designer.cs +++ b/JewelryStore/JewelryStore/FormComponents.Designer.cs @@ -38,13 +38,20 @@ // // dataGridView // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(12, 11); + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.MultiSelect = false; this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; this.dataGridView.RowHeadersWidth = 62; this.dataGridView.RowTemplate.Height = 33; - this.dataGridView.Size = new System.Drawing.Size(525, 427); + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(525, 450); this.dataGridView.TabIndex = 0; // // buttonAdd diff --git a/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs index dd25676..abbb1d3 100644 --- a/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs +++ b/JewelryStore/JewelryStore/FormCreateOrder.Designer.cs @@ -87,6 +87,7 @@ // this.textBoxSum.Location = new System.Drawing.Point(134, 104); this.textBoxSum.Name = "textBoxSum"; + this.textBoxSum.ReadOnly = true; this.textBoxSum.Size = new System.Drawing.Size(291, 31); this.textBoxSum.TabIndex = 5; // diff --git a/JewelryStore/JewelryStore/FormJewel.Designer.cs b/JewelryStore/JewelryStore/FormJewel.Designer.cs index f1094b1..78d04a6 100644 --- a/JewelryStore/JewelryStore/FormJewel.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewel.Designer.cs @@ -57,6 +57,7 @@ this.Count}); this.dataGridView.Location = new System.Drawing.Point(6, 25); this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersVisible = false; this.dataGridView.RowHeadersWidth = 62; this.dataGridView.RowTemplate.Height = 33; this.dataGridView.Size = new System.Drawing.Size(468, 325); @@ -112,6 +113,7 @@ // // textBoxPrice // + this.textBoxPrice.Enabled = false; this.textBoxPrice.Location = new System.Drawing.Point(124, 57); this.textBoxPrice.Name = "textBoxPrice"; this.textBoxPrice.Size = new System.Drawing.Size(267, 31); diff --git a/JewelryStore/JewelryStore/FormJewel.resx b/JewelryStore/JewelryStore/FormJewel.resx index 7cc63c3..3983a23 100644 --- a/JewelryStore/JewelryStore/FormJewel.resx +++ b/JewelryStore/JewelryStore/FormJewel.resx @@ -66,13 +66,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs index ebe459c..3295b49 100644 --- a/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewelComponent.Designer.cs @@ -56,6 +56,7 @@ // // comboBoxComponent // + this.comboBoxComponent.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxComponent.FormattingEnabled = true; this.comboBoxComponent.Location = new System.Drawing.Point(148, 18); this.comboBoxComponent.Name = "comboBoxComponent"; diff --git a/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs index e0e7277..631bb24 100644 --- a/JewelryStore/JewelryStore/FormMain.Designer.cs +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -78,12 +78,16 @@ // // dataGridView // + this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridView.Location = new System.Drawing.Point(12, 36); this.dataGridView.Name = "dataGridView"; this.dataGridView.RowHeadersWidth = 62; this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; this.dataGridView.Size = new System.Drawing.Size(851, 402); this.dataGridView.TabIndex = 1; // diff --git a/JewelryStore/JewelryStore/JewelryStore.csproj b/JewelryStore/JewelryStore/JewelryStore.csproj index cbfa7e5..69cae25 100644 --- a/JewelryStore/JewelryStore/JewelryStore.csproj +++ b/JewelryStore/JewelryStore/JewelryStore.csproj @@ -22,7 +22,14 @@ + + + + Always + + + \ No newline at end of file diff --git a/JewelryStore/JewelryStore/Program.cs b/JewelryStore/JewelryStore/Program.cs index 30e7668..26ae8eb 100644 --- a/JewelryStore/JewelryStore/Program.cs +++ b/JewelryStore/JewelryStore/Program.cs @@ -1,6 +1,6 @@ using JewelryStoreContracts.BusinessLogicsContracts; using JewelryStoreContracts.StoragesContracts; -using JewelryStoreListImplement.Implements; +using JewelryStoreFileImplement.Implements; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; diff --git a/JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs b/JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..7bd744d --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/DataFileSingleton.cs @@ -0,0 +1,55 @@ +using JewelryStoreFileImplement.Models; +using System.Xml.Linq; + +namespace JewelryStoreFileImplement +{ + public class DataFileSingleton + { + private static DataFileSingleton? instance; + private readonly string ComponentFileName = "Component.xml"; + private readonly string OrderFileName = "Order.xml"; + private readonly string JewelFileName = "Jewel.xml"; + public List Components { get; private set; } + public List Orders { get; private set; } + public List Jewels { 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 SaveJewels() => SaveData(Jewels, JewelFileName, "Jewels", x => x.GetXElement); + + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Jewels = LoadData(JewelFileName, "Jewel", x => Jewel.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); + } + } + } +} \ No newline at end of file diff --git a/JewelryStore/JewelryStoreFileImplement/Implements/ComponentStorage.cs b/JewelryStore/JewelryStoreFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..83755e0 --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,90 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreFileImplement.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/JewelryStore/JewelryStoreFileImplement/Implements/JewelStorage.cs b/JewelryStore/JewelryStoreFileImplement/Implements/JewelStorage.cs new file mode 100644 index 0000000..f9e227a --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Implements/JewelStorage.cs @@ -0,0 +1,85 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreFileImplement.Implements +{ + public class JewelStorage : IJewelStorage + { + private readonly DataFileSingleton source; + + public JewelStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public JewelViewModel? GetElement(JewelSearchModel model) + { + if (string.IsNullOrEmpty(model.JewelName) && !model.Id.HasValue) + { + return null; + } + return source.Jewels.FirstOrDefault(x => (!string.IsNullOrEmpty(model.JewelName) && x.JewelName == model.JewelName) || + (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(JewelSearchModel model) + { + if (string.IsNullOrEmpty(model.JewelName)) + { + return new(); + } + return source.Jewels.Where(x => x.JewelName.Contains(model.JewelName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Jewels.Select(x => x.GetViewModel).ToList(); + } + + public JewelViewModel? Insert(JewelBindingModel model) + { + model.Id = source.Jewels.Count > 0 ? source.Jewels.Max(x => x.Id) + 1 : 1; + var newJewel = Jewel.Create(model); + if (newJewel == null) + { + return null; + } + source.Jewels.Add(newJewel); + source.SaveJewels(); + + return newJewel.GetViewModel; + } + + public JewelViewModel? Update(JewelBindingModel model) + { + var jewel = source.Jewels.FirstOrDefault(x => x.Id == model.Id); + if (jewel == null) + { + return null; + } + jewel.Update(model); + source.SaveJewels(); + return jewel.GetViewModel; + } + + public JewelViewModel? Delete(JewelBindingModel model) + { + var jewel = source.Jewels.FirstOrDefault(x => x.Id == model.Id); + if (jewel == null) + { + return null; + } + source.Jewels.Remove(jewel); + source.SaveJewels(); + return jewel.GetViewModel; + } + } +} diff --git a/JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs b/JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..8e26ded --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,83 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.SearchModels; +using JewelryStoreContracts.StoragesContracts; +using JewelryStoreContracts.ViewModels; +using JewelryStoreFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace JewelryStoreFileImplement.Implements +{ + public class OrderStorage : IOrderStorage + { + private readonly DataFileSingleton _source; + public OrderStorage() + { + _source = DataFileSingleton.GetInstance(); + } + public List GetFullList() + { + return _source.Orders.Select(x => SAddJewelName(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 => SAddJewelName(x.GetViewModel)).ToList(); + } + public OrderViewModel? GetElement(OrderSearchModel model) + { + if (!model.Id.HasValue) + { + return null; + } + return SAddJewelName(_source.Orders.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)?.GetViewModel); + } + 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 SAddJewelName(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 SAddJewelName(order.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 SAddJewelName(element.GetViewModel); + } + return null; + } + + public OrderViewModel SAddJewelName(OrderViewModel fullModel) + { + string? jewelName = _source.Jewels.FirstOrDefault(x => x.Id == fullModel?.JewelId)?.JewelName; + if (jewelName != null) fullModel.JewelName = jewelName; + return fullModel; + } + } +} diff --git a/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj b/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj new file mode 100644 index 0000000..8995315 --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/JewelryStoreFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Component.cs b/JewelryStore/JewelryStoreFileImplement/Models/Component.cs new file mode 100644 index 0000000..cd90b4f --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Models/Component.cs @@ -0,0 +1,69 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace JewelryStoreFileImplement.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/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs b/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs new file mode 100644 index 0000000..6c591b9 --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Models/Jewel.cs @@ -0,0 +1,93 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace JewelryStoreFileImplement.Models +{ + public class Jewel : IJewelModel + { + public int Id { get; private set; } + public string JewelName { get; private set; } = string.Empty; + public double Price { get; private set; } + public Dictionary Components { get; private set; } = new(); + private Dictionary? _jewelComponents = null; + public Dictionary JewelComponents + { + get + { + if (_jewelComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _jewelComponents = Components.ToDictionary(x => x.Key, y => + ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); + } + return _jewelComponents; + } + } + + public static Jewel? Create(JewelBindingModel model) + { + if (model == null) + { + return null; + } + return new Jewel() + { + Id = model.Id, + JewelName = model.JewelName, + Price = model.Price, + Components = model.JewelComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + + public static Jewel? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Jewel() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + JewelName = element.Element("JewelName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("JewelComponents")!.Elements("JewelComponent") + .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + + public void Update(JewelBindingModel model) + { + if (model == null) + { + return; + } + JewelName = model.JewelName; + Price = model.Price; + Components = model.JewelComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _jewelComponents = null; + } + + public JewelViewModel GetViewModel => new() + { + Id = Id, + JewelName = JewelName, + Price = Price, + JewelComponents = JewelComponents + }; + + public XElement GetXElement => new("Jewel", + new XAttribute("Id", Id), + new XElement("JewelName", JewelName), + new XElement("Price", Price.ToString()), + new XElement("JewelComponents", Components.Select(x => + new XElement("JewelComponent", new XElement("Key", x.Key), new XElement("Value", x.Value))) + .ToArray())); + } +} diff --git a/JewelryStore/JewelryStoreFileImplement/Models/Order.cs b/JewelryStore/JewelryStoreFileImplement/Models/Order.cs new file mode 100644 index 0000000..df13813 --- /dev/null +++ b/JewelryStore/JewelryStoreFileImplement/Models/Order.cs @@ -0,0 +1,95 @@ +using JewelryStoreContracts.BindingModels; +using JewelryStoreContracts.ViewModels; +using JewelryStoreDataModels.Enums; +using JewelryStoreDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace JewelryStoreFileImplement.Models +{ + public class Order : IOrderModel + { + public int JewelId { 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, + JewelId = model.JewelId, + 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), + JewelId = Convert.ToInt32(element.Element("JewelId")!.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 = string.IsNullOrEmpty(element.Element("DateImplement")!.Value) ? null : Convert.ToDateTime(element.Element("DateImplement")!.Value) + }; + } + + public void Update(OrderBindingModel? model) + { + if (model == null) + { + return; + } + JewelId = model.JewelId; + Count = model.Count; + Sum = model.Sum; + Status = model.Status; + DateCreate = model.DateCreate; + DateImplement = model.DateImplement; + } + + public OrderViewModel GetViewModel => new() + { + Id = Id, + JewelId = JewelId, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("JewelId", JewelId), + 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())); + } +} -- 2.25.1 From d8e282bec0fc5416fd3f906154dfbe198a06d986 Mon Sep 17 00:00:00 2001 From: Anastasia Date: Mon, 20 Mar 2023 11:00:13 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F,=20=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B8=20=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80?= =?UTF-8?q?=D0=BC=D0=B5=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B8=D0=BB=D0=B8?= =?UTF-8?q?=D1=81=D1=8C=20=D1=81=D1=80=D0=B0=D0=B7=D1=83.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JewelryStore/FormComponents.Designer.cs | 1 + .../JewelryStore/FormJewel.Designer.cs | 1 + .../JewelryStore/FormJewels.Designer.cs | 1 + .../JewelryStore/FormMain.Designer.cs | 53 ++++++++++--------- JewelryStore/JewelryStore/FormMain.cs | 5 +- 5 files changed, 34 insertions(+), 27 deletions(-) diff --git a/JewelryStore/JewelryStore/FormComponents.Designer.cs b/JewelryStore/JewelryStore/FormComponents.Designer.cs index e35263a..dfa26c5 100644 --- a/JewelryStore/JewelryStore/FormComponents.Designer.cs +++ b/JewelryStore/JewelryStore/FormComponents.Designer.cs @@ -106,6 +106,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/JewelryStore/JewelryStore/FormJewel.Designer.cs b/JewelryStore/JewelryStore/FormJewel.Designer.cs index 78d04a6..54fa842 100644 --- a/JewelryStore/JewelryStore/FormJewel.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewel.Designer.cs @@ -207,6 +207,7 @@ this.Controls.Add(this.groupBox); this.Name = "FormJewel"; this.Text = "Изделие"; + this.Load += new System.EventHandler(this.FormJewel_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.groupBox.ResumeLayout(false); this.ResumeLayout(false); diff --git a/JewelryStore/JewelryStore/FormJewels.Designer.cs b/JewelryStore/JewelryStore/FormJewels.Designer.cs index 3d7d620..911c3cb 100644 --- a/JewelryStore/JewelryStore/FormJewels.Designer.cs +++ b/JewelryStore/JewelryStore/FormJewels.Designer.cs @@ -100,6 +100,7 @@ this.Controls.Add(this.dataGridView); this.Name = "FormJewels"; this.Text = "Изделия"; + this.Load += new System.EventHandler(this.FormJewels_Load); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); this.ResumeLayout(false); diff --git a/JewelryStore/JewelryStore/FormMain.Designer.cs b/JewelryStore/JewelryStore/FormMain.Designer.cs index 631bb24..1ea6c48 100644 --- a/JewelryStore/JewelryStore/FormMain.Designer.cs +++ b/JewelryStore/JewelryStore/FormMain.Designer.cs @@ -32,12 +32,12 @@ this.СправочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.КомпонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ИзделияToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); this.buttonOrderReady = new System.Windows.Forms.Button(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonRefresh = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); this.menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -49,7 +49,7 @@ this.СправочникиToolStripMenuItem}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(1121, 33); + this.menuStrip.Size = new System.Drawing.Size(1260, 33); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "menuStrip1"; // @@ -76,24 +76,10 @@ this.ИзделияToolStripMenuItem.Text = "Изделия"; this.ИзделияToolStripMenuItem.Click += new System.EventHandler(this.ИзделияToolStripMenuItem_Click); // - // dataGridView - // - this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; - this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView.Location = new System.Drawing.Point(12, 36); - this.dataGridView.Name = "dataGridView"; - this.dataGridView.RowHeadersWidth = 62; - this.dataGridView.RowTemplate.Height = 33; - this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dataGridView.Size = new System.Drawing.Size(851, 402); - this.dataGridView.TabIndex = 1; - // // buttonCreateOrder // - this.buttonCreateOrder.Location = new System.Drawing.Point(884, 78); + this.buttonCreateOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonCreateOrder.Location = new System.Drawing.Point(1038, 73); this.buttonCreateOrder.Name = "buttonCreateOrder"; this.buttonCreateOrder.Size = new System.Drawing.Size(210, 34); this.buttonCreateOrder.TabIndex = 2; @@ -103,7 +89,8 @@ // // buttonTakeOrderInWork // - this.buttonTakeOrderInWork.Location = new System.Drawing.Point(884, 150); + this.buttonTakeOrderInWork.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonTakeOrderInWork.Location = new System.Drawing.Point(1038, 145); this.buttonTakeOrderInWork.Name = "buttonTakeOrderInWork"; this.buttonTakeOrderInWork.Size = new System.Drawing.Size(210, 34); this.buttonTakeOrderInWork.TabIndex = 3; @@ -113,7 +100,8 @@ // // buttonOrderReady // - this.buttonOrderReady.Location = new System.Drawing.Point(884, 221); + this.buttonOrderReady.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonOrderReady.Location = new System.Drawing.Point(1038, 216); this.buttonOrderReady.Name = "buttonOrderReady"; this.buttonOrderReady.Size = new System.Drawing.Size(210, 34); this.buttonOrderReady.TabIndex = 4; @@ -123,7 +111,8 @@ // // buttonIssuedOrder // - this.buttonIssuedOrder.Location = new System.Drawing.Point(884, 292); + this.buttonIssuedOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonIssuedOrder.Location = new System.Drawing.Point(1038, 287); this.buttonIssuedOrder.Name = "buttonIssuedOrder"; this.buttonIssuedOrder.Size = new System.Drawing.Size(210, 34); this.buttonIssuedOrder.TabIndex = 5; @@ -133,7 +122,8 @@ // // buttonRefresh // - this.buttonRefresh.Location = new System.Drawing.Point(884, 361); + this.buttonRefresh.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRefresh.Location = new System.Drawing.Point(1038, 356); this.buttonRefresh.Name = "buttonRefresh"; this.buttonRefresh.Size = new System.Drawing.Size(210, 34); this.buttonRefresh.TabIndex = 6; @@ -141,21 +131,34 @@ this.buttonRefresh.UseVisualStyleBackColor = true; this.buttonRefresh.Click += new System.EventHandler(this.ButtonRefresh_Click); // + // dataGridView + // + this.dataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.Window; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Location = new System.Drawing.Point(12, 36); + this.dataGridView.Name = "dataGridView"; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.RowTemplate.Height = 33; + this.dataGridView.Size = new System.Drawing.Size(1003, 402); + this.dataGridView.TabIndex = 7; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1121, 450); + this.ClientSize = new System.Drawing.Size(1260, 450); + this.Controls.Add(this.dataGridView); this.Controls.Add(this.buttonRefresh); this.Controls.Add(this.buttonIssuedOrder); this.Controls.Add(this.buttonOrderReady); this.Controls.Add(this.buttonTakeOrderInWork); this.Controls.Add(this.buttonCreateOrder); - this.Controls.Add(this.dataGridView); this.Controls.Add(this.menuStrip); this.MainMenuStrip = this.menuStrip; this.Name = "FormMain"; this.Text = "Ювелирная лавка"; + this.Load += new System.EventHandler(this.FormMain_Load); this.menuStrip.ResumeLayout(false); this.menuStrip.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); @@ -170,11 +173,11 @@ private ToolStripMenuItem СправочникиToolStripMenuItem; private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem ИзделияToolStripMenuItem; - private DataGridView dataGridView; private Button buttonCreateOrder; private Button buttonTakeOrderInWork; private Button buttonOrderReady; private Button buttonIssuedOrder; private Button buttonRefresh; + private DataGridView dataGridView; } } \ No newline at end of file diff --git a/JewelryStore/JewelryStore/FormMain.cs b/JewelryStore/JewelryStore/FormMain.cs index d35464d..168154a 100644 --- a/JewelryStore/JewelryStore/FormMain.cs +++ b/JewelryStore/JewelryStore/FormMain.cs @@ -25,6 +25,7 @@ namespace JewelryStore private void LoadData() { + _logger.LogInformation("Загрузка заказов"); try { var list = _orderLogic.ReadList(null); @@ -32,12 +33,12 @@ namespace JewelryStore { dataGridView.DataSource = list; dataGridView.Columns["JewelId"].Visible = false; + dataGridView.Columns["JewelName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } - _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка загрузки заказов"); + _logger.LogError(ex, "Ошибка загрузки изделий"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } -- 2.25.1