From ce248a32440d86bafd8c6fc61c3809d556db1024 Mon Sep 17 00:00:00 2001 From: russell Date: Sun, 14 Apr 2024 02:36:43 +0400 Subject: [PATCH 1/4] lab1_hard --- .../BusinessLogics/ShopLogic.cs | 166 ++++++++++++++ .../BindingModels/ShopBindingModel.cs | 21 ++ .../BusinessLogicsContracts/IShopLogic.cs | 22 ++ .../SearchModels/ShopSearchModel.cs | 9 + .../StoragesContracts/IShopStorage.cs | 21 ++ .../ViewModels/ShopViewModel.cs | 25 ++ .../Models/IShopModel.cs | 15 ++ .../DataListSingleton.cs | 2 + .../Implements/ShopStorage.cs | 110 +++++++++ .../CarRepairShopListImplement/Models/Shop.cs | 60 +++++ CarRepairShop/CarRepairShopView/FormMain.cs | 18 ++ .../CarRepairShopView/FormMain.designer.cs | 24 +- .../FormMakeShipment.Designer.cs | 153 +++++++++++++ .../CarRepairShopView/FormMakeShipment.cs | 116 ++++++++++ .../CarRepairShopView/FormMakeShipment.resx | 120 ++++++++++ .../CarRepairShopView/FormShop.Designer.cs | 213 ++++++++++++++++++ CarRepairShop/CarRepairShopView/FormShop.cs | 125 ++++++++++ CarRepairShop/CarRepairShopView/FormShop.resx | 120 ++++++++++ .../CarRepairShopView/FormShops.Designer.cs | 126 +++++++++++ CarRepairShop/CarRepairShopView/FormShops.cs | 104 +++++++++ .../CarRepairShopView/FormShops.resx | 120 ++++++++++ CarRepairShop/CarRepairShopView/Program.cs | 5 + 22 files changed, 1693 insertions(+), 2 deletions(-) create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs create mode 100644 CarRepairShop/CarRepairShopContracts/SearchModels/ShopSearchModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs create mode 100644 CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs create mode 100644 CarRepairShop/CarRepairShopListImplement/Models/Shop.cs create mode 100644 CarRepairShop/CarRepairShopView/FormMakeShipment.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormMakeShipment.cs create mode 100644 CarRepairShop/CarRepairShopView/FormMakeShipment.resx create mode 100644 CarRepairShop/CarRepairShopView/FormShop.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormShop.cs create mode 100644 CarRepairShop/CarRepairShopView/FormShop.resx create mode 100644 CarRepairShop/CarRepairShopView/FormShops.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormShops.cs create mode 100644 CarRepairShop/CarRepairShopView/FormShops.resx diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..3cc14bc --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,166 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopBusinessLogic.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 MakeShipment(ShopSearchModel shopModel, IRepairModel repair, int count) + { + if (shopModel == null) + { + throw new ArgumentNullException(nameof(shopModel)); + } + if (repair == null) + { + throw new ArgumentNullException(nameof(repair)); + } + if (count <= 0) + { + throw new ArgumentException("Количество ремонтов в магазине должно быть больше нуля", nameof(count)); + } + _logger.LogInformation("MakeShipment(GetElement). ShopName: {ShopName}. Id: {Id}", shopModel.ShopName, shopModel.Id); + var shop = _shopStorage.GetElement(shopModel); + if (shop == null) + { + _logger.LogWarning("MakeShipment(GetElement). Element not found"); + return false; + } + if (shop.ShopRepairs.ContainsKey(repair.Id)) + { + var shopIC = shop.ShopRepairs[repair.Id]; + shopIC.Item2 += count; + shop.ShopRepairs[repair.Id] = shopIC; + _logger.LogInformation("MakeShipment. Added {count} '{repair}' to '{ShopName}' shop", count, repair.RepairName, + shop.ShopName); + } + else + { + shop.ShopRepairs.Add(repair.Id, (repair, count)); + _logger.LogInformation("MakeShipment. Added {count} new '{repair}' to '{ShopName}' shop", count, repair.RepairName, + shop.ShopName); + } + if (_shopStorage.Update(new ShopBindingModel() + { + Id = shop.Id, + ShopName = shop.ShopName, + Address = shop.Address, + DateOpening = shop.DateOpening, + ShopRepairs = shop.ShopRepairs, + }) == null) + { + _logger.LogWarning("MakeShipment. 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.Address)); + } + _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("Магазин с таким названием уже есть"); + } + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..3d09765 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,21 @@ +using CarRepairShopDataModels.Models; + +namespace CarRepairShopContracts.BindingModels +{ + public class ShopBindingModel : IShopModel + { + 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 ShopRepairs + { + get; + set; + } = new(); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs new file mode 100644 index 0000000..02e0872 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs @@ -0,0 +1,22 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; + +namespace CarRepairShopContracts.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 MakeShipment(ShopSearchModel shopModel, IRepairModel Repair, int count); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/SearchModels/ShopSearchModel.cs b/CarRepairShop/CarRepairShopContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..916dbb5 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,9 @@ +namespace CarRepairShopContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + + public string? ShopName { get; set; } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..439d071 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,21 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.ViewModels; + +namespace CarRepairShopContracts.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); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..824e926 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,25 @@ +using CarRepairShopDataModels.Models; +using System.ComponentModel; + +namespace CarRepairShopContracts.ViewModels +{ + public class ShopViewModel : IShopModel + { + 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; } = DateTime.Now; + + public Dictionary ShopRepairs + { + get; + set; + } = new(); + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..5e53025 --- /dev/null +++ b/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs @@ -0,0 +1,15 @@ +using CarRepairShopDataModels; + +namespace CarRepairShopDataModels.Models +{ + public interface IShopModel : IId + { + string ShopName { get; } + + string Address { get; } + + DateTime DateOpening { get; } + + Dictionary ShopRepairs { get; } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs index b943306..73ed3ac 100644 --- a/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs +++ b/CarRepairShop/CarRepairShopListImplement/DataListSingleton.cs @@ -11,12 +11,14 @@ namespace CarRepairShopListImplement public List Orders { get; set; } public List Repairs { get; set; } + public List Shops { get; set; } private DataListSingleton() { Components = new List(); Orders = new List(); Repairs = new List(); + Shops = new List(); } public static DataListSingleton GetInstance() diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..80b8c72 --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs @@ -0,0 +1,110 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopListImplement; +using CarRepairShopListImplement.Models; + +namespace CarRepairShopListImplement.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; + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs b/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs new file mode 100644 index 0000000..a0947dc --- /dev/null +++ b/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs @@ -0,0 +1,60 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; + +namespace CarRepairShopListImplement.Models +{ + public class Shop : IShopModel + { + 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 ShopRepairs + { + 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, + ShopRepairs = model.ShopRepairs + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + ShopRepairs = model.ShopRepairs; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopRepairs = ShopRepairs + }; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.cs b/CarRepairShop/CarRepairShopView/FormMain.cs index 54b5e20..6d75706 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.cs @@ -144,5 +144,23 @@ namespace CarRepairShopView { LoadData(); } + + 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(FormMakeShipment)); + if (service is FormMakeShipment form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.designer.cs b/CarRepairShop/CarRepairShopView/FormMain.designer.cs index e6b5aea..68e602d 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.designer.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.designer.cs @@ -32,6 +32,8 @@ this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ремонтыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + магазиныToolStripMenuItem = new ToolStripMenuItem(); + пополнениеМагазинаToolStripMenuItem = new ToolStripMenuItem(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonOrderReady = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); @@ -45,7 +47,8 @@ // menuStrip1 // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.справочникиToolStripMenuItem}); + this.справочникиToolStripMenuItem, + пополнениеМагазинаToolStripMenuItem }); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); @@ -57,7 +60,8 @@ // this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.компонентыToolStripMenuItem, - this.ремонтыToolStripMenuItem}); + this.ремонтыToolStripMenuItem, + магазиныToolStripMenuItem }); this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(94, 20); this.справочникиToolStripMenuItem.Text = "Справочники"; @@ -76,6 +80,20 @@ this.ремонтыToolStripMenuItem.Text = "Ремонты"; this.ремонтыToolStripMenuItem.Click += new System.EventHandler(this.РемонтыToolStripMenuItem_Click); // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(180, 22); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + // + // пополнениеМагазинаToolStripMenuItem + // + пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + пополнениеМагазинаToolStripMenuItem.Size = new Size(143, 20); + пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; + // // buttonIssuedOrder // this.buttonIssuedOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -193,6 +211,8 @@ private System.Windows.Forms.Button buttonCreateOrder; private System.Windows.Forms.DataGridView dataGridView; private System.Windows.Forms.Button buttonRef; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; } } diff --git a/CarRepairShop/CarRepairShopView/FormMakeShipment.Designer.cs b/CarRepairShop/CarRepairShopView/FormMakeShipment.Designer.cs new file mode 100644 index 0000000..b6bea6f --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMakeShipment.Designer.cs @@ -0,0 +1,153 @@ +namespace CarRepairShopView +{ + partial class FormMakeShipment + { + /// + /// 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() + { + labelShop = new Label(); + comboBoxShop = new ComboBox(); + labelRepair = new Label(); + comboBoxRepair = new ComboBox(); + labelCount = new Label(); + textBoxCount = new TextBox(); + buttonSave = new Button(); + buttonCancel = new Button(); + SuspendLayout(); + // + // labelShop + // + labelShop.AutoSize = true; + labelShop.Location = new Point(14, 13); + labelShop.Margin = new Padding(4, 0, 4, 0); + labelShop.Name = "labelShop"; + labelShop.Size = new Size(60, 15); + labelShop.TabIndex = 2; + labelShop.Text = "Магазин :"; + // + // comboBoxShop + // + comboBoxShop.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxShop.FormattingEnabled = true; + comboBoxShop.Location = new Point(102, 10); + comboBoxShop.Margin = new Padding(4, 3, 4, 3); + comboBoxShop.Name = "comboBoxShop"; + comboBoxShop.Size = new Size(252, 23); + comboBoxShop.TabIndex = 5; + // + // labelRepair + // + labelRepair.AutoSize = true; + labelRepair.Location = new Point(14, 48); + labelRepair.Margin = new Padding(4, 0, 4, 0); + labelRepair.Name = "labelRepair"; + labelRepair.Size = new Size(80, 15); + labelRepair.TabIndex = 6; + labelRepair.Text = "Ремонт:"; + // + // comboBoxRepair + // + comboBoxRepair.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxRepair.FormattingEnabled = true; + comboBoxRepair.Location = new Point(102, 44); + comboBoxRepair.Margin = new Padding(4, 3, 4, 3); + comboBoxRepair.Name = "comboBoxRepair"; + comboBoxRepair.Size = new Size(252, 23); + comboBoxRepair.TabIndex = 7; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(14, 83); + labelCount.Margin = new Padding(4, 0, 4, 0); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(78, 15); + labelCount.TabIndex = 8; + labelCount.Text = "Количество :"; + // + // textBoxCount + // + textBoxCount.Location = new Point(102, 80); + textBoxCount.Margin = new Padding(4, 3, 4, 3); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(252, 23); + textBoxCount.TabIndex = 9; + // + // buttonSave + // + buttonSave.Location = new Point(160, 112); + buttonSave.Margin = new Padding(4, 3, 4, 3); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(88, 27); + buttonSave.TabIndex = 10; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(254, 112); + buttonCancel.Margin = new Padding(4, 3, 4, 3); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(88, 27); + buttonCancel.TabIndex = 11; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // FormMakeShipment + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(373, 147); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(textBoxCount); + Controls.Add(labelCount); + Controls.Add(comboBoxRepair); + Controls.Add(labelRepair); + Controls.Add(comboBoxShop); + Controls.Add(labelShop); + Name = "FormMakeShipment"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Пополнение магазина"; + Load += FormMakeShipment_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelShop; + private ComboBox comboBoxShop; + private Label labelRepair; + private ComboBox comboBoxRepair; + private Label labelCount; + private TextBox textBoxCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMakeShipment.cs b/CarRepairShop/CarRepairShopView/FormMakeShipment.cs new file mode 100644 index 0000000..8814bf0 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMakeShipment.cs @@ -0,0 +1,116 @@ +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormMakeShipment : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logicRepair; + + private readonly IShopLogic _logicShop; + + public FormMakeShipment(ILogger logger, IRepairLogic logicRepair, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicRepair = logicRepair; + _logicShop = logicShop; + } + + private void FormMakeShipment_Load(object sender, EventArgs e) + { + _logger.LogInformation("Reapirs loading"); + try + { + var list = _logicRepair.ReadList(null); + if (list != null) + { + comboBoxRepair.DisplayMember = "RepairName"; + comboBoxRepair.ValueMember = "Id"; + comboBoxRepair.DataSource = list; + comboBoxRepair.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Repairs 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 (comboBoxRepair.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 repair = _logicRepair.ReadElement(new RepairSearchModel + { Id = Convert.ToInt32(comboBoxRepair.SelectedValue) }); + if (repair == null) + { + throw new Exception("Ремонт не найден."); + } + var operationResult = _logicShop.MakeShipment(new ShopSearchModel + { + Id = Convert.ToInt32(comboBoxShop.SelectedValue) + }, + repair, + 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/CarRepairShop/CarRepairShopView/FormMakeShipment.resx b/CarRepairShop/CarRepairShopView/FormMakeShipment.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormMakeShipment.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/FormShop.Designer.cs b/CarRepairShop/CarRepairShopView/FormShop.Designer.cs new file mode 100644 index 0000000..3e3562a --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShop.Designer.cs @@ -0,0 +1,213 @@ +namespace CarRepairShopView +{ + 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() + { + labelName = new Label(); + textBoxName = new TextBox(); + labelAddress = new Label(); + textBoxAddress = new TextBox(); + dateTimePicker = new DateTimePicker(); + labelOpeningDate = new Label(); + groupBoxRepairs = new GroupBox(); + dataGridView = new DataGridView(); + ColumnId = new DataGridViewTextBoxColumn(); + ColumnName = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + buttonSave = new Button(); + buttonCancel = new Button(); + groupBoxRepairs.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // labelName + // + labelName.AutoSize = true; + labelName.Location = new Point(14, 10); + labelName.Margin = new Padding(4, 0, 4, 0); + labelName.Name = "labelName"; + labelName.Size = new Size(65, 15); + labelName.TabIndex = 1; + labelName.Text = "Название :"; + // + // textBoxName + // + textBoxName.Location = new Point(92, 7); + textBoxName.Margin = new Padding(4, 3, 4, 3); + textBoxName.Name = "textBoxName"; + textBoxName.Size = new Size(252, 23); + textBoxName.TabIndex = 2; + // + // labelAddress + // + labelAddress.AutoSize = true; + labelAddress.Location = new Point(14, 40); + labelAddress.Margin = new Padding(4, 0, 4, 0); + labelAddress.Name = "labelAddress"; + labelAddress.Size = new Size(46, 15); + labelAddress.TabIndex = 3; + labelAddress.Text = "Адрес :"; + // + // textBoxAddress + // + textBoxAddress.Location = new Point(92, 37); + textBoxAddress.Margin = new Padding(4, 3, 4, 3); + textBoxAddress.Name = "textBoxAddress"; + textBoxAddress.Size = new Size(252, 23); + textBoxAddress.TabIndex = 4; + // + // dateTimePicker + // + dateTimePicker.Location = new Point(126, 66); + dateTimePicker.Name = "dateTimePicker"; + dateTimePicker.Size = new Size(218, 23); + dateTimePicker.TabIndex = 5; + // + // labelOpeningDate + // + labelOpeningDate.AutoSize = true; + labelOpeningDate.Location = new Point(14, 69); + labelOpeningDate.Margin = new Padding(4, 0, 4, 0); + labelOpeningDate.Name = "labelOpeningDate"; + labelOpeningDate.Size = new Size(93, 15); + labelOpeningDate.TabIndex = 6; + labelOpeningDate.Text = "Дата открытия :"; + // + // groupBoxRepairs + // + groupBoxRepairs.Controls.Add(dataGridView); + groupBoxRepairs.Location = new Point(4, 100); + groupBoxRepairs.Margin = new Padding(4, 3, 4, 3); + groupBoxRepairs.Name = "groupBoxRepairs"; + groupBoxRepairs.Padding = new Padding(4, 3, 4, 3); + groupBoxRepairs.Size = new Size(469, 288); + groupBoxRepairs.TabIndex = 7; + groupBoxRepairs.TabStop = false; + groupBoxRepairs.Text = "Ремонт"; + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnId, ColumnName, ColumnCount }); + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(4, 19); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(457, 266); + dataGridView.TabIndex = 0; + // + // ColumnId + // + ColumnId.HeaderText = "Id"; + ColumnId.Name = "ColumnId"; + ColumnId.ReadOnly = true; + ColumnId.Visible = false; + // + // ColumnName + // + ColumnName.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnName.HeaderText = "Название ремонта"; + ColumnName.Name = "ColumnName"; + ColumnName.ReadOnly = true; + // + // ColumnCount + // + ColumnCount.HeaderText = "Количество"; + ColumnCount.Name = "ColumnCount"; + ColumnCount.ReadOnly = true; + // + // buttonSave + // + buttonSave.Location = new Point(255, 394); + buttonSave.Margin = new Padding(4, 3, 4, 3); + buttonSave.Name = "buttonSave"; + buttonSave.Size = new Size(88, 27); + buttonSave.TabIndex = 8; + buttonSave.Text = "Сохранить"; + buttonSave.UseVisualStyleBackColor = true; + buttonSave.Click += ButtonSave_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(359, 394); + buttonCancel.Margin = new Padding(4, 3, 4, 3); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(88, 27); + buttonCancel.TabIndex = 9; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // FormShop + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(478, 432); + Controls.Add(buttonCancel); + Controls.Add(buttonSave); + Controls.Add(groupBoxRepairs); + Controls.Add(labelOpeningDate); + Controls.Add(dateTimePicker); + Controls.Add(textBoxAddress); + Controls.Add(labelAddress); + Controls.Add(textBoxName); + Controls.Add(labelName); + Name = "FormShop"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Магазин"; + Load += FormShop_Load; + groupBoxRepairs.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label labelName; + private TextBox textBoxName; + private Label labelAddress; + private TextBox textBoxAddress; + private DateTimePicker dateTimePicker; + private Label labelOpeningDate; + private GroupBox groupBoxRepairs; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnId; + private DataGridViewTextBoxColumn ColumnName; + private DataGridViewTextBoxColumn ColumnCount; + private Button buttonSave; + private Button buttonCancel; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormShop.cs b/CarRepairShop/CarRepairShopView/FormShop.cs new file mode 100644 index 0000000..11c937a --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShop.cs @@ -0,0 +1,125 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.SearchModels; +using CarRepairShopDataModels.Models; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormShop : Form + { + private readonly ILogger _logger; + + private readonly IShopLogic _logic; + + private int? _id; + + private Dictionary _shopRepairs; + + public int Id { set { _id = value; } } + + public FormShop(ILogger logger, IShopLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + _shopRepairs = new Dictionary(); + } + + private void FormShop_Load(object sender, EventArgs e) + { + if (_id.HasValue) + { + _logger.LogInformation("Shop loading"); + try + { + var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value }); + if (view != null) + { + textBoxName.Text = view.ShopName; + textBoxAddress.Text = view.Address; + dateTimePicker.Value = view.DateOpening; + _shopRepairs = view.ShopRepairs ?? new Dictionary(); + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Shop loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Shop repairs loading"); + try + { + if (_shopRepairs != null) + { + dataGridView.Rows.Clear(); + foreach (var repair in _shopRepairs) + { + dataGridView.Rows.Add(new object[] { repair.Key, repair.Value.Item1.RepairName, repair.Value.Item2 }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Shop repairs loading error"); + 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(dateTimePicker.Text)) + { + MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Shop saving"); + try + { + var model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = textBoxName.Text, + Address = textBoxAddress.Text, + DateOpening = dateTimePicker.Value, + ShopRepairs = _shopRepairs + }; + 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, "Shop saving error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/CarRepairShop/CarRepairShopView/FormShop.resx b/CarRepairShop/CarRepairShopView/FormShop.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShop.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/FormShops.Designer.cs b/CarRepairShop/CarRepairShopView/FormShops.Designer.cs new file mode 100644 index 0000000..d55b56b --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShops.Designer.cs @@ -0,0 +1,126 @@ +namespace CarRepairShopView +{ + 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(); + buttonUpd = new Button(); + buttonDel = new Button(); + buttonEdit = new Button(); + buttonAdd = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(408, 360); + dataGridView.TabIndex = 2; + // + // buttonUpd + // + buttonUpd.Location = new Point(432, 152); + buttonUpd.Margin = new Padding(4, 3, 4, 3); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(88, 27); + buttonUpd.TabIndex = 12; + buttonUpd.Text = "Обновить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += ButtonUpd_Click; + // + // buttonDel + // + buttonDel.Location = new Point(432, 105); + buttonDel.Margin = new Padding(4, 3, 4, 3); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(88, 27); + buttonDel.TabIndex = 11; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += ButtonDel_Click; + // + // buttonEdit + // + buttonEdit.Location = new Point(432, 58); + buttonEdit.Margin = new Padding(4, 3, 4, 3); + buttonEdit.Name = "buttonEdit"; + buttonEdit.Size = new Size(88, 27); + buttonEdit.TabIndex = 10; + buttonEdit.Text = "Изменить"; + buttonEdit.UseVisualStyleBackColor = true; + buttonEdit.Click += ButtonEdit_Click; + // + // buttonAdd + // + buttonAdd.Location = new Point(432, 14); + buttonAdd.Margin = new Padding(4, 3, 4, 3); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(88, 27); + buttonAdd.TabIndex = 9; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // + // FormShops + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(541, 360); + Controls.Add(buttonUpd); + Controls.Add(buttonDel); + Controls.Add(buttonEdit); + Controls.Add(buttonAdd); + Controls.Add(dataGridView); + Name = "FormShops"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Магазины"; + Load += FormShops_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonUpd; + private Button buttonDel; + private Button buttonEdit; + private Button buttonAdd; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormShops.cs b/CarRepairShop/CarRepairShopView/FormShops.cs new file mode 100644 index 0000000..c54e30b --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShops.cs @@ -0,0 +1,104 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + 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["ShopRepairs"].Visible = false; + } + _logger.LogInformation("Shops loading"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Shops loading error"); + 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 ButtonEdit_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("Deletion of shop"); + try + { + if (!_logic.Delete(new ShopBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Shop deletion error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/CarRepairShop/CarRepairShopView/FormShops.resx b/CarRepairShop/CarRepairShopView/FormShops.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormShops.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index a63c4a2..212c588 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -37,10 +37,12 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,6 +51,9 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file From 51df1aeb594f512746054042f558c46d9e3fa3d9 Mon Sep 17 00:00:00 2001 From: russell Date: Sat, 27 Apr 2024 22:23:26 +0400 Subject: [PATCH 2/4] lab2_hard --- CarRepairShop/CarRepairShop.sln | 10 +- .../BusinessLogics/OrderLogic.cs | 84 ++++++++++- .../BusinessLogics/ShopLogic.cs | 10 ++ .../BindingModels/ShopBindingModel.cs | 2 + .../BusinessLogicsContracts/IShopLogic.cs | 2 + .../StoragesContracts/IShopStorage.cs | 3 + .../ViewModels/ShopViewModel.cs | 3 + .../Models/IShopModel.cs | 2 + .../DataFileSingleton.cs | 7 + .../Implements/ShopStorage.cs | 134 ++++++++++++++++++ .../CarRepairShopFileImplement/Models/Shop.cs | 108 ++++++++++++++ .../Implements/ShopStorage.cs | 6 + .../CarRepairShopListImplement/Models/Shop.cs | 9 +- CarRepairShop/CarRepairShopView/FormMain.cs | 9 ++ .../CarRepairShopView/FormMain.designer.cs | 18 ++- .../CarRepairShopView/FormSale.Designer.cs | 127 +++++++++++++++++ CarRepairShop/CarRepairShopView/FormSale.cs | 87 ++++++++++++ CarRepairShop/CarRepairShopView/FormSale.resx | 120 ++++++++++++++++ .../CarRepairShopView/FormShop.Designer.cs | 32 ++++- CarRepairShop/CarRepairShopView/FormShop.cs | 7 + CarRepairShop/CarRepairShopView/Program.cs | 1 + 21 files changed, 765 insertions(+), 16 deletions(-) create mode 100644 CarRepairShop/CarRepairShopFileImplement/Implements/ShopStorage.cs create mode 100644 CarRepairShop/CarRepairShopFileImplement/Models/Shop.cs create mode 100644 CarRepairShop/CarRepairShopView/FormSale.Designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormSale.cs create mode 100644 CarRepairShop/CarRepairShopView/FormSale.resx diff --git a/CarRepairShop/CarRepairShop.sln b/CarRepairShop/CarRepairShop.sln index d41853f..3d67e9a 100644 --- a/CarRepairShop/CarRepairShop.sln +++ b/CarRepairShop/CarRepairShop.sln @@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopDataModels", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopListImplement", "CarRepairShopListImplement\CarRepairShopListImplement.csproj", "{5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopFileImplement", "CarRepairShopFileImplement\CarRepairShopFileImplement.csproj", "{FD920623-E8C5-45DE-9D7F-A6C643102F9D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopFileImplement", "CarRepairShopFileImplement\CarRepairShopFileImplement.csproj", "{4966A8B7-5985-48DF-834A-3E41D2E0D01D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -41,10 +41,10 @@ Global {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Debug|Any CPU.Build.0 = Debug|Any CPU {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Release|Any CPU.ActiveCfg = Release|Any CPU {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Release|Any CPU.Build.0 = Release|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Release|Any CPU.Build.0 = Release|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs index 5253fc5..f5d6b56 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -4,6 +4,7 @@ using CarRepairShopContracts.SearchModels; using CarRepairShopContracts.StoragesContracts; using CarRepairShopContracts.ViewModels; using CarRepairShopDataModels.Enums; +using CarRepairShopDataModels.Models; using Microsoft.Extensions.Logging; namespace CarRepairShopBusinessLogic.BusinessLogics @@ -14,10 +15,20 @@ namespace CarRepairShopBusinessLogic.BusinessLogics private readonly IOrderStorage _orderStorage; - public OrderLogic(ILogger logger, IOrderStorage orderStorage) + private readonly IRepairStorage _repairStorage; + + private readonly IShopStorage _shopStorage; + + private readonly IShopLogic _shopLogic; + + public OrderLogic(ILogger logger, IOrderStorage orderStorage, IRepairStorage repairStorage, + IShopStorage shopStorage, IShopLogic shopLogic) { _logger = logger; _orderStorage = orderStorage; + _repairStorage = repairStorage; + _shopStorage = shopStorage; + _shopLogic = shopLogic; } public bool CreateOrder(OrderBindingModel model) @@ -106,6 +117,20 @@ namespace CarRepairShopBusinessLogic.BusinessLogics newStatus, order.Status); return false; } + if (newStatus == OrderStatus.Выдан) + { + var repair = _repairStorage.GetElement(new RepairSearchModel() { Id = order.RepairId }); + if (repair == null) + { + _logger.LogWarning("Change status operation failed. Repairs not found"); + return false; + } + if (!DeliverRepairs(repair, order.Count)) + { + _logger.LogWarning("Change status operation failed. Repairs delivery operation failed"); + return false; + } + } model.RepairId = order.RepairId; model.Count = order.Count; model.Sum = order.Sum; @@ -125,5 +150,62 @@ namespace CarRepairShopBusinessLogic.BusinessLogics } return true; } + private bool DeliverRepairs(IRepairModel repair, int count) + { + if (count <= 0) + { + _logger.LogWarning("Repairs delivery operation failed. Repair count <= 0"); + return false; + } + + var shopList = _shopStorage.GetFullList(); + int shopsCapacity = shopList.Sum(x => x.RepairMaxAmount); + int currentRepairs = shopList.Select(x => x.ShopRepairs.Sum(y => y.Value.Item2)).Sum(); + int freePlaces = shopsCapacity - currentRepairs; + + if (freePlaces < count) + { + _logger.LogWarning("Repairs delivery operation failed. No space for new repairs"); + return false; + } + + foreach (var shop in shopList) + { + freePlaces = shop.RepairMaxAmount - shop.ShopRepairs.Sum(x => x.Value.Item2); + if (freePlaces == 0) + { + continue; + } + if (freePlaces >= count) + { + if (_shopLogic.MakeShipment(new() { Id = shop.Id }, repair, count)) + { + count = 0; + } + else + { + _logger.LogWarning("Repairs delivery operation failed"); + return false; + } + } + else + { + if (_shopLogic.MakeShipment(new() { Id = shop.Id }, repair, freePlaces)) + { + count -= freePlaces; + } + else + { + _logger.LogWarning("Repairs delivery operation failed"); + return false; + } + } + if (count == 0) + { + return true; + } + } + return false; + } } } diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs index 3cc14bc..3a76eec 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -105,6 +105,11 @@ namespace CarRepairShopBusinessLogic.BusinessLogics _logger.LogWarning("MakeShipment(GetElement). Element not found"); return false; } + if (shop.RepairMaxAmount - shop.ShopRepairs.Sum(x => x.Value.Item2) < count) + { + _logger.LogWarning("MakeShipment error. No space for new repairs"); + return false; + } if (shop.ShopRepairs.ContainsKey(repair.Id)) { var shopIC = shop.ShopRepairs[repair.Id]; @@ -125,6 +130,7 @@ namespace CarRepairShopBusinessLogic.BusinessLogics ShopName = shop.ShopName, Address = shop.Address, DateOpening = shop.DateOpening, + RepairMaxAmount = shop.RepairMaxAmount, ShopRepairs = shop.ShopRepairs, }) == null) { @@ -133,6 +139,10 @@ namespace CarRepairShopBusinessLogic.BusinessLogics } return true; } + public bool MakeSale(IRepairModel model, int count) + { + return _shopStorage.MakeSale(model, count); + } private void CheckModel(ShopBindingModel model, bool withParams = true) { diff --git a/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs b/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs index 3d09765..994546d 100644 --- a/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs +++ b/CarRepairShop/CarRepairShopContracts/BindingModels/ShopBindingModel.cs @@ -17,5 +17,7 @@ namespace CarRepairShopContracts.BindingModels get; set; } = new(); + + public int RepairMaxAmount { get; set; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs index 02e0872..c84608c 100644 --- a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IShopLogic.cs @@ -18,5 +18,7 @@ namespace CarRepairShopContracts.BusinessLogicsContracts bool Delete(ShopBindingModel model); bool MakeShipment(ShopSearchModel shopModel, IRepairModel Repair, int count); + + bool MakeSale(IRepairModel model, int count); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs index 439d071..6fd3b3f 100644 --- a/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs +++ b/CarRepairShop/CarRepairShopContracts/StoragesContracts/IShopStorage.cs @@ -1,6 +1,7 @@ using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.SearchModels; using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; namespace CarRepairShopContracts.StoragesContracts { @@ -17,5 +18,7 @@ namespace CarRepairShopContracts.StoragesContracts ShopViewModel? Update(ShopBindingModel model); ShopViewModel? Delete(ShopBindingModel model); + + bool MakeSale(IRepairModel model, int count); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs index 824e926..640ace7 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ShopViewModel.cs @@ -21,5 +21,8 @@ namespace CarRepairShopContracts.ViewModels get; set; } = new(); + + [DisplayName("Максимальное количество ремонтов")] + public int RepairMaxAmount { get; set; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs b/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs index 5e53025..d2d0ccc 100644 --- a/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs +++ b/CarRepairShop/CarRepairShopDataModels/Models/IShopModel.cs @@ -11,5 +11,7 @@ namespace CarRepairShopDataModels.Models DateTime DateOpening { get; } Dictionary ShopRepairs { get; } + + int RepairMaxAmount { get; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs b/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs index f9aebff..be8e3ab 100644 --- a/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs +++ b/CarRepairShop/CarRepairShopFileImplement/DataFileSingleton.cs @@ -13,12 +13,16 @@ namespace CarRepairShopFileImplement private readonly string RepairFileName = "Repair.xml"; + private readonly string ShopFileName = "Shop.xml"; + public List Components { get; private set; } public List Orders { get; private set; } public List Repairs { get; private set; } + public List Shops { get; private set; } + public static DataFileSingleton GetInstance() { if (instance == null) @@ -34,11 +38,14 @@ namespace CarRepairShopFileImplement public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); + private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Repairs = LoadData(RepairFileName, "Repair", x => Repair.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Shops = LoadData(ShopFileName, "Shop", x => Shop.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/CarRepairShop/CarRepairShopFileImplement/Implements/ShopStorage.cs b/CarRepairShop/CarRepairShopFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..2d050bb --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,134 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopFileImplement; +using CarRepairShopDataModels.Models; +using CarRepairShopFileImplement.Models; +using System.Collections.Generic; + +namespace CarRepairShopFileImplement.Implements +{ + public class ShopStorage : IShopStorage + { + private readonly DataFileSingleton source; + + public ShopStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Shops + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + return source.Shops + .Where(x => x.ShopName.Contains(model.ShopName)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + return source.Shops + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + model.Id = source.Shops.Count > 0 ? source.Shops.Max(x => x.Id) + 1 : 1; + var newShop = Shop.Create(model); + if (newShop == null) + { + return null; + } + source.Shops.Add(newShop); + source.SaveShops(); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + var shop = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + source.SaveShops(); + return shop.GetViewModel; + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + var element = source.Shops.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Shops.Remove(element); + source.SaveShops(); + return element.GetViewModel; + } + return null; + } + + public bool MakeSale(IRepairModel model, int count) + { + var repair = source.Repairs.FirstOrDefault(x => x.Id == model.Id); + int countInShops = source.Shops.SelectMany(x => x.ShopRepairs).Sum(y => y.Key == model.Id ? y.Value.Item2 : 0); + + if (repair == null || countInShops < count) + { + return false; + } + + foreach (var shop in source.Shops) + { + var shopRepairs = shop.ShopRepairs.Where(x => x.Key == model.Id); + if (shopRepairs.Any()) + { + var shopRepair = shopRepairs.First(); + int min = Math.Min(shopRepair.Value.Item2, count); + if (min == shopRepair.Value.Item2) + { + shop.ShopRepairs.Remove(shopRepair.Key); + } + else + { + shop.ShopRepairs[shopRepair.Key] = (shopRepair.Value.Item1, shopRepair.Value.Item2 - min); + } + shop.Update(new ShopBindingModel + { + Id = shop.Id, + ShopName = shop.ShopName, + Address = shop.Address, + DateOpening = shop.DateOpening, + ShopRepairs = shop.ShopRepairs, + RepairMaxAmount = shop.RepairMaxAmount + }); + count -= min; + if (count <= 0) + { + break; + } + } + } + source.SaveShops(); + return true; + } + } +} diff --git a/CarRepairShop/CarRepairShopFileImplement/Models/Shop.cs b/CarRepairShop/CarRepairShopFileImplement/Models/Shop.cs new file mode 100644 index 0000000..ec3d829 --- /dev/null +++ b/CarRepairShop/CarRepairShopFileImplement/Models/Shop.cs @@ -0,0 +1,108 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using System.Xml.Linq; + +namespace CarRepairShopFileImplement.Models +{ + public class Shop : IShopModel + { + 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 Repairs { get; private set; } = new(); + + private Dictionary? _shopRepairs = null; + + public Dictionary ShopRepairs + { + get + { + if (_shopRepairs == null) + { + var source = DataFileSingleton.GetInstance(); + _shopRepairs = Repairs.ToDictionary(x => x.Key, + y => ((source.Repairs.FirstOrDefault(z => z.Id == y.Key) as IRepairModel)!, y.Value)); + } + return _shopRepairs; + } + } + + public int RepairMaxAmount { get; private set; } + + 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, + Repairs = model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2), + RepairMaxAmount = model.RepairMaxAmount + }; + } + + public static Shop? Create(XElement element) + { + if (element == null) + { + return null; + } + return new Shop() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ShopName = element.Element("ShopName")!.Value, + Address = element.Element("Address")!.Value, + DateOpening = Convert.ToDateTime(element.Element("DateOpening")!.Value), + RepairMaxAmount = Convert.ToInt32(element.Element("RepairMaxAmount")!.Value), + Repairs = element.Element("ShopRepairs")!.Elements("ShopRepair") + .ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), x => Convert.ToInt32(x.Element("Value")?.Value)) + }; + } + + public void Update(ShopBindingModel? model) + { + if (model == null) + { + return; + } + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + RepairMaxAmount = model.RepairMaxAmount; + Repairs = model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2); + _shopRepairs = null; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + ShopRepairs = ShopRepairs, + RepairMaxAmount = RepairMaxAmount + }; + + public XElement GetXElement => new("Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("DateOpening", DateOpening.ToString()), + new XElement("RepairMaxAmount", RepairMaxAmount.ToString()), + new XElement("ShopRepairs", + Repairs.Select(x => new XElement("ShopRepair", + new XElement("Key", x.Key), + new XElement("Value", x.Value))).ToArray())); + } +} diff --git a/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs b/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs index 80b8c72..9609239 100644 --- a/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs +++ b/CarRepairShop/CarRepairShopListImplement/Implements/ShopStorage.cs @@ -2,6 +2,7 @@ using CarRepairShopContracts.SearchModels; using CarRepairShopContracts.StoragesContracts; using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; using CarRepairShopListImplement; using CarRepairShopListImplement.Models; @@ -106,5 +107,10 @@ namespace CarRepairShopListImplement.Implements } return null; } + + public bool MakeSale(IRepairModel model, int count) + { + throw new NotImplementedException(); + } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs b/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs index a0947dc..27e012b 100644 --- a/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs +++ b/CarRepairShop/CarRepairShopListImplement/Models/Shop.cs @@ -20,6 +20,8 @@ namespace CarRepairShopListImplement.Models private set; } = new Dictionary(); + public int RepairMaxAmount { get; private set; } + public static Shop? Create(ShopBindingModel? model) { if (model == null) @@ -32,7 +34,8 @@ namespace CarRepairShopListImplement.Models ShopName = model.ShopName, Address = model.Address, DateOpening = model.DateOpening, - ShopRepairs = model.ShopRepairs + ShopRepairs = model.ShopRepairs, + RepairMaxAmount = model.RepairMaxAmount }; } @@ -46,6 +49,7 @@ namespace CarRepairShopListImplement.Models Address = model.Address; DateOpening = model.DateOpening; ShopRepairs = model.ShopRepairs; + RepairMaxAmount = model.RepairMaxAmount; } public ShopViewModel GetViewModel => new() @@ -54,7 +58,8 @@ namespace CarRepairShopListImplement.Models ShopName = ShopName, Address = Address, DateOpening = DateOpening, - ShopRepairs = ShopRepairs + ShopRepairs = ShopRepairs, + RepairMaxAmount = RepairMaxAmount }; } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.cs b/CarRepairShop/CarRepairShopView/FormMain.cs index 6d75706..4eeb432 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.cs @@ -162,5 +162,14 @@ namespace CarRepairShopView form.ShowDialog(); } } + + private void продажаРемонтовToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormSale)); + if (service is FormSale form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.designer.cs b/CarRepairShop/CarRepairShopView/FormMain.designer.cs index 68e602d..4639e22 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.designer.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.designer.cs @@ -40,6 +40,7 @@ this.buttonCreateOrder = new System.Windows.Forms.Button(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonRef = new System.Windows.Forms.Button(); + продажаРемонтовToolStripMenuItem = new ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -48,7 +49,8 @@ // this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.справочникиToolStripMenuItem, - пополнениеМагазинаToolStripMenuItem }); + пополнениеМагазинаToolStripMenuItem, + продажаРемонтовToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); @@ -69,21 +71,21 @@ // компонентыToolStripMenuItem // this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.компонентыToolStripMenuItem.Text = "Компоненты"; this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click); // // ремонтыToolStripMenuItem // this.ремонтыToolStripMenuItem.Name = "ремонтыToolStripMenuItem"; - this.ремонтыToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.ремонтыToolStripMenuItem.Size = new System.Drawing.Size(145, 22); this.ремонтыToolStripMenuItem.Text = "Ремонты"; this.ремонтыToolStripMenuItem.Click += new System.EventHandler(this.РемонтыToolStripMenuItem_Click); // // магазиныToolStripMenuItem // магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(180, 22); + магазиныToolStripMenuItem.Size = new Size(145, 22); магазиныToolStripMenuItem.Text = "Магазины"; магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; // @@ -173,6 +175,13 @@ this.buttonRef.UseVisualStyleBackColor = true; this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click); // + // продажаРемонтовToolStripMenuItem + // + продажаРемонтовToolStripMenuItem.Name = "продажаРемонтовToolStripMenuItem"; + продажаРемонтовToolStripMenuItem.Size = new Size(143, 20); + продажаРемонтовToolStripMenuItem.Text = "Продажа Ремонтов"; + продажаРемонтовToolStripMenuItem.Click += продажаРемонтовToolStripMenuItem_Click; + // // FormMain // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -213,6 +222,7 @@ private System.Windows.Forms.Button buttonRef; private ToolStripMenuItem магазиныToolStripMenuItem; private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem продажаРемонтовToolStripMenuItem; } } diff --git a/CarRepairShop/CarRepairShopView/FormSale.Designer.cs b/CarRepairShop/CarRepairShopView/FormSale.Designer.cs new file mode 100644 index 0000000..f951c58 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormSale.Designer.cs @@ -0,0 +1,127 @@ +namespace CarRepairShopView +{ + partial class FormSale + { + /// + /// 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() + { + buttonCancel = new Button(); + buttonSale = new Button(); + textBoxCount = new TextBox(); + labelCount = new Label(); + comboBoxRepair = new ComboBox(); + labelRepair = new Label(); + SuspendLayout(); + // + // buttonCancel + // + buttonCancel.Location = new Point(253, 83); + buttonCancel.Margin = new Padding(4, 3, 4, 3); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(88, 27); + buttonCancel.TabIndex = 17; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + buttonCancel.Click += ButtonCancel_Click; + // + // buttonSale + // + buttonSale.Location = new Point(159, 83); + buttonSale.Margin = new Padding(4, 3, 4, 3); + buttonSale.Name = "buttonSale"; + buttonSale.Size = new Size(88, 27); + buttonSale.TabIndex = 16; + buttonSale.Text = "Продать"; + buttonSale.UseVisualStyleBackColor = true; + buttonSale.Click += ButtonSale_Click; + // + // textBoxCount + // + textBoxCount.Location = new Point(101, 51); + textBoxCount.Margin = new Padding(4, 3, 4, 3); + textBoxCount.Name = "textBoxCount"; + textBoxCount.Size = new Size(252, 23); + textBoxCount.TabIndex = 15; + // + // labelCount + // + labelCount.AutoSize = true; + labelCount.Location = new Point(13, 54); + labelCount.Margin = new Padding(4, 0, 4, 0); + labelCount.Name = "labelCount"; + labelCount.Size = new Size(78, 15); + labelCount.TabIndex = 14; + labelCount.Text = "Количество :"; + // + // comboBoxRepair + // + comboBoxRepair.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxRepair.FormattingEnabled = true; + comboBoxRepair.Location = new Point(101, 15); + comboBoxRepair.Margin = new Padding(4, 3, 4, 3); + comboBoxRepair.Name = "comboBoxRepair"; + comboBoxRepair.Size = new Size(252, 23); + comboBoxRepair.TabIndex = 13; + // + // labelRepair + // + labelRepair.AutoSize = true; + labelRepair.Location = new Point(13, 19); + labelRepair.Margin = new Padding(4, 0, 4, 0); + labelRepair.Name = "labelRepair"; + labelRepair.Size = new Size(80, 15); + labelRepair.TabIndex = 12; + labelRepair.Text = "Ремонт :"; + // + // FormRepairSale + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(373, 123); + Controls.Add(buttonCancel); + Controls.Add(buttonSale); + Controls.Add(textBoxCount); + Controls.Add(labelCount); + Controls.Add(comboBoxRepair); + Controls.Add(labelRepair); + Name = "FormRepairSale"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Продажа ремонта"; + Load += FormRepairSale_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Button buttonCancel; + private Button buttonSale; + private TextBox textBoxCount; + private Label labelCount; + private ComboBox comboBoxRepair; + private Label labelRepair; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormSale.cs b/CarRepairShop/CarRepairShopView/FormSale.cs new file mode 100644 index 0000000..38b1c12 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormSale.cs @@ -0,0 +1,87 @@ +using CarRepairShopContracts.BusinessLogicsContracts; +using CarRepairShopContracts.BindingModels; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormSale : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _logicRepair; + + private readonly IShopLogic _logicShop; + + public FormSale(ILogger logger, IRepairLogic logicRepair, IShopLogic logicShop) + { + InitializeComponent(); + _logger = logger; + _logicRepair = logicRepair; + _logicShop = logicShop; + } + + private void FormRepairSale_Load(object sender, EventArgs e) + { + _logger.LogInformation("Repairs loading"); + try + { + var list = _logicRepair.ReadList(null); + if (list != null) + { + comboBoxRepair.DisplayMember = "RepairName"; + comboBoxRepair.ValueMember = "Id"; + comboBoxRepair.DataSource = list; + comboBoxRepair.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Repairs loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSale_Click(object sender, EventArgs e) + { + if (comboBoxRepair.SelectedValue == null) + { + MessageBox.Show("Выберите ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + if (string.IsNullOrEmpty(textBoxCount.Text)) + { + MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _logger.LogInformation("Repair sale"); + try + { + var operationResult = _logicShop.MakeSale( + new RepairBindingModel + { + Id = Convert.ToInt32(comboBoxRepair.SelectedValue) + }, + 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, "Repair sale error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/CarRepairShop/CarRepairShopView/FormSale.resx b/CarRepairShop/CarRepairShopView/FormSale.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormSale.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/FormShop.Designer.cs b/CarRepairShop/CarRepairShopView/FormShop.Designer.cs index 3e3562a..753e9dd 100644 --- a/CarRepairShop/CarRepairShopView/FormShop.Designer.cs +++ b/CarRepairShop/CarRepairShopView/FormShop.Designer.cs @@ -41,6 +41,8 @@ ColumnCount = new DataGridViewTextBoxColumn(); buttonSave = new Button(); buttonCancel = new Button(); + textBoxMaximum = new TextBox(); + labelMaximum = new Label(); groupBoxRepairs.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -101,7 +103,7 @@ // groupBoxRepairs // groupBoxRepairs.Controls.Add(dataGridView); - groupBoxRepairs.Location = new Point(4, 100); + groupBoxRepairs.Location = new Point(5, 138); groupBoxRepairs.Margin = new Padding(4, 3, 4, 3); groupBoxRepairs.Name = "groupBoxRepairs"; groupBoxRepairs.Padding = new Padding(4, 3, 4, 3); @@ -150,7 +152,7 @@ // // buttonSave // - buttonSave.Location = new Point(255, 394); + buttonSave.Location = new Point(256, 434); buttonSave.Margin = new Padding(4, 3, 4, 3); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(88, 27); @@ -161,7 +163,7 @@ // // buttonCancel // - buttonCancel.Location = new Point(359, 394); + buttonCancel.Location = new Point(360, 434); buttonCancel.Margin = new Padding(4, 3, 4, 3); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(88, 27); @@ -170,11 +172,31 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; // + // textBoxMaximum + // + textBoxMaximum.Location = new Point(169, 97); + textBoxMaximum.Margin = new Padding(4, 3, 4, 3); + textBoxMaximum.Name = "textBoxMaximum"; + textBoxMaximum.Size = new Size(175, 23); + textBoxMaximum.TabIndex = 11; + // + // labelMaximum + // + labelMaximum.AutoSize = true; + labelMaximum.Location = new Point(14, 100); + labelMaximum.Margin = new Padding(4, 0, 4, 0); + labelMaximum.Name = "labelMaximum"; + labelMaximum.Size = new Size(147, 15); + labelMaximum.TabIndex = 10; + labelMaximum.Text = "Максимум ремонта :"; + // // FormShop // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(478, 432); + ClientSize = new Size(478, 468); + Controls.Add(textBoxMaximum); + Controls.Add(labelMaximum); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBoxRepairs); @@ -209,5 +231,7 @@ private DataGridViewTextBoxColumn ColumnCount; private Button buttonSave; private Button buttonCancel; + private TextBox textBoxMaximum; + private Label labelMaximum; } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormShop.cs b/CarRepairShop/CarRepairShopView/FormShop.cs index 11c937a..392a71c 100644 --- a/CarRepairShop/CarRepairShopView/FormShop.cs +++ b/CarRepairShop/CarRepairShopView/FormShop.cs @@ -38,6 +38,7 @@ namespace CarRepairShopView { textBoxName.Text = view.ShopName; textBoxAddress.Text = view.Address; + textBoxMaximum.Text = view.RepairMaxAmount.ToString(); dateTimePicker.Value = view.DateOpening; _shopRepairs = view.ShopRepairs ?? new Dictionary(); LoadData(); @@ -89,6 +90,11 @@ namespace CarRepairShopView MessageBox.Show("Заполните дату", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + if (string.IsNullOrEmpty(textBoxMaximum.Text)) + { + MessageBox.Show("Заполните максимальное количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } _logger.LogInformation("Shop saving"); try { @@ -98,6 +104,7 @@ namespace CarRepairShopView ShopName = textBoxName.Text, Address = textBoxAddress.Text, DateOpening = dateTimePicker.Value, + RepairMaxAmount = Convert.ToInt32(textBoxMaximum.Text), ShopRepairs = _shopRepairs }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); diff --git a/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index 64bbd80..cf574c9 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -54,6 +54,7 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file From d6232e904fb22df2dfb67ed61a1b929a267ffd3a Mon Sep 17 00:00:00 2001 From: russell Date: Sat, 27 Apr 2024 22:53:33 +0400 Subject: [PATCH 3/4] lab3_hard --- CarRepairShop/CarRepairShop.sln | 20 +- .../CarRepairShopDatabase.cs | 3 + .../Implements/ShopStorage.cs | 146 +++++++++++ .../20240418133633_ShopAddition.Designer.cs | 247 ++++++++++++++++++ .../Migrations/20240418133633_ShopAddition.cs | 75 ++++++ .../CarRepairShopDatabaseModelSnapshot.cs | 77 ++++++ .../Models/Repair.cs | 22 +- .../Models/Shop.cs | 110 ++++++++ .../Models/ShopRepair.cs | 22 ++ 9 files changed, 701 insertions(+), 21 deletions(-) create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Implements/ShopStorage.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Models/Shop.cs create mode 100644 CarRepairShop/CarRepairShopDatabaseImplement/Models/ShopRepair.cs diff --git a/CarRepairShop/CarRepairShop.sln b/CarRepairShop/CarRepairShop.sln index dd1c58a..3cb2c30 100644 --- a/CarRepairShop/CarRepairShop.sln +++ b/CarRepairShop/CarRepairShop.sln @@ -13,9 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopDataModels", " EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopListImplement", "CarRepairShopListImplement\CarRepairShopListImplement.csproj", "{5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopFileImplement", "CarRepairShopFileImplement\CarRepairShopFileImplement.csproj", "{FD920623-E8C5-45DE-9D7F-A6C643102F9D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopFileImplement", "CarRepairShopFileImplement\CarRepairShopFileImplement.csproj", "{4966A8B7-5985-48DF-834A-3E41D2E0D01D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarRepairShopDatabaseImplement", "CarRepairShopDatabaseImplement\CarRepairShopDatabaseImplement.csproj", "{1AC87AFF-B786-44E5-AAAC-A87461E936FC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarRepairShopDatabaseImplement", "CarRepairShopDatabaseImplement\CarRepairShopDatabaseImplement.csproj", "{C40664B4-5073-45D2-9E3A-562EDE32CC51}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,14 +43,14 @@ Global {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Debug|Any CPU.Build.0 = Debug|Any CPU {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Release|Any CPU.ActiveCfg = Release|Any CPU {5EF355A9-2708-47C4-B7B1-6D1CB89CDC02}.Release|Any CPU.Build.0 = Release|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FD920623-E8C5-45DE-9D7F-A6C643102F9D}.Release|Any CPU.Build.0 = Release|Any CPU - {1AC87AFF-B786-44E5-AAAC-A87461E936FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1AC87AFF-B786-44E5-AAAC-A87461E936FC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1AC87AFF-B786-44E5-AAAC-A87461E936FC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1AC87AFF-B786-44E5-AAAC-A87461E936FC}.Release|Any CPU.Build.0 = Release|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4966A8B7-5985-48DF-834A-3E41D2E0D01D}.Release|Any CPU.Build.0 = Release|Any CPU + {C40664B4-5073-45D2-9E3A-562EDE32CC51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C40664B4-5073-45D2-9E3A-562EDE32CC51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C40664B4-5073-45D2-9E3A-562EDE32CC51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C40664B4-5073-45D2-9E3A-562EDE32CC51}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs index 72c7416..ce9245d 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/CarRepairShopDatabase.cs @@ -21,5 +21,8 @@ namespace CarRepairShopDatabaseImplement public virtual DbSet RepairComponents { set; get; } public virtual DbSet Orders { set; get; } + public virtual DbSet Shops { set; get; } + + public virtual DbSet ShopRepairs { set; get; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ShopStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..99c1d11 --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/ShopStorage.cs @@ -0,0 +1,146 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.SearchModels; +using CarRepairShopContracts.StoragesContracts; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDatabaseImplement.Models; +using CarRepairShopDataModels.Models; +using Microsoft.EntityFrameworkCore; + +namespace CarRepairShopDatabaseImplement.Implements +{ + public class ShopStorage : IShopStorage + { + public List GetFullList() + { + using var context = new CarRepairShopDatabase(); + return context.Shops + .Include(x => x.Repairs) + .ThenInclude(x => x.Repair) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName)) + { + return new(); + } + using var context = new CarRepairShopDatabase(); + return context.Shops + .Include(x => x.Repairs) + .ThenInclude(x => x.Repair) + .Where(x => x.ShopName.Contains(model.ShopName)) + .ToList() + .Select(x => x.GetViewModel) + .ToList(); + } + + public ShopViewModel? GetElement(ShopSearchModel model) + { + if (string.IsNullOrEmpty(model.ShopName) && !model.Id.HasValue) + { + return null; + } + using var context = new CarRepairShopDatabase(); + return context.Shops + .Include(x => x.Repairs) + .ThenInclude(x => x.Repair) + .FirstOrDefault(x => (!string.IsNullOrEmpty(model.ShopName) && x.ShopName == model.ShopName) || + (model.Id.HasValue && x.Id == model.Id)) + ?.GetViewModel; + } + + public ShopViewModel? Insert(ShopBindingModel model) + { + using var context = new CarRepairShopDatabase(); + var newShop = Shop.Create(context, model); + if (newShop == null) + { + return null; + } + context.Shops.Add(newShop); + context.SaveChanges(); + return newShop.GetViewModel; + } + + public ShopViewModel? Update(ShopBindingModel model) + { + using var context = new CarRepairShopDatabase(); + using var transaction = context.Database.BeginTransaction(); + try + { + var shop = context.Shops.FirstOrDefault(rec => rec.Id == model.Id); + if (shop == null) + { + return null; + } + shop.Update(model); + context.SaveChanges(); + shop.UpdateRepairs(context, model); + transaction.Commit(); + return shop.GetViewModel; + } + catch + { + transaction.Rollback(); + throw; + } + } + + public ShopViewModel? Delete(ShopBindingModel model) + { + using var context = new CarRepairShopDatabase(); + var element = context.Shops + .Include(x => x.Repairs) + .FirstOrDefault(rec => rec.Id == model.Id); + if (element != null) + { + context.Shops.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + return null; + } + + public bool MakeSale(IRepairModel model, int count) + { + using var context = new CarRepairShopDatabase(); + using var transaction = context.Database.BeginTransaction(); + try + { + foreach (var shop in context.Shops.Include(x => x.Repairs).ThenInclude(x => x.Repair) + .Where(x => x.Repairs.Any(x => x.RepairId == model.Id)) + .ToList()) + { + var repair = shop.ShopRepairs[model.Id]; + int min = Math.Min(repair.Item2, count); + if (min == repair.Item2) + { + shop.ShopRepairs.Remove(model.Id); + } + else + { + shop.ShopRepairs[model.Id] = (repair.Item1, repair.Item2 - min); + } + shop.UpdateRepairs(context, new() { Id = shop.Id, ShopRepairs = shop.ShopRepairs }); + count -= min; + if (count == 0) + { + context.SaveChanges(); + transaction.Commit(); + return true; + } + } + transaction.Rollback(); + return false; + } + catch + { + transaction.Rollback(); + throw; + } + } + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs new file mode 100644 index 0000000..764e8fa --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs @@ -0,0 +1,247 @@ +// +using System; +using CarRepairShopDatabaseImplement; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Metadata; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace CarRepairShopDatabaseImplement.Migrations +{ + [DbContext(typeof(CarRepairShopDatabase))] + [Migration("20240418133633_ShopAddition")] + partial class ShopAddition + { + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasAnnotation("ProductVersion", "6.0.27") + .HasAnnotation("Relational:MaxIdentifierLength", 128); + + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ComponentName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("Cost") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.ToTable("Components"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("DateCreate") + .HasColumnType("datetime2"); + + b.Property("DateImplement") + .HasColumnType("datetime2"); + + b.Property("RepairId") + .HasColumnType("int"); + + b.Property("Status") + .HasColumnType("int"); + + b.Property("Sum") + .HasColumnType("float"); + + b.HasKey("Id"); + + b.HasIndex("RepairId"); + + b.ToTable("Orders"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Price") + .HasColumnType("float"); + + b.Property("RepairName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Repairs"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("ComponentId") + .HasColumnType("int"); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("RepairId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("ComponentId"); + + b.HasIndex("RepairId"); + + b.ToTable("RepairComponents"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DateOpening") + .HasColumnType("datetime2"); + + b.Property("RepairMaxAmount") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("RepairId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RepairId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopRepairs"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") + .WithMany("Orders") + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Repair"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.RepairComponent", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Component", "Component") + .WithMany("RepairComponents") + .HasForeignKey("ComponentId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") + .WithMany("Components") + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Component"); + + b.Navigation("Repair"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") + .WithMany() + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("CarRepairShopDatabaseImplement.Models.Shop", "Shop") + .WithMany("Repairs") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Repair"); + + b.Navigation("Shop"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b => + { + b.Navigation("RepairComponents"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Repair", b => + { + b.Navigation("Components"); + + b.Navigation("Orders"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => + { + b.Navigation("Repairs"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.cs new file mode 100644 index 0000000..3216ce9 --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.cs @@ -0,0 +1,75 @@ +using System; +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace CarRepairShopDatabaseImplement.Migrations +{ + public partial class ShopAddition : Migration + { + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Shops", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ShopName = table.Column(type: "nvarchar(max)", nullable: false), + Address = table.Column(type: "nvarchar(max)", nullable: false), + DateOpening = table.Column(type: "datetime2", nullable: false), + RepairMaxAmount = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Shops", x => x.Id); + }); + + migrationBuilder.CreateTable( + name: "ShopRepairs", + columns: table => new + { + Id = table.Column(type: "int", nullable: false) + .Annotation("SqlServer:Identity", "1, 1"), + ShopId = table.Column(type: "int", nullable: false), + RepairId = table.Column(type: "int", nullable: false), + Count = table.Column(type: "int", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_ShopRepairs", x => x.Id); + table.ForeignKey( + name: "FK_ShopRepairs_Repairs_RepairId", + column: x => x.RepairId, + principalTable: "Repairs", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + table.ForeignKey( + name: "FK_ShopRepairs_Shops_ShopId", + column: x => x.ShopId, + principalTable: "Shops", + principalColumn: "Id", + onDelete: ReferentialAction.Cascade); + }); + + migrationBuilder.CreateIndex( + name: "IX_ShopRepairs_RepairId", + table: "ShopRepairs", + column: "RepairId"); + + migrationBuilder.CreateIndex( + name: "IX_ShopRepairs_ShopId", + table: "ShopRepairs", + column: "ShopId"); + } + + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "ShopRepairs"); + + migrationBuilder.DropTable( + name: "Shops"); + } + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs index 3d42a4a..9867922 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs @@ -121,6 +121,59 @@ namespace CarRepairShopDatabaseImplement.Migrations b.ToTable("RepairComponents"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Address") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.Property("DateOpening") + .HasColumnType("datetime2"); + + b.Property("RepairMaxAmount") + .HasColumnType("int"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("nvarchar(max)"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("int"); + + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + + b.Property("Count") + .HasColumnType("int"); + + b.Property("RepairId") + .HasColumnType("int"); + + b.Property("ShopId") + .HasColumnType("int"); + + b.HasKey("Id"); + + b.HasIndex("RepairId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopRepairs"); + }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Order", b => { b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") @@ -151,6 +204,25 @@ namespace CarRepairShopDatabaseImplement.Migrations b.Navigation("Repair"); }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => + { + b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") + .WithMany() + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("CarRepairShopDatabaseImplement.Models.Shop", "Shop") + .WithMany("Repairs") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Repair"); + + b.Navigation("Shop"); + }); + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Component", b => { b.Navigation("RepairComponents"); @@ -162,6 +234,11 @@ namespace CarRepairShopDatabaseImplement.Migrations b.Navigation("Orders"); }); + + modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => + { + b.Navigation("Repairs"); + }); #pragma warning restore 612, 618 } } diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs index 50495c0..01a8c4a 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs @@ -16,19 +16,19 @@ namespace CarRepairShopDatabaseImplement.Models [Required] public double Price { get; set; } - private Dictionary? _repairComponents = null; + private Dictionary? _productComponents = null; [NotMapped] public Dictionary RepairComponents { get { - if (_repairComponents == null) + if (_productComponents == null) { - _repairComponents = Components + _productComponents = Components .ToDictionary(recPC => recPC.ComponentId, recPC => (recPC.Component as IComponentModel, recPC.Count)); } - return _repairComponents; + return _productComponents; } } @@ -69,31 +69,31 @@ namespace CarRepairShopDatabaseImplement.Models public void UpdateComponents(CarRepairShopDatabase context, RepairBindingModel model) { - var repairComponents = context.RepairComponents.Where(rec => rec.RepairId == model.Id).ToList(); - if (repairComponents != null && repairComponents.Count > 0) + var productComponents = context.RepairComponents.Where(rec => rec.RepairId == model.Id).ToList(); + if (productComponents != null && productComponents.Count > 0) { // удалили те, которых нет в модели - context.RepairComponents.RemoveRange(repairComponents.Where(rec => !model.RepairComponents.ContainsKey(rec.ComponentId))); + context.RepairComponents.RemoveRange(productComponents.Where(rec => !model.RepairComponents.ContainsKey(rec.ComponentId))); context.SaveChanges(); // обновили количество у существующих записей - foreach (var updateComponent in repairComponents) + foreach (var updateComponent in productComponents) { updateComponent.Count = model.RepairComponents[updateComponent.ComponentId].Item2; model.RepairComponents.Remove(updateComponent.ComponentId); } context.SaveChanges(); } - var repair = context.Repairs.First(x => x.Id == Id); + var product = context.Repairs.First(x => x.Id == Id); foreach (var pc in model.RepairComponents) { context.RepairComponents.Add(new RepairComponent { - Repair = repair, + Repair = product, Component = context.Components.First(x => x.Id == pc.Key), Count = pc.Value.Item2 }); context.SaveChanges(); } - _repairComponents = null; + _productComponents = null; } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Shop.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Shop.cs new file mode 100644 index 0000000..ba21637 --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Shop.cs @@ -0,0 +1,110 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.ViewModels; +using CarRepairShopDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace CarRepairShopDatabaseImplement.Models +{ + public class Shop : IShopModel + { + public int Id { get; set; } + + [Required] + public string ShopName { get; set; } = string.Empty; + + [Required] + public string Address { get; set; } = string.Empty; + + [Required] + public DateTime DateOpening { get; set; } + + [Required] + public int RepairMaxAmount { get; set; } + + private Dictionary? _shopRepairs = null; + + [NotMapped] + public Dictionary ShopRepairs + { + get + { + if (_shopRepairs == null) + { + _shopRepairs = Repairs + .ToDictionary(x => x.RepairId, x => (x.Repair as IRepairModel, x.Count)); + } + return _shopRepairs; + } + } + + [ForeignKey("ShopId")] + public virtual List Repairs { get; set; } = new(); + + public static Shop Create(CarRepairShopDatabase context, ShopBindingModel model) + { + return new Shop() + { + Id = model.Id, + ShopName = model.ShopName, + Address = model.Address, + DateOpening = model.DateOpening, + RepairMaxAmount = model.RepairMaxAmount, + Repairs = model.ShopRepairs.Select(x => new ShopRepair + { + Repair = context.Repairs.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList() + }; + } + + public void Update(ShopBindingModel model) + { + ShopName = model.ShopName; + Address = model.Address; + DateOpening = model.DateOpening; + RepairMaxAmount = model.RepairMaxAmount; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + DateOpening = DateOpening, + RepairMaxAmount = RepairMaxAmount, + ShopRepairs = ShopRepairs + }; + + public void UpdateRepairs(CarRepairShopDatabase context, ShopBindingModel model) + { + var shopRepairs = context.ShopRepairs.Where(rec => rec.ShopId == model.Id).ToList(); + if (shopRepairs != null && shopRepairs.Count > 0) + { + context.ShopRepairs.RemoveRange(shopRepairs.Where(rec => !model.ShopRepairs.ContainsKey(rec.RepairId))); + context.SaveChanges(); + foreach (var updateRepair in shopRepairs) + { + if (model.ShopRepairs.ContainsKey(updateRepair.RepairId)) + { + updateRepair.Count = model.ShopRepairs[updateRepair.RepairId].Item2; + model.ShopRepairs.Remove(updateRepair.RepairId); + } + } + context.SaveChanges(); + } + var shop = context.Shops.First(x => x.Id == Id); + foreach (var ic in model.ShopRepairs) + { + context.ShopRepairs.Add(new ShopRepair + { + Shop = shop, + Repair = context.Repairs.First(x => x.Id == ic.Key), + Count = ic.Value.Item2 + }); + context.SaveChanges(); + } + _shopRepairs = null; + } + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/ShopRepair.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/ShopRepair.cs new file mode 100644 index 0000000..87c4ddc --- /dev/null +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/ShopRepair.cs @@ -0,0 +1,22 @@ +using System.ComponentModel.DataAnnotations; + +namespace CarRepairShopDatabaseImplement.Models +{ + public class ShopRepair + { + public int Id { get; set; } + + [Required] + public int ShopId { get; set; } + + [Required] + public int RepairId { get; set; } + + [Required] + public int Count { get; set; } + + public virtual Repair Repair { get; set; } = new(); + + public virtual Shop Shop { get; set; } = new(); + } +} From c75f07170421cfd33f9f5757fca728a5abc0d8e2 Mon Sep 17 00:00:00 2001 From: russell Date: Fri, 24 May 2024 23:50:52 +0400 Subject: [PATCH 4/4] lab4_hard --- .../BusinessLogics/ReportLogic.cs | 102 +++-- .../OfficePackage/AbstractSaveToExcel.cs | 88 +++- .../OfficePackage/AbstractSaveToPdf.cs | 38 +- .../OfficePackage/AbstractSaveToWord.cs | 41 +- .../HelperEnums/ExcelStyleInfoType.cs | 2 +- .../HelperEnums/PdfParagraphAlignmentType.cs | 2 +- .../OfficePackage/HelperModels/ExcelInfo.cs | 2 + .../OfficePackage/HelperModels/PdfInfo.cs | 2 + .../OfficePackage/HelperModels/WordInfo.cs | 2 + .../OfficePackage/HelperModels/WordTable.cs | 9 + .../OfficePackage/Implements/SaveToExcel.cs | 2 +- .../OfficePackage/Implements/SaveToPdf.cs | 2 +- .../OfficePackage/Implements/SaveToWord.cs | 111 +++++ .../BusinessLogicsContracts/IReportLogic.cs | 33 +- .../ViewModels/ReportOrdersByDateViewModel.cs | 11 + .../ViewModels/ReportOrdersViewModel.cs | 2 +- .../ViewModels/ReportShopReportViewModel.cs | 11 + .../20240418133633_ShopAddition.Designer.cs | 4 +- .../CarRepairShopDatabaseModelSnapshot.cs | 4 +- .../Models/Repair.cs | 2 + CarRepairShop/CarRepairShopView/FormMain.cs | 32 +- .../CarRepairShopView/FormMain.designer.cs | 58 ++- .../FormReportGroupedOrders.cs | 72 +++ .../FormReportGroupedOrders.designer.cs | 91 ++++ .../FormReportGroupedOrders.resx | 120 +++++ .../FormReportRepairComponents.cs | 2 +- .../FormReportShopRepairs.cs | 70 +++ .../FormReportShopRepairs.designer.cs | 114 +++++ .../FormReportShopRepairs.resx | 120 +++++ CarRepairShop/CarRepairShopView/Program.cs | 10 +- .../ReportGroupedOrders.rdlc | 424 ++++++++++++++++++ 31 files changed, 1490 insertions(+), 93 deletions(-) create mode 100644 CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordTable.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersByDateViewModel.cs create mode 100644 CarRepairShop/CarRepairShopContracts/ViewModels/ReportShopReportViewModel.cs create mode 100644 CarRepairShop/CarRepairShopView/FormReportGroupedOrders.cs create mode 100644 CarRepairShop/CarRepairShopView/FormReportGroupedOrders.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormReportGroupedOrders.resx create mode 100644 CarRepairShop/CarRepairShopView/FormReportShopRepairs.cs create mode 100644 CarRepairShop/CarRepairShopView/FormReportShopRepairs.designer.cs create mode 100644 CarRepairShop/CarRepairShopView/FormReportShopRepairs.resx create mode 100644 CarRepairShop/CarRepairShopView/ReportGroupedOrders.rdlc diff --git a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ReportLogic.cs b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ReportLogic.cs index 2d563c8..1dc8067 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -14,28 +14,27 @@ namespace CarRepairShopBusinessLogic.BusinessLogics private readonly IOrderStorage _orderStorage; + private readonly IShopStorage _shopStorage; + private readonly AbstractSaveToExcel _saveToExcel; private readonly AbstractSaveToWord _saveToWord; private readonly AbstractSaveToPdf _saveToPdf; - public ReportLogic(IRepairStorage repairStorage, IOrderStorage orderStorage, + public ReportLogic(IRepairStorage repairStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) { _repairStorage = repairStorage; _orderStorage = orderStorage; + _shopStorage = shopStorage; _saveToExcel = saveToExcel; _saveToWord = saveToWord; _saveToPdf = saveToPdf; } - - /// - /// Получение списка компонент с указанием, в каких ремонтах используются - /// - /// - public List GetRepairComponent() + + public List GetRepairComponents() { var repairs = _repairStorage.GetFullList(); @@ -61,11 +60,32 @@ namespace CarRepairShopBusinessLogic.BusinessLogics return list; } - /// - /// Получение списка заказов за определенный период - /// - /// - /// + public List GetShopRepairs() + { + var shops = _shopStorage.GetFullList(); + + var list = new List(); + + foreach (var shop in shops) + { + var record = new ReportShopRepairViewModel + { + ShopName = shop.ShopName, + Repairs = new List<(string Repair, int Count)>(), + TotalCount = 0, + }; + foreach (var repair in shop.ShopRepairs) + { + record.Repairs.Add(new(repair.Value.Item1.RepairName, repair.Value.Item2)); + record.TotalCount += repair.Value.Item2; + } + + list.Add(record); + } + + return list; + } + public List GetOrders(ReportBindingModel model) { return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) @@ -80,10 +100,18 @@ namespace CarRepairShopBusinessLogic.BusinessLogics .ToList(); } - /// - /// Сохранение компонент в файл-Word - /// - /// + public List GetGroupedByDateOrders() + { + return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date) + .Select(x => new ReportOrdersByDateViewModel + { + Date = x.Key, + Count = x.Count(), + Sum = x.Sum(y => y.Sum) + }) + .ToList(); + } + public void SaveRepairsToWordFile(ReportBindingModel model) { _saveToWord.CreateDoc(new WordInfo @@ -94,24 +122,36 @@ namespace CarRepairShopBusinessLogic.BusinessLogics }); } - /// - /// Сохранение компонент с указаеним продуктов в файл-Excel - /// - /// + public void SaveShopsToWordFile(ReportBindingModel model) + { + _saveToWord.CreateShopsTable(new WordInfo + { + FileName = model.FileName, + Title = "Список магазинов", + Shops = _shopStorage.GetFullList() + }); + } + public void SaveRepairComponentToExcelFile(ReportBindingModel model) { _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список компонентов", - RepairComponents = GetRepairComponent() + Title = "Список ремонтов", + RepairComponents = GetRepairComponents() + }); + } + + public void SaveShopRepairToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateShopReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Загруженность магазинов", + ShopRepairs = GetShopRepairs() }); } - /// - /// Сохранение заказов в файл-Pdf - /// - /// public void SaveOrdersToPdfFile(ReportBindingModel model) { _saveToPdf.CreateDoc(new PdfInfo @@ -123,5 +163,15 @@ namespace CarRepairShopBusinessLogic.BusinessLogics Orders = GetOrders(model) }); } + + public void SaveGroupedOrdersToPdfFile(ReportBindingModel model) + { + _saveToPdf.CreateDocWithGroupedOrders(new PdfInfo + { + FileName = model.FileName, + Title = "Заказы по датам", + GroupedOrders = GetGroupedByDateOrders() + }); + } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 9380fdf..659b519 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -46,7 +46,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage ColumnName = "B", RowIndex = rowIndex, Text = Component, - StyleInfo = ExcelStyleInfoType.TextWithBroder + StyleInfo = ExcelStyleInfoType.TextWithBorder }); InsertCellInWorksheet(new ExcelCellParameters @@ -54,9 +54,8 @@ namespace CarRepairShopBusinessLogic.OfficePackage ColumnName = "C", RowIndex = rowIndex, Text = Count.ToString(), - StyleInfo = ExcelStyleInfoType.TextWithBroder - }); - + StyleInfo = ExcelStyleInfoType.TextWithBorder + }); rowIndex++; } @@ -80,11 +79,82 @@ namespace CarRepairShopBusinessLogic.OfficePackage SaveExcel(info); } - /// - /// Создание excel-файла - /// - /// - protected abstract void CreateExcel(ExcelInfo info); + public void CreateShopReport(ExcelInfo info) + { + CreateExcel(info); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + + uint rowIndex = 2; + foreach (var sr in info.ShopRepairs) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = sr.ShopName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + + foreach (var (Repair, Count) in sr.Repairs) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = Repair, + StyleInfo = ExcelStyleInfoType.TextWithBorder + }); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = Count.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBorder + }); + + rowIndex++; + } + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = sr.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + } + + SaveExcel(info); + } + + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfo info); /// /// Добавляем новую ячейку в лист diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index ecc1bc9..814cda2 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -9,7 +9,8 @@ namespace CarRepairShopBusinessLogic.OfficePackage { CreatePdf(info); CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); - CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", + Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); CreateTable(new List { "2cm", "3cm", "6cm", "4cm", "3cm" }); @@ -24,18 +25,47 @@ namespace CarRepairShopBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.RepairName, order.OrderStatus, order.Sum.ToString() }, + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.RepairName, + order.OrderStatus, order.Sum.ToString() }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left }); } - CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Rigth }); + CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right }); + + SavePdf(info); + } + + public void CreateDocWithGroupedOrders(PdfInfo info) + { + CreatePdf(info); + CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + + CreateTable(new List { "5cm", "6cm", "5cm" }); + + CreateRow(new PdfRowParameters + { + Texts = new List { "Дата", "Количество заказов", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + + foreach (var order in info.GroupedOrders) + { + CreateRow(new PdfRowParameters + { + Texts = new List { order.Date.ToShortDateString(), order.Count.ToString(), order.Sum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right }); SavePdf(info); } /// - /// Создание doc-файла + /// Создание pdf-файла /// /// protected abstract void CreatePdf(PdfInfo info); diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 20e5c7f..f1ef1d7 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -24,7 +24,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage CreateParagraph(new WordParagraph { Texts = new List<(string, WordTextProperties)> {(repair.RepairName + " - ", new WordTextProperties { Size = "24", Bold = true}), - (repair.Price.ToString(), new WordTextProperties { Size = "24" })}, + (repair.Price.ToString(), new WordTextProperties { Size = "24", })}, TextProperties = new WordTextProperties { Size = "24", @@ -36,6 +36,33 @@ namespace CarRepairShopBusinessLogic.OfficePackage SaveWord(info); } + public void CreateShopsTable(WordInfo info) + { + CreateWord(info); + List> list = new List>(); + foreach (var shop in info.Shops) + { + var ls = new List + { + shop.ShopName, + shop.Address, + shop.DateOpening.ToShortDateString() + }; + list.Add(ls); + } + var wordTable = new WordTable + { + Headers = new List { + "Название", + "Адрес", + "Дата открытия"}, + Columns = 3, + RowText = list + }; + CreateTable(wordTable); + SaveWord(info); + } + /// /// Создание doc-файла /// @@ -49,6 +76,18 @@ namespace CarRepairShopBusinessLogic.OfficePackage /// protected abstract void CreateParagraph(WordParagraph paragraph); + /// + /// Создание таблицы + /// + /// + protected abstract void CreateTable(WordTable table); + + /// + /// Создание строки таблицы + /// + /// + protected abstract void CreateRow(WordParagraph paragraph); + /// /// Сохранение файла /// diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs index d48e21a..759c281 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -6,6 +6,6 @@ Text, - TextWithBroder + TextWithBorder } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs index 4391b45..c7d6da5 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs @@ -6,6 +6,6 @@ Left, - Rigth + Right } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs index c8a5e79..a97b971 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -9,5 +9,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; public List RepairComponents { get; set; } = new(); + + public List ShopRepairs { get; set; } = new(); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs index a5db549..fd8b7ef 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -13,5 +13,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage.HelperModels public DateTime DateTo { get; set; } public List Orders { get; set; } = new(); + + public List GroupedOrders { get; set; } = new(); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs index f501435..3afd1bb 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -9,5 +9,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; public List Repairs { get; set; } = new(); + + public List Shops { get; set; } = new(); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordTable.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordTable.cs new file mode 100644 index 0000000..4bf9300 --- /dev/null +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/HelperModels/WordTable.cs @@ -0,0 +1,9 @@ +namespace CarRepairShopBusinessLogic.OfficePackage.HelperModels +{ + public class WordTable + { + public List Headers { get; set; } = new(); + public List> RowText { get; set; } = new(); + public int Columns { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs index 256c920..b22a67f 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -144,7 +144,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage.Implements return styleInfo switch { ExcelStyleInfoType.Title => 2U, - ExcelStyleInfoType.TextWithBroder => 1U, + ExcelStyleInfoType.TextWithBorder => 1U, ExcelStyleInfoType.Text => 0U, _ => 0U, }; diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs index 5a8b329..fd6c714 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -20,7 +20,7 @@ namespace CarRepairShopBusinessLogic.OfficePackage.Implements { PdfParagraphAlignmentType.Center => ParagraphAlignment.Center, PdfParagraphAlignmentType.Left => ParagraphAlignment.Left, - PdfParagraphAlignmentType.Rigth => ParagraphAlignment.Right, + PdfParagraphAlignmentType.Right => ParagraphAlignment.Right, _ => ParagraphAlignment.Justify, }; } diff --git a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs index 1a25789..78347ae 100644 --- a/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/CarRepairShop/CarRepairShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -3,6 +3,7 @@ using CarRepairShopBusinessLogic.OfficePackage.HelperModels; using DocumentFormat.OpenXml; using DocumentFormat.OpenXml.Packaging; using DocumentFormat.OpenXml.Wordprocessing; +using System.Security.Cryptography; namespace CarRepairShopBusinessLogic.OfficePackage.Implements { @@ -12,6 +13,8 @@ namespace CarRepairShopBusinessLogic.OfficePackage.Implements private Body? _docBody; + private Table? table; + /// /// Получение типа выравнивания /// @@ -119,6 +122,114 @@ namespace CarRepairShopBusinessLogic.OfficePackage.Implements _docBody.AppendChild(docParagraph); } + protected override void CreateTable(WordTable table) + { + if (_docBody == null || table == null) + { + return; + } + Table docTable = new Table(); + TableProperties tableProps = new TableProperties( + new TopBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new BottomBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new LeftBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new RightBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideHorizontalBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }, + new InsideVerticalBorder + { + Val = new EnumValue(BorderValues.Single), + Size = 12 + }); + docTable.AppendChild(tableProps); + TableGrid tableGrid = new TableGrid(); + for (int i = 0; i < table.Columns; i++) + { + tableGrid.AppendChild(new GridColumn()); + } + docTable.AppendChild(tableGrid); + TableRow tableRow = new TableRow(); + foreach (var text in table.Headers) + { + tableRow.AppendChild(CreateTableCell(text)); + } + docTable.AppendChild(tableRow); + int height = table.RowText.Count; + int width = table.Columns; + for (int i = 0; i < height; i++) + { + tableRow = new TableRow(); + for (int j = 0; j < width; j++) + { + var element = table.RowText[i][j]; + tableRow.AppendChild(CreateTableCell(element)); + } + docTable.AppendChild(tableRow); + } + + _docBody.AppendChild(docTable); + } + + protected override void CreateRow(WordParagraph paragraph) + { + if (_docBody == null || table == null || paragraph == null) + { + return; + } + TableRow tableRow = new(); + foreach (var column in paragraph.Texts) + { + var tableParagraph = new Paragraph(); + tableParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties)); + + var tableRun = new Run(); + var runProperties = new RunProperties(); + runProperties.AppendChild(new FontSize { Val = column.Item2.Size }); + if (column.Item2.Bold) + { + runProperties.AppendChild(new Bold()); + } + tableRun.AppendChild(runProperties); + tableRun.AppendChild(new Text { Text = column.Item1, Space = SpaceProcessingModeValues.Preserve }); + tableParagraph.AppendChild(tableRun); + + TableCell cell = new(); + cell.AppendChild(tableParagraph); + tableRow.AppendChild(cell); + } + table.AppendChild(tableRow); + } + + private TableCell CreateTableCell(string element) + { + var tableParagraph = new Paragraph(); + var run = new Run(); + run.AppendChild(new Text { Text = element }); + tableParagraph.AppendChild(run); + var tableCell = new TableCell(); + tableCell.AppendChild(tableParagraph); + return tableCell; + } + protected override void SaveWord(WordInfo info) { if (_docBody == null || _wordDocument == null) diff --git a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs index 2ab39b7..a9e6840 100644 --- a/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs +++ b/CarRepairShop/CarRepairShopContracts/BusinessLogicsContracts/IReportLogic.cs @@ -5,35 +5,24 @@ namespace CarRepairShopContracts.BusinessLogicsContracts { public interface IReportLogic { - /// - /// Получение списка компонент с указанием, в каких ремонтах используются - /// - /// - List GetRepairComponent(); + List GetRepairComponents(); + + List GetShopRepairs(); - /// - /// Получение списка заказов за определенный период - /// - /// - /// List GetOrders(ReportBindingModel model); - /// - /// Сохранение компонент в файл-Word - /// - /// + List GetGroupedByDateOrders(); + void SaveRepairsToWordFile(ReportBindingModel model); - /// - /// Сохранение компонент с указаеним продуктов в файл-Excel - /// - /// + void SaveShopsToWordFile(ReportBindingModel model); + void SaveRepairComponentToExcelFile(ReportBindingModel model); - /// - /// Сохранение заказов в файл-Pdf - /// - /// + void SaveShopRepairToExcelFile(ReportBindingModel model); + void SaveOrdersToPdfFile(ReportBindingModel model); + + void SaveGroupedOrdersToPdfFile(ReportBindingModel model); } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersByDateViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersByDateViewModel.cs new file mode 100644 index 0000000..326b0f5 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersByDateViewModel.cs @@ -0,0 +1,11 @@ +namespace CarRepairShopContracts.ViewModels +{ + public class ReportOrdersByDateViewModel + { + public DateTime Date { get; set; } + + public int Count { get; set; } + + public double Sum { get; set; } + } +} diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersViewModel.cs index 96329ec..bb94ced 100644 --- a/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersViewModel.cs +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportOrdersViewModel.cs @@ -11,5 +11,5 @@ public string OrderStatus { get; set; } = string.Empty; public double Sum { get; set; } - } + } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopContracts/ViewModels/ReportShopReportViewModel.cs b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportShopReportViewModel.cs new file mode 100644 index 0000000..4a2a1a5 --- /dev/null +++ b/CarRepairShop/CarRepairShopContracts/ViewModels/ReportShopReportViewModel.cs @@ -0,0 +1,11 @@ +namespace CarRepairShopContracts.ViewModels +{ + public class ReportShopRepairViewModel + { + public string ShopName { get; set; } = string.Empty; + + public int TotalCount { get; set; } + + public List<(string Repair, int Count)> Repairs { get; set; } = new(); + } +} diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs index 764e8fa..06c4668 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240418133633_ShopAddition.Designer.cs @@ -209,7 +209,7 @@ namespace CarRepairShopDatabaseImplement.Migrations modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => { b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") - .WithMany() + .WithMany("ShopRepairs") .HasForeignKey("RepairId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -235,6 +235,8 @@ namespace CarRepairShopDatabaseImplement.Migrations b.Navigation("Components"); b.Navigation("Orders"); + + b.Navigation("ShopRepairs"); }); modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs index 9867922..14310b2 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/CarRepairShopDatabaseModelSnapshot.cs @@ -207,7 +207,7 @@ namespace CarRepairShopDatabaseImplement.Migrations modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.ShopRepair", b => { b.HasOne("CarRepairShopDatabaseImplement.Models.Repair", "Repair") - .WithMany() + .WithMany("ShopRepairs") .HasForeignKey("RepairId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); @@ -233,6 +233,8 @@ namespace CarRepairShopDatabaseImplement.Migrations b.Navigation("Components"); b.Navigation("Orders"); + + b.Navigation("ShopRepairs"); }); modelBuilder.Entity("CarRepairShopDatabaseImplement.Models.Shop", b => diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs index 01a8c4a..7230d8a 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Models/Repair.cs @@ -38,6 +38,8 @@ namespace CarRepairShopDatabaseImplement.Models [ForeignKey("RepairId")] public virtual List Orders { get; set; } = new(); + [ForeignKey("RepairId")] + public virtual List ShopRepairs { get; set; } = new(); public static Repair Create(CarRepairShopDatabase context, RepairBindingModel model) { return new Repair() diff --git a/CarRepairShop/CarRepairShopView/FormMain.cs b/CarRepairShop/CarRepairShopView/FormMain.cs index fa708b6..f215514 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.cs @@ -1,5 +1,4 @@ -using CarRepairShopBusinessLogic.BusinessLogics; -using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BindingModels; using CarRepairShopContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; @@ -12,6 +11,7 @@ namespace CarRepairShopView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); @@ -203,5 +203,33 @@ namespace CarRepairShopView } } + + private void СписокМагазиновToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + + private void ЗагруженностьМагазиновToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportShopRepairs)); + if (service is FormReportShopRepairs form) + { + form.ShowDialog(); + } + } + + private void ЗаказыПоДатамToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders)); + if (service is FormReportGroupedOrders form) + { + form.ShowDialog(); + } + } } } \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormMain.designer.cs b/CarRepairShop/CarRepairShopView/FormMain.designer.cs index ccb50b4..f1e13d0 100644 --- a/CarRepairShop/CarRepairShopView/FormMain.designer.cs +++ b/CarRepairShop/CarRepairShopView/FormMain.designer.cs @@ -38,6 +38,9 @@ this.ComponentsToolStripMenuItem = new ToolStripMenuItem(); this.ComponentRepairsToolStripMenuItem = new ToolStripMenuItem(); this.OrdersToolStripMenuItem = new ToolStripMenuItem(); + списокМагазиновToolStripMenuItem = new ToolStripMenuItem(); + загруженностьМагазиновToolStripMenuItem = new ToolStripMenuItem(); + заказыПоДатамToolStripMenuItem = new ToolStripMenuItem(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonOrderReady = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); @@ -54,8 +57,7 @@ this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.справочникиToolStripMenuItem, пополнениеМагазинаToolStripMenuItem, - продажаРемонтовToolStripMenuItem}); - this.справочникиToolStripMenuItem, + продажаРемонтовToolStripMenuItem, this.отчетыToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; @@ -88,9 +90,23 @@ this.ремонтыToolStripMenuItem.Text = "Ремонты"; this.ремонтыToolStripMenuItem.Click += new System.EventHandler(this.РемонтыToolStripMenuItem_Click); // + // магазиныToolStripMenuItem + // + магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; + магазиныToolStripMenuItem.Size = new Size(145, 22); + магазиныToolStripMenuItem.Text = "Магазины"; + магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + // + // пополнениеМагазинаToolStripMenuItem + // + пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; + пополнениеМагазинаToolStripMenuItem.Size = new Size(143, 20); + пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; + пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; + // // отчетыToolStripMenuItem // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentRepairsToolStripMenuItem, OrdersToolStripMenuItem }); + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentRepairsToolStripMenuItem, OrdersToolStripMenuItem, списокМагазиновToolStripMenuItem, загруженностьМагазиновToolStripMenuItem, заказыПоДатамToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; отчетыToolStripMenuItem.Size = new Size(60, 20); отчетыToolStripMenuItem.Text = "Отчеты"; @@ -116,19 +132,26 @@ OrdersToolStripMenuItem.Text = "Список заказов"; OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // - // магазиныToolStripMenuItem + // списокМагазиновToolStripMenuItem // - магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem"; - магазиныToolStripMenuItem.Size = new Size(145, 22); - магазиныToolStripMenuItem.Text = "Магазины"; - магазиныToolStripMenuItem.Click += МагазиныToolStripMenuItem_Click; + списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem"; + списокМагазиновToolStripMenuItem.Size = new Size(235, 22); + списокМагазиновToolStripMenuItem.Text = "Список магазинов"; + списокМагазиновToolStripMenuItem.Click += СписокМагазиновToolStripMenuItem_Click; + // + // загруженностьМагазиновToolStripMenuItem // - // пополнениеМагазинаToolStripMenuItem + загруженностьМагазиновToolStripMenuItem.Name = "загруженностьМагазиновToolStripMenuItem"; + загруженностьМагазиновToolStripMenuItem.Size = new Size(235, 22); + загруженностьМагазиновToolStripMenuItem.Text = "Загруженность магазинов"; + загруженностьМагазиновToolStripMenuItem.Click += ЗагруженностьМагазиновToolStripMenuItem_Click; // - пополнениеМагазинаToolStripMenuItem.Name = "пополнениеМагазинаToolStripMenuItem"; - пополнениеМагазинаToolStripMenuItem.Size = new Size(143, 20); - пополнениеМагазинаToolStripMenuItem.Text = "Пополнение магазина"; - пополнениеМагазинаToolStripMenuItem.Click += ПополнениеМагазинаToolStripMenuItem_Click; + // заказыПоДатамToolStripMenuItem + // + заказыПоДатамToolStripMenuItem.Name = "заказыПоДатамToolStripMenuItem"; + заказыПоДатамToolStripMenuItem.Size = new Size(235, 22); + заказыПоДатамToolStripMenuItem.Text = "Заказы по датам"; + заказыПоДатамToolStripMenuItem.Click += ЗаказыПоДатамToolStripMenuItem_Click; // // buttonIssuedOrder // @@ -254,13 +277,16 @@ private System.Windows.Forms.Button buttonCreateOrder; private System.Windows.Forms.DataGridView dataGridView; private System.Windows.Forms.Button buttonRef; + private ToolStripMenuItem магазиныToolStripMenuItem; + private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; + private ToolStripMenuItem продажаРемонтовToolStripMenuItem; private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem ComponentsToolStripMenuItem; private ToolStripMenuItem ComponentRepairsToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem; - private ToolStripMenuItem магазиныToolStripMenuItem; - private ToolStripMenuItem пополнениеМагазинаToolStripMenuItem; - private ToolStripMenuItem продажаРемонтовToolStripMenuItem; + private ToolStripMenuItem списокМагазиновToolStripMenuItem; + private ToolStripMenuItem загруженностьМагазиновToolStripMenuItem; + private ToolStripMenuItem заказыПоДатамToolStripMenuItem; } } diff --git a/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.cs b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.cs new file mode 100644 index 0000000..edce31d --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.cs @@ -0,0 +1,72 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; + +namespace CarRepairShopView +{ + public partial class FormReportGroupedOrders : Form + { + private readonly ReportViewer reportViewer; + + private readonly ILogger _logger; + + private readonly IReportLogic _logic; + + public FormReportGroupedOrders(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + reportViewer = new ReportViewer + { + Dock = DockStyle.Fill + }; + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportGroupedOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + + private void ButtonCreateReport_Click(object sender, EventArgs e) + { + try + { + var dataSource = _logic.GetGroupedByDateOrders(); + var source = new ReportDataSource("DataSetOrders", dataSource); + reportViewer.LocalReport.DataSources.Clear(); + reportViewer.LocalReport.DataSources.Add(source); + + reportViewer.RefreshReport(); + _logger.LogInformation("Loading list of grouped orders"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Loading list of grouped orders error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonToPdf_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel + { + FileName = dialog.FileName, + }); + _logger.LogInformation("Saving list of grouped orders"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Saving list of grouped orders error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.designer.cs b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.designer.cs new file mode 100644 index 0000000..3bd7722 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.designer.cs @@ -0,0 +1,91 @@ +namespace CarRepairShopView +{ + partial class FormReportGroupedOrders + { + /// + /// 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() + { + panel = new Panel(); + buttonToPdf = new Button(); + buttonCreateReport = new Button(); + panel.SuspendLayout(); + SuspendLayout(); + // + // panel + // + panel.Controls.Add(buttonToPdf); + panel.Controls.Add(buttonCreateReport); + panel.Dock = DockStyle.Top; + panel.Location = new Point(0, 0); + panel.Margin = new Padding(4, 3, 4, 3); + panel.Name = "panel"; + panel.Size = new Size(1031, 40); + panel.TabIndex = 0; + // + // buttonToPdf + // + buttonToPdf.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonToPdf.Location = new Point(188, 8); + buttonToPdf.Margin = new Padding(4, 3, 4, 3); + buttonToPdf.Name = "buttonToPdf"; + buttonToPdf.Size = new Size(139, 27); + buttonToPdf.TabIndex = 5; + buttonToPdf.Text = "В Pdf"; + buttonToPdf.UseVisualStyleBackColor = true; + buttonToPdf.Click += ButtonToPdf_Click; + // + // buttonCreateReport + // + buttonCreateReport.Location = new Point(11, 8); + buttonCreateReport.Margin = new Padding(4, 3, 4, 3); + buttonCreateReport.Name = "buttonCreateReport"; + buttonCreateReport.Size = new Size(139, 27); + buttonCreateReport.TabIndex = 4; + buttonCreateReport.Text = "Сформировать"; + buttonCreateReport.UseVisualStyleBackColor = true; + buttonCreateReport.Click += ButtonCreateReport_Click; + // + // FormReportGroupedOrders + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1031, 647); + Controls.Add(panel); + Margin = new Padding(4, 3, 4, 3); + Name = "FormReportGroupedOrders"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Заказы по датам"; + panel.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private System.Windows.Forms.Panel panel; + private System.Windows.Forms.Button buttonToPdf; + private System.Windows.Forms.Button buttonCreateReport; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.resx b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportGroupedOrders.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/FormReportRepairComponents.cs b/CarRepairShop/CarRepairShopView/FormReportRepairComponents.cs index 337d66d..ac2ba1a 100644 --- a/CarRepairShop/CarRepairShopView/FormReportRepairComponents.cs +++ b/CarRepairShop/CarRepairShopView/FormReportRepairComponents.cs @@ -21,7 +21,7 @@ namespace CarRepairShopView { try { - var dict = _logic.GetRepairComponent(); + var dict = _logic.GetRepairComponents(); if (dict != null) { dataGridView.Rows.Clear(); diff --git a/CarRepairShop/CarRepairShopView/FormReportShopRepairs.cs b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.cs new file mode 100644 index 0000000..ad15953 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.cs @@ -0,0 +1,70 @@ +using CarRepairShopContracts.BindingModels; +using CarRepairShopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace CarRepairShopView +{ + public partial class FormReportShopRepairs : Form + { + private readonly ILogger _logger; + + private readonly IReportLogic _logic; + + public FormReportShopRepairs(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormReportShopRepairs_Load(object sender, EventArgs e) + { + try + { + var dict = _logic.GetShopRepairs(); + if (dict != null) + { + dataGridView.Rows.Clear(); + foreach (var elem in dict) + { + dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" }); + foreach (var listElem in elem.Repairs) + { + dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); + } + dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); + dataGridView.Rows.Add(Array.Empty()); + } + } + _logger.LogInformation("Loading information on store workload"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Loading information on store workload error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonSaveToExcel_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveShopRepairToExcelFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + _logger.LogInformation("Saving information on store workload"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Saving information on store workload error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormReportShopRepairs.designer.cs b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.designer.cs new file mode 100644 index 0000000..999106e --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.designer.cs @@ -0,0 +1,114 @@ +namespace CarRepairShopView +{ + partial class FormReportShopRepairs + { + /// + /// 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(); + buttonSaveToExcel = new Button(); + ColumnShop = new DataGridViewTextBoxColumn(); + ColumnRepair = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.AllowUserToOrderColumns = true; + dataGridView.AllowUserToResizeColumns = false; + dataGridView.AllowUserToResizeRows = false; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnRepair, ColumnCount }); + dataGridView.Dock = DockStyle.Bottom; + dataGridView.Location = new Point(0, 47); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.Size = new Size(616, 510); + dataGridView.TabIndex = 0; + // + // buttonSaveToExcel + // + buttonSaveToExcel.Location = new Point(13, 10); + buttonSaveToExcel.Margin = new Padding(4, 3, 4, 3); + buttonSaveToExcel.Name = "buttonSaveToExcel"; + buttonSaveToExcel.Size = new Size(186, 27); + buttonSaveToExcel.TabIndex = 1; + buttonSaveToExcel.Text = "Сохранить в Excel"; + buttonSaveToExcel.UseVisualStyleBackColor = true; + buttonSaveToExcel.Click += ButtonSaveToExcel_Click; + // + // ColumnShop + // + ColumnShop.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnShop.HeaderText = "Магазин"; + ColumnShop.Name = "ColumnShop"; + ColumnShop.ReadOnly = true; + // + // ColumnRepair + // + ColumnRepair.HeaderText = "Ремонт"; + ColumnRepair.Name = "ColumnRepair"; + ColumnRepair.ReadOnly = true; + ColumnRepair.Width = 200; + // + // ColumnCount + // + ColumnCount.HeaderText = "Количество"; + ColumnCount.Name = "ColumnCount"; + ColumnCount.ReadOnly = true; + // + // FormReportShopRepairs + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(616, 557); + Controls.Add(buttonSaveToExcel); + Controls.Add(dataGridView); + Margin = new Padding(4, 3, 4, 3); + Name = "FormReportShopRepairs"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Загруженность магазинов"; + Load += FormReportShopRepairs_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private System.Windows.Forms.DataGridView dataGridView; + private System.Windows.Forms.Button buttonSaveToExcel; + private DataGridViewTextBoxColumn ColumnShop; + private DataGridViewTextBoxColumn ColumnRepair; + private DataGridViewTextBoxColumn ColumnCount; + } +} \ No newline at end of file diff --git a/CarRepairShop/CarRepairShopView/FormReportShopRepairs.resx b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/CarRepairShop/CarRepairShopView/FormReportShopRepairs.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/CarRepairShop/CarRepairShopView/Program.cs b/CarRepairShop/CarRepairShopView/Program.cs index 09e0880..ef560e1 100644 --- a/CarRepairShop/CarRepairShopView/Program.cs +++ b/CarRepairShop/CarRepairShopView/Program.cs @@ -8,7 +8,6 @@ using NLog.Extensions.Logging; using CarRepairShopBusinessLogic.OfficePackage; using CarRepairShopBusinessLogic.OfficePackage.Implements; - namespace CarRepairShopView { internal static class Program @@ -47,10 +46,9 @@ namespace CarRepairShopView services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); - services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -58,12 +56,14 @@ namespace CarRepairShopView 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/CarRepairShop/CarRepairShopView/ReportGroupedOrders.rdlc b/CarRepairShop/CarRepairShopView/ReportGroupedOrders.rdlc new file mode 100644 index 0000000..67f7eda --- /dev/null +++ b/CarRepairShop/CarRepairShopView/ReportGroupedOrders.rdlc @@ -0,0 +1,424 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + CarRepairShopContractsViewModels + /* Local Query */ + + + + Date + System.DateTime + + + Count + System.Int32 + + + Sum + System.Decimal + + + + CarRepairShopContracts.ViewModels + ReportOrdersByDateViewModel + CarRepairShopContracts.ViewModels.ReportOrdersByDateViewModel, CarRepairShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + Заказы по датам + + + + + + + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 6.01401cm + + + 6.56042cm + + + 6.12687cm + + + + + 0.6cm + + + + + true + true + + + + + Дата + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Количество заказов + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Date.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Count.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 1.95474cm + 1.16099cm + 1.2cm + 18.7013cm + 1 + + + + + + true + true + + + + + Всего: + + + + + + + 4cm + 11.23542cm + 0.6cm + 2.5cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4cm + 13.73542cm + 0.6cm + 6.12687cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + 5.72875cm +