From 8436120f568fff3ae1073abc4a47038053d23b0d Mon Sep 17 00:00:00 2001
From: Kirill <117719052+KirillFirsof@users.noreply.github.com>
Date: Tue, 26 Mar 2024 22:55:45 +0400
Subject: [PATCH 1/2] ready
---
ClothShop/ClothShop.sln | 8 +-
.../ClothShopFileImplement.csproj | 14 +++
.../DataFileSingleton.cs | 55 +++++++++++
.../Implements/ComponentStorage.cs | 85 ++++++++++++++++
.../Implements/OrderStorage.cs | 97 +++++++++++++++++++
.../Implements/TextileStorage.cs | 78 +++++++++++++++
.../Models/Component.cs | 59 +++++++++++
.../ClothShopFileImplement/Models/Order.cs | 81 ++++++++++++++++
.../ClothShopFileImplement/Models/Textile.cs | 94 ++++++++++++++++++
ClothShop/ClothShopView/ClothShopView.csproj | 1 +
.../ClothShopView/FormComponent.Designer.cs | 2 +-
ClothShop/ClothShopView/FormMain.cs | 2 +-
ClothShop/ClothShopView/Program.cs | 3 +-
13 files changed, 575 insertions(+), 4 deletions(-)
create mode 100644 ClothShop/ClothShopFileImplement/ClothShopFileImplement.csproj
create mode 100644 ClothShop/ClothShopFileImplement/DataFileSingleton.cs
create mode 100644 ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
create mode 100644 ClothShop/ClothShopFileImplement/Implements/OrderStorage.cs
create mode 100644 ClothShop/ClothShopFileImplement/Implements/TextileStorage.cs
create mode 100644 ClothShop/ClothShopFileImplement/Models/Component.cs
create mode 100644 ClothShop/ClothShopFileImplement/Models/Order.cs
create mode 100644 ClothShop/ClothShopFileImplement/Models/Textile.cs
diff --git a/ClothShop/ClothShop.sln b/ClothShop/ClothShop.sln
index 0dff537..415d3e7 100644
--- a/ClothShop/ClothShop.sln
+++ b/ClothShop/ClothShop.sln
@@ -11,7 +11,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClothShopContracts", "Cloth
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClothShopBusinessLogic", "ClothShopBusinessLogic\ClothShopBusinessLogic.csproj", "{8534F012-C159-4318-BF75-2E5B9BA691FF}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClothShopListImplement", "ClothShopListImplement\ClothShopListImplement.csproj", "{43F6977E-E37D-4D9C-BF55-6526520A04EB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClothShopListImplement", "ClothShopListImplement\ClothShopListImplement.csproj", "{43F6977E-E37D-4D9C-BF55-6526520A04EB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClothShopFileImplement", "ClothShopFileImplement\ClothShopFileImplement.csproj", "{EDA6F63F-1DF0-4075-BDBE-B0B71B76D384}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{43F6977E-E37D-4D9C-BF55-6526520A04EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{43F6977E-E37D-4D9C-BF55-6526520A04EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43F6977E-E37D-4D9C-BF55-6526520A04EB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EDA6F63F-1DF0-4075-BDBE-B0B71B76D384}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EDA6F63F-1DF0-4075-BDBE-B0B71B76D384}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EDA6F63F-1DF0-4075-BDBE-B0B71B76D384}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EDA6F63F-1DF0-4075-BDBE-B0B71B76D384}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/ClothShop/ClothShopFileImplement/ClothShopFileImplement.csproj b/ClothShop/ClothShopFileImplement/ClothShopFileImplement.csproj
new file mode 100644
index 0000000..c051958
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/ClothShopFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/ClothShop/ClothShopFileImplement/DataFileSingleton.cs b/ClothShop/ClothShopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..434c29a
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,55 @@
+using ClothShopFileImplement.Models;
+using System.Xml.Linq;
+namespace ClothShopFileImplement
+{
+ public class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string TextileFileName = "Textile.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Textiles { 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 SaveTextiles() => SaveData(Textiles, TextileFileName,
+ "Textiles", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x =>
+ Component.Create(x)!)!;
+ Textiles = LoadData(TextileFileName, "Textile", x =>
+ Textile.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/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs b/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..d9a454d
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,85 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.SearchModels;
+using ClothShopContracts.StoragesContracts;
+using ClothShopContracts.ViewModels;
+using ClothShopFileImplement.Models;
+namespace ClothShopFileImplement.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/ClothShop/ClothShopFileImplement/Implements/OrderStorage.cs b/ClothShop/ClothShopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..d6cd5ca
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,97 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.SearchModels;
+using ClothShopContracts.StoragesContracts;
+using ClothShopContracts.ViewModels;
+using ClothShopFileImplement.Models;
+namespace ClothShopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+
+ public List GetFullList()
+ {
+ return source.Orders
+ .Select(x => AccessComputerStorage(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 => AccessComputerStorage(x.GetViewModel))
+ .ToList();
+ }
+
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ return AccessComputerStorage(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 AccessComputerStorage(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 AccessComputerStorage(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 AccessComputerStorage(element.GetViewModel);
+ }
+ return null;
+ }
+
+ public OrderViewModel AccessComputerStorage(OrderViewModel model)
+ {
+ if (model == null)
+ return null;
+ foreach (var Computer in source.Textiles)
+ {
+ if (Computer.Id == model.TextileId)
+ {
+ model.TextileName = Computer.TextileName;
+ break;
+ }
+ }
+ return model;
+ }
+ }
+}
+
diff --git a/ClothShop/ClothShopFileImplement/Implements/TextileStorage.cs b/ClothShop/ClothShopFileImplement/Implements/TextileStorage.cs
new file mode 100644
index 0000000..467928c
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Implements/TextileStorage.cs
@@ -0,0 +1,78 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.SearchModels;
+using ClothShopContracts.StoragesContracts;
+using ClothShopContracts.ViewModels;
+using ClothShopFileImplement.Models;
+namespace ClothShopFileImplement.Implements
+{
+ public class TextileStorage : ITextileStorage
+ {
+ private readonly DataFileSingleton source;
+ public TextileStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Textiles
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public List GetFilteredList(TextileSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.TextileName))
+ {
+ return new();
+ }
+ return source.Textiles.Where(x => x.TextileName.Contains(model.TextileName)).Select(x => x.GetViewModel).ToList();
+ }
+
+ public TextileViewModel? GetElement(TextileSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.TextileName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Textiles.FirstOrDefault(x => (!string.IsNullOrEmpty(model.TextileName) && x.TextileName == model.TextileName) ||
+ (model.Id.HasValue && x.Id == model.Id))?.GetViewModel;
+ }
+
+ public TextileViewModel? Insert(TextileBindingModel model)
+ {
+ model.Id = source.Textiles.Count > 0 ? source.Textiles.Max(x => x.Id) + 1 : 1;
+ var newTextile = Textile.Create(model);
+ if (newTextile == null)
+ {
+ return null;
+ }
+ source.Textiles.Add(newTextile);
+ source.SaveTextiles();
+ return newTextile.GetViewModel;
+ }
+
+ public TextileViewModel? Update(TextileBindingModel model)
+ {
+ var Textile = source.Textiles.FirstOrDefault(x => x.Id == model.Id);
+ if (Textile == null)
+ {
+ return null;
+ }
+ Textile.Update(model);
+ source.SaveTextiles();
+ return Textile.GetViewModel;
+ }
+ public TextileViewModel? Delete(TextileBindingModel model)
+ {
+ var Textile = source.Textiles.FirstOrDefault(x => x.Id == model.Id);
+ if (Textile != null)
+ {
+ source.Textiles.Remove(Textile);
+ source.SaveTextiles();
+ return Textile.GetViewModel;
+ }
+ return null;
+ }
+ }
+}
+
diff --git a/ClothShop/ClothShopFileImplement/Models/Component.cs b/ClothShop/ClothShopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..a5acb25
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Models/Component.cs
@@ -0,0 +1,59 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.ViewModels;
+using ClothShopDataModels.Models;
+using System.Xml.Linq;
+namespace ClothShopFileImplement.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/ClothShop/ClothShopFileImplement/Models/Order.cs b/ClothShop/ClothShopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..f94ff2b
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Models/Order.cs
@@ -0,0 +1,81 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.ViewModels;
+using ClothShopDataModels.Enums;
+using ClothShopDataModels.Models;
+using System.Xml.Linq;
+namespace ClothShopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+ public int TextileId { 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(OrderBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Order()
+ {
+ Id = model.Id,
+ TextileId = model.TextileId,
+ 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),
+ TextileId = Convert.ToInt32(element.Element("TextileId")!.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.ToString()),
+ 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;
+ }
+ Status = model.Status;
+ DateImplement = model.DateImplement;
+ }
+ public OrderViewModel GetViewModel => new()
+ {
+ Id = Id,
+ TextileId = TextileId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement,
+ };
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("TextileId", TextileId),
+ new XElement("Sum", Sum.ToString()),
+ new XElement("Count", Count),
+ new XElement("Status", Status.ToString()),
+ new XElement("DateCreate", DateCreate.ToString()),
+ new XElement("DateImplement", DateImplement.ToString())
+ );
+ }
+}
diff --git a/ClothShop/ClothShopFileImplement/Models/Textile.cs b/ClothShop/ClothShopFileImplement/Models/Textile.cs
new file mode 100644
index 0000000..fc1d9a6
--- /dev/null
+++ b/ClothShop/ClothShopFileImplement/Models/Textile.cs
@@ -0,0 +1,94 @@
+using ClothShopContracts.BindingModels;
+using ClothShopContracts.ViewModels;
+using ClothShopDataModels.Models;
+using System.Xml.Linq;
+namespace ClothShopFileImplement.Models
+{
+ public class Textile : ITextileModel
+ {
+ public int Id { get; private set; }
+ public string TextileName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+ private Dictionary? _TextileComponents =
+ null;
+ public Dictionary TextileComponents
+ {
+ get
+ {
+ if (_TextileComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _TextileComponents = Components.ToDictionary(x => x.Key, y =>
+ ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+ y.Value));
+ }
+ return _TextileComponents;
+ }
+ }
+ public static Textile? Create(TextileBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Textile()
+ {
+ Id = model.Id,
+ TextileName = model.TextileName,
+ Price = model.Price,
+ Components = model.TextileComponents.ToDictionary(x => x.Key, x
+ => x.Value.Item2)
+ };
+ }
+ public static Textile? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Textile()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ TextileName = element.Element("TextileName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components =
+ element.Element("TextileComponents")!.Elements("TextileComponent")
+ .ToDictionary(x =>
+ Convert.ToInt32(x.Element("Key")?.Value), x =>
+ Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+ public void Update(TextileBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ TextileName = model.TextileName;
+ Price = model.Price;
+ Components = model.TextileComponents.ToDictionary(x => x.Key, x =>
+ x.Value.Item2);
+ _TextileComponents = null;
+ }
+ public TextileViewModel GetViewModel => new()
+ {
+ Id = Id,
+ TextileName = TextileName,
+ Price = Price,
+ TextileComponents = TextileComponents
+ };
+ public XElement GetXElement => new("Textile",
+ new XAttribute("Id", Id),
+ new XElement("TextileName", TextileName),
+ new XElement("Price", Price.ToString()),
+ new XElement("TextileComponents", Components.Select(x =>
+ new XElement("TextileComponent",
+
+ new XElement("Key", x.Key),
+
+ new XElement("Value", x.Value)))
+
+ .ToArray()));
+ }
+}
diff --git a/ClothShop/ClothShopView/ClothShopView.csproj b/ClothShop/ClothShopView/ClothShopView.csproj
index 50c2236..79e0e3a 100644
--- a/ClothShop/ClothShopView/ClothShopView.csproj
+++ b/ClothShop/ClothShopView/ClothShopView.csproj
@@ -18,6 +18,7 @@
+
diff --git a/ClothShop/ClothShopView/FormComponent.Designer.cs b/ClothShop/ClothShopView/FormComponent.Designer.cs
index 3f9a354..d0ab7fd 100644
--- a/ClothShop/ClothShopView/FormComponent.Designer.cs
+++ b/ClothShop/ClothShopView/FormComponent.Designer.cs
@@ -100,7 +100,7 @@
this.Controls.Add(this.labelCost);
this.Controls.Add(this.labelName);
this.Name = "FormComponent";
- this.Text = "FormComponent";
+ this.Text = "Компонент";
this.Load += new System.EventHandler(this.FormComponent_Load);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/ClothShop/ClothShopView/FormMain.cs b/ClothShop/ClothShopView/FormMain.cs
index 63686f4..5dcd3e3 100644
--- a/ClothShop/ClothShopView/FormMain.cs
+++ b/ClothShop/ClothShopView/FormMain.cs
@@ -75,7 +75,7 @@ namespace ClothShopView
LoadData();
}
}
- private OrderBindingModel CreateBindingModel(int id, bool isDone = false)
+ private OrderBindingModel CreateBindingModel(int id)
{
return new OrderBindingModel
{
diff --git a/ClothShop/ClothShopView/Program.cs b/ClothShop/ClothShopView/Program.cs
index abc19b9..54b1676 100644
--- a/ClothShop/ClothShopView/Program.cs
+++ b/ClothShop/ClothShopView/Program.cs
@@ -1,7 +1,7 @@
using ClothShopContracts.BusinessLogicContracts;
using ClothShopContracts.StoragesContracts;
-using ClothShopListImplement.Implements;
using ClothShopBusinessLogic.BusinessLogics;
+using ClothShopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
@@ -23,6 +23,7 @@ namespace ClothShopView
{
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
+
ApplicationConfiguration.Initialize();
var services = new ServiceCollection();
ConfigureServices(services);
--
2.25.1
From 40b82024d22fa006296b9afd338f60513dbc1548 Mon Sep 17 00:00:00 2001
From: Kirill <117719052+KirillFirsof@users.noreply.github.com>
Date: Wed, 27 Mar 2024 15:36:23 +0400
Subject: [PATCH 2/2] =?UTF-8?q?=D1=81=D0=B4=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Implements/ComponentStorage.cs | 33 ++++++++-----------
.../Models/Component.cs | 15 ++++++---
.../ClothShopView/FormComponents.Designer.cs | 4 +--
.../ClothShopView/FormCreateOrder.Designer.cs | 2 +-
ClothShop/ClothShopView/FormMain.Designer.cs | 2 +-
.../ClothShopView/FormTextile.Designer.cs | 2 +-
.../FormTextileComponent.Designer.cs | 2 +-
.../ClothShopView/FormTextiles.Designer.cs | 2 +-
8 files changed, 30 insertions(+), 32 deletions(-)
diff --git a/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs b/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
index d9a454d..eb50819 100644
--- a/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
+++ b/ClothShop/ClothShopFileImplement/Implements/ComponentStorage.cs
@@ -3,6 +3,12 @@ using ClothShopContracts.SearchModels;
using ClothShopContracts.StoragesContracts;
using ClothShopContracts.ViewModels;
using ClothShopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
namespace ClothShopFileImplement.Implements
{
public class ComponentStorage : IComponentStorage
@@ -14,21 +20,15 @@ namespace ClothShopFileImplement.Implements
}
public List GetFullList()
{
- return source.Components
- .Select(x => x.GetViewModel)
- .ToList();
+ return source.Components.Select(x => x.GetViewModel).ToList();
}
- public List GetFilteredList(ComponentSearchModel
- model)
+ 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();
+ return source.Components.Where(x => x.ComponentName.Contains(model.ComponentName)).Select(x => x.GetViewModel).ToList();
}
public ComponentViewModel? GetElement(ComponentSearchModel model)
{
@@ -36,12 +36,8 @@ namespace ClothShopFileImplement.Implements
{
return null;
}
- return source.Components
- .FirstOrDefault(x =>
- (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
- model.ComponentName) ||
- (model.Id.HasValue && x.Id == model.Id))
- ?.GetViewModel;
+ 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)
{
@@ -58,8 +54,7 @@ namespace ClothShopFileImplement.Implements
}
public ComponentViewModel? Update(ComponentBindingModel model)
{
- var component = source.Components.FirstOrDefault(x => x.Id ==
- model.Id);
+ var component = source.Components.FirstOrDefault(x => x.Id == model.Id);
if (component == null)
{
return null;
@@ -70,8 +65,7 @@ namespace ClothShopFileImplement.Implements
}
public ComponentViewModel? Delete(ComponentBindingModel model)
{
- var element = source.Components.FirstOrDefault(x => x.Id ==
- model.Id);
+ var element = source.Components.FirstOrDefault(x => x.Id == model.Id);
if (element != null)
{
source.Components.Remove(element);
@@ -82,4 +76,3 @@ namespace ClothShopFileImplement.Implements
}
}
}
-
diff --git a/ClothShop/ClothShopFileImplement/Models/Component.cs b/ClothShop/ClothShopFileImplement/Models/Component.cs
index a5acb25..d6cc994 100644
--- a/ClothShop/ClothShopFileImplement/Models/Component.cs
+++ b/ClothShop/ClothShopFileImplement/Models/Component.cs
@@ -1,7 +1,13 @@
using ClothShopContracts.BindingModels;
using ClothShopContracts.ViewModels;
using ClothShopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
using System.Xml.Linq;
+
namespace ClothShopFileImplement.Models
{
public class Component : IComponentModel
@@ -51,9 +57,8 @@ namespace ClothShopFileImplement.Models
Cost = Cost
};
public XElement GetXElement => new("Component",
- new XAttribute("Id", Id),
- new XElement("ComponentName", ComponentName),
- new XElement("Cost", Cost.ToString()));
+ new XAttribute("Id", Id),
+ new XElement("ComponentName", ComponentName),
+ new XElement("Cost", Cost.ToString()));
}
-}
-
+}
\ No newline at end of file
diff --git a/ClothShop/ClothShopView/FormComponents.Designer.cs b/ClothShop/ClothShopView/FormComponents.Designer.cs
index 209efcb..1b80bc7 100644
--- a/ClothShop/ClothShopView/FormComponents.Designer.cs
+++ b/ClothShop/ClothShopView/FormComponents.Designer.cs
@@ -98,8 +98,8 @@
this.Controls.Add(this.buttonAdd);
this.Controls.Add(this.dataGridView);
this.Name = "FormComponents";
- this.Text = "FormComponents";
- this.Click += new System.EventHandler(this.FormComponents_Load);
+ this.Text = "Компоненты";
+ this.Load += new System.EventHandler(this.FormComponents_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
diff --git a/ClothShop/ClothShopView/FormCreateOrder.Designer.cs b/ClothShop/ClothShopView/FormCreateOrder.Designer.cs
index 4599961..b4f68aa 100644
--- a/ClothShop/ClothShopView/FormCreateOrder.Designer.cs
+++ b/ClothShop/ClothShopView/FormCreateOrder.Designer.cs
@@ -126,7 +126,7 @@
this.Controls.Add(this.labelTextile);
this.Controls.Add(this.comboBoxTextile);
this.Name = "FormCreateOrder";
- this.Text = "FormCreateOrder";
+ this.Text = "Создать заказ";
this.Load += new System.EventHandler(this.FormCreateOrder_Load);
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/ClothShop/ClothShopView/FormMain.Designer.cs b/ClothShop/ClothShopView/FormMain.Designer.cs
index 870c130..74ba808 100644
--- a/ClothShop/ClothShopView/FormMain.Designer.cs
+++ b/ClothShop/ClothShopView/FormMain.Designer.cs
@@ -152,7 +152,7 @@
this.Controls.Add(this.buttonTakeOrderInWork);
this.Controls.Add(this.buttonCreateOrder);
this.Name = "FormMain";
- this.Text = "FormMain";
+ this.Text = "Заказы";
this.Load += new System.EventHandler(this.FormMain_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.menuStrip.ResumeLayout(false);
diff --git a/ClothShop/ClothShopView/FormTextile.Designer.cs b/ClothShop/ClothShopView/FormTextile.Designer.cs
index cabf2bb..6d08be5 100644
--- a/ClothShop/ClothShopView/FormTextile.Designer.cs
+++ b/ClothShop/ClothShopView/FormTextile.Designer.cs
@@ -204,7 +204,7 @@
this.Controls.Add(this.buttonCancel);
this.Controls.Add(this.buttonSave);
this.Name = "FormTextile";
- this.Text = "FormTextile";
+ this.Text = "Изделия";
this.Load += new System.EventHandler(this.FormTextile_Load);
this.groupBoxComponents.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dataGridViewComponents)).EndInit();
diff --git a/ClothShop/ClothShopView/FormTextileComponent.Designer.cs b/ClothShop/ClothShopView/FormTextileComponent.Designer.cs
index 7574789..0b1fb2b 100644
--- a/ClothShop/ClothShopView/FormTextileComponent.Designer.cs
+++ b/ClothShop/ClothShopView/FormTextileComponent.Designer.cs
@@ -102,7 +102,7 @@
this.Controls.Add(this.labelCount);
this.Controls.Add(this.labelComponent);
this.Name = "FormTextileComponent";
- this.Text = "FormTextileComponent";
+ this.Text = "Компонет изделия";
this.ResumeLayout(false);
this.PerformLayout();
diff --git a/ClothShop/ClothShopView/FormTextiles.Designer.cs b/ClothShop/ClothShopView/FormTextiles.Designer.cs
index b7ad7a2..cc858ff 100644
--- a/ClothShop/ClothShopView/FormTextiles.Designer.cs
+++ b/ClothShop/ClothShopView/FormTextiles.Designer.cs
@@ -98,7 +98,7 @@
this.Controls.Add(this.buttonAdd);
this.Controls.Add(this.dataGridView);
this.Name = "FormTextiles";
- this.Text = "FormTextiles";
+ this.Text = "Изделия";
this.Load += new System.EventHandler(this.FormTextiles_Load);
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
this.ResumeLayout(false);
--
2.25.1