From 4eefc1b6ad526193e5b34e2d48f83d75f5ed23ef Mon Sep 17 00:00:00 2001 From: sardq Date: Sat, 23 Mar 2024 20:06:46 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PlumbingRepair/PlumbingRepairView/FormMain.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/PlumbingRepair/PlumbingRepairView/FormMain.cs b/PlumbingRepair/PlumbingRepairView/FormMain.cs index e1e6e98..76ec79e 100644 --- a/PlumbingRepair/PlumbingRepairView/FormMain.cs +++ b/PlumbingRepair/PlumbingRepairView/FormMain.cs @@ -30,7 +30,6 @@ namespace PlumbingRepairView if (list != null) { dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; dataGridView.Columns["WorkId"].Visible= false; } _logger.LogInformation("Загрузка заказов"); From bf5eaae8a1436de9f9ce9cca76bbc08aec3a4de1 Mon Sep 17 00:00:00 2001 From: sardq Date: Fri, 12 Apr 2024 20:16:02 +0400 Subject: [PATCH 2/2] =?UTF-8?q?1=20=D1=83=D1=81=D0=BB=D0=BE=D0=B6=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ShopLogic.cs | 165 +++++++++++++ .../BindingModels/ShopBindingModel.cs | 17 ++ .../BusinessLogicsContracts/IShopLogic.cs | 22 ++ .../SearchModels/ShopSearchModel.cs | 9 + .../StoragesContracts/IShopStorage.cs | 21 ++ .../ViewModels/OrderViewModel.cs | 1 + .../ViewModels/ShopViewModel.cs | 20 ++ .../Models/IShopModel.cs | 13 + .../DataListSingleton.cs | 3 + .../Implements/ShopStorage.cs | 108 +++++++++ .../Models/Shop.cs | 54 +++++ .../PlumbingRepairView/FormMain.Designer.cs | 22 +- PlumbingRepair/PlumbingRepairView/FormMain.cs | 18 +- .../PlumbingRepairView/FormShop.Designer.cs | 222 ++++++++++++++++++ PlumbingRepair/PlumbingRepairView/FormShop.cs | 124 ++++++++++ .../PlumbingRepairView/FormShop.resx | 60 +++++ .../PlumbingRepairView/FormShops.Designer.cs | 127 ++++++++++ .../PlumbingRepairView/FormShops.cs | 105 +++++++++ .../PlumbingRepairView/FormShops.resx | 60 +++++ .../FormStoreReplenishment.Designer.cs | 153 ++++++++++++ .../FormStoreReplenishment.cs | 117 +++++++++ .../FormStoreReplenishment.resx | 60 +++++ PlumbingRepair/PlumbingRepairView/Program.cs | 5 + 23 files changed, 1504 insertions(+), 2 deletions(-) create mode 100644 PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ShopLogic.cs create mode 100644 PlumbingRepair/PlumbingRepairContracts/BindingModels/ShopBindingModel.cs create mode 100644 PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IShopLogic.cs create mode 100644 PlumbingRepair/PlumbingRepairContracts/SearchModels/ShopSearchModel.cs create mode 100644 PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IShopStorage.cs create mode 100644 PlumbingRepair/PlumbingRepairContracts/ViewModels/ShopViewModel.cs create mode 100644 PlumbingRepair/PlumbingRepairDataModels/Models/IShopModel.cs create mode 100644 PlumbingRepair/PlumbingRepairListImplement/Implements/ShopStorage.cs create mode 100644 PlumbingRepair/PlumbingRepairListImplement/Models/Shop.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormShop.Designer.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormShop.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormShop.resx create mode 100644 PlumbingRepair/PlumbingRepairView/FormShops.Designer.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormShops.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormShops.resx create mode 100644 PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.Designer.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.cs create mode 100644 PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.resx diff --git a/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ShopLogic.cs b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..54f2762 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,165 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairBusinessLogic.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 StoreReplenishment(ShopSearchModel shopModel, IWorkModel workModel, int count) + { + if (shopModel == null) + { + throw new ArgumentNullException(nameof(shopModel)); + } + if (workModel == null) + { + throw new ArgumentNullException(nameof(workModel)); + } + if (count <= 0) + { + throw new ArgumentNullException("Количество товаров должно быть больше 0", nameof(count)); + } + _logger.LogInformation("StoreReplenishment. ShopName:{ShopName}. Id:{Id}", shopModel.ShopName, shopModel.Id); + var element = _shopStorage.GetElement(shopModel); + if (element == null) + { + throw new InvalidOperationException("StoreReplenishment. Element not found"); + } + + if(element.ShopWorks.ContainsKey(workModel.Id)) + { + var oldWorks = element.ShopWorks[workModel.Id]; + oldWorks.Item2 += count; + element.ShopWorks[workModel.Id] = oldWorks; + _logger.LogInformation("StoreReplenishment. Added {count} '{work}' to '{ShopName}' shop", count, workModel.WorkName,shopModel.ShopName); + } + else + { + element.ShopWorks.Add(workModel.Id,(workModel, count)); + _logger.LogInformation("StoreReplenishment. Added {count} new '{work}' to '{ShopName}' shop", count, workModel.WorkName, shopModel.ShopName); + } + if(_shopStorage.Update(new ShopBindingModel() + { + Id = element.Id, + ShopName = element.ShopName, + Address = element.Address, + DateOpening = element.DateOpening, + ShopWorks= element.ShopWorks + }) == null) + { + _logger.LogInformation("StoreReplenishment. Update operation failed"); + return false; + } + 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.ShopName)); + } + + _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{Address}. Id:{Id}", model.ShopName, model.Address, model.Id); + var element = _shopStorage.GetElement(new ShopSearchModel + { + ShopName = model.ShopName + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Компонент с таким названием уже есть"); + } + } + } +} diff --git a/PlumbingRepair/PlumbingRepairContracts/BindingModels/ShopBindingModel.cs b/PlumbingRepair/PlumbingRepairContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..14fffbe --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,17 @@ +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairContracts.BindingModels +{ + public class ShopBindingModel + { + public int Id { get; set; } + + public string ShopName { get; set; } =string.Empty; + + public string Address { get; set; } = string.Empty; + + public DateTime DateOpening { get; set; } = DateTime.Now; + + public Dictionary ShopWorks { get; set; } = new(); + } +} diff --git a/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IShopLogic.cs b/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IShopLogic.cs new file mode 100644 index 0000000..fd54ec4 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/BusinessLogicsContracts/IShopLogic.cs @@ -0,0 +1,22 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairContracts.BusinessLogicsContracts +{ + public interface IShopLogic + { + List? ReadList(ShopSearchModel? model); + + ShopViewModel? ReadElement(ShopSearchModel model); + + bool Create(ShopBindingModel model); + + bool Update(ShopBindingModel model); + + bool Delete(ShopBindingModel model); + + bool StoreReplenishment(ShopSearchModel shopModel, IWorkModel workModel, int count); + } +} diff --git a/PlumbingRepair/PlumbingRepairContracts/SearchModels/ShopSearchModel.cs b/PlumbingRepair/PlumbingRepairContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..9e730c0 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,9 @@ +namespace PlumbingRepairContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + + public string? ShopName { get; set; } + } +} diff --git a/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IShopStorage.cs b/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..e9d4ffc --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,21 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.ViewModels; + +namespace PlumbingRepairContracts.StoragesContracts +{ + public interface IShopStorage + { + List GetFullList(); + + List GetFilteredList(ShopSearchModel model); + + ShopViewModel? GetElement(ShopSearchModel model); + + ShopViewModel? Insert(ShopBindingModel model); + + ShopViewModel? Update(ShopBindingModel model); + + ShopViewModel? Delete(ShopBindingModel model); + } +} diff --git a/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs b/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs index beb6a1d..98f85b9 100644 --- a/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs +++ b/PlumbingRepair/PlumbingRepairContracts/ViewModels/OrderViewModel.cs @@ -8,6 +8,7 @@ namespace PlumbingRepairContracts.ViewModels { [DisplayName("Номер")] public int Id { get; set; } + [DisplayName("Номер работы")] public int WorkId { get; set; } [DisplayName("Работа")] diff --git a/PlumbingRepair/PlumbingRepairContracts/ViewModels/ShopViewModel.cs b/PlumbingRepair/PlumbingRepairContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..9e10421 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,20 @@ +using PlumbingRepairDataModels.Models; +using System.ComponentModel; + +namespace PlumbingRepairContracts.ViewModels +{ + public class ShopViewModel + { + public int Id { get; set; } + + [DisplayName("Название магазина")] + public string ShopName { get; set; } = string.Empty; + + [DisplayName("Адрес")] + public string Address { get; set; } = string.Empty; + [DisplayName("Дата открытия")] + public DateTime DateOpening { get; set; } + public Dictionary ShopWorks { get; set; } = new(); + + } +} diff --git a/PlumbingRepair/PlumbingRepairDataModels/Models/IShopModel.cs b/PlumbingRepair/PlumbingRepairDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..9a6add5 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairDataModels/Models/IShopModel.cs @@ -0,0 +1,13 @@ +namespace PlumbingRepairDataModels.Models +{ + public class IShopModel + { + string ShopName { get; } + + string Address { get; } + + DateTime DateOpening { get; } + + Dictionary ShopWorks { get; } + } +} diff --git a/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs b/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs index 556458d..39a9955 100644 --- a/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs +++ b/PlumbingRepair/PlumbingRepairListImplement/DataListSingleton.cs @@ -12,11 +12,14 @@ namespace PlumbingRepairListImplement public List Works { get; set; } + public List Shops { get; set; } + private DataListSingleton() { Components = new List(); Orders = new List(); Works = new List(); + Shops = new List(); } public static DataListSingleton GetInstance() diff --git a/PlumbingRepair/PlumbingRepairListImplement/Implements/ShopStorage.cs b/PlumbingRepair/PlumbingRepairListImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..750f879 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairListImplement/Implements/ShopStorage.cs @@ -0,0 +1,108 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairContracts.StoragesContracts; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace PlumbingRepairListImplement.Implements +{ + public class ShopStorage : IShopStorage + { + + private readonly DataListSingleton _source; + + public ShopStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var shop in _source.Shops) + { + result.Add(shop.GetViewModel); + } + return result; + } + public List GetFilteredList(ShopSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.ShopName)) + { + return result; + } + foreach (var shop in _source.Shops) + { + if (shop.ShopName.Contains(model.ShopName)) + { + result.Add(shop.GetViewModel); + } + } + return result; + } + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + 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; + } + } + return null; + } + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = 1; + foreach (var shop in _source.Shops) + { + if (model.Id <= shop.Id) + { + model.Id = shop.Id + 1; + } + } + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + _source.Shops.Add(newShop); + return newShop.GetViewModel; + } + public ShopViewModel? Update(ShopBindingModel model) + { + 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; + } + } +} diff --git a/PlumbingRepair/PlumbingRepairListImplement/Models/Shop.cs b/PlumbingRepair/PlumbingRepairListImplement/Models/Shop.cs new file mode 100644 index 0000000..b843322 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairListImplement/Models/Shop.cs @@ -0,0 +1,54 @@ +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.ViewModels; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairListImplement.Models +{ + public class Shop + { + public int Id { get; private set; } + + public string ShopName { get; private set; } = string.Empty; + + public string Address { get; private set; } = string.Empty; + public DateTime DateOpening { get; private set; } + + public Dictionary ShopWorks { get; private set; } = new Dictionary(); + + public static Shop? Create(ShopBindingModel? model) + { + if (model == null) + { + return null; + } + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpening = model.DateOpening, + ShopWorks = model.ShopWorks + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpening= model.DateOpening; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopWorks = ShopWorks + }; + } +} diff --git a/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs index 39e09b3..80c1cec 100644 --- a/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs +++ b/PlumbingRepair/PlumbingRepairView/FormMain.Designer.cs @@ -38,6 +38,8 @@ this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.РаботыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.пToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.menuStrip1.SuspendLayout(); this.SuspendLayout(); @@ -137,7 +139,9 @@ // this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.компонентыToolStripMenuItem, - this.РаботыToolStripMenuItem}); + this.РаботыToolStripMenuItem, + this.магазиныToolStripMenuItem, + this.пToolStripMenuItem}); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(139, 29); this.справочникиToolStripMenuItem.Text = "Справочники"; @@ -156,6 +160,20 @@ this.РаботыToolStripMenuItem.Text = "Работы"; this.РаботыToolStripMenuItem.Click += new System.EventHandler(this.РаботыToolStripMenuItem_Click); // + // магазиныToolStripMenuItem + // + this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(296, 34); + this.магазиныToolStripMenuItem.Text = "Магазины"; + this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click); + // + // пToolStripMenuItem + // + this.пToolStripMenuItem.Name = "пToolStripMenuItem"; + this.пToolStripMenuItem.Size = new System.Drawing.Size(296, 34); + this.пToolStripMenuItem.Text = "Пополнение магазина"; + this.пToolStripMenuItem.Click += new System.EventHandler(this.пополнениеToolStripMenuItem_Click); + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); @@ -192,5 +210,7 @@ private ToolStripMenuItem справочникиToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem РаботыToolStripMenuItem; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem пToolStripMenuItem; } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormMain.cs b/PlumbingRepair/PlumbingRepairView/FormMain.cs index 76ec79e..91fa707 100644 --- a/PlumbingRepair/PlumbingRepairView/FormMain.cs +++ b/PlumbingRepair/PlumbingRepairView/FormMain.cs @@ -58,6 +58,22 @@ namespace PlumbingRepairView form.ShowDialog(); } } + private void магазиныToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormShops)); + if (service is FormShops form) + { + form.ShowDialog(); + } + } + private void пополнениеToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormStoreReplenishment)); + if (service is FormStoreReplenishment form) + { + form.ShowDialog(); + } + } private void ButtonCreateOrder_Click(object sender, EventArgs e) { @@ -142,6 +158,6 @@ namespace PlumbingRepairView private void ButtonRef_Click(object sender, EventArgs e) { LoadData(); - } + } } } \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormShop.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormShop.Designer.cs new file mode 100644 index 0000000..a65a88d --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShop.Designer.cs @@ -0,0 +1,222 @@ +namespace PlumbingRepairView +{ + 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() + { + this.textBoxAddress = new System.Windows.Forms.TextBox(); + this.labelAddress = new System.Windows.Forms.Label(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonSave = new System.Windows.Forms.Button(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.labelName = new System.Windows.Forms.Label(); + this.dateTimePickerOpening = new System.Windows.Forms.DateTimePicker(); + this.groupBoxComponents = new System.Windows.Forms.GroupBox(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.labelDateOpening = new System.Windows.Forms.Label(); + this.groupBoxComponents.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // textBoxAddress + // + this.textBoxAddress.Location = new System.Drawing.Point(152, 75); + this.textBoxAddress.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.textBoxAddress.Name = "textBoxAddress"; + this.textBoxAddress.Size = new System.Drawing.Size(183, 31); + this.textBoxAddress.TabIndex = 15; + // + // labelAddress + // + this.labelAddress.AutoSize = true; + this.labelAddress.Location = new System.Drawing.Point(8, 78); + this.labelAddress.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelAddress.Name = "labelAddress"; + this.labelAddress.Size = new System.Drawing.Size(66, 25); + this.labelAddress.TabIndex = 14; + this.labelAddress.Text = "Адрес:"; + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(633, 149); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(126, 45); + this.buttonCancel.TabIndex = 17; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(633, 50); + this.buttonSave.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(126, 45); + this.buttonSave.TabIndex = 16; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // textBoxName + // + this.textBoxName.Location = new System.Drawing.Point(152, 27); + this.textBoxName.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(358, 31); + this.textBoxName.TabIndex = 13; + // + // labelName + // + this.labelName.AutoSize = true; + this.labelName.Location = new System.Drawing.Point(8, 30); + this.labelName.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(94, 25); + this.labelName.TabIndex = 12; + this.labelName.Text = "Название:"; + // + // dateTimePickerOpening + // + this.dateTimePickerOpening.Location = new System.Drawing.Point(152, 118); + this.dateTimePickerOpening.Name = "dateTimePickerOpening"; + this.dateTimePickerOpening.Size = new System.Drawing.Size(300, 31); + this.dateTimePickerOpening.TabIndex = 18; + // + // groupBoxComponents + // + this.groupBoxComponents.Controls.Add(this.dataGridView); + this.groupBoxComponents.Controls.Add(this.buttonSave); + this.groupBoxComponents.Controls.Add(this.buttonCancel); + this.groupBoxComponents.Location = new System.Drawing.Point(8, 151); + this.groupBoxComponents.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.groupBoxComponents.Name = "groupBoxComponents"; + this.groupBoxComponents.Padding = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.groupBoxComponents.Size = new System.Drawing.Size(797, 379); + this.groupBoxComponents.TabIndex = 19; + this.groupBoxComponents.TabStop = false; + this.groupBoxComponents.Text = "Компоненты"; + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.ColumnId, + this.ColumnName, + this.ColumnCount}); + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(6, 29); + this.dataGridView.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(583, 345); + this.dataGridView.TabIndex = 0; + // + // ColumnId + // + this.ColumnId.HeaderText = "Id"; + this.ColumnId.MinimumWidth = 8; + this.ColumnId.Name = "ColumnId"; + this.ColumnId.ReadOnly = true; + this.ColumnId.Visible = false; + this.ColumnId.Width = 150; + // + // ColumnName + // + this.ColumnName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.ColumnName.HeaderText = "Работа"; + this.ColumnName.MinimumWidth = 8; + this.ColumnName.Name = "ColumnName"; + this.ColumnName.ReadOnly = true; + // + // ColumnCount + // + this.ColumnCount.HeaderText = "Количество"; + this.ColumnCount.MinimumWidth = 8; + this.ColumnCount.Name = "ColumnCount"; + this.ColumnCount.ReadOnly = true; + this.ColumnCount.Width = 150; + // + // labelDateOpening + // + this.labelDateOpening.AutoSize = true; + this.labelDateOpening.Location = new System.Drawing.Point(8, 118); + this.labelDateOpening.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelDateOpening.Name = "labelDateOpening"; + this.labelDateOpening.Size = new System.Drawing.Size(135, 25); + this.labelDateOpening.TabIndex = 20; + this.labelDateOpening.Text = "Дата открытия:"; + // + // FormShop + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(812, 543); + this.Controls.Add(this.labelDateOpening); + this.Controls.Add(this.groupBoxComponents); + this.Controls.Add(this.dateTimePickerOpening); + this.Controls.Add(this.textBoxAddress); + this.Controls.Add(this.labelAddress); + this.Controls.Add(this.textBoxName); + this.Controls.Add(this.labelName); + this.Name = "FormShop"; + this.Text = "Магазин"; + this.Load += new System.EventHandler(this.FormShop_Load); + this.groupBoxComponents.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxAddress; + private Label labelAddress; + private Button buttonCancel; + private Button buttonSave; + private TextBox textBoxName; + private Label labelName; + private DateTimePicker dateTimePickerOpening; + private GroupBox groupBoxComponents; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnId; + private DataGridViewTextBoxColumn ColumnName; + private DataGridViewTextBoxColumn ColumnCount; + private Label labelDateOpening; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormShop.cs b/PlumbingRepair/PlumbingRepairView/FormShop.cs new file mode 100644 index 0000000..f610272 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShop.cs @@ -0,0 +1,124 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; +using PlumbingRepairDataModels.Models; + +namespace PlumbingRepairView +{ + public partial class FormShop : Form + { + private readonly ILogger _logger; + + private readonly IShopLogic _logic; + + private int? _id; + + private Dictionary _shopWorks; + + public int Id { set { _id = value; } } + + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _shopWorks = new Dictionary(); + } + + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Загрузка изделия"); + try + { + var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address; + dateTimePickerOpening.Value = view.DateOpening; + _shopWorks = view.ShopWorks ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Загрузка изделий магазина"); + try + { + if (_shopWorks != null) + { + dataGridView.Rows.Clear(); + foreach (var pc in _shopWorks) + { + dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.WorkName, pc.Value.Item2 }); + } + } + } + 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; + } + if (string.IsNullOrEmpty(textBoxAddress.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(dateTimePickerOpening.Text)) + { + MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Сохранение магазина"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + DateOpening= dateTimePickerOpening.Value, + ShopWorks = _shopWorks + }; + 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/PlumbingRepair/PlumbingRepairView/FormShop.resx b/PlumbingRepair/PlumbingRepairView/FormShop.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShop.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/PlumbingRepair/PlumbingRepairView/FormShops.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormShops.Designer.cs new file mode 100644 index 0000000..a3ea23f --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShops.Designer.cs @@ -0,0 +1,127 @@ +namespace PlumbingRepairView +{ + 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() + { + this.buttonRef = new System.Windows.Forms.Button(); + this.buttonDel = new System.Windows.Forms.Button(); + this.buttonUpd = new System.Windows.Forms.Button(); + this.buttonAdd = new System.Windows.Forms.Button(); + this.dataGridView = new System.Windows.Forms.DataGridView(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); + this.SuspendLayout(); + // + // buttonRef + // + this.buttonRef.Location = new System.Drawing.Point(786, 234); + this.buttonRef.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.buttonRef.Name = "buttonRef"; + this.buttonRef.Size = new System.Drawing.Size(125, 44); + this.buttonRef.TabIndex = 19; + this.buttonRef.Text = "Обновить"; + this.buttonRef.UseVisualStyleBackColor = true; + this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); + // + // buttonDel + // + this.buttonDel.Location = new System.Drawing.Point(786, 156); + this.buttonDel.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.buttonDel.Name = "buttonDel"; + this.buttonDel.Size = new System.Drawing.Size(125, 44); + this.buttonDel.TabIndex = 18; + this.buttonDel.Text = "Удалить"; + this.buttonDel.UseVisualStyleBackColor = true; + this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click); + // + // buttonUpd + // + this.buttonUpd.Location = new System.Drawing.Point(786, 77); + this.buttonUpd.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.buttonUpd.Name = "buttonUpd"; + this.buttonUpd.Size = new System.Drawing.Size(125, 44); + this.buttonUpd.TabIndex = 17; + this.buttonUpd.Text = "Изменить"; + this.buttonUpd.UseVisualStyleBackColor = true; + this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click); + // + // buttonAdd + // + this.buttonAdd.Location = new System.Drawing.Point(786, 4); + this.buttonAdd.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.buttonAdd.Name = "buttonAdd"; + this.buttonAdd.Size = new System.Drawing.Size(125, 44); + this.buttonAdd.TabIndex = 16; + this.buttonAdd.Text = "Добавить"; + this.buttonAdd.UseVisualStyleBackColor = true; + this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click); + // + // dataGridView + // + this.dataGridView.AllowUserToAddRows = false; + this.dataGridView.AllowUserToDeleteRows = false; + this.dataGridView.BackgroundColor = System.Drawing.SystemColors.ControlLightLight; + this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridView.Dock = System.Windows.Forms.DockStyle.Left; + this.dataGridView.Location = new System.Drawing.Point(0, 0); + this.dataGridView.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.dataGridView.MultiSelect = false; + this.dataGridView.Name = "dataGridView"; + this.dataGridView.ReadOnly = true; + this.dataGridView.RowHeadersVisible = false; + this.dataGridView.RowHeadersWidth = 62; + this.dataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; + this.dataGridView.Size = new System.Drawing.Size(767, 446); + this.dataGridView.TabIndex = 15; + // + // FormShops + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(926, 446); + this.Controls.Add(this.buttonRef); + this.Controls.Add(this.buttonDel); + this.Controls.Add(this.buttonUpd); + this.Controls.Add(this.buttonAdd); + this.Controls.Add(this.dataGridView); + this.Name = "FormShops"; + this.Text = "Магазины"; + this.Load += new System.EventHandler(this.FormShop_Load); + ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private Button buttonRef; + private Button buttonDel; + private Button buttonUpd; + private Button buttonAdd; + private DataGridView dataGridView; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormShops.cs b/PlumbingRepair/PlumbingRepairView/FormShops.cs new file mode 100644 index 0000000..76a6e39 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShops.cs @@ -0,0 +1,105 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BindingModels; +using PlumbingRepairContracts.BusinessLogicsContracts; + +namespace PlumbingRepairView +{ + 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 FormShop_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["ShopWorks"].Visible = false; + dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + + } + _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 ButtonUpd_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 ButtonDel_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 ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/PlumbingRepair/PlumbingRepairView/FormShops.resx b/PlumbingRepair/PlumbingRepairView/FormShops.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormShops.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.Designer.cs b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.Designer.cs new file mode 100644 index 0000000..e6323b8 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.Designer.cs @@ -0,0 +1,153 @@ +namespace PlumbingRepairView +{ + partial class FormStoreReplenishment + { + /// + /// 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() + { + this.textBoxCount = new System.Windows.Forms.TextBox(); + this.labelWorkName = new System.Windows.Forms.Label(); + this.labelShopName = new System.Windows.Forms.Label(); + this.labelCount = new System.Windows.Forms.Label(); + this.comboBoxShop = new System.Windows.Forms.ComboBox(); + this.comboBoxWork = new System.Windows.Forms.ComboBox(); + this.buttonSave = new System.Windows.Forms.Button(); + this.buttonCancel = new System.Windows.Forms.Button(); + this.SuspendLayout(); + // + // textBoxCount + // + this.textBoxCount.Location = new System.Drawing.Point(128, 109); + this.textBoxCount.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.textBoxCount.Name = "textBoxCount"; + this.textBoxCount.Size = new System.Drawing.Size(183, 31); + this.textBoxCount.TabIndex = 13; + // + // labelWorkName + // + this.labelWorkName.AutoSize = true; + this.labelWorkName.Location = new System.Drawing.Point(5, 67); + this.labelWorkName.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelWorkName.Name = "labelWorkName"; + this.labelWorkName.Size = new System.Drawing.Size(72, 25); + this.labelWorkName.TabIndex = 12; + this.labelWorkName.Text = "Работа:"; + // + // labelShopName + // + this.labelShopName.AutoSize = true; + this.labelShopName.Location = new System.Drawing.Point(5, 19); + this.labelShopName.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelShopName.Name = "labelShopName"; + this.labelShopName.Size = new System.Drawing.Size(85, 25); + this.labelShopName.TabIndex = 10; + this.labelShopName.Text = "Магазин:"; + // + // labelCount + // + this.labelCount.AutoSize = true; + this.labelCount.Location = new System.Drawing.Point(5, 115); + this.labelCount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.labelCount.Name = "labelCount"; + this.labelCount.Size = new System.Drawing.Size(111, 25); + this.labelCount.TabIndex = 14; + this.labelCount.Text = "Количество:"; + // + // comboBoxShop + // + this.comboBoxShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxShop.FormattingEnabled = true; + this.comboBoxShop.Location = new System.Drawing.Point(128, 19); + this.comboBoxShop.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.comboBoxShop.Name = "comboBoxShop"; + this.comboBoxShop.Size = new System.Drawing.Size(359, 33); + this.comboBoxShop.TabIndex = 15; + // + // comboBoxWork + // + this.comboBoxWork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBoxWork.FormattingEnabled = true; + this.comboBoxWork.Location = new System.Drawing.Point(128, 59); + this.comboBoxWork.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); + this.comboBoxWork.Name = "comboBoxWork"; + this.comboBoxWork.Size = new System.Drawing.Size(359, 33); + this.comboBoxWork.TabIndex = 16; + // + // buttonSave + // + this.buttonSave.Location = new System.Drawing.Point(15, 182); + this.buttonSave.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonSave.Name = "buttonSave"; + this.buttonSave.Size = new System.Drawing.Size(126, 45); + this.buttonSave.TabIndex = 18; + this.buttonSave.Text = "Сохранить"; + this.buttonSave.UseVisualStyleBackColor = true; + this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click); + // + // buttonCancel + // + this.buttonCancel.Location = new System.Drawing.Point(331, 182); + this.buttonCancel.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(126, 45); + this.buttonCancel.TabIndex = 19; + this.buttonCancel.Text = "Отмена"; + this.buttonCancel.UseVisualStyleBackColor = true; + this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click); + // + // FormStoreReplenishment + // + this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(501, 239); + this.Controls.Add(this.buttonSave); + this.Controls.Add(this.buttonCancel); + this.Controls.Add(this.comboBoxWork); + this.Controls.Add(this.comboBoxShop); + this.Controls.Add(this.labelCount); + this.Controls.Add(this.textBoxCount); + this.Controls.Add(this.labelWorkName); + this.Controls.Add(this.labelShopName); + this.Name = "FormStoreReplenishment"; + this.Text = "FormStoreReplenishment"; + this.Load += new System.EventHandler(this.FormStoreReplenishment_Load); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private TextBox textBoxCount; + private Label labelWorkName; + private Label labelShopName; + private Label labelCount; + private ComboBox comboBoxShop; + private ComboBox comboBoxWork; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.cs b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.cs new file mode 100644 index 0000000..0fd19d7 --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.cs @@ -0,0 +1,117 @@ +using Microsoft.Extensions.Logging; +using PlumbingRepairContracts.BusinessLogicsContracts; +using PlumbingRepairContracts.SearchModels; + + +namespace PlumbingRepairView +{ + public partial class FormStoreReplenishment : Form + { + private readonly ILogger _logger; + + private readonly IWorkLogic _workLogic; + + private readonly IShopLogic _logicShop; + + public FormStoreReplenishment(ILogger logger, IWorkLogic workLogic, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _workLogic = workLogic; + _logicShop = logicShop; + } + + private void FormStoreReplenishment_Load(object sender, EventArgs e) + { + _logger.LogInformation("Works loading"); + try + { + var list = _workLogic.ReadList(null); + if (list != null) + { + comboBoxWork.DisplayMember = "WorkName"; + comboBoxWork.ValueMember = "Id"; + comboBoxWork.DataSource = list; + comboBoxWork.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Works loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + _logger.LogInformation("Shops loading"); + try + { + var list = _logicShop.ReadList(null); + if (list != null) + { + comboBoxShop.DisplayMember = "ShopName"; + comboBoxShop.ValueMember = "Id"; + comboBoxShop.DataSource = list; + comboBoxShop.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Shops loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSave_Click(object sender, EventArgs e) + { + if (comboBoxShop.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (comboBoxWork.SelectedValue == null) + { + MessageBox.Show("Выберите работу", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Shop replenishment"); + try + { + var work = _workLogic.ReadElement(new WorkSearchModel + { Id = Convert.ToInt32(comboBoxWork.SelectedValue) }); + if (work == null) + { + throw new Exception("Работа не найдена."); + } + var operationResult = _logicShop.StoreReplenishment(new ShopSearchModel + { + Id = Convert.ToInt32(comboBoxShop.SelectedValue) + }, + work, + Convert.ToInt32(textBoxCount.Text)); + if (!operationResult) + { + throw new Exception("Ошибка при проведении поставки."); + } + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Shop replenishment error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + DialogResult = DialogResult.OK; + Close(); + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.resx b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/PlumbingRepair/PlumbingRepairView/FormStoreReplenishment.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/PlumbingRepair/PlumbingRepairView/Program.cs b/PlumbingRepair/PlumbingRepairView/Program.cs index 03a1750..60cb5e4 100644 --- a/PlumbingRepair/PlumbingRepairView/Program.cs +++ b/PlumbingRepair/PlumbingRepairView/Program.cs @@ -38,10 +38,12 @@ namespace PlumbingRepairView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,7 +51,10 @@ namespace PlumbingRepairView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file