diff --git a/RenovationWork/RenovationWork.sln b/RenovationWork/RenovationWork.sln index 567d22d..aebfae6 100644 --- a/RenovationWork/RenovationWork.sln +++ b/RenovationWork/RenovationWork.sln @@ -9,9 +9,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkContracts", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkListImplement", "RenovationWorkListImplement\RenovationWorkListImplement.csproj", "{E3A3F73E-E2DF-43E2-9EA0-DEB584A81F9A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkBusinessLogic", "RenovationWorkBusinessLogic\RenovationWorkBusinessLogic.csproj", "{6397981A-13F5-417F-A289-23436442C277}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkBusinessLogic", "RenovationWorkBusinessLogic\RenovationWorkBusinessLogic.csproj", "{6397981A-13F5-417F-A289-23436442C277}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkView", "RenovationWorkView\RenovationWorkView.csproj", "{E3889A30-0232-4D10-9BBA-8BEE6D098008}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RenovationWorkView", "RenovationWorkView\RenovationWorkView.csproj", "{E3889A30-0232-4D10-9BBA-8BEE6D098008}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RenovationWorkFileImplement", "RenovationWorkFileImplement\RenovationWorkFileImplement.csproj", "{6E0F3EC0-B81C-442A-8511-F6D041C48576}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -39,6 +41,10 @@ Global {E3889A30-0232-4D10-9BBA-8BEE6D098008}.Debug|Any CPU.Build.0 = Debug|Any CPU {E3889A30-0232-4D10-9BBA-8BEE6D098008}.Release|Any CPU.ActiveCfg = Release|Any CPU {E3889A30-0232-4D10-9BBA-8BEE6D098008}.Release|Any CPU.Build.0 = Release|Any CPU + {6E0F3EC0-B81C-442A-8511-F6D041C48576}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E0F3EC0-B81C-442A-8511-F6D041C48576}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E0F3EC0-B81C-442A-8511-F6D041C48576}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E0F3EC0-B81C-442A-8511-F6D041C48576}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs new file mode 100644 index 0000000..9caf506 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/DataFileSingleton.cs @@ -0,0 +1,70 @@ +using RenovationWorkDataModels.Models; +using RenovationWorkFileImplement.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 RenovationWorkFileImplement +{ + internal class DataFileSingleton + { + private static DataFileSingleton? instance; + + private readonly string ComponentFileName = "Component.xml"; + + private readonly string OrderFileName = "Order.xml"; + + private readonly string RepairFileName = "Repair.xml"; + public List Components { get; private set; } + + + public List Orders { get; private set; } + + + public List Repairs { 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 SaveRepairs() => SaveData(Repairs, RepairFileName, "Repairs", x => x.GetXElement); + + public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + + private DataFileSingleton() + { + Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; + Repairs = LoadData(RepairFileName, "Repair", x => Repair.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/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs new file mode 100644 index 0000000..b380773 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/ComponentStorage.cs @@ -0,0 +1,92 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SeatchModels; +using RenovationWorkContracts.StorageContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.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/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs new file mode 100644 index 0000000..efc4f1e --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/OrderStorage.cs @@ -0,0 +1,97 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SeatchModels; +using RenovationWorkContracts.StorageContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.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 repair in source.Repairs) + { + if (repair.Id == order.RepairId) + { + viewModel.RepairName = repair.RepairName; + break; + } + } + return viewModel; + } + } +} + diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs new file mode 100644 index 0000000..f965194 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/RepairStorage.cs @@ -0,0 +1,84 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.SeatchModels; +using RenovationWorkContracts.StorageContracts; +using RenovationWorkContracts.ViewModels; +using RenovationWorkFileImplement.Models; +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.Implements +{ + public class RepairStorage : IRepairStorage + { + private readonly DataFileSingleton source; + public RepairViewModel? Delete(RepairBindingModel model) + { + var document = source.Repairs.FirstOrDefault(x => x.Id == model.Id); + if (document == null) + { + return null; + } + document.Update(model); + source.SaveRepairs(); + return document.GetViewModel; + } + public RepairStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public RepairViewModel? GetElement(RepairSearchModel model) + { + if (string.IsNullOrEmpty(model.RepairName) && !model.Id.HasValue) + { + return null; + } + return source.Repairs.FirstOrDefault(x => (!string.IsNullOrEmpty(model.RepairName) && x.RepairName == + model.RepairName) || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public List GetFilteredList(RepairSearchModel model) + { + if (string.IsNullOrEmpty(model.RepairName)) + { + return new(); + } + return source.Repairs.Where(x => x.RepairName.Contains(model.RepairName)).Select(x => x.GetViewModel).ToList(); + } + + public List GetFullList() + { + return source.Repairs.Select(x => x.GetViewModel).ToList(); + } + + public RepairViewModel? Insert(RepairBindingModel model) + { + model.Id = source.Repairs.Count > 0 ? source.Repairs.Max(x => x.Id) + 1 : 1; + var newDoc = Repair.Create(model); + if (newDoc == null) + { + return null; + } + source.Repairs.Add(newDoc); + source.SaveRepairs(); + return newDoc.GetViewModel; + } + + public RepairViewModel? Update(RepairBindingModel model) + { + var document = source.Repairs.FirstOrDefault(x => x.Id == model.Id); + if (document == null) + { + return null; + } + document.Update(model); + source.SaveRepairs(); + return document.GetViewModel; + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs new file mode 100644 index 0000000..cd116d4 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs @@ -0,0 +1,71 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement.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 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/RenovationWork/RenovationWorkFileImplement/Models/Order.cs b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs new file mode 100644 index 0000000..5271940 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs @@ -0,0 +1,107 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement.Models +{ + public class Order + { + public int RepairId { get; private set; } + public string? RepairName { 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, + RepairId = model.RepairId, + RepairName = model.RepairName, + 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), + RepairId = Convert.ToInt32(element.Element("RepairId")!.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; + } + Status = model.Status; + DateImplement = model.DateImplement; + } + + + public OrderViewModel GetViewModel => new() + { + Id = Id, + RepairId = RepairId, + RepairName = RepairName, + Count = Count, + Sum = Sum, + Status = Status, + DateCreate = DateCreate, + DateImplement = DateImplement + }; + + public XElement GetXElement => new("Order", + new XAttribute("Id", Id), + new XElement("RepairId", RepairId), + 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/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs new file mode 100644 index 0000000..828855d --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs @@ -0,0 +1,100 @@ +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.ViewModels; +using RenovationWorkDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace RenovationWorkFileImplement.Models +{ + internal class Repair : IRepairModel + { + public int Id { get; private set; } + + public string RepairName { get; private set; } = string.Empty; + + public double Price { get; private set; } + + public Dictionary Components { get; private set; } = new(); + + private Dictionary? _repairComponents = null; + public Dictionary RepairComponents + { + get + { + if (_repairComponents == null) + { + var source = DataFileSingleton.GetInstance(); + _repairComponents = Components.ToDictionary(x => x.Key, y => ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!, y.Value)); + } + return _repairComponents; + } + } + + public static Repair? Create(RepairBindingModel? model) + { + if (model == null) + { + return null; + } + return new Repair() + { + Id = model.Id, + RepairName = model.RepairName, + Price = model.Price, + Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2) + }; + } + public static Repair? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Repair() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + RepairName = element.Element("RepairName")!.Value, + Price = Convert.ToDouble(element.Element("Price")!.Value), + Components = element.Element("RepairComponents")!.Elements("RepairComponent") + .ToDictionary(x => + Convert.ToInt32(x.Element("Key")?.Value), x => + Convert.ToInt32(x.Element("Value")?.Value)) + + }; + + } + + public void Update(RepairBindingModel? model) + { + if (model == null) + { + return; + } + RepairName = model.RepairName; + Price = model.Price; + Components = model.RepairComponents.ToDictionary(x => x.Key, x => x.Value.Item2); + _repairComponents = null; + } + + public RepairViewModel GetViewModel => new() + { + Id = Id, + RepairName = RepairName, + Price = Price, + RepairComponents = RepairComponents + }; + public XElement GetXElement => new("Repair", + new XAttribute("Id", Id), + new XElement("RepairName", RepairName), + new XElement("Price", Price.ToString()), + new XElement("RepairComponents", Components.Select(x => new XElement("RepairComponent", + new XElement("Key", x.Key), + new XElement("Value", x.Value))) + .ToArray())); + } +} + diff --git a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj new file mode 100644 index 0000000..2d896a8 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + + + + + + + + diff --git a/RenovationWork/RenovationWorkView/FormMain.Designer.cs b/RenovationWork/RenovationWorkView/FormMain.Designer.cs index c178972..c2fdeb5 100644 --- a/RenovationWork/RenovationWorkView/FormMain.Designer.cs +++ b/RenovationWork/RenovationWorkView/FormMain.Designer.cs @@ -92,6 +92,7 @@ this.DataGridView.RowTemplate.Height = 25; this.DataGridView.Size = new System.Drawing.Size(1007, 542); this.DataGridView.TabIndex = 1; + this.DataGridView.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.DataGridView_CellContentClick); // // CreateOrderButton // diff --git a/RenovationWork/RenovationWorkView/FormMain.cs b/RenovationWork/RenovationWorkView/FormMain.cs index b7e419d..37e7723 100644 --- a/RenovationWork/RenovationWorkView/FormMain.cs +++ b/RenovationWork/RenovationWorkView/FormMain.cs @@ -197,5 +197,10 @@ namespace PrecastConcretePlantView { LoadData(); } + + private void DataGridView_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + + } } } diff --git a/RenovationWork/RenovationWorkView/Program.cs b/RenovationWork/RenovationWorkView/Program.cs index 6b21d41..c346395 100644 --- a/RenovationWork/RenovationWorkView/Program.cs +++ b/RenovationWork/RenovationWorkView/Program.cs @@ -3,7 +3,7 @@ using PrecastConcretePlantView; using RenovationWorkBusinessLogic.BusinessLogic; using RenovationWorkContracts.BusinessLogicsContracts; using RenovationWorkContracts.StorageContracts; -using RenovationWorkListImplement.Implements; +using RenovationWorkFileImplement.Implements; using System; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; @@ -37,7 +37,7 @@ namespace RenovationWorkView services.AddTransient(); services.AddTransient(); - services.AddTransient(); // + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -45,7 +45,7 @@ namespace RenovationWorkView services.AddTransient(); services.AddTransient(); services.AddTransient(); - services.AddTransient(); // + services.AddTransient(); } } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkView/RenovationWorkView.csproj b/RenovationWork/RenovationWorkView/RenovationWorkView.csproj index 4bb955d..46ca26d 100644 --- a/RenovationWork/RenovationWorkView/RenovationWorkView.csproj +++ b/RenovationWork/RenovationWorkView/RenovationWorkView.csproj @@ -28,7 +28,7 @@ - + \ No newline at end of file