diff --git a/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/BlacksmithWorkshopFileImplement.csproj b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/BlacksmithWorkshopFileImplement.csproj
new file mode 100644
index 0000000..4b96496
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/BlacksmithWorkshopFileImplement.csproj
@@ -0,0 +1,14 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
+
diff --git a/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/DataFileSingleton.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/DataFileSingleton.cs
new file mode 100644
index 0000000..b3b3671
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/DataFileSingleton.cs
@@ -0,0 +1,58 @@
+using BlacksmithWorkshopFileImplement.Models;
+using System.Xml.Linq;
+
+namespace BlackcmithWorkshopFileImplement
+{
+ internal class DataFileSingleton
+ {
+ private static DataFileSingleton? instance;
+ private readonly string ComponentFileName = "Component.xml";
+ private readonly string OrderFileName = "Order.xml";
+ private readonly string ManufactureFileName = "Manufacture.xml";
+ public List Components { get; private set; }
+ public List Orders { get; private set; }
+ public List Manufactures { 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 SaveManufactures() => SaveData(Manufactures, ManufactureFileName,
+ "Manufactures", x => x.GetXElement);
+ public void SaveOrders() => SaveData(Orders, OrderFileName,
+ "Orders", x => x.GetXElement);
+ private DataFileSingleton()
+ {
+ Components = LoadData(ComponentFileName, "Component", x =>
+ Component.Create(x)!)!;
+ Manufactures = LoadData(ManufactureFileName, "Manufacture", x =>
+ Manufacture.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/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ComponentStorage.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ComponentStorage.cs
new file mode 100644
index 0000000..3caaf00
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ComponentStorage.cs
@@ -0,0 +1,91 @@
+using BlackcmithWorkshopFileImplement;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopFileImplement.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/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ManufactureStorage.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ManufactureStorage.cs
new file mode 100644
index 0000000..64849ca
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/ManufactureStorage.cs
@@ -0,0 +1,91 @@
+using BlackcmithWorkshopFileImplement;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopFileImplement.Implements
+{
+ public class ManufactureStorage : IManufactureStorage
+ {
+ private readonly DataFileSingleton source;
+ public ManufactureStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Manufactures
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+
+ public List GetFilteredList(ManufactureSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ManufactureName))
+ {
+ return new();
+ }
+ return source.Manufactures
+ .Where(x => x.ManufactureName.Contains(model.ManufactureName))
+ .Select(x => x.GetViewModel)
+ .ToList();
+ }
+ public ManufactureViewModel? GetElement(ManufactureSearchModel model)
+ {
+ if (string.IsNullOrEmpty(model.ManufactureName) && !model.Id.HasValue)
+ {
+ return null;
+ }
+ return source.Manufactures
+ .FirstOrDefault(x =>
+ (!string.IsNullOrEmpty(model.ManufactureName) && x.ManufactureName ==
+ model.ManufactureName) ||
+ (model.Id.HasValue && x.Id == model.Id))
+ ?.GetViewModel;
+ }
+ public ManufactureViewModel? Insert(ManufactureBindingModel model)
+ {
+ model.Id = source.Manufactures.Count > 0 ? source.Manufactures.Max(x =>
+ x.Id) + 1 : 1;
+ var newManufacture = Manufacture.Create(model);
+ if (newManufacture == null)
+ {
+ return null;
+ }
+ source.Manufactures.Add(newManufacture);
+ source.SaveManufactures();
+ return newManufacture.GetViewModel;
+ }
+ public ManufactureViewModel? Update(ManufactureBindingModel model)
+ {
+ var Manufacture = source.Manufactures.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (Manufacture == null)
+ {
+ return null;
+ }
+ Manufacture.Update(model);
+ source.SaveManufactures();
+ return Manufacture.GetViewModel;
+ }
+ public ManufactureViewModel? Delete(ManufactureBindingModel model)
+ {
+ var Manufacture = source.Manufactures.FirstOrDefault(x => x.Id ==
+ model.Id);
+ if (Manufacture != null)
+ {
+ source.Manufactures.Remove(Manufacture);
+ source.SaveManufactures();
+ return Manufacture.GetViewModel;
+ }
+ return null;
+ }
+ }
+}
diff --git a/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/OrderStorage.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/OrderStorage.cs
new file mode 100644
index 0000000..d724dc4
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/OrderStorage.cs
@@ -0,0 +1,99 @@
+using BlackcmithWorkshopFileImplement;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopFileImplement.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopFileImplement.Implements
+{
+ public class OrderStorage : IOrderStorage
+ {
+ private readonly DataFileSingleton source;
+ public OrderStorage()
+ {
+ source = DataFileSingleton.GetInstance();
+ }
+ public List GetFullList()
+ {
+ return source.Orders
+ .Select(x => AccessManufactureStorage(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 => AccessManufactureStorage(x.GetViewModel))
+ .ToList();
+ }
+ public OrderViewModel? GetElement(OrderSearchModel model)
+ {
+ if (!model.Id.HasValue)
+ {
+ return null;
+ }
+ return AccessManufactureStorage(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 AccessManufactureStorage(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 AccessManufactureStorage(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 AccessManufactureStorage(element.GetViewModel);
+ }
+ return null;
+ }
+ public OrderViewModel? AccessManufactureStorage(OrderViewModel model)
+ {
+ if (model == null)
+ return null;
+ foreach (var Manufacture in source.Manufactures)
+ {
+ if (Manufacture.Id == model.ManufactureId)
+ {
+ model.ManufactureName = Manufacture.ManufactureName;
+ break;
+ }
+ }
+ return model;
+ }
+ }
+}
diff --git a/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Component.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Component.cs
new file mode 100644
index 0000000..e7a419c
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Component.cs
@@ -0,0 +1,64 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace BlacksmithWorkshopFileImplement.Models
+{
+ public class Component : IComponentModel
+ {
+ public int Id { get; set; }
+ public string ComponentName { get; 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/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Manufacture.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Manufacture.cs
new file mode 100644
index 0000000..7d42aa5
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Manufacture.cs
@@ -0,0 +1,96 @@
+using BlackcmithWorkshopFileImplement;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace BlacksmithWorkshopFileImplement.Models
+{
+ public class Manufacture : IManufactureModel
+ {
+ public int Id { get; private set; }
+ public string ManufactureName { get; private set; } = string.Empty;
+ public double Price { get; private set; }
+ public Dictionary Components { get; private set; } = new();
+ private Dictionary? _ManufactureComponents = null;
+ public Dictionary ManufactureComponents
+ {
+ get
+ {
+ if (_ManufactureComponents == null)
+ {
+ var source = DataFileSingleton.GetInstance();
+ _ManufactureComponents = Components.ToDictionary(x => x.Key, y =>
+ ((source.Components.FirstOrDefault(z => z.Id == y.Key) as IComponentModel)!,
+ y.Value));
+ }
+ return _ManufactureComponents;
+ }
+ }
+ public static Manufacture? Create(ManufactureBindingModel model)
+ {
+ if (model == null)
+ {
+ return null;
+ }
+ return new Manufacture()
+ {
+ Id = model.Id,
+ ManufactureName = model.ManufactureName,
+ Price = model.Price,
+ Components = model.ManufactureComponents.ToDictionary(x => x.Key, x
+ => x.Value.Item2)
+ };
+ }
+ public static Manufacture? Create(XElement element)
+ {
+ if (element == null)
+ {
+ return null;
+ }
+ return new Manufacture()
+ {
+ Id = Convert.ToInt32(element.Attribute("Id")!.Value),
+ ManufactureName = element.Element("ManufactureName")!.Value,
+ Price = Convert.ToDouble(element.Element("Price")!.Value),
+ Components =
+ element.Element("ManufactureComponents")!.Elements("ManufactureComponent")
+ .ToDictionary(x =>
+ Convert.ToInt32(x.Element("Key")?.Value), x =>
+ Convert.ToInt32(x.Element("Value")?.Value))
+ };
+ }
+ public void Update(ManufactureBindingModel model)
+ {
+ if (model == null)
+ {
+ return;
+ }
+ ManufactureName = model.ManufactureName;
+ Price = model.Price;
+ Components = model.ManufactureComponents.ToDictionary(x => x.Key, x =>
+ x.Value.Item2);
+ _ManufactureComponents = null;
+ }
+ public ManufactureViewModel GetViewModel => new()
+ {
+ Id = Id,
+ ManufactureName = ManufactureName,
+ Price = Price,
+ ManufactureComponents = ManufactureComponents
+ };
+ public XElement GetXElement => new("Manufacture",
+ new XAttribute("Id", Id),
+ new XElement("ManufactureName", ManufactureName),
+ new XElement("Price", Price.ToString()),
+ new XElement("ManufactureComponents", Components.Select(x =>
+ new XElement("ManufactureComponent",
+ new XElement("Key", x.Key),
+ new XElement("Value", x.Value))).ToArray()));
+ }
+}
diff --git a/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Order.cs b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Order.cs
new file mode 100644
index 0000000..0b0d08e
--- /dev/null
+++ b/BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Models/Order.cs
@@ -0,0 +1,87 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Enums;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Linq;
+
+namespace BlacksmithWorkshopFileImplement.Models
+{
+ public class Order : IOrderModel
+ {
+ public int Id { get; private set; }
+ public int ManufactureId { 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,
+ ManufactureId = model.ManufactureId,
+ 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),
+ ManufactureId = Convert.ToInt32(element.Element("ManufactureId")!.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,
+ ManufactureId = ManufactureId,
+ Count = Count,
+ Sum = Sum,
+ Status = Status,
+ DateCreate = DateCreate,
+ DateImplement = DateImplement,
+ };
+ public XElement GetXElement => new("Order",
+ new XAttribute("Id", Id),
+ new XElement("ManufactureId", ManufactureId),
+ 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/BlacksmithWorkshop/BlacksmithWorkshop.csproj b/BlacksmithWorkshop/BlacksmithWorkshop.csproj
deleted file mode 100644
index 0d78b48..0000000
--- a/BlacksmithWorkshop/BlacksmithWorkshop.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- WinExe
- net6.0-windows
- enable
- true
- enable
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop.sln b/BlacksmithWorkshop/BlacksmithWorkshop.sln
index 408f263..5d4e3e7 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop.sln
+++ b/BlacksmithWorkshop/BlacksmithWorkshop.sln
@@ -5,13 +5,15 @@ VisualStudioVersion = 17.7.34031.279
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshop", "BlacksmithWorkshop\BlacksmithWorkshop.csproj", "{54575961-6705-47D3-8063-416A45518BED}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopDataModels", "BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj", "{96E8CFC7-A9D8-438B-AE8C-184ED25D5AAC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopDataModels", "BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj", "{96E8CFC7-A9D8-438B-AE8C-184ED25D5AAC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopContracts", "BlacksmithWorkshopContracts\BlacksmithWorkshopContracts.csproj", "{40A50297-20F6-4F73-834D-0902F6F7965B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopContracts", "BlacksmithWorkshopContracts\BlacksmithWorkshopContracts.csproj", "{40A50297-20F6-4F73-834D-0902F6F7965B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopBusinessLogic", "BlacksmithWorkshopBusinessLogic\BlacksmithWorkshopBusinessLogic.csproj", "{81DD48F2-F58D-4C86-AC0C-74E447366DFA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopBusinessLogic", "BlacksmithWorkshopBusinessLogic\BlacksmithWorkshopBusinessLogic.csproj", "{81DD48F2-F58D-4C86-AC0C-74E447366DFA}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopListImplement", "BlacksmithWorkshopListImplement\BlacksmithWorkshopListImplement.csproj", "{F6B2AA66-2A89-4DEA-AE90-84991C1EE424}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopListImplement", "BlacksmithWorkshopListImplement\BlacksmithWorkshopListImplement.csproj", "{F6B2AA66-2A89-4DEA-AE90-84991C1EE424}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopFileImplement", "BlackcmithWorkshopFileImplement\BlacksmithWorkshopFileImplement.csproj", "{63C0A1A4-FA76-4F7C-8144-A33085F7DF08}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,6 +41,10 @@ Global
{F6B2AA66-2A89-4DEA-AE90-84991C1EE424}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F6B2AA66-2A89-4DEA-AE90-84991C1EE424}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F6B2AA66-2A89-4DEA-AE90-84991C1EE424}.Release|Any CPU.Build.0 = Release|Any CPU
+ {63C0A1A4-FA76-4F7C-8144-A33085F7DF08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {63C0A1A4-FA76-4F7C-8144-A33085F7DF08}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {63C0A1A4-FA76-4F7C-8144-A33085F7DF08}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {63C0A1A4-FA76-4F7C-8144-A33085F7DF08}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj b/BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj
index 0d78b48..537a10a 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj
@@ -13,6 +13,7 @@
+
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
index d906146..1a721e2 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
@@ -33,7 +33,7 @@
ComponentsToolStripMenuItem = new ToolStripMenuItem();
ManufacturesToolStripMenuItem = new ToolStripMenuItem();
ShopsToolStripMenuItem = new ToolStripMenuItem();
- SupplyМагазинаToolStripMenuItem = new ToolStripMenuItem();
+ SupplyToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView();
buttonCreateOrder = new Button();
buttonRefresh = new Button();
@@ -46,67 +46,62 @@
//
// menuStrip
//
- menuStrip.ImageScalingSize = new Size(24, 24);
menuStrip.Items.AddRange(new ToolStripItem[] { GuidesToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
- menuStrip.Padding = new Padding(9, 3, 0, 3);
- menuStrip.Size = new Size(1444, 35);
+ menuStrip.Size = new Size(1011, 24);
menuStrip.TabIndex = 0;
menuStrip.Text = "Меню";
//
// GuidesToolStripMenuItem
//
- GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem, ShopsToolStripMenuItem, SupplyМагазинаToolStripMenuItem });
+ GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem, ShopsToolStripMenuItem, SupplyToolStripMenuItem });
GuidesToolStripMenuItem.Name = "GuidesToolStripMenuItem";
- GuidesToolStripMenuItem.Size = new Size(139, 29);
+ GuidesToolStripMenuItem.Size = new Size(94, 20);
GuidesToolStripMenuItem.Text = "Справочники";
//
// ComponentsToolStripMenuItem
//
ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
- ComponentsToolStripMenuItem.Size = new Size(296, 34);
+ ComponentsToolStripMenuItem.Size = new Size(198, 22);
ComponentsToolStripMenuItem.Text = "Компоненты";
ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click;
//
// ManufacturesToolStripMenuItem
//
ManufacturesToolStripMenuItem.Name = "ManufacturesToolStripMenuItem";
- ManufacturesToolStripMenuItem.Size = new Size(296, 34);
+ ManufacturesToolStripMenuItem.Size = new Size(198, 22);
ManufacturesToolStripMenuItem.Text = "Кузнечные изделия";
ManufacturesToolStripMenuItem.Click += ManufacturesStripMenuItem_Click;
//
// ShopsToolStripMenuItem
//
ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
- ShopsToolStripMenuItem.Size = new Size(296, 34);
+ ShopsToolStripMenuItem.Size = new Size(198, 22);
ShopsToolStripMenuItem.Text = "Магазины";
ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
//
- // SupplyМагазинаToolStripMenuItem
+ // SupplyToolStripMenuItem
//
- SupplyМагазинаToolStripMenuItem.Name = "SupplyМагазинаToolStripMenuItem";
- SupplyМагазинаToolStripMenuItem.Size = new Size(296, 34);
- SupplyМагазинаToolStripMenuItem.Text = "Пополнение магазина";
- SupplyМагазинаToolStripMenuItem.Click += SupplyМагазинаToolStripMenuItem_Click;
+ SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem";
+ SupplyToolStripMenuItem.Size = new Size(198, 22);
+ SupplyToolStripMenuItem.Text = "Пополнение магазина";
+ SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click;
//
// dataGridView
//
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 38);
- dataGridView.Margin = new Padding(4, 5, 4, 5);
+ dataGridView.Location = new Point(0, 23);
dataGridView.Name = "dataGridView";
- dataGridView.RowHeadersWidth = 62;
dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(1210, 712);
+ dataGridView.Size = new Size(847, 427);
dataGridView.TabIndex = 1;
//
// buttonCreateOrder
//
- buttonCreateOrder.Location = new Point(1219, 63);
- buttonCreateOrder.Margin = new Padding(4, 5, 4, 5);
+ buttonCreateOrder.Location = new Point(853, 38);
buttonCreateOrder.Name = "buttonCreateOrder";
- buttonCreateOrder.Size = new Size(211, 52);
+ buttonCreateOrder.Size = new Size(148, 31);
buttonCreateOrder.TabIndex = 2;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
@@ -114,10 +109,9 @@
//
// buttonRefresh
//
- buttonRefresh.Location = new Point(1219, 310);
- buttonRefresh.Margin = new Padding(4, 5, 4, 5);
+ buttonRefresh.Location = new Point(853, 186);
buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(211, 52);
+ buttonRefresh.Size = new Size(148, 31);
buttonRefresh.TabIndex = 3;
buttonRefresh.Text = "Обновить список";
buttonRefresh.UseVisualStyleBackColor = true;
@@ -125,10 +119,9 @@
//
// buttonIssued
//
- buttonIssued.Location = new Point(1219, 248);
- buttonIssued.Margin = new Padding(4, 5, 4, 5);
+ buttonIssued.Location = new Point(853, 149);
buttonIssued.Name = "buttonIssued";
- buttonIssued.Size = new Size(211, 52);
+ buttonIssued.Size = new Size(148, 31);
buttonIssued.TabIndex = 4;
buttonIssued.Text = "Заказ выдан";
buttonIssued.UseVisualStyleBackColor = true;
@@ -136,10 +129,9 @@
//
// buttonReady
//
- buttonReady.Location = new Point(1219, 187);
- buttonReady.Margin = new Padding(4, 5, 4, 5);
+ buttonReady.Location = new Point(853, 112);
buttonReady.Name = "buttonReady";
- buttonReady.Size = new Size(211, 52);
+ buttonReady.Size = new Size(148, 31);
buttonReady.TabIndex = 5;
buttonReady.Text = "Заказ готов";
buttonReady.UseVisualStyleBackColor = true;
@@ -147,10 +139,9 @@
//
// buttonTakeInWork
//
- buttonTakeInWork.Location = new Point(1219, 125);
- buttonTakeInWork.Margin = new Padding(4, 5, 4, 5);
+ buttonTakeInWork.Location = new Point(853, 75);
buttonTakeInWork.Name = "buttonTakeInWork";
- buttonTakeInWork.Size = new Size(211, 52);
+ buttonTakeInWork.Size = new Size(148, 31);
buttonTakeInWork.TabIndex = 6;
buttonTakeInWork.Text = "Отдать на выполнение";
buttonTakeInWork.UseVisualStyleBackColor = true;
@@ -158,9 +149,9 @@
//
// FormMain
//
- AutoScaleDimensions = new SizeF(10F, 25F);
+ AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1444, 750);
+ ClientSize = new Size(1011, 450);
Controls.Add(buttonTakeInWork);
Controls.Add(buttonReady);
Controls.Add(buttonIssued);
@@ -169,7 +160,6 @@
Controls.Add(dataGridView);
Controls.Add(menuStrip);
MainMenuStrip = menuStrip;
- Margin = new Padding(4, 5, 4, 5);
Name = "FormMain";
StartPosition = FormStartPosition.CenterParent;
Text = "Кузница";
@@ -194,6 +184,6 @@
private Button buttonReady;
private Button buttonTakeInWork;
private ToolStripMenuItem ShopsToolStripMenuItem;
- private ToolStripMenuItem SupplyМагазинаToolStripMenuItem;
+ private ToolStripMenuItem SupplyToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
index b3d272d..bbfa082 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
@@ -163,7 +163,6 @@ namespace BlacksmithWorkshop
{
LoadData();
}
-
private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormShops));
@@ -172,8 +171,7 @@ namespace BlacksmithWorkshop
form.ShowDialog();
}
}
-
- private void SupplyМагазинаToolStripMenuItem_Click(object sender, EventArgs e)
+ private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
if (service is FormSupply form)
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
index 1fe8340..1d9d90e 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs
@@ -1,193 +1,186 @@
namespace BlacksmithWorkshop
{
- partial class FormShop
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class FormShop
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- labelName = new Label();
- labelAddress = new Label();
- labelDate = new Label();
- textBoxName = new TextBox();
- textBoxAddress = new TextBox();
- dateTimePicker = new DateTimePicker();
- dataGridView = new DataGridView();
- buttonSave = new Button();
- buttonCancel = new Button();
- ColumnId = new DataGridViewTextBoxColumn();
- ColumnName = new DataGridViewTextBoxColumn();
- ColumnPrice = new DataGridViewTextBoxColumn();
- ColumnCount = new DataGridViewTextBoxColumn();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(24, 21);
- labelName.Name = "labelName";
- labelName.Size = new Size(90, 25);
- labelName.TabIndex = 0;
- labelName.Text = "Название";
- //
- // labelAddress
- //
- labelAddress.AutoSize = true;
- labelAddress.Location = new Point(24, 72);
- labelAddress.Name = "labelAddress";
- labelAddress.Size = new Size(62, 25);
- labelAddress.TabIndex = 1;
- labelAddress.Text = "Адрес";
- //
- // labelDate
- //
- labelDate.AutoSize = true;
- labelDate.Location = new Point(24, 117);
- labelDate.Name = "labelDate";
- labelDate.Size = new Size(135, 25);
- labelDate.TabIndex = 2;
- labelDate.Text = "Дата открытия:";
- //
- // textBoxName
- //
- textBoxName.Location = new Point(204, 15);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(230, 31);
- textBoxName.TabIndex = 3;
- //
- // textBoxAddress
- //
- textBoxAddress.Location = new Point(204, 66);
- textBoxAddress.Name = "textBoxAddress";
- textBoxAddress.Size = new Size(230, 31);
- textBoxAddress.TabIndex = 4;
- //
- // dateTimePicker
- //
- dateTimePicker.Location = new Point(204, 117);
- dateTimePicker.Name = "dateTimePicker";
- dateTimePicker.Size = new Size(230, 31);
- dateTimePicker.TabIndex = 5;
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
- dataGridView.Location = new Point(24, 177);
- dataGridView.Name = "dataGridView";
- dataGridView.RowHeadersWidth = 62;
- dataGridView.RowTemplate.Height = 33;
- dataGridView.Size = new Size(780, 434);
- dataGridView.TabIndex = 6;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(24, 652);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(165, 51);
- buttonSave.TabIndex = 7;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += buttonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(217, 652);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(165, 51);
- buttonCancel.TabIndex = 8;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += buttonCancel_Click;
- //
- // ColumnId
- //
- ColumnId.HeaderText = "";
- ColumnId.MinimumWidth = 8;
- ColumnId.Name = "ColumnId";
- ColumnId.Visible = false;
- ColumnId.Width = 150;
- //
- // ColumnName
- //
- ColumnName.HeaderText = "Изделие";
- ColumnName.MinimumWidth = 8;
- ColumnName.Name = "ColumnName";
- ColumnName.Width = 426;
- //
- // ColumnPrice
- //
- ColumnPrice.HeaderText = "Цена";
- ColumnPrice.MinimumWidth = 8;
- ColumnPrice.Name = "ColumnPrice";
- ColumnPrice.Width = 150;
- //
- // ColumnCount
- //
- ColumnCount.HeaderText = "Количество";
- ColumnCount.MinimumWidth = 8;
- ColumnCount.Name = "ColumnCount";
- ColumnCount.Width = 150;
- //
- // FormShop
- //
- AutoScaleDimensions = new SizeF(10F, 25F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(836, 750);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(dataGridView);
- Controls.Add(dateTimePicker);
- Controls.Add(textBoxAddress);
- Controls.Add(textBoxName);
- Controls.Add(labelDate);
- Controls.Add(labelAddress);
- Controls.Add(labelName);
- Name = "FormShop";
- Text = "Магазин";
- Load += FormShop_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ dataGridView = new DataGridView();
+ ColumnId = new DataGridViewTextBoxColumn();
+ ColumnName = new DataGridViewTextBoxColumn();
+ ColumnPrice = new DataGridViewTextBoxColumn();
+ ColumnCount = new DataGridViewTextBoxColumn();
+ dateTimePicker = new DateTimePicker();
+ labelName = new Label();
+ labelAddress = new Label();
+ labelDate = new Label();
+ textBoxName = new TextBox();
+ textBoxAddress = new TextBox();
+ buttonSave = new Button();
+ buttonCancel = new Button();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
+ dataGridView.Location = new Point(12, 101);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(553, 281);
+ dataGridView.TabIndex = 0;
+ //
+ // ColumnId
+ //
+ ColumnId.HeaderText = "";
+ ColumnId.Name = "ColumnId";
+ ColumnId.Visible = false;
+ //
+ // ColumnName
+ //
+ ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ ColumnName.HeaderText = "Изделие";
+ ColumnName.Name = "ColumnName";
+ //
+ // ColumnPrice
+ //
+ ColumnPrice.HeaderText = "Цена";
+ ColumnPrice.Name = "ColumnPrice";
+ //
+ // ColumnCount
+ //
+ ColumnCount.HeaderText = "Количество";
+ ColumnCount.Name = "ColumnCount";
+ //
+ // dateTimePicker
+ //
+ dateTimePicker.Location = new Point(150, 63);
+ dateTimePicker.Name = "dateTimePicker";
+ dateTimePicker.Size = new Size(166, 23);
+ dateTimePicker.TabIndex = 1;
+ //
+ // labelName
+ //
+ labelName.AutoSize = true;
+ labelName.Location = new Point(12, 9);
+ labelName.Name = "labelName";
+ labelName.Size = new Size(62, 15);
+ labelName.TabIndex = 2;
+ labelName.Text = "Название:";
+ //
+ // labelAddress
+ //
+ labelAddress.AutoSize = true;
+ labelAddress.Location = new Point(12, 38);
+ labelAddress.Name = "labelAddress";
+ labelAddress.Size = new Size(43, 15);
+ labelAddress.TabIndex = 3;
+ labelAddress.Text = "Адрес:";
+ //
+ // labelDate
+ //
+ labelDate.AutoSize = true;
+ labelDate.Location = new Point(12, 69);
+ labelDate.Name = "labelDate";
+ labelDate.Size = new Size(90, 15);
+ labelDate.TabIndex = 4;
+ labelDate.Text = "Дата открытия:";
+ //
+ // textBoxName
+ //
+ textBoxName.Location = new Point(150, 6);
+ textBoxName.Name = "textBoxName";
+ textBoxName.Size = new Size(166, 23);
+ textBoxName.TabIndex = 5;
+ //
+ // textBoxAddress
+ //
+ textBoxAddress.Location = new Point(150, 35);
+ textBoxAddress.Name = "textBoxAddress";
+ textBoxAddress.Size = new Size(166, 23);
+ textBoxAddress.TabIndex = 6;
+ //
+ // buttonSave
+ //
+ buttonSave.Location = new Point(12, 401);
+ buttonSave.Name = "buttonSave";
+ buttonSave.Size = new Size(123, 25);
+ buttonSave.TabIndex = 7;
+ buttonSave.Text = "Сохранить";
+ buttonSave.UseVisualStyleBackColor = true;
+ buttonSave.Click += SaveButton_Click;
+ //
+ // buttonCancel
+ //
+ buttonCancel.Location = new Point(150, 401);
+ buttonCancel.Name = "buttonCancel";
+ buttonCancel.Size = new Size(123, 25);
+ buttonCancel.TabIndex = 8;
+ buttonCancel.Text = "Отмена";
+ buttonCancel.UseVisualStyleBackColor = true;
+ buttonCancel.Click += CancelButton_Click;
+ //
+ // FormShop
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(585, 450);
+ Controls.Add(buttonCancel);
+ Controls.Add(buttonSave);
+ Controls.Add(textBoxAddress);
+ Controls.Add(textBoxName);
+ Controls.Add(labelDate);
+ Controls.Add(labelAddress);
+ Controls.Add(labelName);
+ Controls.Add(dateTimePicker);
+ Controls.Add(dataGridView);
+ Name = "FormShop";
+ StartPosition = FormStartPosition.CenterParent;
+ Text = "Магазин";
+ Load += FormShop_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
- #endregion
+ #endregion
- private Label labelName;
- private Label labelAddress;
- private Label labelDate;
- private TextBox textBoxName;
- private TextBox textBoxAddress;
- private DateTimePicker dateTimePicker;
- private DataGridView dataGridView;
- private Button buttonSave;
- private Button buttonCancel;
- private DataGridViewTextBoxColumn ColumnId;
- private DataGridViewTextBoxColumn ColumnName;
- private DataGridViewTextBoxColumn ColumnPrice;
- private DataGridViewTextBoxColumn ColumnCount;
- }
+ private DataGridView dataGridView;
+ private DateTimePicker dateTimePicker;
+ private Label labelName;
+ private Label labelAddress;
+ private Label labelDate;
+ private TextBox textBoxName;
+ private TextBox textBoxAddress;
+ private DataGridViewTextBoxColumn ColumnId;
+ private DataGridViewTextBoxColumn ColumnName;
+ private DataGridViewTextBoxColumn ColumnPrice;
+ private DataGridViewTextBoxColumn ColumnCount;
+ private Button buttonSave;
+ private Button buttonCancel;
+ }
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
index d859ac7..9d551fe 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs
@@ -4,7 +4,6 @@ using BlacksmithWorkshopContracts.SearchModels;
using BlacksmithWorkshopDataModels.Models;
using Microsoft.Extensions.Logging;
using Microsoft.VisualBasic.Logging;
-//using NLog;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -17,112 +16,107 @@ using System.Windows.Forms;
namespace BlacksmithWorkshop
{
- public partial class FormShop : Form
- {
- private readonly ILogger _logger;
- private readonly IShopLogic _logic;
- public int? _id;
- private Dictionary _manufactures;
-
- public FormShop(ILogger logger, IShopLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- _manufactures = new();
- }
-
- private void FormShop_Load(object sender, EventArgs e)
- {
- if (_id.HasValue)
- {
- _logger.LogInformation("Загрузка магазина");
- try
- {
- var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
- if (shop != null)
- {
- textBoxName.Text = shop.ShopName;
- textBoxAddress.Text = shop.Address;
- dateTimePicker.Text = shop.OpeningDate.ToString();
- _manufactures = shop.ShopManufactures;
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
-
- private void LoadData()
- {
- _logger.LogInformation("Загрузка товаров магазина");
- try
- {
- if (_manufactures != null)
- {
- foreach (var manufactures in _manufactures)
- {
- dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
- manufactures.Value.Item1.Price, manufactures.Value.Item2 });
- }
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки изделий магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
-
- private void buttonCancel_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
-
- private void buttonSave_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxName.Text))
- {
- MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (string.IsNullOrEmpty(textBoxAddress.Text))
- {
- MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation("Сохранение магазина");
- try
- {
- var model = new ShopBindingModel
- {
- Id = _id ?? 0,
- ShopName = textBoxName.Text,
- Address = textBoxAddress.Text,
- OpeningDate = dateTimePicker.Value.Date,
- ShopManufactures = _manufactures
- };
- var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
- DialogResult = DialogResult.OK;
- Close();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка сохранения магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
+ public partial class FormShop : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logic;
+ public int? _id;
+ private Dictionary _manufactures;
+ public FormShop(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ _manufactures = new();
+ }
+ private void FormShop_Load(object sender, EventArgs e)
+ {
+ if (_id.HasValue)
+ {
+ _logger.LogInformation("Загрузка магазина");
+ try
+ {
+ var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
+ if (shop != null)
+ {
+ textBoxName.Text = shop.ShopName;
+ textBoxAddress.Text = shop.Address;
+ dateTimePicker.Text = shop.OpeningDate.ToString();
+ _manufactures = shop.ShopManufactures;
+ }
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ }
+ private void LoadData()
+ {
+ _logger.LogInformation("Загрузка товаров магазина");
+ try
+ {
+ if (_manufactures != null)
+ {
+ foreach (var manufactures in _manufactures)
+ {
+ dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
+ manufactures.Value.Item1.Price, manufactures.Value.Item2 });
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки изделий магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+ MessageBoxIcon.Error);
+ }
+ }
+ private void CancelButton_Click(object sender, EventArgs e)
+ {
+ DialogResult = DialogResult.Cancel;
+ Close();
+ }
+ private void SaveButton_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(textBoxName.Text))
+ {
+ MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ if (string.IsNullOrEmpty(textBoxAddress.Text))
+ {
+ MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ return;
+ }
+ _logger.LogInformation("Сохранение магазина");
+ try
+ {
+ var model = new ShopBindingModel
+ {
+ Id = _id ?? 0,
+ ShopName = textBoxName.Text,
+ Address = textBoxAddress.Text,
+ OpeningDate = dateTimePicker.Value.Date,
+ ShopManufactures = _manufactures
+ };
+ var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
+ if (!operationResult)
+ {
+ throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+ }
+ MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ DialogResult = DialogResult.OK;
+ Close();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка сохранения магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs
index dec8bba..7755f6d 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs
@@ -1,114 +1,114 @@
namespace BlacksmithWorkshop
{
- partial class FormShops
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
+ partial class FormShops
+ {
+ ///
+ /// Required designer variable.
+ ///
+ private System.ComponentModel.IContainer components = null;
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
+ ///
+ /// Clean up any resources being used.
+ ///
+ /// true if managed resources should be disposed; otherwise, false.
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
- #region Windows Form Designer generated code
+ #region Windows Form Designer generated code
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- dataGridView = new DataGridView();
- buttonAdd = new Button();
- buttonUpdate = new Button();
- buttonDelete = new Button();
- buttonRefresh = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 2);
- dataGridView.Name = "dataGridView";
- dataGridView.RowHeadersWidth = 62;
- dataGridView.RowTemplate.Height = 33;
- dataGridView.Size = new Size(829, 751);
- dataGridView.TabIndex = 0;
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(910, 46);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(173, 58);
- buttonAdd.TabIndex = 1;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += buttonAdd_Click;
- //
- // buttonUpdate
- //
- buttonUpdate.Location = new Point(910, 129);
- buttonUpdate.Name = "buttonUpdate";
- buttonUpdate.Size = new Size(173, 58);
- buttonUpdate.TabIndex = 2;
- buttonUpdate.Text = "Изменить";
- buttonUpdate.UseVisualStyleBackColor = true;
- buttonUpdate.Click += buttonUpdate_Click;
- //
- // buttonDelete
- //
- buttonDelete.Location = new Point(910, 212);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new Size(173, 58);
- buttonDelete.TabIndex = 3;
- buttonDelete.Text = "Удалить";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += buttonDelete_Click;
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(910, 300);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(173, 58);
- buttonRefresh.TabIndex = 4;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += buttonRefresh_Click;
- //
- // FormShops
- //
- AutoScaleDimensions = new SizeF(10F, 25F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1143, 750);
- Controls.Add(buttonRefresh);
- Controls.Add(buttonDelete);
- Controls.Add(buttonUpdate);
- Controls.Add(buttonAdd);
- Controls.Add(dataGridView);
- Name = "FormShops";
- Text = "Магазины";
- Load += FormShops_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- }
+ ///
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ ///
+ private void InitializeComponent()
+ {
+ dataGridView = new DataGridView();
+ buttonAdd = new Button();
+ buttonUpdate = new Button();
+ buttonDelete = new Button();
+ buttonRefresh = new Button();
+ ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+ SuspendLayout();
+ //
+ // dataGridView
+ //
+ dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridView.Location = new Point(0, 0);
+ dataGridView.Name = "dataGridView";
+ dataGridView.RowTemplate.Height = 25;
+ dataGridView.Size = new Size(567, 450);
+ dataGridView.TabIndex = 0;
+ //
+ // buttonAdd
+ //
+ buttonAdd.Location = new Point(617, 22);
+ buttonAdd.Name = "buttonAdd";
+ buttonAdd.Size = new Size(152, 33);
+ buttonAdd.TabIndex = 1;
+ buttonAdd.Text = "Создать";
+ buttonAdd.UseVisualStyleBackColor = true;
+ buttonAdd.Click += AddButton_Click;
+ //
+ // buttonUpdate
+ //
+ buttonUpdate.Location = new Point(617, 61);
+ buttonUpdate.Name = "buttonUpdate";
+ buttonUpdate.Size = new Size(152, 33);
+ buttonUpdate.TabIndex = 2;
+ buttonUpdate.Text = "Изменить";
+ buttonUpdate.UseVisualStyleBackColor = true;
+ buttonUpdate.Click += UpdateButton_Click;
+ //
+ // buttonDelete
+ //
+ buttonDelete.Location = new Point(617, 100);
+ buttonDelete.Name = "buttonDelete";
+ buttonDelete.Size = new Size(152, 33);
+ buttonDelete.TabIndex = 3;
+ buttonDelete.Text = "Удалить";
+ buttonDelete.UseVisualStyleBackColor = true;
+ buttonDelete.Click += DeleteButton_Click;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Location = new Point(617, 139);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(152, 33);
+ buttonRefresh.TabIndex = 4;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += RefreshButton_Click;
+ //
+ // FormShops
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(800, 450);
+ Controls.Add(buttonRefresh);
+ Controls.Add(buttonDelete);
+ Controls.Add(buttonUpdate);
+ Controls.Add(buttonAdd);
+ Controls.Add(dataGridView);
+ Name = "FormShops";
+ StartPosition = FormStartPosition.CenterParent;
+ Text = "Магазины";
+ Load += FormShops_Load;
+ ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+ ResumeLayout(false);
+ }
- #endregion
+ #endregion
- private DataGridView dataGridView;
- private Button buttonAdd;
- private Button buttonUpdate;
- private Button buttonDelete;
- private Button buttonRefresh;
- }
+ private DataGridView dataGridView;
+ private Button buttonAdd;
+ private Button buttonUpdate;
+ private Button buttonDelete;
+ private Button buttonRefresh;
+ }
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs
index 18161b0..e9fcb99 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs
@@ -1,4 +1,7 @@
-using System;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -7,111 +10,101 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic.Logging;
-//using NLog;
namespace BlacksmithWorkshop
{
- public partial class FormShops : Form
- {
- private readonly ILogger _logger;
- private readonly IShopLogic _logic;
- public FormShops(ILogger logger, IShopLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
-
- private void FormShops_Load(object sender, EventArgs e)
- {
- LoadData();
- }
- private void LoadData()
- {
- try
- {
- var list = _logic.ReadList(null);
- if (list != null)
- {
- dataGridView.DataSource = list;
- dataGridView.Columns["Id"].Visible = false;
- dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["OpeningDate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["ShopManufactures"].Visible = false;
- }
- _logger.LogInformation("Загрузка магазинов");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки магазинов");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
-
- private void buttonAdd_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormShop));
- if (service is FormShop form)
- {
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
-
- private void buttonUpdate_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormShop));
- if (service is FormShop form)
- {
- form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- }
-
- private void buttonDelete_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Удаление магазина");
- try
- {
- if (!_logic.Delete(new ShopBindingModel
- {
- Id = id
- }))
- {
- throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка удаления магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
- }
-
- private void buttonRefresh_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- }
+ public partial class FormShops : Form
+ {
+ private readonly ILogger _logger;
+ private readonly IShopLogic _logic;
+ public FormShops(ILogger logger, IShopLogic logic)
+ {
+ InitializeComponent();
+ _logger = logger;
+ _logic = logic;
+ }
+ private void LoadData()
+ {
+ try
+ {
+ var list = _logic.ReadList(null);
+ if (list != null)
+ {
+ dataGridView.DataSource = list;
+ dataGridView.Columns["Id"].Visible = false;
+ dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ dataGridView.Columns["OpeningDate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+ dataGridView.Columns["ShopManufactures"].Visible = false;
+ }
+ _logger.LogInformation("Загрузка магазинов");
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка загрузки магазинов");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ private void FormShops_Load(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ private void AddButton_Click(object sender, EventArgs e)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+ if (service is FormShop form)
+ {
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+ private void UpdateButton_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+ if (service is FormShop form)
+ {
+ form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ if (form.ShowDialog() == DialogResult.OK)
+ {
+ LoadData();
+ }
+ }
+ }
+ }
+ private void RefreshButton_Click(object sender, EventArgs e)
+ {
+ LoadData();
+ }
+ private void DeleteButton_Click(object sender, EventArgs e)
+ {
+ if (dataGridView.SelectedRows.Count == 1)
+ {
+ if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+ {
+ int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+ _logger.LogInformation("Удаление магазина");
+ try
+ {
+ if (!_logic.Delete(new ShopBindingModel
+ {
+ Id = id
+ }))
+ {
+ throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
+ }
+ LoadData();
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка удаления магазина");
+ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ }
+ }
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs
index 36502f8..5e2f0fd 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.Designer.cs
@@ -32,65 +32,67 @@
ManufactureComboBox = new ComboBox();
CountTextBox = new TextBox();
buttonSave = new Button();
- buttonCancel = new Button();
+ buttonCansel = new Button();
SuspendLayout();
//
// ShopComboBox
//
+ ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
ShopComboBox.FormattingEnabled = true;
ShopComboBox.Location = new Point(12, 12);
ShopComboBox.Name = "ShopComboBox";
- ShopComboBox.Size = new Size(318, 33);
+ ShopComboBox.Size = new Size(224, 23);
ShopComboBox.TabIndex = 0;
//
// ManufactureComboBox
//
+ ManufactureComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
ManufactureComboBox.FormattingEnabled = true;
- ManufactureComboBox.Location = new Point(348, 12);
+ ManufactureComboBox.Location = new Point(242, 12);
ManufactureComboBox.Name = "ManufactureComboBox";
- ManufactureComboBox.Size = new Size(318, 33);
+ ManufactureComboBox.Size = new Size(224, 23);
ManufactureComboBox.TabIndex = 1;
//
// CountTextBox
//
- CountTextBox.Location = new Point(689, 14);
+ CountTextBox.Location = new Point(472, 12);
CountTextBox.Name = "CountTextBox";
- CountTextBox.Size = new Size(318, 31);
+ CountTextBox.Size = new Size(224, 23);
CountTextBox.TabIndex = 2;
//
// buttonSave
//
- buttonSave.Location = new Point(240, 78);
+ buttonSave.Location = new Point(162, 47);
buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(173, 44);
+ buttonSave.Size = new Size(157, 28);
buttonSave.TabIndex = 3;
buttonSave.Text = "Сохранить";
buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += buttonSave_Click;
+ buttonSave.Click += SaveButton_Click;
//
- // buttonCancel
+ // buttonCansel
//
- buttonCancel.Location = new Point(430, 78);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(173, 44);
- buttonCancel.TabIndex = 4;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += buttonCancel_Click;
+ buttonCansel.Location = new Point(394, 47);
+ buttonCansel.Name = "buttonCansel";
+ buttonCansel.Size = new Size(157, 28);
+ buttonCansel.TabIndex = 4;
+ buttonCansel.Text = "Отмена";
+ buttonCansel.UseVisualStyleBackColor = true;
+ buttonCansel.Click += CancelButton_Click;
//
// FormSupply
//
- AutoScaleDimensions = new SizeF(10F, 25F);
+ AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1010, 145);
- Controls.Add(buttonCancel);
+ ClientSize = new Size(707, 87);
+ Controls.Add(buttonCansel);
Controls.Add(buttonSave);
Controls.Add(CountTextBox);
Controls.Add(ManufactureComboBox);
Controls.Add(ShopComboBox);
Name = "FormSupply";
+ StartPosition = FormStartPosition.CenterParent;
Text = "Пополнение магазина";
- Load += FormSupply_Load;
ResumeLayout(false);
PerformLayout();
}
@@ -101,6 +103,6 @@
private ComboBox ManufactureComboBox;
private TextBox CountTextBox;
private Button buttonSave;
- private Button buttonCancel;
+ private Button buttonCansel;
}
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs
index 599fd9a..9742c1e 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormSupply.cs
@@ -20,7 +20,6 @@ namespace BlacksmithWorkshop
private readonly List? _shopsList;
IShopLogic _shopLogic;
IManufactureLogic _manufactureLogic;
-
public int ShopId
{
get
@@ -66,7 +65,6 @@ namespace BlacksmithWorkshop
get { return Convert.ToInt32(CountTextBox.Text); }
set { CountTextBox.Text = value.ToString(); }
}
-
public FormSupply(IManufactureLogic ManufactureLogic, IShopLogic shopLogic)
{
InitializeComponent();
@@ -89,18 +87,7 @@ namespace BlacksmithWorkshop
ShopComboBox.SelectedItem = null;
}
}
-
- private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
- {
-
- }
-
- private void FormSupply_Load(object sender, EventArgs e)
- {
-
- }
-
- private void buttonSave_Click(object sender, EventArgs e)
+ private void SaveButton_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(CountTextBox.Text))
{
@@ -143,8 +130,7 @@ namespace BlacksmithWorkshop
return;
}
}
-
- private void buttonCancel_Click(object sender, EventArgs e)
+ private void CancelButton_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
Close();
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
index 81e1e01..46eb659 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
@@ -1,7 +1,7 @@
using BlacksmithWorkshopBusinessLogic.BusinessLogics;
using BlacksmithWorkshopContracts.BusinessLogicsContracts;
using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopListImplement.Implements;
+using BlacksmithWorkshopFileImplement.Implements;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using NLog.Extensions.Logging;
@@ -40,18 +40,18 @@ namespace BlacksmithWorkshop
services.AddTransient();
services.AddTransient();
services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- }
+ services.AddTransient();
+ services.AddTransient();
+ services.AddTransient();
+ }
}
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs
index 8b8263d..48e1963 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs
@@ -6,151 +6,156 @@ using BlacksmithWorkshopContracts.ViewModels;
using BlacksmithWorkshopDataModels.Models;
using Microsoft.Extensions.Logging;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
{
- public class ShopLogic : IShopLogic
- {
- private readonly ILogger _logger;
- private readonly IShopStorage _shopStorage;
- public ShopLogic(ILogger logger, IShopStorage ShopStorage)
- {
- _logger = logger;
- _shopStorage = ShopStorage;
- }
- public List? ReadList(ShopSearchModel? model)
- {
- _logger.LogInformation("ReadList. ShopName:{ShopName}. Id:{ Id}", model?.ShopName, model?.Id);
- var list = model == null ? _shopStorage.GetFullList() :
- _shopStorage.GetFilteredList(model);
- if (list == null)
- {
- _logger.LogWarning("ReadList return null list");
- return null;
- }
- _logger.LogInformation("ReadList. Count:{Count}", list.Count);
- return list;
- }
- public ShopViewModel? ReadElement(ShopSearchModel model)
- {
- if (model == null)
- {
- throw new ArgumentNullException(nameof(model));
- }
- _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
- var element = _shopStorage.GetElement(model);
- if (element == null)
- {
- _logger.LogWarning("ReadElement element not found");
- return null;
- }
- _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
- return element;
- }
- public bool Create(ShopBindingModel model)
- {
- CheckModel(model);
- if (_shopStorage.Insert(model) == null)
- {
- _logger.LogWarning("Insert operation failed");
- return false;
- }
- return true;
- }
- public bool Update(ShopBindingModel model)
- {
- CheckModel(model);
- if (_shopStorage.Update(model) == null)
- {
- _logger.LogWarning("Update operation failed");
- return false;
- }
- return true;
- }
- public bool Delete(ShopBindingModel model)
- {
- CheckModel(model, false);
- _logger.LogInformation("Delete. Id:{Id}", model.Id);
- if (_shopStorage.Delete(model) == null)
- {
- _logger.LogWarning("Delete operation failed");
- return false;
- }
- return true;
- }
-
-
- public bool ReplenishManufactures(ShopSearchModel model, IManufactureModel manufacture, int count)
- {
- _logger.LogInformation("Try to replenish manufactures. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
- if (model == null)
- throw new ArgumentNullException(nameof(model));
- ShopViewModel? curModel = ReadElement(model);
- if (curModel == null)
+ public class ShopLogic : IShopLogic
+ {
+ private readonly ILogger _logger;
+ private readonly IShopStorage _shopStorage;
+ public ShopLogic(ILogger logger, IShopStorage ShopStorage)
+ {
+ _logger = logger;
+ _shopStorage = ShopStorage;
+ }
+ public List? ReadList(ShopSearchModel? model)
+ {
+ _logger.LogInformation("ReadList. ShopName:{ShopName}. Id:{ Id}", model?.ShopName, model?.Id);
+ var list = model == null ? _shopStorage.GetFullList() :
+ _shopStorage.GetFilteredList(model);
+ if (list == null)
+ {
+ _logger.LogWarning("ReadList return null list");
+ return null;
+ }
+ _logger.LogInformation("ReadList. Count:{Count}", list.Count);
+ return list;
+ }
+ public ShopViewModel? ReadElement(ShopSearchModel model)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ _logger.LogInformation("ReadElement. ShopName:{ShopName}.Id:{ Id}", model.ShopName, model.Id);
+ var element = _shopStorage.GetElement(model);
+ if (element == null)
+ {
+ _logger.LogWarning("ReadElement element not found");
+ return null;
+ }
+ _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
+ return element;
+ }
+ public bool Create(ShopBindingModel model)
+ {
+ CheckModel(model);
+ if (_shopStorage.Insert(model) == null)
+ {
+ _logger.LogWarning("Insert operation failed");
+ return false;
+ }
+ return true;
+ }
+ public bool Update(ShopBindingModel model)
+ {
+ CheckModel(model);
+ if (_shopStorage.Update(model) == null)
+ {
+ _logger.LogWarning("Update operation failed");
+ return false;
+ }
+ return true;
+ }
+ public bool Delete(ShopBindingModel model)
+ {
+ CheckModel(model, false);
+ _logger.LogInformation("Delete. Id:{Id}", model.Id);
+ if (_shopStorage.Delete(model) == null)
+ {
+ _logger.LogWarning("Delete operation failed");
+ return false;
+ }
+ return true;
+ }
+ public bool ReplenishManufactures(ShopSearchModel model, IManufactureModel manufacture, int count)
+ {
+ _logger.LogInformation("Try to replenish manufactures. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
+ if (model == null)
{
_logger.LogWarning("Read operation failed");
- return false;
- }
- if (manufacture == null)
- throw new ArgumentNullException(nameof(manufacture));
- if (count <= 0)
- throw new ArgumentException("Количество должно быть положительным числом");
-
- //попытка найти информацию о товаре в магазине по его идентификатору в словаре
- //найден и добавляется
- if (curModel.ShopManufactures.TryGetValue(manufacture.Id, out var pair))
- {
- curModel.ShopManufactures[manufacture.Id] = (pair.Item1, pair.Item2 + count);
- }
- //не найден и добавляется
- else
- {
- curModel.ShopManufactures.Add(manufacture.Id, (manufacture, count));
- }
- Update(new()
- {
- Id = curModel.Id,
- ShopName = curModel.ShopName,
- OpeningDate = curModel.OpeningDate,
- Address = curModel.Address,
- ShopManufactures = curModel.ShopManufactures,
- });
- _logger.LogInformation("Success. ManufactureName:{ManufactureName}. Id:{Id}. Replenish:{count}",
- manufacture.ManufactureName, manufacture.Id, count);
- return true;
- }
- private void CheckModel(ShopBindingModel model, bool withParams = true)
- {
- if (model == null)
- {
throw new ArgumentNullException(nameof(model));
- }
- if (!withParams)
+ }
+ ShopViewModel? curModel = ReadElement(model);
+ if (curModel == null)
+ {
+ _logger.LogWarning("Read operation failed");
+ throw new ArgumentNullException(nameof(curModel));
+ }
+ if (manufacture == null)
{
- return;
- }
- if (string.IsNullOrEmpty(model.ShopName))
+ _logger.LogWarning("Read operation failed");
+ throw new ArgumentNullException(nameof(manufacture));
+ }
+ if (count <= 0)
{
- throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
- }
- if (string.IsNullOrEmpty(model.Address))
- {
- throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
- }
- _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}",
- model.ShopName, model.Address, model.OpeningDate, model.Id);
- var element = _shopStorage.GetElement(new ShopSearchModel
- {
- ShopName = model.ShopName
- });
- if (element != null && element.Id != model.Id)
- {
- throw new InvalidOperationException("Магазин с таким названием уже есть");
- }
- }
- }
+ _logger.LogWarning("Read operation failed");
+ throw new ArgumentException("Количество должно быть положительным числом");
+ }
+ if (curModel.ShopManufactures.TryGetValue(manufacture.Id, out var pair))
+ {
+ curModel.ShopManufactures[manufacture.Id] = (pair.Item1, pair.Item2 + count);
+ }
+ else
+ {
+ curModel.ShopManufactures.Add(manufacture.Id, (manufacture, count));
+ }
+ Update(new()
+ {
+ Id = curModel.Id,
+ ShopName = curModel.ShopName,
+ OpeningDate = curModel.OpeningDate,
+ Address = curModel.Address,
+ ShopManufactures = curModel.ShopManufactures,
+ });
+ _logger.LogInformation("Success. ManufactureName:{ManufactureName}. Id:{Id}. Replenish:{count}",
+ manufacture.ManufactureName, manufacture.Id, count);
+ return true;
+ }
+ private void CheckModel(ShopBindingModel model, bool withParams = true)
+ {
+ if (model == null)
+ {
+ throw new ArgumentNullException(nameof(model));
+ }
+ if (!withParams)
+ {
+ return;
+ }
+ if (string.IsNullOrEmpty(model.ShopName))
+ {
+ throw new ArgumentNullException("Нет названия магазина", nameof(model.ShopName));
+ }
+ if (string.IsNullOrEmpty(model.Address))
+ {
+ throw new ArgumentNullException("Нет адреса магазина", nameof(model.Address));
+ }
+ _logger.LogInformation("Shop. ShopName:{ShopName}.Address:{Address}. DateOpen:{DateOpen}. Id: { Id}",
+ model.ShopName, model.Address, model.OpeningDate, model.Id);
+ var element = _shopStorage.GetElement(new ShopSearchModel
+ {
+ ShopName = model.ShopName
+ });
+ if (element != null && element.Id != model.Id)
+ {
+ throw new InvalidOperationException("Магазин с таким названием уже есть");
+ }
+ }
+ }
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs
index 7190645..79ff366 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs
@@ -1,9 +1,9 @@
-using BlacksmithWorkshopDataModels.Models;
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using BlacksmithWorkshopDataModels.Models;
namespace BlacksmithWorkshopContracts.BindingModels
{
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs
index bec9313..5b6358d 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs
@@ -1,13 +1,12 @@
using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
using BlacksmithWorkshopDataModels.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-
namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
{
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs
index 75cf708..64a9f62 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs
@@ -8,7 +8,7 @@ namespace BlacksmithWorkshopContracts.SearchModels
{
public class ShopSearchModel
{
- public int? Id { get; set; }
+ public int? Id { get; set; }
public string? ShopName { get; set; }
}
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs
index f3918e0..c36afa4 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs
@@ -15,7 +15,7 @@ namespace BlacksmithWorkshopContracts.StoragesContracts
List GetFilteredList(ShopSearchModel model);
ShopViewModel? GetElement(ShopSearchModel model);
ShopViewModel? Insert(ShopBindingModel model);
- ShopViewModel? Update(ShopBindingModel model);
+ ShopViewModel? Update(ShopBindingModel model);
ShopViewModel? Delete(ShopBindingModel model);
}
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs
index c3a502d..eb418a9 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/ShopStorage.cs
@@ -1,13 +1,13 @@
-using BlacksmithWorkshopListImplement.Models;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopListImplement.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
namespace BlacksmithWorkshopListImplement.Implements
{
@@ -21,7 +21,7 @@ namespace BlacksmithWorkshopListImplement.Implements
public List GetFullList()
{
List result = new List();
- foreach (var Shop in _source.Shops)
+ foreach(var Shop in _source.Shops)
{
result.Add(Shop.GetViewModel);
}
@@ -34,7 +34,7 @@ namespace BlacksmithWorkshopListImplement.Implements
{
return result;
}
- foreach (var Shop in _source.Shops)
+ foreach(var Shop in _source.Shops)
{
if (Shop.ShopName.Contains(model.ShopName))
{
@@ -49,21 +49,21 @@ namespace BlacksmithWorkshopListImplement.Implements
{
return null;
}
- foreach (var Shop in _source.Shops)
+ foreach(var Shop in _source.Shops)
{
- if ((!string.IsNullOrEmpty(model.ShopName) &&
- Shop.ShopName == model.ShopName) ||
- (model.Id.HasValue && Shop.Id == model.Id))
- {
- return Shop.GetViewModel;
- }
- }
+ if ((!string.IsNullOrEmpty(model.ShopName) &&
+ Shop.ShopName == model.ShopName) ||
+ (model.Id.HasValue && Shop.Id == model.Id))
+ {
+ return Shop.GetViewModel;
+ }
+ }
return null;
}
public ShopViewModel? Insert(ShopBindingModel model)
{
model.Id = 1;
- foreach (var Shop in _source.Shops)
+ foreach(var Shop in _source.Shops)
{
if (Shop.Id >= model.Id)
{
@@ -80,28 +80,28 @@ namespace BlacksmithWorkshopListImplement.Implements
}
public ShopViewModel? Update(ShopBindingModel model)
{
- foreach (var Shop in _source.Shops)
- {
- if (Shop.Id == model.Id)
- {
- Shop.Update(model);
- return Shop.GetViewModel;
- }
- }
- return null;
- }
+ foreach (var Shop in _source.Shops)
+ {
+ if (Shop.Id == model.Id)
+ {
+ Shop.Update(model);
+ return Shop.GetViewModel;
+ }
+ }
+ return null;
+ }
public ShopViewModel? Delete(ShopBindingModel model)
{
- for (int i = 0; i < _source.Shops.Count; ++i)
- {
- if (_source.Shops[i].Id == model.Id)
- {
- var element = _source.Shops[i];
- _source.Shops.RemoveAt(i);
- return element.GetViewModel;
- }
- }
- return null;
- }
+ for (int i = 0; i < _source.Shops.Count; ++i)
+ {
+ if (_source.Shops[i].Id == model.Id)
+ {
+ var element = _source.Shops[i];
+ _source.Shops.RemoveAt(i);
+ return element.GetViewModel;
+ }
+ }
+ return null;
+ }
}
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs
index 3ee03cc..4c761e4 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopListImplement/Models/Shop.cs
@@ -1,17 +1,17 @@
-using System;
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using BlacksmithWorkshopDataModels.Models;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
namespace BlacksmithWorkshopListImplement.Models
{
public class Shop : IShopModel
{
- public int Id { get; private set; }
+ public int Id { get; private set; }
public string ShopName { get; private set; } = string.Empty;
public string Address { get; private set; } = string.Empty;
public DateTime OpeningDate { get; private set; }
diff --git a/BlacksmithWorkshop/FormComponent.Designer.cs b/BlacksmithWorkshop/FormComponent.Designer.cs
deleted file mode 100644
index 3f8123d..0000000
--- a/BlacksmithWorkshop/FormComponent.Designer.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormComponent
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- labelName = new Label();
- labelCost = new Label();
- textBoxName = new TextBox();
- textBoxCost = new TextBox();
- buttonSave = new Button();
- buttonCancel = new Button();
- SuspendLayout();
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(18, 9);
- labelName.Name = "labelName";
- labelName.Size = new Size(62, 15);
- labelName.TabIndex = 0;
- labelName.Text = "Название:";
- //
- // labelCost
- //
- labelCost.AutoSize = true;
- labelCost.Location = new Point(18, 39);
- labelCost.Name = "labelCost";
- labelCost.Size = new Size(38, 15);
- labelCost.TabIndex = 1;
- labelCost.Text = "Цена:";
- //
- // textBoxName
- //
- textBoxName.Location = new Point(86, 6);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(393, 23);
- textBoxName.TabIndex = 2;
- //
- // textBoxCost
- //
- textBoxCost.Location = new Point(86, 36);
- textBoxCost.Name = "textBoxCost";
- textBoxCost.Size = new Size(393, 23);
- textBoxCost.TabIndex = 3;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(108, 65);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(76, 24);
- buttonSave.TabIndex = 4;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += ButtonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(314, 65);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(76, 24);
- buttonCancel.TabIndex = 5;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += ButtonCancel_Click;
- //
- // FormComponent
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(503, 103);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(textBoxCost);
- Controls.Add(textBoxName);
- Controls.Add(labelCost);
- Controls.Add(labelName);
- Name = "FormComponent";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Компонент";
- Load += FormComponent_Load;
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Label labelName;
- private Label labelCost;
- private TextBox textBoxName;
- private TextBox textBoxCost;
- private Button buttonSave;
- private Button buttonCancel;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormComponent.cs b/BlacksmithWorkshop/FormComponent.cs
deleted file mode 100644
index 1cca08c..0000000
--- a/BlacksmithWorkshop/FormComponent.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using Microsoft.Extensions.Logging;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormComponent : Form
- {
- private readonly ILogger _logger;
- private readonly IComponentLogic _logic;
- private int? _id;
- public int Id { set { _id = value; } }
- public FormComponent(ILogger logger, IComponentLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
- private void FormComponent_Load(object sender, EventArgs e)
- {
- if (_id.HasValue)
- {
- try
- {
- _logger.LogInformation(" ");
- var view = _logic.ReadElement(new ComponentSearchModel
- {
- Id =
- _id.Value
- });
- if (view != null)
- {
- textBoxName.Text = view.ComponentName;
- textBoxCost.Text = view.Cost.ToString();
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, " ");
- MessageBox.Show(ex.Message, "", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void ButtonSave_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxName.Text))
- {
- MessageBox.Show(" ", "",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation(" ");
- try
- {
- var model = new ComponentBindingModel
- {
- Id = _id ?? 0,
- ComponentName = textBoxName.Text,
- Cost = Convert.ToDouble(textBoxCost.Text)
- };
- var operationResult = _id.HasValue ? _logic.Update(model) :
- _logic.Create(model);
- if (!operationResult)
- {
- throw new Exception(" . .");
-
- }
- MessageBox.Show(" ", "",
- MessageBoxButtons.OK, MessageBoxIcon.Information);
- DialogResult = DialogResult.OK;
- Close();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, " ");
- MessageBox.Show(ex.Message, "", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void ButtonCancel_Click(object sender, EventArgs e)
- {
-
- DialogResult = DialogResult.Cancel;
- Close();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormComponent.resx b/BlacksmithWorkshop/FormComponent.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormComponent.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormComponents.Designer.cs b/BlacksmithWorkshop/FormComponents.Designer.cs
deleted file mode 100644
index 7ed35e2..0000000
--- a/BlacksmithWorkshop/FormComponents.Designer.cs
+++ /dev/null
@@ -1,113 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormComponents
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- buttonAdd = new Button();
- buttonChange = new Button();
- buttonDelete = new Button();
- buttonRefresh = new Button();
- dataGridView = new DataGridView();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(474, 12);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(118, 29);
- buttonAdd.TabIndex = 1;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += AddButton_Click;
- //
- // buttonChange
- //
- buttonChange.Location = new Point(474, 47);
- buttonChange.Name = "buttonChange";
- buttonChange.Size = new Size(118, 29);
- buttonChange.TabIndex = 2;
- buttonChange.Text = "Изменить";
- buttonChange.UseVisualStyleBackColor = true;
- buttonChange.Click += ChangeButton_Click;
- //
- // buttonDelete
- //
- buttonDelete.Location = new Point(474, 82);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new Size(118, 29);
- buttonDelete.TabIndex = 3;
- buttonDelete.Text = "Удалить";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += DeleteButton_Click;
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(474, 117);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(118, 29);
- buttonRefresh.TabIndex = 4;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += RefreshButton_Click;
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 0);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(468, 450);
- dataGridView.TabIndex = 5;
- //
- // FormComponents
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(600, 450);
- Controls.Add(dataGridView);
- Controls.Add(buttonRefresh);
- Controls.Add(buttonDelete);
- Controls.Add(buttonChange);
- Controls.Add(buttonAdd);
- Name = "FormComponents";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Компоненты";
- Load += ComponentsForm_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
- private Button buttonAdd;
- private Button buttonChange;
- private Button buttonDelete;
- private Button buttonRefresh;
- private DataGridView dataGridView;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormComponents.cs b/BlacksmithWorkshop/FormComponents.cs
deleted file mode 100644
index 6cb054c..0000000
--- a/BlacksmithWorkshop/FormComponents.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormComponents : Form
- {
- private readonly ILogger _logger;
- private readonly IComponentLogic _logic;
- public FormComponents(ILogger logger, IComponentLogic
- logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
- private void ComponentsForm_Load(object sender, EventArgs e)
- {
- LoadData();
- }
- private void LoadData()
- {
- try
- {
- var list = _logic.ReadList(null);
- if (list != null)
- {
- dataGridView.DataSource = list;
- dataGridView.Columns["Id"].Visible = false;
- dataGridView.Columns["ComponentName"].AutoSizeMode =
- DataGridViewAutoSizeColumnMode.Fill;
- }
- _logger.LogInformation("Загрузка компонентов");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки компонентов");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void AddButton_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
- if (service is FormComponent form)
- {
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- private void ChangeButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- var service =
- Program.ServiceProvider?.GetService(typeof(FormComponent));
- if (service is FormComponent form)
- {
- form.Id =
- Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
-
- }
- private void DeleteButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- if (MessageBox.Show("Удалить запись?", "Вопрос",
- MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- int id =
- Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Удаление компонента");
- try
- {
- if (!_logic.Delete(new ComponentBindingModel
- {
- Id = id
- }))
- {
- throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка удаления компонента");
- MessageBox.Show(ex.Message, "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
-
- }
- private void RefreshButton_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormComponents.resx b/BlacksmithWorkshop/FormComponents.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormComponents.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormCreateOrder.Designer.cs b/BlacksmithWorkshop/FormCreateOrder.Designer.cs
deleted file mode 100644
index 666f1bf..0000000
--- a/BlacksmithWorkshop/FormCreateOrder.Designer.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormCreateOrder
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- labelName = new Label();
- labelCount = new Label();
- labelSum = new Label();
- TextBoxCount = new TextBox();
- ComboBoxManufacture = new ComboBox();
- TextBoxSum = new TextBox();
- buttonCancel = new Button();
- buttonSave = new Button();
- SuspendLayout();
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(22, 17);
- labelName.Name = "labelName";
- labelName.Size = new Size(56, 15);
- labelName.TabIndex = 0;
- labelName.Text = "Изделие:";
- //
- // labelCount
- //
- labelCount.AutoSize = true;
- labelCount.Location = new Point(22, 46);
- labelCount.Name = "labelCount";
- labelCount.Size = new Size(75, 15);
- labelCount.TabIndex = 1;
- labelCount.Text = "Количество:";
- //
- // labelSum
- //
- labelSum.AutoSize = true;
- labelSum.Location = new Point(22, 75);
- labelSum.Name = "labelSum";
- labelSum.Size = new Size(48, 15);
- labelSum.TabIndex = 2;
- labelSum.Text = "Сумма:";
- //
- // TextBoxCount
- //
- TextBoxCount.Location = new Point(125, 43);
- TextBoxCount.Name = "TextBoxCount";
- TextBoxCount.Size = new Size(214, 23);
- TextBoxCount.TabIndex = 3;
- TextBoxCount.TextChanged += TextBoxCount_TextChanged;
- //
- // ComboBoxManufacture
- //
- ComboBoxManufacture.DropDownStyle = ComboBoxStyle.DropDownList;
- ComboBoxManufacture.FormattingEnabled = true;
- ComboBoxManufacture.Location = new Point(125, 14);
- ComboBoxManufacture.Name = "ComboBoxManufacture";
- ComboBoxManufacture.Size = new Size(214, 23);
- ComboBoxManufacture.TabIndex = 4;
- ComboBoxManufacture.SelectedIndexChanged += ComboBoxManufacture_SelectedIndexChanged;
- //
- // TextBoxSum
- //
- TextBoxSum.Location = new Point(125, 72);
- TextBoxSum.Name = "TextBoxSum";
- TextBoxSum.ReadOnly = true;
- TextBoxSum.Size = new Size(214, 23);
- TextBoxSum.TabIndex = 5;
- TextBoxSum.TextChanged += TextBoxSum_TextChanged;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(247, 104);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(77, 24);
- buttonCancel.TabIndex = 6;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += CancelButton_Click;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(164, 104);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(77, 24);
- buttonSave.TabIndex = 7;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += SaveButton_Click;
- //
- // FormCreateOrder
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(349, 139);
- Controls.Add(buttonSave);
- Controls.Add(buttonCancel);
- Controls.Add(TextBoxSum);
- Controls.Add(ComboBoxManufacture);
- Controls.Add(TextBoxCount);
- Controls.Add(labelSum);
- Controls.Add(labelCount);
- Controls.Add(labelName);
- Name = "FormCreateOrder";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Заказ";
- Load += FormCreateOrder_Load;
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Label labelName;
- private Label labelCount;
- private Label labelSum;
- private TextBox TextBoxCount;
- private ComboBox ComboBoxManufacture;
- private TextBox TextBoxSum;
- private Button buttonCancel;
- private Button buttonSave;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormCreateOrder.cs b/BlacksmithWorkshop/FormCreateOrder.cs
deleted file mode 100644
index 6f5f157..0000000
--- a/BlacksmithWorkshop/FormCreateOrder.cs
+++ /dev/null
@@ -1,134 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormCreateOrder : Form
- {
- private readonly ILogger _logger;
- private readonly IManufactureLogic _logicI;
- private readonly IOrderLogic _logicO;
- public FormCreateOrder(ILogger logger, IManufactureLogic
- logicI, IOrderLogic logicO)
- {
- InitializeComponent();
- _logger = logger;
- _logicI = logicI;
- _logicO = logicO;
- }
- private void FormCreateOrder_Load(object sender, EventArgs e)
- {
- _logger.LogInformation("Загрузка кузнечных изделий для заказа");
- try
- {
- var list = _logicI.ReadList(null);
- if (list != null)
- {
- ComboBoxManufacture.DisplayMember = "ManufactureName";
- ComboBoxManufacture.ValueMember = "Id";
- ComboBoxManufacture.DataSource = list;
- ComboBoxManufacture.SelectedItem = null;
- }
- _logger.LogInformation("Кузнечные изделия загружены");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки кузнечных изделий");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void CalcSum()
- {
- if (ComboBoxManufacture.SelectedValue != null &&
- !string.IsNullOrEmpty(TextBoxCount.Text))
- {
- try
- {
- int id = Convert.ToInt32(ComboBoxManufacture.SelectedValue);
- var Manufacture = _logicI.ReadElement(new ManufactureSearchModel
- {
- Id = id
- });
- int count = Convert.ToInt32(TextBoxCount.Text);
- TextBoxSum.Text = Math.Round(count * (Manufacture?.Price ?? 0),
- 2).ToString();
- _logger.LogInformation("Расчет суммы заказа");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка расчета суммы заказа");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void TextBoxCount_TextChanged(object sender, EventArgs e)
- {
- CalcSum();
- }
- private void TextBoxSum_TextChanged(object sender, EventArgs e)
- {
- CalcSum();
- }
- private void SaveButton_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(TextBoxCount.Text))
- {
- MessageBox.Show("Заполните поле Количество", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (ComboBoxManufacture.SelectedValue == null)
- {
- MessageBox.Show("Выберите кузнечное изделие", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation("Создание заказа");
- try
- {
- var operationResult = _logicO.CreateOrder(new OrderBindingModel
- {
- ManufactureId = Convert.ToInt32(ComboBoxManufacture.SelectedValue),
- Count = Convert.ToInt32(TextBoxCount.Text),
- Sum = Convert.ToDouble(TextBoxSum.Text)
- });
- if (!operationResult)
- {
- throw new Exception("Ошибка при создании заказа. Дополнительная информация в логах.");
- }
- MessageBox.Show("Сохранение прошло успешно", "Сообщение",
- MessageBoxButtons.OK, MessageBoxIcon.Information);
- DialogResult = DialogResult.OK;
- Close();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка создания заказа");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void CancelButton_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- private void ComboBoxManufacture_SelectedIndexChanged(object sender, EventArgs e)
- {
- CalcSum();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormCreateOrder.resx b/BlacksmithWorkshop/FormCreateOrder.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormCreateOrder.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/FormMain.Designer.cs
deleted file mode 100644
index 1a721e2..0000000
--- a/BlacksmithWorkshop/FormMain.Designer.cs
+++ /dev/null
@@ -1,189 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormMain
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- menuStrip = new MenuStrip();
- GuidesToolStripMenuItem = new ToolStripMenuItem();
- ComponentsToolStripMenuItem = new ToolStripMenuItem();
- ManufacturesToolStripMenuItem = new ToolStripMenuItem();
- ShopsToolStripMenuItem = new ToolStripMenuItem();
- SupplyToolStripMenuItem = new ToolStripMenuItem();
- dataGridView = new DataGridView();
- buttonCreateOrder = new Button();
- buttonRefresh = new Button();
- buttonIssued = new Button();
- buttonReady = new Button();
- buttonTakeInWork = new Button();
- menuStrip.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // menuStrip
- //
- menuStrip.Items.AddRange(new ToolStripItem[] { GuidesToolStripMenuItem });
- menuStrip.Location = new Point(0, 0);
- menuStrip.Name = "menuStrip";
- menuStrip.Size = new Size(1011, 24);
- menuStrip.TabIndex = 0;
- menuStrip.Text = "Меню";
- //
- // GuidesToolStripMenuItem
- //
- GuidesToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ManufacturesToolStripMenuItem, ShopsToolStripMenuItem, SupplyToolStripMenuItem });
- GuidesToolStripMenuItem.Name = "GuidesToolStripMenuItem";
- GuidesToolStripMenuItem.Size = new Size(94, 20);
- GuidesToolStripMenuItem.Text = "Справочники";
- //
- // ComponentsToolStripMenuItem
- //
- ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
- ComponentsToolStripMenuItem.Size = new Size(198, 22);
- ComponentsToolStripMenuItem.Text = "Компоненты";
- ComponentsToolStripMenuItem.Click += ComponentsStripMenuItem_Click;
- //
- // ManufacturesToolStripMenuItem
- //
- ManufacturesToolStripMenuItem.Name = "ManufacturesToolStripMenuItem";
- ManufacturesToolStripMenuItem.Size = new Size(198, 22);
- ManufacturesToolStripMenuItem.Text = "Кузнечные изделия";
- ManufacturesToolStripMenuItem.Click += ManufacturesStripMenuItem_Click;
- //
- // ShopsToolStripMenuItem
- //
- ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem";
- ShopsToolStripMenuItem.Size = new Size(198, 22);
- ShopsToolStripMenuItem.Text = "Магазины";
- ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click;
- //
- // SupplyToolStripMenuItem
- //
- SupplyToolStripMenuItem.Name = "SupplyToolStripMenuItem";
- SupplyToolStripMenuItem.Size = new Size(198, 22);
- SupplyToolStripMenuItem.Text = "Пополнение магазина";
- SupplyToolStripMenuItem.Click += SupplyToolStripMenuItem_Click;
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 23);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(847, 427);
- dataGridView.TabIndex = 1;
- //
- // buttonCreateOrder
- //
- buttonCreateOrder.Location = new Point(853, 38);
- buttonCreateOrder.Name = "buttonCreateOrder";
- buttonCreateOrder.Size = new Size(148, 31);
- buttonCreateOrder.TabIndex = 2;
- buttonCreateOrder.Text = "Создать заказ";
- buttonCreateOrder.UseVisualStyleBackColor = true;
- buttonCreateOrder.Click += CreateOrderButton_Click;
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(853, 186);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(148, 31);
- buttonRefresh.TabIndex = 3;
- buttonRefresh.Text = "Обновить список";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += RefreshButton_Click;
- //
- // buttonIssued
- //
- buttonIssued.Location = new Point(853, 149);
- buttonIssued.Name = "buttonIssued";
- buttonIssued.Size = new Size(148, 31);
- buttonIssued.TabIndex = 4;
- buttonIssued.Text = "Заказ выдан";
- buttonIssued.UseVisualStyleBackColor = true;
- buttonIssued.Click += IssuedButton_Click;
- //
- // buttonReady
- //
- buttonReady.Location = new Point(853, 112);
- buttonReady.Name = "buttonReady";
- buttonReady.Size = new Size(148, 31);
- buttonReady.TabIndex = 5;
- buttonReady.Text = "Заказ готов";
- buttonReady.UseVisualStyleBackColor = true;
- buttonReady.Click += ReadyButton_Click;
- //
- // buttonTakeInWork
- //
- buttonTakeInWork.Location = new Point(853, 75);
- buttonTakeInWork.Name = "buttonTakeInWork";
- buttonTakeInWork.Size = new Size(148, 31);
- buttonTakeInWork.TabIndex = 6;
- buttonTakeInWork.Text = "Отдать на выполнение";
- buttonTakeInWork.UseVisualStyleBackColor = true;
- buttonTakeInWork.Click += TakeInWorkButton_Click;
- //
- // FormMain
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1011, 450);
- Controls.Add(buttonTakeInWork);
- Controls.Add(buttonReady);
- Controls.Add(buttonIssued);
- Controls.Add(buttonRefresh);
- Controls.Add(buttonCreateOrder);
- Controls.Add(dataGridView);
- Controls.Add(menuStrip);
- MainMenuStrip = menuStrip;
- Name = "FormMain";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Кузница";
- Load += FormMain_Load;
- menuStrip.ResumeLayout(false);
- menuStrip.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private MenuStrip menuStrip;
- private ToolStripMenuItem GuidesToolStripMenuItem;
- private ToolStripMenuItem ComponentsToolStripMenuItem;
- private ToolStripMenuItem ManufacturesToolStripMenuItem;
- private DataGridView dataGridView;
- private Button buttonCreateOrder;
- private Button buttonRefresh;
- private Button buttonIssued;
- private Button buttonReady;
- private Button buttonTakeInWork;
- private ToolStripMenuItem ShopsToolStripMenuItem;
- private ToolStripMenuItem SupplyToolStripMenuItem;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/FormMain.cs
deleted file mode 100644
index bbfa082..0000000
--- a/BlacksmithWorkshop/FormMain.cs
+++ /dev/null
@@ -1,183 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopDataModels.Enums;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormMain : Form
- {
- private readonly ILogger _logger;
- private readonly IOrderLogic _orderLogic;
- public FormMain(ILogger logger, IOrderLogic orderLogic)
- {
- InitializeComponent();
- _logger = logger;
- _orderLogic = orderLogic;
- }
- private void ComponentsStripMenuItem_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
- if (service is FormComponents form)
- {
- form.ShowDialog();
- }
- }
- private void FormMain_Load(object sender, EventArgs e)
- {
- LoadData();
- }
- private void LoadData()
- {
- _logger.LogInformation("Загрузка заказов");
- try
- {
- var list = _orderLogic.ReadList(null);
- if (list != null)
- {
- dataGridView.DataSource = list;
- dataGridView.Columns["ManufactureId"].Visible = false;
- dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- }
- _logger.LogInformation("Загрузка заказов");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки заказов");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- private void ManufacturesStripMenuItem_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormManufactures));
- if (service is FormManufactures form)
- {
- form.ShowDialog();
- }
- }
- private void CreateOrderButton_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
- if (service is FormCreateOrder form)
- {
- form.ShowDialog();
- LoadData();
- }
- }
- private OrderBindingModel CreateBindingModel(int id, bool isDone = false)
- {
- return new OrderBindingModel
- {
- Id = id,
- ManufactureId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["ManufactureId"].Value),
- Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
- Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
- Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
- DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
- };
- }
- private void TakeInWorkButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- int id =
- Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
- try
- {
- var operationResult = _orderLogic.TakeOrderInWork(CreateBindingModel(id));
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка передачи заказа в работу");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void ReadyButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- int id =
- Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'",
- id);
- try
- {
- var operationResult = _orderLogic.FinishOrder(CreateBindingModel(id));
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка отметки о готовности заказа");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
- private void IssuedButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- int id =
- Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
- id);
- try
- {
- var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id));
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- _logger.LogInformation("Заказ №{id} выдан", id);
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void RefreshButton_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- private void ShopsToolStripMenuItem_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormShops));
- if (service is FormShops form)
- {
- form.ShowDialog();
- }
- }
- private void SupplyToolStripMenuItem_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormSupply));
- if (service is FormSupply form)
- {
- form.ShowDialog();
- }
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormMain.resx b/BlacksmithWorkshop/FormMain.resx
deleted file mode 100644
index 6c82d08..0000000
--- a/BlacksmithWorkshop/FormMain.resx
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 17, 17
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufacture.Designer.cs b/BlacksmithWorkshop/FormManufacture.Designer.cs
deleted file mode 100644
index 878c8ba..0000000
--- a/BlacksmithWorkshop/FormManufacture.Designer.cs
+++ /dev/null
@@ -1,225 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormManufacture
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- labelName = new Label();
- labelCost = new Label();
- textBoxName = new TextBox();
- textBoxPrice = new TextBox();
- groupBoxComponents = new GroupBox();
- dataGridView = new DataGridView();
- ColumnId = new DataGridViewTextBoxColumn();
- ColumnName = new DataGridViewTextBoxColumn();
- ColumnCount = new DataGridViewTextBoxColumn();
- buttonRefresh = new Button();
- buttonDelete = new Button();
- buttonChange = new Button();
- buttonAdd = new Button();
- buttonSave = new Button();
- buttonCancel = new Button();
- groupBoxComponents.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(15, 10);
- labelName.Name = "labelName";
- labelName.Size = new Size(62, 15);
- labelName.TabIndex = 0;
- labelName.Text = "Название:";
- //
- // labelCost
- //
- labelCost.AutoSize = true;
- labelCost.Location = new Point(15, 41);
- labelCost.Name = "labelCost";
- labelCost.Size = new Size(70, 15);
- labelCost.TabIndex = 1;
- labelCost.Text = "Стоимость:";
- //
- // textBoxName
- //
- textBoxName.Location = new Point(106, 7);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(289, 23);
- textBoxName.TabIndex = 2;
- //
- // textBoxPrice
- //
- textBoxPrice.Location = new Point(106, 38);
- textBoxPrice.Name = "textBoxPrice";
- textBoxPrice.ReadOnly = true;
- textBoxPrice.Size = new Size(289, 23);
- textBoxPrice.TabIndex = 3;
- //
- // groupBoxComponents
- //
- groupBoxComponents.Controls.Add(dataGridView);
- groupBoxComponents.Controls.Add(buttonRefresh);
- groupBoxComponents.Controls.Add(buttonDelete);
- groupBoxComponents.Controls.Add(buttonChange);
- groupBoxComponents.Controls.Add(buttonAdd);
- groupBoxComponents.Location = new Point(15, 67);
- groupBoxComponents.Name = "groupBoxComponents";
- groupBoxComponents.Size = new Size(596, 285);
- groupBoxComponents.TabIndex = 4;
- groupBoxComponents.TabStop = false;
- groupBoxComponents.Text = "Компоненты";
- //
- // dataGridView
- //
- dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnCount });
- dataGridView.Location = new Point(11, 23);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(439, 256);
- dataGridView.TabIndex = 5;
- //
- // ColumnId
- //
- ColumnId.HeaderText = "Идентификатор";
- ColumnId.Name = "ColumnId";
- ColumnId.Visible = false;
- //
- // ColumnName
- //
- ColumnName.FillWeight = 200F;
- ColumnName.HeaderText = "Компонент";
- ColumnName.Name = "ColumnName";
- //
- // ColumnCount
- //
- ColumnCount.HeaderText = "Количество";
- ColumnCount.Name = "ColumnCount";
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(470, 137);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(106, 29);
- buttonRefresh.TabIndex = 4;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += ButtonRef_Click;
- //
- // buttonDelete
- //
- buttonDelete.Location = new Point(470, 102);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new Size(106, 29);
- buttonDelete.TabIndex = 3;
- buttonDelete.Text = "Удалить";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += ButtonDel_Click;
- //
- // buttonChange
- //
- buttonChange.Location = new Point(470, 67);
- buttonChange.Name = "buttonChange";
- buttonChange.Size = new Size(106, 29);
- buttonChange.TabIndex = 2;
- buttonChange.Text = "Изменить";
- buttonChange.UseVisualStyleBackColor = true;
- buttonChange.Click += ButtonUpd_Click;
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(470, 32);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(106, 29);
- buttonAdd.TabIndex = 1;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += ButtonAdd_Click;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(373, 358);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(106, 29);
- buttonSave.TabIndex = 5;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += ButtonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(485, 358);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(106, 29);
- buttonCancel.TabIndex = 6;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += ButtonCancel_Click;
- //
- // FormManufacture
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(626, 401);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(groupBoxComponents);
- Controls.Add(textBoxPrice);
- Controls.Add(textBoxName);
- Controls.Add(labelCost);
- Controls.Add(labelName);
- Name = "FormManufacture";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Изделие";
- Load += FormManufacture_Load;
- groupBoxComponents.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Label labelName;
- private Label labelCost;
- private TextBox textBoxName;
- private TextBox textBoxPrice;
- private GroupBox groupBoxComponents;
- private Button buttonRefresh;
- private Button buttonDelete;
- private Button buttonChange;
- private Button buttonAdd;
- private Button buttonSave;
- private Button buttonCancel;
- private DataGridView dataGridView;
- private DataGridViewTextBoxColumn ColumnId;
- private DataGridViewTextBoxColumn ColumnName;
- private DataGridViewTextBoxColumn ColumnCount;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufacture.cs b/BlacksmithWorkshop/FormManufacture.cs
deleted file mode 100644
index 44f15f2..0000000
--- a/BlacksmithWorkshop/FormManufacture.cs
+++ /dev/null
@@ -1,214 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormManufacture : Form
- {
- private readonly ILogger _logger;
- private readonly IManufactureLogic _logic;
- private int? _id;
- private Dictionary _manufactureComponents;
- public int Id { set { _id = value; } }
- public FormManufacture(ILogger logger, IManufactureLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- _manufactureComponents = new Dictionary();
- }
- private void FormManufacture_Load(object sender, EventArgs e)
- {
- if (_id.HasValue)
- {
- _logger.LogInformation("Загрузка кузнечного изделия");
- try
- {
- var view = _logic.ReadElement(new ManufactureSearchModel { Id = _id.Value });
- if (view != null)
- {
- textBoxName.Text = view.ManufactureName;
- textBoxPrice.Text = view.Price.ToString();
- _manufactureComponents = view.ManufactureComponents ?? new
- Dictionary();
- LoadData();
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки кузнечного изделия");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void LoadData()
- {
- _logger.LogInformation("Загрузка компонентов кузнечного изделия");
- try
- {
- if (_manufactureComponents != null)
- {
- dataGridView.Rows.Clear();
- foreach (var pc in _manufactureComponents)
- {
- dataGridView.Rows.Add(new object[] { pc.Key,
- pc.Value.Item1.ComponentName, pc.Value.Item2 });
- }
- textBoxPrice.Text = CalcPrice().ToString();
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки компонентов кузнечного изделия");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void ButtonAdd_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormManufactureComponent));
- if (service is FormManufactureComponent form)
- {
- if (form.ShowDialog() == DialogResult.OK)
- {
- if (form.ComponentModel == null)
- {
- return;
- }
- _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
- if (_manufactureComponents.ContainsKey(form.Id))
- {
- _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
- }
- else
- {
- _manufactureComponents.Add(form.Id, (form.ComponentModel, form.Count));
- }
- LoadData();
- }
- }
- }
- private void ButtonUpd_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormManufactureComponent));
- if (service is FormManufactureComponent form)
- {
- int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
- form.Id = id;
- form.Count = _manufactureComponents[id].Item2;
- if (form.ShowDialog() == DialogResult.OK)
- {
- if (form.ComponentModel == null)
- {
- return;
- }
- _logger.LogInformation("Изменение компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
- _manufactureComponents[form.Id] = (form.ComponentModel, form.Count);
- LoadData();
- }
- }
- }
- }
- private void ButtonDel_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- if (MessageBox.Show("Удалить запись?", "Вопрос",
- MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- try
- {
- _logger.LogInformation("Удаление компонента:{ ComponentName}- { Count} ", dataGridView.SelectedRows[0].Cells[1].Value);
- _manufactureComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
- }
- catch (Exception ex)
- {
- MessageBox.Show(ex.Message, "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- LoadData();
- }
- }
- }
- private void ButtonRef_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- private void ButtonSave_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxName.Text))
- {
- MessageBox.Show("Заполните название", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (string.IsNullOrEmpty(textBoxPrice.Text))
- {
- MessageBox.Show("Заполните цену", "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- return;
- }
- if (_manufactureComponents == null || _manufactureComponents.Count == 0)
- {
- MessageBox.Show("Заполните компоненты", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation("Сохранение кузнечного изделия");
- try
- {
- var model = new ManufactureBindingModel
- {
- Id = _id ?? 0,
- ManufactureName = textBoxName.Text,
- Price = Convert.ToDouble(textBoxPrice.Text),
- ManufactureComponents = _manufactureComponents
- };
- var operationResult = _id.HasValue ? _logic.Update(model) :
- _logic.Create(model);
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- MessageBox.Show("Сохранение прошло успешно", "Сообщение",
- MessageBoxButtons.OK, MessageBoxIcon.Information);
- DialogResult = DialogResult.OK;
- Close();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка сохранения кузнечного изделия");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- private void ButtonCancel_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- private double CalcPrice()
- {
- double price = 0;
- foreach (var elem in _manufactureComponents)
- {
- price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2);
- }
- return Math.Round(price * 1.1, 2);
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormManufacture.resx b/BlacksmithWorkshop/FormManufacture.resx
deleted file mode 100644
index fcacbcb..0000000
--- a/BlacksmithWorkshop/FormManufacture.resx
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- True
-
-
- True
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufactureComponent.Designer.cs b/BlacksmithWorkshop/FormManufactureComponent.Designer.cs
deleted file mode 100644
index 64d4a64..0000000
--- a/BlacksmithWorkshop/FormManufactureComponent.Designer.cs
+++ /dev/null
@@ -1,120 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormManufactureComponent
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- labelComponent = new Label();
- comboBoxComponent = new ComboBox();
- labelCount = new Label();
- textBoxCount = new TextBox();
- buttonSave = new Button();
- buttonCancel = new Button();
- SuspendLayout();
- //
- // labelComponent
- //
- labelComponent.AutoSize = true;
- labelComponent.Location = new Point(12, 9);
- labelComponent.Name = "labelComponent";
- labelComponent.Size = new Size(72, 15);
- labelComponent.TabIndex = 0;
- labelComponent.Text = "Компонент:";
- //
- // comboBoxComponent
- //
- comboBoxComponent.DropDownStyle = ComboBoxStyle.DropDownList;
- comboBoxComponent.FormattingEnabled = true;
- comboBoxComponent.Location = new Point(93, 6);
- comboBoxComponent.Name = "comboBoxComponent";
- comboBoxComponent.Size = new Size(285, 23);
- comboBoxComponent.TabIndex = 1;
- //
- // labelCount
- //
- labelCount.AutoSize = true;
- labelCount.Location = new Point(12, 34);
- labelCount.Name = "labelCount";
- labelCount.Size = new Size(75, 15);
- labelCount.TabIndex = 2;
- labelCount.Text = "Количество:";
- //
- // textBoxCount
- //
- textBoxCount.Location = new Point(93, 31);
- textBoxCount.Name = "textBoxCount";
- textBoxCount.Size = new Size(285, 23);
- textBoxCount.TabIndex = 3;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(64, 60);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(107, 29);
- buttonSave.TabIndex = 4;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += ButtonSave_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(228, 60);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(107, 29);
- buttonCancel.TabIndex = 5;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += ButtonCancel_Click;
- //
- // FormManufactureComponent
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(394, 98);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(textBoxCount);
- Controls.Add(labelCount);
- Controls.Add(comboBoxComponent);
- Controls.Add(labelComponent);
- Name = "FormManufactureComponent";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Компонент изделия";
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private Label labelComponent;
- private ComboBox comboBoxComponent;
- private Label labelCount;
- private TextBox textBoxCount;
- private Button buttonSave;
- private Button buttonCancel;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufactureComponent.cs b/BlacksmithWorkshop/FormManufactureComponent.cs
deleted file mode 100644
index 8ab5728..0000000
--- a/BlacksmithWorkshop/FormManufactureComponent.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormManufactureComponent : Form
- {
- private readonly List? _list;
- public int Id
- {
- get
- {
- return
- Convert.ToInt32(comboBoxComponent.SelectedValue);
- }
- set
- {
- comboBoxComponent.SelectedValue = value;
- }
- }
- public IComponentModel? ComponentModel
- {
- get
- {
- if (_list == null)
- {
- return null;
- }
- foreach (var elem in _list)
- {
- if (elem.Id == Id)
- {
- return elem;
- }
- }
- return null;
- }
- }
- public int Count
- {
- get { return Convert.ToInt32(textBoxCount.Text); }
- set
- { textBoxCount.Text = value.ToString(); }
- }
- public FormManufactureComponent(IComponentLogic logic)
- {
- InitializeComponent();
- _list = logic.ReadList(null);
- if (_list != null)
- {
- comboBoxComponent.DisplayMember = "ComponentName";
- comboBoxComponent.ValueMember = "Id";
- comboBoxComponent.DataSource = _list;
- comboBoxComponent.SelectedItem = null;
- }
- }
- private void ButtonSave_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxCount.Text))
- {
- MessageBox.Show("Заполните поле Количество", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (comboBoxComponent.SelectedValue == null)
- {
- MessageBox.Show("Выберите компонент", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- DialogResult = DialogResult.OK;
- Close();
- }
- private void ButtonCancel_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormManufactureComponent.resx b/BlacksmithWorkshop/FormManufactureComponent.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormManufactureComponent.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufactures.Designer.cs b/BlacksmithWorkshop/FormManufactures.Designer.cs
deleted file mode 100644
index b7dc438..0000000
--- a/BlacksmithWorkshop/FormManufactures.Designer.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormManufactures
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- dataGridView = new DataGridView();
- buttonAdd = new Button();
- buttonChange = new Button();
- buttonDelete = new Button();
- buttonRefresh = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 0);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(468, 450);
- dataGridView.TabIndex = 6;
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(474, 12);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(118, 29);
- buttonAdd.TabIndex = 7;
- buttonAdd.Text = "Добавить";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += AddButton_Click;
- //
- // buttonChange
- //
- buttonChange.Location = new Point(474, 47);
- buttonChange.Name = "buttonChange";
- buttonChange.Size = new Size(118, 29);
- buttonChange.TabIndex = 8;
- buttonChange.Text = "Изменить";
- buttonChange.UseVisualStyleBackColor = true;
- buttonChange.Click += UpdateButton_Click;
- //
- // buttonDelete
- //
- buttonDelete.Location = new Point(474, 82);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new Size(118, 29);
- buttonDelete.TabIndex = 9;
- buttonDelete.Text = "Удалить";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += DeleteButton_Click;
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(474, 117);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(118, 29);
- buttonRefresh.TabIndex = 10;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += RefreshButton_Click;
- //
- // FormManufactures
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(600, 450);
- Controls.Add(buttonRefresh);
- Controls.Add(buttonDelete);
- Controls.Add(buttonChange);
- Controls.Add(buttonAdd);
- Controls.Add(dataGridView);
- Name = "FormManufactures";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Изделия";
- Load += FormManufactures_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
-
- private DataGridView dataGridView;
- private Button buttonAdd;
- private Button buttonChange;
- private Button buttonDelete;
- private Button buttonRefresh;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormManufactures.cs b/BlacksmithWorkshop/FormManufactures.cs
deleted file mode 100644
index 98c512c..0000000
--- a/BlacksmithWorkshop/FormManufactures.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormManufactures : Form
- {
- private readonly ILogger _logger;
- private readonly IManufactureLogic _logic;
- public FormManufactures(ILogger logger, IManufactureLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
- private void FormManufactures_Load(object sender, EventArgs e)
- {
- LoadData();
- }
- private void LoadData()
- {
- try
- {
- var list = _logic.ReadList(null);
- if (list != null)
- {
- dataGridView.DataSource = list;
- dataGridView.Columns["Id"].Visible = false;
- dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["ManufactureComponents"].Visible = false;
- }
- _logger.LogInformation("Загрузка кузнечных изделий");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки кузнечных изделий");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- private void AddButton_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
- if (service is FormManufacture form)
- {
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- private void UpdateButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
- if (service is FormManufacture form)
- {
- var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- }
- private void DeleteButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Удаление кузнечного изделия");
- try
- {
- if (!_logic.Delete(new ManufactureBindingModel { Id = id }))
- {
- throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка удаления кузнечного изделия");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
- }
- private void RefreshButton_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormManufactures.resx b/BlacksmithWorkshop/FormManufactures.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormManufactures.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormShop.Designer.cs b/BlacksmithWorkshop/FormShop.Designer.cs
deleted file mode 100644
index 1d9d90e..0000000
--- a/BlacksmithWorkshop/FormShop.Designer.cs
+++ /dev/null
@@ -1,186 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormShop
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- dataGridView = new DataGridView();
- ColumnId = new DataGridViewTextBoxColumn();
- ColumnName = new DataGridViewTextBoxColumn();
- ColumnPrice = new DataGridViewTextBoxColumn();
- ColumnCount = new DataGridViewTextBoxColumn();
- dateTimePicker = new DateTimePicker();
- labelName = new Label();
- labelAddress = new Label();
- labelDate = new Label();
- textBoxName = new TextBox();
- textBoxAddress = new TextBox();
- buttonSave = new Button();
- buttonCancel = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnPrice, ColumnCount });
- dataGridView.Location = new Point(12, 101);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(553, 281);
- dataGridView.TabIndex = 0;
- //
- // ColumnId
- //
- ColumnId.HeaderText = "";
- ColumnId.Name = "ColumnId";
- ColumnId.Visible = false;
- //
- // ColumnName
- //
- ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- ColumnName.HeaderText = "Изделие";
- ColumnName.Name = "ColumnName";
- //
- // ColumnPrice
- //
- ColumnPrice.HeaderText = "Цена";
- ColumnPrice.Name = "ColumnPrice";
- //
- // ColumnCount
- //
- ColumnCount.HeaderText = "Количество";
- ColumnCount.Name = "ColumnCount";
- //
- // dateTimePicker
- //
- dateTimePicker.Location = new Point(150, 63);
- dateTimePicker.Name = "dateTimePicker";
- dateTimePicker.Size = new Size(166, 23);
- dateTimePicker.TabIndex = 1;
- //
- // labelName
- //
- labelName.AutoSize = true;
- labelName.Location = new Point(12, 9);
- labelName.Name = "labelName";
- labelName.Size = new Size(62, 15);
- labelName.TabIndex = 2;
- labelName.Text = "Название:";
- //
- // labelAddress
- //
- labelAddress.AutoSize = true;
- labelAddress.Location = new Point(12, 38);
- labelAddress.Name = "labelAddress";
- labelAddress.Size = new Size(43, 15);
- labelAddress.TabIndex = 3;
- labelAddress.Text = "Адрес:";
- //
- // labelDate
- //
- labelDate.AutoSize = true;
- labelDate.Location = new Point(12, 69);
- labelDate.Name = "labelDate";
- labelDate.Size = new Size(90, 15);
- labelDate.TabIndex = 4;
- labelDate.Text = "Дата открытия:";
- //
- // textBoxName
- //
- textBoxName.Location = new Point(150, 6);
- textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(166, 23);
- textBoxName.TabIndex = 5;
- //
- // textBoxAddress
- //
- textBoxAddress.Location = new Point(150, 35);
- textBoxAddress.Name = "textBoxAddress";
- textBoxAddress.Size = new Size(166, 23);
- textBoxAddress.TabIndex = 6;
- //
- // buttonSave
- //
- buttonSave.Location = new Point(12, 401);
- buttonSave.Name = "buttonSave";
- buttonSave.Size = new Size(123, 25);
- buttonSave.TabIndex = 7;
- buttonSave.Text = "Сохранить";
- buttonSave.UseVisualStyleBackColor = true;
- buttonSave.Click += SaveButton_Click;
- //
- // buttonCancel
- //
- buttonCancel.Location = new Point(150, 401);
- buttonCancel.Name = "buttonCancel";
- buttonCancel.Size = new Size(123, 25);
- buttonCancel.TabIndex = 8;
- buttonCancel.Text = "Отмена";
- buttonCancel.UseVisualStyleBackColor = true;
- buttonCancel.Click += CancelButton_Click;
- //
- // FormShop
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(585, 450);
- Controls.Add(buttonCancel);
- Controls.Add(buttonSave);
- Controls.Add(textBoxAddress);
- Controls.Add(textBoxName);
- Controls.Add(labelDate);
- Controls.Add(labelAddress);
- Controls.Add(labelName);
- Controls.Add(dateTimePicker);
- Controls.Add(dataGridView);
- Name = "FormShop";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Магазин";
- Load += FormShop_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private DataGridView dataGridView;
- private DateTimePicker dateTimePicker;
- private Label labelName;
- private Label labelAddress;
- private Label labelDate;
- private TextBox textBoxName;
- private TextBox textBoxAddress;
- private DataGridViewTextBoxColumn ColumnId;
- private DataGridViewTextBoxColumn ColumnName;
- private DataGridViewTextBoxColumn ColumnPrice;
- private DataGridViewTextBoxColumn ColumnCount;
- private Button buttonSave;
- private Button buttonCancel;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormShop.cs b/BlacksmithWorkshop/FormShop.cs
deleted file mode 100644
index 9d551fe..0000000
--- a/BlacksmithWorkshop/FormShop.cs
+++ /dev/null
@@ -1,122 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using Microsoft.VisualBasic.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormShop : Form
- {
- private readonly ILogger _logger;
- private readonly IShopLogic _logic;
- public int? _id;
- private Dictionary _manufactures;
- public FormShop(ILogger logger, IShopLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- _manufactures = new();
- }
- private void FormShop_Load(object sender, EventArgs e)
- {
- if (_id.HasValue)
- {
- _logger.LogInformation("Загрузка магазина");
- try
- {
- var shop = _logic.ReadElement(new ShopSearchModel { Id = _id });
- if (shop != null)
- {
- textBoxName.Text = shop.ShopName;
- textBoxAddress.Text = shop.Address;
- dateTimePicker.Text = shop.OpeningDate.ToString();
- _manufactures = shop.ShopManufactures;
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- }
- private void LoadData()
- {
- _logger.LogInformation("Загрузка товаров магазина");
- try
- {
- if (_manufactures != null)
- {
- foreach (var manufactures in _manufactures)
- {
- dataGridView.Rows.Add(new object[] { manufactures.Key, manufactures.Value.Item1.ManufactureName,
- manufactures.Value.Item1.Price, manufactures.Value.Item2 });
- }
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки изделий магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
- MessageBoxIcon.Error);
- }
- }
- private void CancelButton_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- private void SaveButton_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(textBoxName.Text))
- {
- MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (string.IsNullOrEmpty(textBoxAddress.Text))
- {
- MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- _logger.LogInformation("Сохранение магазина");
- try
- {
- var model = new ShopBindingModel
- {
- Id = _id ?? 0,
- ShopName = textBoxName.Text,
- Address = textBoxAddress.Text,
- OpeningDate = dateTimePicker.Value.Date,
- ShopManufactures = _manufactures
- };
- var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
- if (!operationResult)
- {
- throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
- }
- MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
- DialogResult = DialogResult.OK;
- Close();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка сохранения магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormShop.resx b/BlacksmithWorkshop/FormShop.resx
deleted file mode 100644
index b0c7c5d..0000000
--- a/BlacksmithWorkshop/FormShop.resx
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormShops.Designer.cs b/BlacksmithWorkshop/FormShops.Designer.cs
deleted file mode 100644
index 7755f6d..0000000
--- a/BlacksmithWorkshop/FormShops.Designer.cs
+++ /dev/null
@@ -1,114 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormShops
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- dataGridView = new DataGridView();
- buttonAdd = new Button();
- buttonUpdate = new Button();
- buttonDelete = new Button();
- buttonRefresh = new Button();
- ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
- SuspendLayout();
- //
- // dataGridView
- //
- dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 0);
- dataGridView.Name = "dataGridView";
- dataGridView.RowTemplate.Height = 25;
- dataGridView.Size = new Size(567, 450);
- dataGridView.TabIndex = 0;
- //
- // buttonAdd
- //
- buttonAdd.Location = new Point(617, 22);
- buttonAdd.Name = "buttonAdd";
- buttonAdd.Size = new Size(152, 33);
- buttonAdd.TabIndex = 1;
- buttonAdd.Text = "Создать";
- buttonAdd.UseVisualStyleBackColor = true;
- buttonAdd.Click += AddButton_Click;
- //
- // buttonUpdate
- //
- buttonUpdate.Location = new Point(617, 61);
- buttonUpdate.Name = "buttonUpdate";
- buttonUpdate.Size = new Size(152, 33);
- buttonUpdate.TabIndex = 2;
- buttonUpdate.Text = "Изменить";
- buttonUpdate.UseVisualStyleBackColor = true;
- buttonUpdate.Click += UpdateButton_Click;
- //
- // buttonDelete
- //
- buttonDelete.Location = new Point(617, 100);
- buttonDelete.Name = "buttonDelete";
- buttonDelete.Size = new Size(152, 33);
- buttonDelete.TabIndex = 3;
- buttonDelete.Text = "Удалить";
- buttonDelete.UseVisualStyleBackColor = true;
- buttonDelete.Click += DeleteButton_Click;
- //
- // buttonRefresh
- //
- buttonRefresh.Location = new Point(617, 139);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(152, 33);
- buttonRefresh.TabIndex = 4;
- buttonRefresh.Text = "Обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += RefreshButton_Click;
- //
- // FormShops
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(800, 450);
- Controls.Add(buttonRefresh);
- Controls.Add(buttonDelete);
- Controls.Add(buttonUpdate);
- Controls.Add(buttonAdd);
- Controls.Add(dataGridView);
- Name = "FormShops";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Магазины";
- Load += FormShops_Load;
- ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
- ResumeLayout(false);
- }
-
- #endregion
-
- private DataGridView dataGridView;
- private Button buttonAdd;
- private Button buttonUpdate;
- private Button buttonDelete;
- private Button buttonRefresh;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormShops.cs b/BlacksmithWorkshop/FormShops.cs
deleted file mode 100644
index e9fcb99..0000000
--- a/BlacksmithWorkshop/FormShops.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormShops : Form
- {
- private readonly ILogger _logger;
- private readonly IShopLogic _logic;
- public FormShops(ILogger logger, IShopLogic logic)
- {
- InitializeComponent();
- _logger = logger;
- _logic = logic;
- }
- private void LoadData()
- {
- try
- {
- var list = _logic.ReadList(null);
- if (list != null)
- {
- dataGridView.DataSource = list;
- dataGridView.Columns["Id"].Visible = false;
- dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["Address"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["OpeningDate"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
- dataGridView.Columns["ShopManufactures"].Visible = false;
- }
- _logger.LogInformation("Загрузка магазинов");
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка загрузки магазинов");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- private void FormShops_Load(object sender, EventArgs e)
- {
- LoadData();
- }
- private void AddButton_Click(object sender, EventArgs e)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormShop));
- if (service is FormShop form)
- {
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- private void UpdateButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- var service = Program.ServiceProvider?.GetService(typeof(FormShop));
- if (service is FormShop form)
- {
- form._id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- if (form.ShowDialog() == DialogResult.OK)
- {
- LoadData();
- }
- }
- }
- }
- private void RefreshButton_Click(object sender, EventArgs e)
- {
- LoadData();
- }
- private void DeleteButton_Click(object sender, EventArgs e)
- {
- if (dataGridView.SelectedRows.Count == 1)
- {
- if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
- {
- int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
- _logger.LogInformation("Удаление магазина");
- try
- {
- if (!_logic.Delete(new ShopBindingModel
- {
- Id = id
- }))
- {
- throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
- }
- LoadData();
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Ошибка удаления магазина");
- MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
- }
- }
- }
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormShops.resx b/BlacksmithWorkshop/FormShops.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormShops.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormSupply.Designer.cs b/BlacksmithWorkshop/FormSupply.Designer.cs
deleted file mode 100644
index e350ec8..0000000
--- a/BlacksmithWorkshop/FormSupply.Designer.cs
+++ /dev/null
@@ -1,108 +0,0 @@
-namespace BlacksmithWorkshop
-{
- partial class FormSupply
- {
- ///
- /// Required designer variable.
- ///
- private System.ComponentModel.IContainer components = null;
-
- ///
- /// Clean up any resources being used.
- ///
- /// true if managed resources should be disposed; otherwise, false.
- protected override void Dispose(bool disposing)
- {
- if (disposing && (components != null))
- {
- components.Dispose();
- }
- base.Dispose(disposing);
- }
-
- #region Windows Form Designer generated code
-
- ///
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- ///
- private void InitializeComponent()
- {
- ShopComboBox = new ComboBox();
- ManufactureComboBox = new ComboBox();
- CountTextBox = new TextBox();
- button1 = new Button();
- button2 = new Button();
- SuspendLayout();
- //
- // ShopComboBox
- //
- ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
- ShopComboBox.FormattingEnabled = true;
- ShopComboBox.Location = new Point(12, 12);
- ShopComboBox.Name = "ShopComboBox";
- ShopComboBox.Size = new Size(224, 23);
- ShopComboBox.TabIndex = 0;
- //
- // ManufactureComboBox
- //
- ManufactureComboBox.DropDownStyle = ComboBoxStyle.DropDownList;
- ManufactureComboBox.FormattingEnabled = true;
- ManufactureComboBox.Location = new Point(242, 12);
- ManufactureComboBox.Name = "ManufactureComboBox";
- ManufactureComboBox.Size = new Size(224, 23);
- ManufactureComboBox.TabIndex = 1;
- //
- // CountTextBox
- //
- CountTextBox.Location = new Point(472, 12);
- CountTextBox.Name = "CountTextBox";
- CountTextBox.Size = new Size(224, 23);
- CountTextBox.TabIndex = 2;
- //
- // button1
- //
- button1.Location = new Point(162, 47);
- button1.Name = "button1";
- button1.Size = new Size(157, 28);
- button1.TabIndex = 3;
- button1.Text = "Сохранить";
- button1.UseVisualStyleBackColor = true;
- button1.Click += SaveButton_Click;
- //
- // button2
- //
- button2.Location = new Point(394, 47);
- button2.Name = "button2";
- button2.Size = new Size(157, 28);
- button2.TabIndex = 4;
- button2.Text = "Отмена";
- button2.UseVisualStyleBackColor = true;
- button2.Click += CancelButton_Click;
- //
- // FormSupply
- //
- AutoScaleDimensions = new SizeF(7F, 15F);
- AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(707, 87);
- Controls.Add(button2);
- Controls.Add(button1);
- Controls.Add(CountTextBox);
- Controls.Add(ManufactureComboBox);
- Controls.Add(ShopComboBox);
- Name = "FormSupply";
- StartPosition = FormStartPosition.CenterParent;
- Text = "Пополнение магазина";
- ResumeLayout(false);
- PerformLayout();
- }
-
- #endregion
-
- private ComboBox ShopComboBox;
- private ComboBox ManufactureComboBox;
- private TextBox CountTextBox;
- private Button button1;
- private Button button2;
- }
-}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/FormSupply.cs b/BlacksmithWorkshop/FormSupply.cs
deleted file mode 100644
index 4288560..0000000
--- a/BlacksmithWorkshop/FormSupply.cs
+++ /dev/null
@@ -1,139 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace BlacksmithWorkshop
-{
- public partial class FormSupply : Form
- {
- private readonly List? _manufactureList;
- private readonly List? _shopsList;
- IShopLogic _shopLogic;
- IManufactureLogic _manufactureLogic;
- public int ShopId
- {
- get
- {
- return Convert.ToInt32(ShopComboBox.SelectedValue);
- }
- set
- {
- ShopComboBox.SelectedValue = value;
- }
- }
- public int ManufactureId
- {
- get
- {
- return Convert.ToInt32(ManufactureComboBox.SelectedValue);
- }
- set
- {
- ManufactureComboBox.SelectedValue = value;
- }
- }
- public IManufactureModel? ManufactureModel
- {
- get
- {
- if (_manufactureList == null)
- {
- return null;
- }
- foreach (var elem in _manufactureList)
- {
- if (elem.Id == ManufactureId)
- {
- return elem;
- }
- }
- return null;
- }
- }
- public int Count
- {
- get { return Convert.ToInt32(CountTextBox.Text); }
- set { CountTextBox.Text = value.ToString(); }
- }
- public FormSupply(IManufactureLogic ManufactureLogic, IShopLogic shopLogic)
- {
- InitializeComponent();
- _shopLogic = shopLogic;
- _manufactureLogic = ManufactureLogic;
- _manufactureList = ManufactureLogic.ReadList(null);
- _shopsList = shopLogic.ReadList(null);
- if (_manufactureList != null)
- {
- ManufactureComboBox.DisplayMember = "ManufactureName";
- ManufactureComboBox.ValueMember = "Id";
- ManufactureComboBox.DataSource = _manufactureList;
- ManufactureComboBox.SelectedItem = null;
- }
- if (_shopsList != null)
- {
- ShopComboBox.DisplayMember = "ShopName";
- ShopComboBox.ValueMember = "Id";
- ShopComboBox.DataSource = _shopsList;
- ShopComboBox.SelectedItem = null;
- }
- }
- private void SaveButton_Click(object sender, EventArgs e)
- {
- if (string.IsNullOrEmpty(CountTextBox.Text))
- {
- MessageBox.Show("Заполните поле Количество", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (ManufactureComboBox.SelectedValue == null)
- {
- MessageBox.Show("Выберите кузнечное изделие", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- if (ShopComboBox.SelectedValue == null)
- {
- MessageBox.Show("Выберите магазин", "Ошибка",
- MessageBoxButtons.OK, MessageBoxIcon.Error);
- return;
- }
- try
- {
- int count = Convert.ToInt32(CountTextBox.Text);
- bool res = _shopLogic.ReplenishManufactures(
- new ShopSearchModel() { Id = Convert.ToInt32(ShopComboBox.SelectedValue) },
- _manufactureLogic.ReadElement(new() { Id = Convert.ToInt32(ManufactureComboBox.SelectedValue) }),
- count
- );
- if (!res)
- {
- throw new Exception("Ошибка при пополнении. Дополнительная информация в логах");
- }
- MessageBox.Show("Пополнение прошло успешно");
- DialogResult = DialogResult.OK;
- Close();
-
- }
- catch (Exception)
- {
- MessageBox.Show("Ошибка пополнения");
- return;
- }
- }
- private void CancelButton_Click(object sender, EventArgs e)
- {
- DialogResult = DialogResult.Cancel;
- Close();
- }
- }
-}
diff --git a/BlacksmithWorkshop/FormSupply.resx b/BlacksmithWorkshop/FormSupply.resx
deleted file mode 100644
index af32865..0000000
--- a/BlacksmithWorkshop/FormSupply.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- text/microsoft-resx
-
-
- 2.0
-
-
- System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
\ No newline at end of file
diff --git a/BlacksmithWorkshop/Program.cs b/BlacksmithWorkshop/Program.cs
deleted file mode 100644
index ccbd192..0000000
--- a/BlacksmithWorkshop/Program.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using BlacksmithWorkshopBusinessLogic.BusinessLogics;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopListImplement.Implements;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Extensions.Logging;
-using System;
-
-namespace BlacksmithWorkshop
-{
- internal static class Program
- {
- private static ServiceProvider? _serviceProvider;
- public static ServiceProvider? ServiceProvider => _serviceProvider;
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- static void Main()
- {
- // 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);
- _serviceProvider = services.BuildServiceProvider();
- Application.Run(_serviceProvider.GetRequiredService());
- }
- private static void ConfigureServices(ServiceCollection services)
- {
- services.AddLogging(option =>
- {
- option.SetMinimumLevel(LogLevel.Information);
- option.AddNLog("nlog.config");
- });
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- services.AddTransient();
- }
- }
-}
\ No newline at end of file