diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs index 246c491..77a26f8 100644 --- a/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/AutoWorkshopBusinessLogic/BusinessLogics/OrderLogic.cs @@ -13,11 +13,14 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics private readonly ILogger _logger; private readonly IOrderStorage _orderStorage; + private readonly IShopStorage _shopStorage; - public OrderLogic(ILogger Logger, IOrderStorage OrderStorage) + public OrderLogic(ILogger Logger, IOrderStorage OrderStorage, IShopStorage ShopStorage) { _logger = Logger; + _orderStorage = OrderStorage; + _shopStorage = ShopStorage; } public List? ReadList(OrderSearchModel? Model) @@ -107,6 +110,23 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics public bool DeliveryOrder(OrderBindingModel Model) { + var Order = _orderStorage.GetElement(new OrderSearchModel + { + Id = Model.Id + }); + + if (Order is null) + throw new ArgumentNullException(nameof(Order)); + + if (!_shopStorage.RestockingShops(new SupplyBindingModel + { + RepairId = Order.RepairId, + Count = Order.Count + })) + { + throw new ArgumentException("Недостаточно места"); + } + return ChangeOrderStatus(Model, OrderStatus.Delivered); } diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs index cd67301..fb84e1c 100644 --- a/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -13,16 +13,18 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics private readonly IComponentStorage _componentStorage; private readonly IRepairStorage _RepairStorage; private readonly IOrderStorage _orderStorage; + private readonly IShopStorage _shopStorage; private readonly AbstractSaveToExcel _saveToExcel; private readonly AbstractSaveToWord _saveToWord; private readonly AbstractSaveToPdf _saveToPdf; - public ReportLogic(IRepairStorage RepairStorage, IComponentStorage ComponentStorage, IOrderStorage OrderStorage, + public ReportLogic(IRepairStorage RepairStorage, IComponentStorage ComponentStorage, IOrderStorage OrderStorage, IShopStorage ShopStorage, AbstractSaveToExcel SaveToExcel, AbstractSaveToWord SaveToWord, AbstractSaveToPdf SaveToPdf) { _RepairStorage = RepairStorage; _componentStorage = ComponentStorage; _orderStorage = OrderStorage; + _shopStorage = ShopStorage; _saveToExcel = SaveToExcel; _saveToWord = SaveToWord; @@ -41,6 +43,26 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics .ToList(); } + public List GetShops() + { + return _shopStorage.GetFullList().Select(x => new ReportShopsViewModel + { + ShopName = x.ShopName, + Repairs = x.ShopRepairs.Select(x => (x.Value.Item1.RepairName, x.Value.Item2)).ToList(), + TotalCount = x.ShopRepairs.Select(x => x.Value.Item2).Sum() + }).ToList(); + } + + public List GetGroupedOrders() + { + return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportGroupedOrdersViewModel + { + Date = x.Key, + OrdersCount = x.Count(), + OrdersSum = x.Select(y => y.Sum).Sum() + }).ToList(); + } + public List GetOrders(ReportBindingModel Model) { return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = Model.DateFrom, DateTo = Model.DateTo }) @@ -57,7 +79,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics public void SaveRepairsToWordFile(ReportBindingModel Model) { - _saveToWord.CreateDoc(new WordInfo + _saveToWord.CreateRepairsDoc(new WordRepairsInfo { FileName = Model.FileName, Title = "Список ремонтов", @@ -67,7 +89,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics public void SaveRepairComponentToExcelFile(ReportBindingModel Model) { - _saveToExcel.CreateReport(new ExcelInfo + _saveToExcel.CreateReport(new ExcelRepairsInfo { FileName = Model.FileName, Title = "Список ремонтов", @@ -77,7 +99,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics public void SaveOrdersToPdfFile(ReportBindingModel Model) { - _saveToPdf.CreateDoc(new PdfInfo + _saveToPdf.CreateDoc(new PdfOrdersInfo { FileName = Model.FileName, Title = "Список заказов", @@ -86,5 +108,35 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics Orders = GetOrders(Model) }); } + + public void SaveShopsToWordFile(ReportBindingModel model) + { + _saveToWord.CreateShopsDoc(new WordShopsInfo + { + FileName = model.FileName, + Title = "Список магазинов", + Shops = _shopStorage.GetFullList() + }); + } + + public void SaveShopsToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateShopRepairsReport(new ExcelShopsInfo + { + FileName = model.FileName, + Title = "Загруженность магазинов", + ShopRepairs = GetShops() + }); + } + + public void SaveGroupedOrdersToPdfFile(ReportBindingModel model) + { + _saveToPdf.CreateGroupedOrdersDoc(new PdfGroupedOrdersInfo + { + FileName = model.FileName, + Title = "Список заказов, объединенных по датам", + GroupedOrders = GetGroupedOrders() + }); + } } } diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs new file mode 100644 index 0000000..b15cce5 --- /dev/null +++ b/AutoWorkshopBusinessLogic/BusinessLogics/ShopLogic.cs @@ -0,0 +1,194 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicsContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopBusinessLogic.BusinessLogics +{ + public class ShopLogic : IShopLogic + { + private readonly ILogger _logger; + private readonly IShopStorage _shopStorage; + private readonly IRepairStorage _repairStorage; + + public ShopLogic(ILogger Logger, IShopStorage ShopStorage, IRepairStorage RepairStorage) + { + _logger = Logger; + _shopStorage = ShopStorage; + _repairStorage = RepairStorage; + } + + 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 MakeSupply(SupplyBindingModel Model) + { + if (Model == null) + throw new ArgumentNullException(nameof(Model)); + + if (Model.Count <= 0) + throw new ArgumentException("Количество ремонтов должно быть больше 0"); + + ShopViewModel? Shop = _shopStorage.GetElement(new ShopSearchModel + { + Id = Model.ShopId + }); + + if (Shop == null) + throw new ArgumentException("Магазина не существует"); + + int CurrentRepairsNum = Shop.ShopRepairs.Select(x => x.Value.Item2).Sum(); + if (Model.Count > Shop.RepairsMaxCount - CurrentRepairsNum) + { + _logger.LogWarning("Попытка добавить в магазин число элементов, большее RepairsMaxCount"); + return false; + } + + if (Shop.ShopRepairs.ContainsKey(Model.RepairId)) + { + var RepairsNum = Shop.ShopRepairs[Model.RepairId]; + RepairsNum.Item2 += Model.Count; + Shop.ShopRepairs[Model.RepairId] = RepairsNum; + } + else + { + var Repair = _repairStorage.GetElement(new RepairSearchModel + { + Id = Model.RepairId + }); + + if (Repair == null) + throw new ArgumentException($"Поставка: Товар с id {Model.RepairId} не найден"); + + Shop.ShopRepairs.Add(Model.RepairId, (Repair, Model.Count)); + } + + _shopStorage.Update(new ShopBindingModel() + { + Id = Shop.Id, + ShopName = Shop.ShopName, + Address = Shop.Address, + OpeningDate = Shop.OpeningDate, + ShopRepairs = Shop.ShopRepairs, + RepairsMaxCount = Shop.RepairsMaxCount, + }); + 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.Address)) + throw new ArgumentException("Адрес магазина длжен быть заполнен", nameof(Model.Address)); + + if (string.IsNullOrEmpty(Model.ShopName)) + throw new ArgumentException("Название магазина должно быть заполнено", nameof(Model.ShopName)); + + _logger.LogInformation("Shop. ShopName: {ShopName}. Address: {Address}. OpeningDate: {OpeningDate}. Id:{Id}", + Model.ShopName, Model.Address, Model.OpeningDate, Model.Id); + + var Element = _shopStorage.GetElement(new ShopSearchModel + { + ShopName = Model.ShopName + }); + if (Element != null && Element.Id != Model.Id) + { + throw new InvalidOperationException("Магазин с таким названием уже есть"); + } + } + + public bool MakeSell(SupplySearchModel Model) + { + if (!Model.RepairId.HasValue || !Model.Count.HasValue) + return false; + + _logger.LogInformation("Поиск ремонтов во всех магазинах"); + if (_shopStorage.Sell(Model)) + { + _logger.LogInformation("Продажа выполнена успешно"); + return true; + } + + _logger.LogInformation("Продажа не выполнена"); + return false; + } + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 04b1476..66341bb 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage { public abstract class AbstractSaveToExcel { - public void CreateReport(ExcelInfo Info) + public void CreateReport(ExcelRepairsInfo Info) { CreateExcel(Info); @@ -78,13 +78,88 @@ namespace AutoWorkshopBusinessLogic.OfficePackage SaveExcel(Info); } - - protected abstract void CreateExcel(ExcelInfo Info); + + public void CreateShopRepairsReport(ExcelShopsInfo 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 ShopRep in Info.ShopRepairs) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = RowIndex, + Text = ShopRep.ShopName, + StyleInfo = ExcelStyleInfoType.Text + }); + + RowIndex++; + + foreach (var (Repair, Count) in ShopRep.Repairs) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = RowIndex, + Text = Repair, + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = RowIndex, + Text = Count.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + + RowIndex++; + } + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = RowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = RowIndex, + Text = ShopRep.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + + RowIndex++; + } + + SaveExcel(Info); + } + + protected abstract void CreateExcel(IDocumentInfo Info); protected abstract void InsertCellInWorksheet(ExcelCellParameters ExcelParams); protected abstract void MergeCells(ExcelMergeParameters ExcelParams); - protected abstract void SaveExcel(ExcelInfo Info); + protected abstract void SaveExcel(IDocumentInfo Info); } } diff --git a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index 86fd1a0..94b2490 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage { public abstract class AbstractSaveToPdf { - public void CreateDoc(PdfInfo Info) + public void CreateDoc(PdfOrdersInfo Info) { CreatePdf(Info); CreateParagraph(new PdfParagraph { Text = Info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -33,8 +33,35 @@ namespace AutoWorkshopBusinessLogic.OfficePackage SavePdf(Info); } - - protected abstract void CreatePdf(PdfInfo Info); + + public void CreateGroupedOrdersDoc(PdfGroupedOrdersInfo Info) + { + CreatePdf(Info); + CreateParagraph(new PdfParagraph { Text = Info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + + CreateTable(new List { "4cm", "3cm", "2cm" }); + CreateRow(new PdfRowParameters + { + Texts = new List { "Дата заказа", "Кол-во", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + + foreach (var groupedOrder in Info.GroupedOrders) + { + CreateRow(new PdfRowParameters + { + Texts = new List { groupedOrder.Date.ToShortDateString(), groupedOrder.OrdersCount.ToString(), groupedOrder.OrdersSum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + + CreateParagraph(new PdfParagraph { Text = $"Итого: {Info.GroupedOrders.Sum(x => x.OrdersSum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); + SavePdf(Info); + } + + protected abstract void CreatePdf(IDocumentInfo Info); protected abstract void CreateParagraph(PdfParagraph Paragraph); @@ -42,6 +69,6 @@ namespace AutoWorkshopBusinessLogic.OfficePackage protected abstract void CreateRow(PdfRowParameters RowParameters); - protected abstract void SavePdf(PdfInfo Info); + protected abstract void SavePdf(IDocumentInfo Info); } } diff --git a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 9b98866..3ca7cd2 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -5,7 +5,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage { public abstract class AbstractSaveToWord { - public void CreateDoc(WordInfo Info) + public void CreateRepairsDoc(WordRepairsInfo Info) { CreateWord(Info); @@ -37,11 +37,57 @@ namespace AutoWorkshopBusinessLogic.OfficePackage SaveWord(Info); } - - protected abstract void CreateWord(WordInfo Info); + + public void CreateShopsDoc(WordShopsInfo Info) + { + CreateWord(Info); + + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (Info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Center + } + }); + + CreateTable(new List { "3000", "3000", "3000" }); + CreateRow(new WordRowParameters + { + Texts = new List { "Название", "Адрес", "Дата открытия" }, + TextProperties = new WordTextProperties + { + Size = "24", + Bold = true, + JustificationType = WordJustificationType.Center + } + }); + + foreach (var Shop in Info.Shops) + { + CreateRow(new WordRowParameters + { + Texts = new List { Shop.ShopName, Shop.Address, Shop.OpeningDate.ToString() }, + TextProperties = new WordTextProperties + { + Size = "22", + JustificationType = WordJustificationType.Both + } + }); + } + + SaveWord(Info); + } + + protected abstract void CreateWord(IDocumentInfo Info); protected abstract void CreateParagraph(WordParagraph Paragraph); - protected abstract void SaveWord(WordInfo Info); + protected abstract void SaveWord(IDocumentInfo Info); + + protected abstract void CreateTable(List Colums); + + protected abstract void CreateRow(WordRowParameters RowParameters); } } diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelRepairsInfo.cs similarity index 87% rename from AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs rename to AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelRepairsInfo.cs index 92ea188..58845ee 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelRepairsInfo.cs @@ -2,7 +2,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels { - public class ExcelInfo + public class ExcelRepairsInfo : IDocumentInfo { public string FileName { get; set; } = string.Empty; diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelShopsInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelShopsInfo.cs new file mode 100644 index 0000000..932a172 --- /dev/null +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelShopsInfo.cs @@ -0,0 +1,13 @@ +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelShopsInfo : IDocumentInfo + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List ShopRepairs { get; set; } = new(); + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/IDocumentInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/IDocumentInfo.cs new file mode 100644 index 0000000..048e797 --- /dev/null +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/IDocumentInfo.cs @@ -0,0 +1,9 @@ +namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels +{ + public interface IDocumentInfo + { + public string FileName { get; set; } + + public string Title { get; set; } + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs new file mode 100644 index 0000000..f268593 --- /dev/null +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfGroupedOrdersInfo.cs @@ -0,0 +1,17 @@ +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels +{ + public class PdfGroupedOrdersInfo : IDocumentInfo + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public DateTime DateFrom { get; set; } + + public DateTime DateTo { get; set; } + + public List GroupedOrders { get; set; } = new(); + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfOrdersInfo.cs similarity index 90% rename from AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs rename to AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfOrdersInfo.cs index 1df40e0..ee25fd5 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/PdfOrdersInfo.cs @@ -2,7 +2,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels { - public class PdfInfo + public class PdfOrdersInfo : IDocumentInfo { public string FileName { get; set; } = string.Empty; diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRepairsInfo.cs similarity index 87% rename from AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs rename to AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRepairsInfo.cs index b18f6b2..6c7c0fe 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRepairsInfo.cs @@ -2,7 +2,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels { - public class WordInfo + public class WordRepairsInfo : IDocumentInfo { public string FileName { get; set; } = string.Empty; diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs new file mode 100644 index 0000000..5395e27 --- /dev/null +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordRowParameters.cs @@ -0,0 +1,9 @@ +namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels +{ + public class WordRowParameters + { + public List Texts { get; set; } = new(); + + public WordTextProperties TextProperties { get; set; } = new(); + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordShopsInfo.cs b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordShopsInfo.cs new file mode 100644 index 0000000..2a2f8db --- /dev/null +++ b/AutoWorkshopBusinessLogic/OfficePackage/HelperModels/WordShopsInfo.cs @@ -0,0 +1,13 @@ +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopBusinessLogic.OfficePackage.HelperModels +{ + public class WordShopsInfo : IDocumentInfo + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List Shops { get; set; } = new(); + } +} diff --git a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs index d030433..deddaf2 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -139,7 +139,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements }; } - protected override void CreateExcel(ExcelInfo Info) + protected override void CreateExcel(IDocumentInfo Info) { _spreadsheetDocument = SpreadsheetDocument.Create(Info.FileName, SpreadsheetDocumentType.Workbook); @@ -269,7 +269,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements MergeCells.Append(MergeCell); } - protected override void SaveExcel(ExcelInfo Info) + protected override void SaveExcel(IDocumentInfo Info) { if (_spreadsheetDocument == null) return; diff --git a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs index 0ee1ec4..b1ed115 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -33,7 +33,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements Style.Font.Bold = true; } - protected override void CreatePdf(PdfInfo Info) + protected override void CreatePdf(IDocumentInfo Info) { _document = new Document(); DefineStyles(_document); @@ -94,7 +94,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements } } - protected override void SavePdf(PdfInfo Info) + protected override void SavePdf(IDocumentInfo Info) { var Renderer = new PdfDocumentRenderer(true) { diff --git a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs index 6d9de6f..af01c8d 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -64,7 +64,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements return Properties; } - protected override void CreateWord(WordInfo Info) + protected override void CreateWord(IDocumentInfo Info) { _wordDocument = WordprocessingDocument.Create(Info.FileName, WordprocessingDocumentType.Document); MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); @@ -103,7 +103,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements _docBody.AppendChild(DocParagraph); } - protected override void SaveWord(WordInfo Info) + protected override void SaveWord(IDocumentInfo Info) { if (_docBody == null || _wordDocument == null) { @@ -114,5 +114,79 @@ namespace AutoWorkshopBusinessLogic.OfficePackage.Implements _wordDocument.MainDocumentPart!.Document.Save(); _wordDocument.Close(); } + + private Table? _lastTable; + + protected override void CreateTable(List Columns) + { + if (_docBody == null) + return; + + _lastTable = new Table(); + + var TableProp = new TableProperties(); + TableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed }); + TableProp.AppendChild(new TableBorders( + new TopBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new LeftBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new RightBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new BottomBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new InsideHorizontalBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 }, + new InsideVerticalBorder() { Val = new EnumValue(BorderValues.Single), Size = 4 } + )); + TableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto }); + _lastTable.AppendChild(TableProp); + + TableGrid TableGrid = new TableGrid(); + + foreach (var Column in Columns) + { + TableGrid.AppendChild(new GridColumn() { Width = Column }); + } + + _lastTable.AppendChild(TableGrid); + _docBody.AppendChild(_lastTable); + } + + protected override void CreateRow(WordRowParameters RowParameters) + { + if (_docBody == null || _lastTable == null) + return; + + TableRow DocRow = new TableRow(); + foreach (var Column in RowParameters.Texts) + { + var DocParagraph = new Paragraph(); + WordParagraph Paragraph = new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (Column, RowParameters.TextProperties) }, + TextProperties = RowParameters.TextProperties + }; + + DocParagraph.AppendChild(CreateParagraphProperties(Paragraph.TextProperties)); + + foreach (var Run in Paragraph.Texts) + { + var DocRun = new Run(); + var Properties = new RunProperties(); + + Properties.AppendChild(new FontSize { Val = Run.Item2.Size }); + if (Run.Item2.Bold) + { + Properties.AppendChild(new Bold()); + } + DocRun.AppendChild(Properties); + DocRun.AppendChild(new Text { Text = Run.Item1, Space = SpaceProcessingModeValues.Preserve }); + DocParagraph.AppendChild(DocRun); + } + + TableCell docCell = new TableCell(); + + docCell.AppendChild(DocParagraph); + DocRow.AppendChild(docCell); + } + + _lastTable.AppendChild(DocRow); + } } } diff --git a/AutoWorkshopContracts/BindingModels/ShopBindingModel.cs b/AutoWorkshopContracts/BindingModels/ShopBindingModel.cs new file mode 100644 index 0000000..119f369 --- /dev/null +++ b/AutoWorkshopContracts/BindingModels/ShopBindingModel.cs @@ -0,0 +1,19 @@ +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopContracts.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 OpeningDate { get; set; } = DateTime.Now; + + public Dictionary ShopRepairs { get; set; } = new(); + + public int RepairsMaxCount { get; set; } + } +} diff --git a/AutoWorkshopContracts/BindingModels/SupplyBindingModel.cs b/AutoWorkshopContracts/BindingModels/SupplyBindingModel.cs new file mode 100644 index 0000000..cd776af --- /dev/null +++ b/AutoWorkshopContracts/BindingModels/SupplyBindingModel.cs @@ -0,0 +1,13 @@ +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopContracts.BindingModels +{ + public class SupplyBindingModel : ISupplyModel + { + public int ShopId { get; set; } + + public int RepairId { get; set; } + + public int Count { get; set; } + } +} diff --git a/AutoWorkshopContracts/BusinessLogicContracts/IReportLogic.cs b/AutoWorkshopContracts/BusinessLogicContracts/IReportLogic.cs index b8e10bc..44f73ae 100644 --- a/AutoWorkshopContracts/BusinessLogicContracts/IReportLogic.cs +++ b/AutoWorkshopContracts/BusinessLogicContracts/IReportLogic.cs @@ -8,11 +8,21 @@ namespace AutoWorkshopContracts.BusinessLogicContracts List GetRepairComponents(); List GetOrders(ReportBindingModel Model); - + + List GetShops(); + + List GetGroupedOrders(); + void SaveRepairsToWordFile(ReportBindingModel Model); void SaveRepairComponentToExcelFile(ReportBindingModel Model); void SaveOrdersToPdfFile(ReportBindingModel Model); + + void SaveShopsToWordFile(ReportBindingModel Model); + + void SaveShopsToExcelFile(ReportBindingModel Model); + + void SaveGroupedOrdersToPdfFile(ReportBindingModel Model); } } diff --git a/AutoWorkshopContracts/BusinessLogicContracts/IShopLogic.cs b/AutoWorkshopContracts/BusinessLogicContracts/IShopLogic.cs new file mode 100644 index 0000000..496037a --- /dev/null +++ b/AutoWorkshopContracts/BusinessLogicContracts/IShopLogic.cs @@ -0,0 +1,23 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.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 MakeSupply(SupplyBindingModel Model); + + bool MakeSell(SupplySearchModel Model); + } +} diff --git a/AutoWorkshopContracts/SearchModels/ShopSearchModel.cs b/AutoWorkshopContracts/SearchModels/ShopSearchModel.cs new file mode 100644 index 0000000..22aaaaa --- /dev/null +++ b/AutoWorkshopContracts/SearchModels/ShopSearchModel.cs @@ -0,0 +1,9 @@ +namespace AutoWorkshopContracts.SearchModels +{ + public class ShopSearchModel + { + public int? Id { get; set; } + + public string? ShopName { get; set; } + } +} diff --git a/AutoWorkshopContracts/SearchModels/SupplySearchModel.cs b/AutoWorkshopContracts/SearchModels/SupplySearchModel.cs new file mode 100644 index 0000000..e0a9731 --- /dev/null +++ b/AutoWorkshopContracts/SearchModels/SupplySearchModel.cs @@ -0,0 +1,9 @@ +namespace AutoWorkshopContracts.SearchModels +{ + public class SupplySearchModel + { + public int? RepairId { get; set; } + + public int? Count { get; set; } + } +} diff --git a/AutoWorkshopContracts/StoragesContracts/IShopStorage.cs b/AutoWorkshopContracts/StoragesContracts/IShopStorage.cs new file mode 100644 index 0000000..c516d00 --- /dev/null +++ b/AutoWorkshopContracts/StoragesContracts/IShopStorage.cs @@ -0,0 +1,25 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; + +namespace AutoWorkshopContracts.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); + + bool Sell(SupplySearchModel Model); + + bool RestockingShops(SupplyBindingModel Model); + } +} diff --git a/AutoWorkshopContracts/ViewModels/ReportGroupedOrdersViewModel.cs b/AutoWorkshopContracts/ViewModels/ReportGroupedOrdersViewModel.cs new file mode 100644 index 0000000..ef0b65d --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/ReportGroupedOrdersViewModel.cs @@ -0,0 +1,11 @@ +namespace AutoWorkshopContracts.ViewModels +{ + public class ReportGroupedOrdersViewModel + { + public DateTime Date { get; set; } = DateTime.Now; + + public int OrdersCount { get; set; } + + public double OrdersSum { get; set; } + } +} diff --git a/AutoWorkshopContracts/ViewModels/ReportShopsViewModel.cs b/AutoWorkshopContracts/ViewModels/ReportShopsViewModel.cs new file mode 100644 index 0000000..3014d2c --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/ReportShopsViewModel.cs @@ -0,0 +1,11 @@ +namespace AutoWorkshopContracts.ViewModels +{ + public class ReportShopsViewModel + { + 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/AutoWorkshopContracts/ViewModels/ShopViewModel.cs b/AutoWorkshopContracts/ViewModels/ShopViewModel.cs new file mode 100644 index 0000000..2538f00 --- /dev/null +++ b/AutoWorkshopContracts/ViewModels/ShopViewModel.cs @@ -0,0 +1,24 @@ +using AutoWorkshopDataModels.Models; +using System.ComponentModel; + +namespace AutoWorkshopContracts.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 OpeningDate { get; set; } + + public Dictionary ShopRepairs { get; set; } = new(); + + [DisplayName("Вместимость")] + public int RepairsMaxCount { get; set; } + } +} diff --git a/AutoWorkshopDataModels/Models/IShopModel.cs b/AutoWorkshopDataModels/Models/IShopModel.cs new file mode 100644 index 0000000..83f1f3d --- /dev/null +++ b/AutoWorkshopDataModels/Models/IShopModel.cs @@ -0,0 +1,15 @@ +namespace AutoWorkshopDataModels.Models +{ + public interface IShopModel : IId + { + string ShopName { get; } + + string Address { get; } + + DateTime OpeningDate { get; } + + Dictionary ShopRepairs { get; } + + int RepairsMaxCount { get; } + } +} diff --git a/AutoWorkshopDataModels/Models/ISupplyModel.cs b/AutoWorkshopDataModels/Models/ISupplyModel.cs new file mode 100644 index 0000000..5a12647 --- /dev/null +++ b/AutoWorkshopDataModels/Models/ISupplyModel.cs @@ -0,0 +1,11 @@ +namespace AutoWorkshopDataModels.Models +{ + public interface ISupplyModel + { + int ShopId { get; } + + int RepairId { get; } + + int Count { get; } + } +} diff --git a/AutoWorkshopDatabaseImplement/AutoWorkshopDatabase.cs b/AutoWorkshopDatabaseImplement/AutoWorkshopDatabase.cs index 31fe0d0..bd188b7 100644 --- a/AutoWorkshopDatabaseImplement/AutoWorkshopDatabase.cs +++ b/AutoWorkshopDatabaseImplement/AutoWorkshopDatabase.cs @@ -9,7 +9,7 @@ namespace AutoWorkshopDatabaseImplement { if (OptionsBuilder.IsConfigured == false) { - OptionsBuilder.UseNpgsql(@"Host=localhost;Database=AutoWorkshop;Username=postgres;Password=admin"); + OptionsBuilder.UseNpgsql(@"Host=localhost;Port=5000;Database=AutoWorkshop_Hard;Username=postgres;Password=admin"); } base.OnConfiguring(OptionsBuilder); @@ -26,6 +26,10 @@ namespace AutoWorkshopDatabaseImplement public virtual DbSet Orders { set; get; } + public virtual DbSet Shops { get; set; } + + public virtual DbSet ShopRepairs { get; set; } + public virtual DbSet Clients { set; get; } } } diff --git a/AutoWorkshopDatabaseImplement/Implements/ShopStorage.cs b/AutoWorkshopDatabaseImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..2685c94 --- /dev/null +++ b/AutoWorkshopDatabaseImplement/Implements/ShopStorage.cs @@ -0,0 +1,221 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDatabaseImplement.Models; +using Microsoft.EntityFrameworkCore; + +namespace AutoWorkshopDatabaseImplement.Implements +{ + public class ShopStorage : IShopStorage + { + public List GetFullList() + { + using var Context = new AutoWorkshopDatabase(); + 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 AutoWorkshopDatabase(); + + 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 new(); + + using var Context = new AutoWorkshopDatabase(); + + 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 AutoWorkshopDatabase(); + + 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 AutoWorkshopDatabase(); + + using var Transaction = Context.Database.BeginTransaction(); + try + { + var Shop = Context.Shops.FirstOrDefault(x => x.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 AutoWorkshopDatabase(); + + var Shop = Context.Shops + .Include(x => x.Repairs) + .FirstOrDefault(x => x.Id == Model.Id); + + if (Shop == null) + return null; + + Context.Shops.Remove(Shop); + Context.SaveChanges(); + + return Shop.GetViewModel; + } + + public bool Sell(SupplySearchModel Model) + { + using var Context = new AutoWorkshopDatabase(); + var Transaction = Context.Database.BeginTransaction(); + + try + { + var ShopsWithDesiredRepair = Context.Shops + .Include(x => x.Repairs) + .ThenInclude(x => x.Repair) + .ToList() + .Where(x => x.ShopRepairs.ContainsKey(Model.RepairId.Value)) + .OrderByDescending(x => x.ShopRepairs[Model.RepairId.Value].Item2) + .ToList(); + + foreach (var Shop in ShopsWithDesiredRepair) + { + int Slack = Model.Count.Value - Shop.ShopRepairs[Model.RepairId.Value].Item2; + + if (Slack > 0) + { + Shop.ShopRepairs.Remove(Model.RepairId.Value); + Shop.RepairsDictionatyUpdate(Context); + Context.SaveChanges(); + + Model.Count = Slack; + } + else + { + if (Slack == 0) + { + Shop.ShopRepairs.Remove(Model.RepairId.Value); + } + else + { + var RepairAndCount = Shop.ShopRepairs[Model.RepairId.Value]; + RepairAndCount.Item2 = -Slack; + Shop.ShopRepairs[Model.RepairId.Value] = RepairAndCount; + } + + Shop.RepairsDictionatyUpdate(Context); + Transaction.Commit(); + + return true; + } + } + + Transaction.Rollback(); + return false; + } + catch + { + Transaction.Rollback(); + throw; + } + } + + public bool RestockingShops(SupplyBindingModel Model) + { + using var Context = new AutoWorkshopDatabase(); + var Transaction = Context.Database.BeginTransaction(); + + var Shops = Context.Shops + .Include(x => x.Repairs) + .ThenInclude(x => x.Repair) + .ToList() + .Where(x => x.RepairsMaxCount > x.ShopRepairs + .Select(x => x.Value.Item2).Sum()) + .ToList(); + + try + { + foreach (Shop Shop in Shops) + { + int FreeSpaceNum = Shop.RepairsMaxCount - Shop.ShopRepairs.Select(x => x.Value.Item2).Sum(); + + int Refill = Math.Min(FreeSpaceNum, Model.Count); + Model.Count -= Refill; + + if (Shop.ShopRepairs.ContainsKey(Model.RepairId)) + { + var RepairAndCount = Shop.ShopRepairs[Model.RepairId]; + RepairAndCount.Item2 += Refill; + Shop.ShopRepairs[Model.RepairId] = RepairAndCount; + } + else + { + var Repair = Context.Repairs.First(x => x.Id == Model.RepairId); + Shop.ShopRepairs.Add(Model.RepairId, (Repair, Refill)); + } + + Shop.RepairsDictionatyUpdate(Context); + + if (Model.Count == 0) + { + Transaction.Commit(); + return true; + } + } + + Transaction.Rollback(); + return false; + } + catch + { + Transaction.Rollback(); + throw; + } + } + } +} diff --git a/AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.cs b/AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.cs deleted file mode 100644 index c1ef402..0000000 --- a/AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.cs +++ /dev/null @@ -1,156 +0,0 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; -using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; - -#nullable disable - -namespace AutoWorkshopDatabaseImplement.Migrations -{ - /// - public partial class Clients : Migration - { - /// - protected override void Up(MigrationBuilder migrationBuilder) - { - migrationBuilder.CreateTable( - name: "Clients", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - ClientFIO = table.Column(type: "text", nullable: false), - Email = table.Column(type: "text", nullable: false), - Password = table.Column(type: "text", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Clients", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Components", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - ComponentName = table.Column(type: "text", nullable: false), - Cost = table.Column(type: "double precision", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Components", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Repairs", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - RepairName = table.Column(type: "text", nullable: false), - Price = table.Column(type: "double precision", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_Repairs", x => x.Id); - }); - - migrationBuilder.CreateTable( - name: "Orders", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - RepairId = table.Column(type: "integer", nullable: false), - ClientId = table.Column(type: "integer", nullable: false), - Count = table.Column(type: "integer", nullable: false), - Sum = table.Column(type: "double precision", nullable: false), - Status = table.Column(type: "integer", nullable: false), - DateCreate = table.Column(type: "timestamp without time zone", nullable: false), - DateImplement = table.Column(type: "timestamp without time zone", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_Orders", x => x.Id); - table.ForeignKey( - name: "FK_Orders_Clients_ClientId", - column: x => x.ClientId, - principalTable: "Clients", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_Orders_Repairs_RepairId", - column: x => x.RepairId, - principalTable: "Repairs", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateTable( - name: "RepairComponents", - columns: table => new - { - Id = table.Column(type: "integer", nullable: false) - .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn), - RepairId = table.Column(type: "integer", nullable: false), - ComponentId = table.Column(type: "integer", nullable: false), - Count = table.Column(type: "integer", nullable: false) - }, - constraints: table => - { - table.PrimaryKey("PK_RepairComponents", x => x.Id); - table.ForeignKey( - name: "FK_RepairComponents_Components_ComponentId", - column: x => x.ComponentId, - principalTable: "Components", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - table.ForeignKey( - name: "FK_RepairComponents_Repairs_RepairId", - column: x => x.RepairId, - principalTable: "Repairs", - principalColumn: "Id", - onDelete: ReferentialAction.Cascade); - }); - - migrationBuilder.CreateIndex( - name: "IX_Orders_ClientId", - table: "Orders", - column: "ClientId"); - - migrationBuilder.CreateIndex( - name: "IX_Orders_RepairId", - table: "Orders", - column: "RepairId"); - - migrationBuilder.CreateIndex( - name: "IX_RepairComponents_ComponentId", - table: "RepairComponents", - column: "ComponentId"); - - migrationBuilder.CreateIndex( - name: "IX_RepairComponents_RepairId", - table: "RepairComponents", - column: "RepairId"); - } - - /// - protected override void Down(MigrationBuilder migrationBuilder) - { - migrationBuilder.DropTable( - name: "Orders"); - - migrationBuilder.DropTable( - name: "RepairComponents"); - - migrationBuilder.DropTable( - name: "Clients"); - - migrationBuilder.DropTable( - name: "Components"); - - migrationBuilder.DropTable( - name: "Repairs"); - } - } -} diff --git a/AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.Designer.cs b/AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.Designer.cs similarity index 77% rename from AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.Designer.cs rename to AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.Designer.cs index 61a3eaf..ac63286 100644 --- a/AutoWorkshopDatabaseImplement/Migrations/20240411091839_Clients.Designer.cs +++ b/AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace AutoWorkshopDatabaseImplement.Migrations { [DbContext(typeof(AutoWorkshopDatabase))] - [Migration("20240411091839_Clients")] - partial class Clients + [Migration("20240505173724_Fix Shop-Repair relationship")] + partial class FixShopRepairrelationship { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -25,31 +25,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("text"); - - b.Property("Email") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b => { b.Property("Id") @@ -78,9 +53,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - b.Property("ClientId") - .HasColumnType("integer"); - b.Property("Count") .HasColumnType("integer"); @@ -101,8 +73,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.HasKey("Id"); - b.HasIndex("ClientId"); - b.HasIndex("RepairId"); b.ToTable("Orders"); @@ -154,22 +124,67 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.ToTable("RepairComponents"); }); + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("OpeningDate") + .HasColumnType("timestamp without time zone"); + + b.Property("RepairsMaxCount") + .HasColumnType("integer"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("RepairId") + .HasColumnType("integer"); + + b.Property("ShopId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RepairId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopRepairs"); + }); + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b => { - b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", "Client") - .WithMany("Orders") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair") .WithMany("Orders") .HasForeignKey("RepairId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Client"); - b.Navigation("Repair"); }); @@ -192,9 +207,23 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.Navigation("Repair"); }); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b => + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b => { - b.Navigation("Orders"); + b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair") + .WithMany("Shops") + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutoWorkshopDatabaseImplement.Models.Shop", "Shop") + .WithMany("Repairs") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Repair"); + + b.Navigation("Shop"); }); modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b => @@ -207,6 +236,13 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.Navigation("Components"); b.Navigation("Orders"); + + b.Navigation("Shops"); + }); + + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b => + { + b.Navigation("Repairs"); }); #pragma warning restore 612, 618 } diff --git a/AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.cs b/AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.cs new file mode 100644 index 0000000..1738a1e --- /dev/null +++ b/AutoWorkshopDatabaseImplement/Migrations/20240505173724_Fix Shop-Repair relationship.cs @@ -0,0 +1,22 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace AutoWorkshopDatabaseImplement.Migrations +{ + /// + public partial class FixShopRepairrelationship : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + + } + } +} diff --git a/AutoWorkshopDatabaseImplement/Migrations/AutoWorkshopDatabaseModelSnapshot.cs b/AutoWorkshopDatabaseImplement/Migrations/AutoWorkshopDatabaseModelSnapshot.cs index c4adfe7..7dc1d54 100644 --- a/AutoWorkshopDatabaseImplement/Migrations/AutoWorkshopDatabaseModelSnapshot.cs +++ b/AutoWorkshopDatabaseImplement/Migrations/AutoWorkshopDatabaseModelSnapshot.cs @@ -22,31 +22,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("integer"); - - NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("text"); - - b.Property("Email") - .IsRequired() - .HasColumnType("text"); - - b.Property("Password") - .IsRequired() - .HasColumnType("text"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b => { b.Property("Id") @@ -75,9 +50,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); - b.Property("ClientId") - .HasColumnType("integer"); - b.Property("Count") .HasColumnType("integer"); @@ -98,8 +70,6 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.HasKey("Id"); - b.HasIndex("ClientId"); - b.HasIndex("RepairId"); b.ToTable("Orders"); @@ -151,22 +121,67 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.ToTable("RepairComponents"); }); + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Address") + .IsRequired() + .HasColumnType("text"); + + b.Property("OpeningDate") + .HasColumnType("timestamp without time zone"); + + b.Property("RepairsMaxCount") + .HasColumnType("integer"); + + b.Property("ShopName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.ToTable("Shops"); + }); + + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("integer"); + + NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property("Id")); + + b.Property("Count") + .HasColumnType("integer"); + + b.Property("RepairId") + .HasColumnType("integer"); + + b.Property("ShopId") + .HasColumnType("integer"); + + b.HasKey("Id"); + + b.HasIndex("RepairId"); + + b.HasIndex("ShopId"); + + b.ToTable("ShopRepairs"); + }); + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Order", b => { - b.HasOne("AutoWorkshopDatabaseImplement.Models.Client", "Client") - .WithMany("Orders") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair") .WithMany("Orders") .HasForeignKey("RepairId") .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("Client"); - b.Navigation("Repair"); }); @@ -189,9 +204,23 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.Navigation("Repair"); }); - modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Client", b => + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.ShopRepair", b => { - b.Navigation("Orders"); + b.HasOne("AutoWorkshopDatabaseImplement.Models.Repair", "Repair") + .WithMany("Shops") + .HasForeignKey("RepairId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.HasOne("AutoWorkshopDatabaseImplement.Models.Shop", "Shop") + .WithMany("Repairs") + .HasForeignKey("ShopId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("Repair"); + + b.Navigation("Shop"); }); modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Component", b => @@ -204,6 +233,13 @@ namespace AutoWorkshopDatabaseImplement.Migrations b.Navigation("Components"); b.Navigation("Orders"); + + b.Navigation("Shops"); + }); + + modelBuilder.Entity("AutoWorkshopDatabaseImplement.Models.Shop", b => + { + b.Navigation("Repairs"); }); #pragma warning restore 612, 618 } diff --git a/AutoWorkshopDatabaseImplement/Models/Repair.cs b/AutoWorkshopDatabaseImplement/Models/Repair.cs index e4707ba..b98ccb8 100644 --- a/AutoWorkshopDatabaseImplement/Models/Repair.cs +++ b/AutoWorkshopDatabaseImplement/Models/Repair.cs @@ -38,7 +38,10 @@ namespace AutoWorkshopDatabaseImplement.Models [ForeignKey("RepairId")] public virtual List Orders { get; set; } = new(); - + + [ForeignKey("RepairId")] + public virtual List Shops { get; set; } = new(); + public static Repair Create(AutoWorkshopDatabase Context, RepairBindingModel Model) { return new Repair() diff --git a/AutoWorkshopDatabaseImplement/Models/Shop.cs b/AutoWorkshopDatabaseImplement/Models/Shop.cs new file mode 100644 index 0000000..63f60b8 --- /dev/null +++ b/AutoWorkshopDatabaseImplement/Models/Shop.cs @@ -0,0 +1,131 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; + +namespace AutoWorkshopDatabaseImplement.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 OpeningDate { get; set; } + + [Required] + public int RepairsMaxCount { get; set; } + + [ForeignKey("ShopId")] + public List Repairs { get; set; } = new(); + + private Dictionary? _shopRepairs = null; + + [NotMapped] + public Dictionary ShopRepairs + { + get + { + if (_shopRepairs == null) + { + if (_shopRepairs == null) + { + _shopRepairs = Repairs.ToDictionary(ShopRep => ShopRep.RepairId, ShopRep => (ShopRep.Repair as IRepairModel, ShopRep.Count)); + } + return _shopRepairs; + } + + return _shopRepairs; + } + } + + public static Shop Create(AutoWorkshopDatabase Context, ShopBindingModel Model) + { + return new Shop() + { + Id = Model.Id, + ShopName = Model.ShopName, + Address = Model.Address, + OpeningDate = Model.OpeningDate, + Repairs = Model.ShopRepairs.Select(x => new ShopRepair + { + Repair = Context.Repairs.First(y => y.Id == x.Key), + Count = x.Value.Item2 + }).ToList(), + RepairsMaxCount = Model.RepairsMaxCount + }; + } + + public void Update(ShopBindingModel Model) + { + ShopName = Model.ShopName; + Address = Model.Address; + OpeningDate = Model.OpeningDate; + RepairsMaxCount = Model.RepairsMaxCount; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + OpeningDate = OpeningDate, + ShopRepairs = ShopRepairs, + RepairsMaxCount = RepairsMaxCount + }; + + public void UpdateRepairs(AutoWorkshopDatabase 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(); + + ShopRepairs = Context.ShopRepairs.Where(rec => rec.ShopId == Model.Id).ToList(); + + foreach (var RepairToUpdate in ShopRepairs) + { + RepairToUpdate.Count = Model.ShopRepairs[RepairToUpdate.RepairId].Item2; + Model.ShopRepairs.Remove(RepairToUpdate.RepairId); + } + + Context.SaveChanges(); + } + + var Shop = Context.Shops.First(x => x.Id == Id); + + foreach (var ShopRepair in Model.ShopRepairs) + { + Context.ShopRepairs.Add(new ShopRepair + { + Shop = Shop, + Repair = Context.Repairs.First(x => x.Id == ShopRepair.Key), + Count = ShopRepair.Value.Item2 + }); + + Context.SaveChanges(); + } + + _shopRepairs = null; + } + + public void RepairsDictionatyUpdate(AutoWorkshopDatabase Context) + { + UpdateRepairs(Context, new ShopBindingModel + { + Id = Id, + ShopRepairs = ShopRepairs + }); + } + } +} diff --git a/AutoWorkshopDatabaseImplement/Models/ShopRepair.cs b/AutoWorkshopDatabaseImplement/Models/ShopRepair.cs new file mode 100644 index 0000000..2810e13 --- /dev/null +++ b/AutoWorkshopDatabaseImplement/Models/ShopRepair.cs @@ -0,0 +1,22 @@ +using System.ComponentModel.DataAnnotations; + +namespace AutoWorkshopDatabaseImplement.Models +{ + public class ShopRepair + { + public int Id { get; set; } + + [Required] + public int RepairId { get; set; } + + [Required] + public int ShopId { get; set; } + + [Required] + public int Count { get; set; } + + public virtual Shop Shop { get; set; } = new(); + + public virtual Repair Repair { get; set; } = new(); + } +} diff --git a/AutoWorkshopFileImplement/DataFileSingleton.cs b/AutoWorkshopFileImplement/DataFileSingleton.cs index f638cc5..776dab0 100644 --- a/AutoWorkshopFileImplement/DataFileSingleton.cs +++ b/AutoWorkshopFileImplement/DataFileSingleton.cs @@ -10,6 +10,10 @@ namespace AutoWorkshopFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string RepairFileName = "Repair.xml"; + private readonly string ShopFileName = "Shop.xml"; + + public List Components { get; private set; } + public List Orders { get; private set; } private readonly string ClientFileName = "Client.xml"; public List Components { get; private set; } @@ -17,6 +21,8 @@ namespace AutoWorkshopFileImplement public List Orders { get; private set; } public List Repairs { get; private set; } + public List Shops { get; private set; } + public List Clients { get; private set; } @@ -25,6 +31,7 @@ namespace AutoWorkshopFileImplement 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)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; } @@ -41,6 +48,7 @@ namespace AutoWorkshopFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SaveRepairs() => SaveData(Repairs, RepairFileName, "Repairs", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveShops() => SaveData(Shops, ShopFileName, "Shops", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); private static List? LoadData(string FileName, string XmlNodeName, Func SelectFunction) diff --git a/AutoWorkshopFileImplement/Implements/ShopStorage.cs b/AutoWorkshopFileImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..d6492b1 --- /dev/null +++ b/AutoWorkshopFileImplement/Implements/ShopStorage.cs @@ -0,0 +1,168 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopFileImplement.Models; + +namespace AutoWorkshopFileImplement.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 Shop = _source.Shops.FirstOrDefault(x => x.Id == Model.Id); + + if (Shop == null) + return null; + + _source.Shops.Remove(Shop); + _source.SaveShops(); + + return Shop.GetViewModel; + } + + public bool Sell(SupplySearchModel Model) + { + if (Model == null || !Model.RepairId.HasValue || !Model.Count.HasValue) + return false; + + int TotalRepairsNum = _source.Shops + .Select(x => x.Repairs.ContainsKey(Model.RepairId.Value) ? x.Repairs[Model.RepairId.Value] : 0) + .Sum(); + if (TotalRepairsNum < Model.Count) + return false; + + var ShopsWithDesiredRepair = _source.Shops + .Where(x => x.Repairs.ContainsKey(Model.RepairId.Value)) + .OrderByDescending(x => x.Repairs[Model.RepairId.Value]) + .ToList(); + + foreach (var Shop in ShopsWithDesiredRepair) + { + int Slack = Model.Count.Value - Shop.Repairs[Model.RepairId.Value]; + + if (Slack > 0) + { + Shop.Repairs.Remove(Model.RepairId.Value); + Shop.RepairsUpdate(); + + Model.Count = Slack; + } + else + { + if (Slack == 0) + Shop.Repairs.Remove(Model.RepairId.Value); + else + Shop.Repairs[Model.RepairId.Value] = -Slack; + + Shop.RepairsUpdate(); + _source.SaveShops(); + + return true; + } + } + + _source.SaveShops(); + return false; + } + + public bool RestockingShops(SupplyBindingModel Model) + { + int TotalFreeSpaceNum = _source.Shops + .Select(x => x.RepairsMaxCount - x.ShopRepairs + .Select(y => y.Value.Item2) + .Sum()) + .Sum(); + + if (TotalFreeSpaceNum < Model.Count) + return false; + + foreach (Shop Shop in _source.Shops) + { + int FreeSpaceNum = Shop.RepairsMaxCount - Shop.ShopRepairs.Select(x => x.Value.Item2).Sum(); + + if (FreeSpaceNum <= 0) + continue; + + FreeSpaceNum = Math.Min(FreeSpaceNum, Model.Count); + Model.Count -= FreeSpaceNum; + + if (Shop.Repairs.ContainsKey(Model.RepairId)) + Shop.Repairs[Model.RepairId] += FreeSpaceNum; + else + Shop.Repairs.Add(Model.RepairId, FreeSpaceNum); + + Shop.RepairsUpdate(); + + if (Model.Count == 0) + { + _source.SaveShops(); + return true; + } + } + + return false; + } + } +} diff --git a/AutoWorkshopFileImplement/Models/Shop.cs b/AutoWorkshopFileImplement/Models/Shop.cs new file mode 100644 index 0000000..1d72178 --- /dev/null +++ b/AutoWorkshopFileImplement/Models/Shop.cs @@ -0,0 +1,110 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; +using System.Xml.Linq; + +namespace AutoWorkshopFileImplement.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 OpeningDate { 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 RepairsMaxCount { 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, + OpeningDate = Model.OpeningDate, + Repairs = Model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2), + RepairsMaxCount = Model.RepairsMaxCount + }; + } + + 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, + OpeningDate = Convert.ToDateTime(Element.Element("OpeningDate")!.Value), + Repairs = Element.Element("ShopRepairs")!.Elements("ShopRepair")!.ToDictionary(x => Convert.ToInt32(x.Element("Key")?.Value), + x => Convert.ToInt32(x.Element("Value")?.Value)), + RepairsMaxCount = Convert.ToInt32(Element.Element("RepairsMaxCount")!.Value) + }; + } + + public void Update(ShopBindingModel? Model) + { + if (Model == null) + return; + + ShopName = Model.ShopName; + Address = Model.Address; + OpeningDate = Model.OpeningDate; + RepairsMaxCount = Model.RepairsMaxCount; + Repairs = Model.ShopRepairs.ToDictionary(x => x.Key, x => x.Value.Item2); + _shopRepairs = null; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + OpeningDate = OpeningDate, + ShopRepairs = ShopRepairs, + RepairsMaxCount = RepairsMaxCount + }; + + public XElement GetXElement => new( + "Shop", + new XAttribute("Id", Id), + new XElement("ShopName", ShopName), + new XElement("Address", Address), + new XElement("OpeningDate", OpeningDate.ToString()), + new XElement("ShopRepairs", Repairs.Select( + x => new XElement("ShopRepair", new XElement("Key", x.Key), new XElement("Value", x.Value))).ToArray()), + new XElement("RepairsMaxCount", RepairsMaxCount.ToString()) + ); + + public void RepairsUpdate() + { + _shopRepairs = null; + } + } +} diff --git a/AutoWorkshopImplement/DataListSingleton.cs b/AutoWorkshopImplement/DataListSingleton.cs index 211e51a..49af80c 100644 --- a/AutoWorkshopImplement/DataListSingleton.cs +++ b/AutoWorkshopImplement/DataListSingleton.cs @@ -12,6 +12,9 @@ namespace AutoWorkshopListImplement public List Repairs { get; set; } + public List Shops { get; set; } + + public List Clients { get; set; } private DataListSingleton() @@ -19,6 +22,7 @@ namespace AutoWorkshopListImplement Components = new List(); Orders = new List(); Repairs = new List(); + Shops = new List(); Clients = new List(); } diff --git a/AutoWorkshopImplement/Implements/ShopStorage.cs b/AutoWorkshopImplement/Implements/ShopStorage.cs new file mode 100644 index 0000000..64da069 --- /dev/null +++ b/AutoWorkshopImplement/Implements/ShopStorage.cs @@ -0,0 +1,122 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.StoragesContracts; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopListImplement.Models; + +namespace AutoWorkshopListImplement.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 is 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 Shop = _source.Shops[i]; + _source.Shops.RemoveAt(i); + + return Shop.GetViewModel; + } + } + + return null; + } + + public bool Sell(SupplySearchModel Model) + { + throw new NotImplementedException(); + } + + public bool RestockingShops(SupplyBindingModel Model) + { + throw new NotImplementedException(); + } + } +} diff --git a/AutoWorkshopImplement/Models/Shop.cs b/AutoWorkshopImplement/Models/Shop.cs new file mode 100644 index 0000000..2067c44 --- /dev/null +++ b/AutoWorkshopImplement/Models/Shop.cs @@ -0,0 +1,57 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.ViewModels; +using AutoWorkshopDataModels.Models; + +namespace AutoWorkshopListImplement.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 OpeningDate { get; private set; } + + public Dictionary ShopRepairs { get; private set; } = new(); + + public int RepairsMaxCount { get; private set; } + + public static Shop? Create(ShopBindingModel? Model) + { + if (Model is null) + return null; + + return new Shop() + { + Id = Model.Id, + ShopName = Model.ShopName, + Address = Model.Address, + OpeningDate = Model.OpeningDate, + RepairsMaxCount = Model.RepairsMaxCount, + }; + } + + public void Update(ShopBindingModel? Model) + { + if (Model is null) + return; + + ShopName = Model.ShopName; + Address = Model.Address; + OpeningDate = Model.OpeningDate; + RepairsMaxCount = Model.RepairsMaxCount; + } + + public ShopViewModel GetViewModel => new() + { + Id = Id, + ShopName = ShopName, + Address = Address, + OpeningDate = OpeningDate, + ShopRepairs = ShopRepairs, + RepairsMaxCount = RepairsMaxCount, + }; + } +} diff --git a/AutoWorkshopView/AutoWorkshopView.csproj b/AutoWorkshopView/AutoWorkshopView.csproj index 8628399..1b94f45 100644 --- a/AutoWorkshopView/AutoWorkshopView.csproj +++ b/AutoWorkshopView/AutoWorkshopView.csproj @@ -26,6 +26,9 @@ Always + + Always + \ No newline at end of file diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs b/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs new file mode 100644 index 0000000..6cfd4fa --- /dev/null +++ b/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs @@ -0,0 +1,89 @@ +namespace AutoWorkshopView.Forms +{ + 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(); + ToPdfButton = new Button(); + CreateButton = new Button(); + Panel.SuspendLayout(); + SuspendLayout(); + // + // Panel + // + Panel.Controls.Add(ToPdfButton); + Panel.Controls.Add(CreateButton); + Panel.Dock = DockStyle.Top; + Panel.Location = new Point(0, 0); + Panel.Margin = new Padding(3, 2, 3, 2); + Panel.Name = "Panel"; + Panel.Size = new Size(849, 39); + Panel.TabIndex = 1; + // + // ToPdfButton + // + ToPdfButton.Location = new Point(425, 9); + ToPdfButton.Margin = new Padding(3, 2, 3, 2); + ToPdfButton.Name = "ToPdfButton"; + ToPdfButton.Size = new Size(360, 22); + ToPdfButton.TabIndex = 5; + ToPdfButton.Text = "В PDF"; + ToPdfButton.UseVisualStyleBackColor = true; + ToPdfButton.Click += ButtonToPdf_Click; + // + // CreateButton + // + CreateButton.Location = new Point(43, 9); + CreateButton.Margin = new Padding(3, 2, 3, 2); + CreateButton.Name = "CreateButton"; + CreateButton.Size = new Size(330, 22); + CreateButton.TabIndex = 4; + CreateButton.Text = "Сформировать"; + CreateButton.UseVisualStyleBackColor = true; + CreateButton.Click += ButtonMake_Click; + // + // FormReportGroupedOrders + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(849, 338); + Controls.Add(Panel); + Margin = new Padding(3, 2, 3, 2); + Name = "FormReportGroupedOrders"; + Text = "Объединенные по датам заказы"; + Panel.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private Panel Panel; + private Button ToPdfButton; + private Button CreateButton; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.cs b/AutoWorkshopView/Forms/FormReportGroupedOrders.cs new file mode 100644 index 0000000..20d155d --- /dev/null +++ b/AutoWorkshopView/Forms/FormReportGroupedOrders.cs @@ -0,0 +1,75 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; + +namespace AutoWorkshopView.Forms +{ + 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 ButtonMake_Click(object sender, EventArgs e) + { + try + { + var DataSource = _logic.GetGroupedOrders(); + var Source = new ReportDataSource("DataSetGroupedOrders", DataSource); + _reportViewer.LocalReport.DataSources.Clear(); + _reportViewer.LocalReport.DataSources.Add(Source); + + _reportViewer.RefreshReport(); + _logger.LogInformation("Загрузка списка заказов, объединенных по датам"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка заказов, объединенных по датам"); + 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 + { + System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance); + _logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel + { + FileName = Dialog.FileName, + }); + + _logger.LogInformation("Сохранение списка заказов, объединенных по датам"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка заказов, объединенных по датам"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.resx b/AutoWorkshopView/Forms/FormReportGroupedOrders.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/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/AutoWorkshopView/Forms/FormReportShop.Designer.cs b/AutoWorkshopView/Forms/FormReportShop.Designer.cs new file mode 100644 index 0000000..fa4a2c3 --- /dev/null +++ b/AutoWorkshopView/Forms/FormReportShop.Designer.cs @@ -0,0 +1,115 @@ +namespace AutoWorkshopView.Forms +{ + partial class FormReportShop + { + /// + /// 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() + { + SaveToExcelButton = new Button(); + DataGridView = new DataGridView(); + ColumnShop = new DataGridViewTextBoxColumn(); + ColumnRepair = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); + SuspendLayout(); + // + // SaveToExcelButton + // + SaveToExcelButton.Location = new Point(12, 10); + SaveToExcelButton.Margin = new Padding(3, 2, 3, 2); + SaveToExcelButton.Name = "SaveToExcelButton"; + SaveToExcelButton.Size = new Size(195, 27); + SaveToExcelButton.TabIndex = 3; + SaveToExcelButton.Text = "Сохранить в Excel"; + SaveToExcelButton.UseVisualStyleBackColor = true; + SaveToExcelButton.Click += ButtonSaveToExcel_Click; + // + // DataGridView + // + DataGridView.AllowUserToAddRows = false; + DataGridView.AllowUserToDeleteRows = false; + DataGridView.AllowUserToOrderColumns = true; + DataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnRepair, ColumnCount }); + DataGridView.Dock = DockStyle.Bottom; + DataGridView.Location = new Point(0, 50); + DataGridView.Margin = new Padding(3, 2, 3, 2); + DataGridView.Name = "DataGridView"; + DataGridView.ReadOnly = true; + DataGridView.RowHeadersWidth = 51; + DataGridView.RowTemplate.Height = 29; + DataGridView.Size = new Size(523, 288); + DataGridView.TabIndex = 2; + // + // ColumnShop + // + ColumnShop.FillWeight = 130F; + ColumnShop.HeaderText = "Магазин"; + ColumnShop.MinimumWidth = 6; + ColumnShop.Name = "ColumnShop"; + ColumnShop.ReadOnly = true; + // + // ColumnRepair + // + ColumnRepair.FillWeight = 140F; + ColumnRepair.HeaderText = "Ремонт"; + ColumnRepair.MinimumWidth = 6; + ColumnRepair.Name = "ColumnRepair"; + ColumnRepair.ReadOnly = true; + // + // ColumnCount + // + ColumnCount.FillWeight = 90F; + ColumnCount.HeaderText = "Количество"; + ColumnCount.MinimumWidth = 6; + ColumnCount.Name = "ColumnCount"; + ColumnCount.ReadOnly = true; + // + // FormReportShop + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(523, 338); + Controls.Add(SaveToExcelButton); + Controls.Add(DataGridView); + Margin = new Padding(3, 2, 3, 2); + Name = "FormReportShop"; + Text = "Загруженность магазинов"; + Load += FormReportShop_Load; + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private Button SaveToExcelButton; + private DataGridView DataGridView; + private DataGridViewTextBoxColumn ColumnShop; + private DataGridViewTextBoxColumn ColumnRepair; + private DataGridViewTextBoxColumn ColumnCount; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/FormReportShop.cs b/AutoWorkshopView/Forms/FormReportShop.cs new file mode 100644 index 0000000..95530d4 --- /dev/null +++ b/AutoWorkshopView/Forms/FormReportShop.cs @@ -0,0 +1,75 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms +{ + public partial class FormReportShop : Form + { + private readonly ILogger _logger; + private readonly IReportLogic _logic; + + public FormReportShop(ILogger Logger, IReportLogic Logic) + { + InitializeComponent(); + + _logger = Logger; + _logic = Logic; + } + + private void FormReportShop_Load(object sender, EventArgs e) + { + try + { + var Shops = _logic.GetShops(); + if (Shops != null) + { + DataGridView.Rows.Clear(); + + foreach (var Shop in Shops) + { + DataGridView.Rows.Add(new object[] { Shop.ShopName, "", "" }); + + foreach (var Repair in Shop.Repairs) + { + DataGridView.Rows.Add(new object[] { "", Repair.Item1, Repair.Item2 }); + } + + DataGridView.Rows.Add(new object[] { "Итого", "", Shop.TotalCount }); + DataGridView.Rows.Add(Array.Empty()); + } + } + + _logger.LogInformation("Загрузка списка ремонтов по магазинам"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка ремонтов по магазинам"); + 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.SaveShopsToExcelFile(new ReportBindingModel + { + FileName = Dialog.FileName + }); + + _logger.LogInformation("Сохранение списка ремонтов по магазинам"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка ремонтов по магазинам"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } +} diff --git a/AutoWorkshopView/Forms/FormReportShop.resx b/AutoWorkshopView/Forms/FormReportShop.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/FormReportShop.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/AutoWorkshopView/Forms/Shop/FormCreateSupply.Designer.cs b/AutoWorkshopView/Forms/Shop/FormCreateSupply.Designer.cs new file mode 100644 index 0000000..69a5844 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormCreateSupply.Designer.cs @@ -0,0 +1,146 @@ +namespace AutoWorkshopView.Forms.Shop +{ + partial class FormCreateSupply + { + /// + /// 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 + + private void InitializeComponent() + { + ShopComboBox = new ComboBox(); + ShopLabel = new Label(); + RepairLabel = new Label(); + RepairComboBox = new ComboBox(); + CountLabel = new Label(); + CountTextbox = new TextBox(); + CancelButton = new Button(); + SaveButton = new Button(); + SuspendLayout(); + // + // ShopComboBox + // + ShopComboBox.DropDownStyle = ComboBoxStyle.DropDownList; + ShopComboBox.FormattingEnabled = true; + ShopComboBox.Location = new Point(101, 9); + ShopComboBox.Margin = new Padding(3, 2, 3, 2); + ShopComboBox.Name = "ShopComboBox"; + ShopComboBox.Size = new Size(302, 23); + ShopComboBox.TabIndex = 0; + // + // ShopLabel + // + ShopLabel.AutoSize = true; + ShopLabel.Location = new Point(10, 12); + ShopLabel.Name = "ShopLabel"; + ShopLabel.Size = new Size(60, 15); + ShopLabel.TabIndex = 1; + ShopLabel.Text = "Магазин: "; + // + // RepairLabel + // + RepairLabel.AutoSize = true; + RepairLabel.Location = new Point(11, 39); + RepairLabel.Name = "RepairLabel"; + RepairLabel.Size = new Size(51, 15); + RepairLabel.TabIndex = 2; + RepairLabel.Text = "Ремонт:"; + // + // RepairComboBox + // + RepairComboBox.DropDownStyle = ComboBoxStyle.DropDownList; + RepairComboBox.FormattingEnabled = true; + RepairComboBox.Location = new Point(101, 36); + RepairComboBox.Margin = new Padding(3, 2, 3, 2); + RepairComboBox.Name = "RepairComboBox"; + RepairComboBox.Size = new Size(302, 23); + RepairComboBox.TabIndex = 3; + // + // CountLabel + // + CountLabel.AutoSize = true; + CountLabel.Location = new Point(11, 66); + CountLabel.Name = "CountLabel"; + CountLabel.Size = new Size(78, 15); + CountLabel.TabIndex = 4; + CountLabel.Text = "Количество: "; + // + // CountTextbox + // + CountTextbox.Location = new Point(101, 63); + CountTextbox.Margin = new Padding(3, 2, 3, 2); + CountTextbox.Name = "CountTextbox"; + CountTextbox.Size = new Size(302, 23); + CountTextbox.TabIndex = 5; + // + // CancelButton + // + CancelButton.Location = new Point(301, 100); + CancelButton.Margin = new Padding(3, 2, 3, 2); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(102, 29); + CancelButton.TabIndex = 6; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += CancelButton_Click; + // + // SaveButton + // + SaveButton.Location = new Point(183, 100); + SaveButton.Margin = new Padding(3, 2, 3, 2); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(102, 29); + SaveButton.TabIndex = 7; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += SaveButton_Click; + // + // FormCreateSupply + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(417, 143); + Controls.Add(SaveButton); + Controls.Add(CancelButton); + Controls.Add(CountTextbox); + Controls.Add(CountLabel); + Controls.Add(RepairComboBox); + Controls.Add(RepairLabel); + Controls.Add(ShopLabel); + Controls.Add(ShopComboBox); + Margin = new Padding(3, 2, 3, 2); + Name = "FormCreateSupply"; + Text = "Создание поставки"; + Load += FormCreateSupply_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private ComboBox ShopComboBox; + private Label ShopLabel; + private Label RepairLabel; + private ComboBox RepairComboBox; + private Label CountLabel; + private TextBox CountTextbox; + private Button CancelButton; + private Button SaveButton; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/Shop/FormCreateSupply.cs b/AutoWorkshopView/Forms/Shop/FormCreateSupply.cs new file mode 100644 index 0000000..f9afb68 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormCreateSupply.cs @@ -0,0 +1,99 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.BusinessLogicsContracts; +using AutoWorkshopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms.Shop +{ + public partial class FormCreateSupply : Form + { + private readonly ILogger _logger; + private readonly IRepairLogic _repairLogic; + private readonly IShopLogic _shopLogic; + + private List _shopList = new List(); + private List _RepairList = new List(); + + public FormCreateSupply(ILogger Logger, IRepairLogic RepairLogic, IShopLogic ShopLogic) + { + InitializeComponent(); + + _logger = Logger; + _repairLogic = RepairLogic; + _shopLogic = ShopLogic; + } + + private void FormCreateSupply_Load(object sender, EventArgs e) + { + _shopList = _shopLogic.ReadList(null); + _RepairList = _repairLogic.ReadList(null); + + if (_shopList != null) + { + ShopComboBox.DisplayMember = "ShopName"; + ShopComboBox.ValueMember = "Id"; + ShopComboBox.DataSource = _shopList; + ShopComboBox.SelectedItem = null; + _logger.LogInformation("Загрузка магазинов для поставок"); + } + + if (_RepairList != null) + { + RepairComboBox.DisplayMember = "RepairName"; + RepairComboBox.ValueMember = "Id"; + RepairComboBox.DataSource = _RepairList; + RepairComboBox.SelectedItem = null; + _logger.LogInformation("Загрузка ремонтов для поставок"); + } + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (ShopComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (RepairComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Создание поставки"); + + try + { + var OperationResult = _shopLogic.MakeSupply(new SupplyBindingModel + { + ShopId = Convert.ToInt32(ShopComboBox.SelectedValue), + RepairId = Convert.ToInt32(RepairComboBox.SelectedValue), + Count = Convert.ToInt32(CountTextbox.Text) + }); + + if (!OperationResult) + { + throw new Exception("Ошибка при создании поставки. Дополнительная информация в логах."); + } + + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + + DialogResult = DialogResult.OK; + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания поставки"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void CancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AutoWorkshopView/Forms/Shop/FormCreateSupply.resx b/AutoWorkshopView/Forms/Shop/FormCreateSupply.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormCreateSupply.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/AutoWorkshopView/Forms/Shop/FormSellRepair.Designer.cs b/AutoWorkshopView/Forms/Shop/FormSellRepair.Designer.cs new file mode 100644 index 0000000..26e3cea --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormSellRepair.Designer.cs @@ -0,0 +1,125 @@ +namespace AutoWorkshopView.Forms.Shop +{ + partial class FormSellRepair + { + /// + /// 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() + { + RepairLabel = new Label(); + RepairComboBox = new ComboBox(); + CountLabel = new Label(); + CountTextBox = new TextBox(); + SellButton = new Button(); + CancelButton = new Button(); + SuspendLayout(); + // + // RepairLabel + // + RepairLabel.AutoSize = true; + RepairLabel.Location = new Point(10, 11); + RepairLabel.Name = "RepairLabel"; + RepairLabel.Size = new Size(54, 15); + RepairLabel.TabIndex = 0; + RepairLabel.Text = "Ремонт: "; + // + // RepairComboBox + // + RepairComboBox.DropDownStyle = ComboBoxStyle.DropDownList; + RepairComboBox.FormattingEnabled = true; + RepairComboBox.Location = new Point(94, 8); + RepairComboBox.Margin = new Padding(3, 2, 3, 2); + RepairComboBox.Name = "RepairComboBox"; + RepairComboBox.Size = new Size(217, 23); + RepairComboBox.TabIndex = 1; + // + // CountLabel + // + CountLabel.AutoSize = true; + CountLabel.Location = new Point(10, 41); + CountLabel.Name = "CountLabel"; + CountLabel.Size = new Size(78, 15); + CountLabel.TabIndex = 2; + CountLabel.Text = "Количество: "; + // + // CountTextBox + // + CountTextBox.Location = new Point(94, 39); + CountTextBox.Margin = new Padding(3, 2, 3, 2); + CountTextBox.Name = "CountTextBox"; + CountTextBox.Size = new Size(217, 23); + CountTextBox.TabIndex = 3; + // + // SellButton + // + SellButton.Location = new Point(117, 77); + SellButton.Margin = new Padding(3, 2, 3, 2); + SellButton.Name = "SellButton"; + SellButton.Size = new Size(92, 30); + SellButton.TabIndex = 4; + SellButton.Text = "Продать"; + SellButton.UseVisualStyleBackColor = true; + SellButton.Click += SellButton_Click; + // + // CancelButton + // + CancelButton.Location = new Point(215, 77); + CancelButton.Margin = new Padding(3, 2, 3, 2); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(96, 30); + CancelButton.TabIndex = 5; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += ButtonCancel_Click; + // + // FormSellRepair + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(325, 122); + Controls.Add(CancelButton); + Controls.Add(SellButton); + Controls.Add(CountTextBox); + Controls.Add(CountLabel); + Controls.Add(RepairComboBox); + Controls.Add(RepairLabel); + Margin = new Padding(3, 2, 3, 2); + Name = "FormSellRepair"; + Text = "Продажа ремонтов"; + Load += FormSellRepair_Load; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label RepairLabel; + private ComboBox RepairComboBox; + private Label CountLabel; + private TextBox CountTextBox; + private Button SellButton; + private Button CancelButton; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/Shop/FormSellRepair.cs b/AutoWorkshopView/Forms/Shop/FormSellRepair.cs new file mode 100644 index 0000000..ad41bd8 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormSellRepair.cs @@ -0,0 +1,87 @@ +using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.BusinessLogicsContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopContracts.ViewModels; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms.Shop +{ + public partial class FormSellRepair : Form + { + private readonly ILogger _logger; + + private readonly IRepairLogic _repairLogic; + private readonly IShopLogic _shopLogic; + + private List _repairList = new List(); + + public FormSellRepair(ILogger Logger, IRepairLogic RepairLogic, IShopLogic ShopLogic) + { + InitializeComponent(); + + _logger = Logger; + _repairLogic = RepairLogic; + _shopLogic = ShopLogic; + } + + private void FormSellRepair_Load(object sender, EventArgs e) + { + _repairList = _repairLogic.ReadList(null); + + if (_repairList != null) + { + RepairComboBox.DisplayMember = "RepairName"; + RepairComboBox.ValueMember = "Id"; + RepairComboBox.DataSource = _repairList; + RepairComboBox.SelectedItem = null; + + _logger.LogInformation("Загрузка ремонтов для продажи"); + } + } + + private void SellButton_Click(object sender, EventArgs e) + { + if (RepairComboBox.SelectedValue == null) + { + MessageBox.Show("Выберите ремонт", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Создание покупки"); + + try + { + bool Result = _shopLogic.MakeSell(new SupplySearchModel + { + RepairId = Convert.ToInt32(RepairComboBox.SelectedValue), + Count = Convert.ToInt32(CountTextBox.Text) + }); + + if (Result) + { + _logger.LogInformation("Проверка пройдена, продажа проведена"); + MessageBox.Show("Продажа проведена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + + DialogResult = DialogResult.OK; + Close(); + } + else + { + _logger.LogInformation("Проверка не пройдена"); + MessageBox.Show("Продажа не может быть создана.", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Warning); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка создания покупки"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AutoWorkshopView/Forms/Shop/FormSellRepair.resx b/AutoWorkshopView/Forms/Shop/FormSellRepair.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormSellRepair.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/AutoWorkshopView/Forms/Shop/FormShop.Designer.cs b/AutoWorkshopView/Forms/Shop/FormShop.Designer.cs new file mode 100644 index 0000000..962758d --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormShop.Designer.cs @@ -0,0 +1,222 @@ +namespace AutoWorkshopView.Forms.Shop +{ + 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() + { + NameLabel = new Label(); + NameTextBox = new TextBox(); + AddressTextBox = new TextBox(); + AddressLabel = new Label(); + CancelButton = new Button(); + SaveButton = new Button(); + ViewDataGrid = new DataGridView(); + IdColumn = new DataGridViewTextBoxColumn(); + RepairNameColumn = new DataGridViewTextBoxColumn(); + CountColumn = new DataGridViewTextBoxColumn(); + OpeningDateLabel = new Label(); + OpenDateTimePicker = new DateTimePicker(); + RepairsMaxCountLabel = new Label(); + RepairsMaxCountNumericUp = new NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)ViewDataGrid).BeginInit(); + ((System.ComponentModel.ISupportInitialize)RepairsMaxCountNumericUp).BeginInit(); + SuspendLayout(); + // + // NameLabel + // + NameLabel.AutoSize = true; + NameLabel.Location = new Point(9, 9); + NameLabel.Name = "NameLabel"; + NameLabel.Size = new Size(65, 15); + NameLabel.TabIndex = 0; + NameLabel.Text = "Название: "; + // + // NameTextBox + // + NameTextBox.Location = new Point(105, 6); + NameTextBox.Margin = new Padding(3, 2, 3, 2); + NameTextBox.Name = "NameTextBox"; + NameTextBox.Size = new Size(210, 23); + NameTextBox.TabIndex = 1; + // + // AddressTextBox + // + AddressTextBox.Location = new Point(105, 33); + AddressTextBox.Margin = new Padding(3, 2, 3, 2); + AddressTextBox.Name = "AddressTextBox"; + AddressTextBox.Size = new Size(210, 23); + AddressTextBox.TabIndex = 3; + // + // AddressLabel + // + AddressLabel.AutoSize = true; + AddressLabel.Location = new Point(10, 36); + AddressLabel.Name = "AddressLabel"; + AddressLabel.Size = new Size(46, 15); + AddressLabel.TabIndex = 2; + AddressLabel.Text = "Адрес: "; + // + // CancelButton + // + CancelButton.Location = new Point(345, 302); + CancelButton.Margin = new Padding(3, 2, 3, 2); + CancelButton.Name = "CancelButton"; + CancelButton.Size = new Size(100, 25); + CancelButton.TabIndex = 5; + CancelButton.Text = "Отмена"; + CancelButton.UseVisualStyleBackColor = true; + CancelButton.Click += CancelButton_Click; + // + // SaveButton + // + SaveButton.Location = new Point(239, 302); + SaveButton.Margin = new Padding(3, 2, 3, 2); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(100, 25); + SaveButton.TabIndex = 6; + SaveButton.Text = "Сохранить"; + SaveButton.UseVisualStyleBackColor = true; + SaveButton.Click += SaveButton_Click; + // + // ViewDataGrid + // + ViewDataGrid.AllowUserToAddRows = false; + ViewDataGrid.AllowUserToDeleteRows = false; + ViewDataGrid.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + ViewDataGrid.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + ViewDataGrid.Columns.AddRange(new DataGridViewColumn[] { IdColumn, RepairNameColumn, CountColumn }); + ViewDataGrid.Location = new Point(9, 126); + ViewDataGrid.Margin = new Padding(3, 2, 3, 2); + ViewDataGrid.Name = "ViewDataGrid"; + ViewDataGrid.ReadOnly = true; + ViewDataGrid.RowHeadersBorderStyle = DataGridViewHeaderBorderStyle.None; + ViewDataGrid.RowHeadersWidthSizeMode = DataGridViewRowHeadersWidthSizeMode.AutoSizeToDisplayedHeaders; + ViewDataGrid.RowTemplate.Height = 29; + ViewDataGrid.Size = new Size(436, 172); + ViewDataGrid.TabIndex = 7; + // + // IdColumn + // + IdColumn.HeaderText = "Id"; + IdColumn.MinimumWidth = 6; + IdColumn.Name = "IdColumn"; + IdColumn.ReadOnly = true; + IdColumn.Visible = false; + // + // RepairNameColumn + // + RepairNameColumn.HeaderText = "Ремонт"; + RepairNameColumn.MinimumWidth = 6; + RepairNameColumn.Name = "RepairNameColumn"; + RepairNameColumn.ReadOnly = true; + // + // CountColumn + // + CountColumn.HeaderText = "Количество"; + CountColumn.MinimumWidth = 6; + CountColumn.Name = "CountColumn"; + CountColumn.ReadOnly = true; + // + // OpeningDateLabel + // + OpeningDateLabel.AutoSize = true; + OpeningDateLabel.Location = new Point(9, 63); + OpeningDateLabel.Name = "OpeningDateLabel"; + OpeningDateLabel.Size = new Size(90, 15); + OpeningDateLabel.TabIndex = 8; + OpeningDateLabel.Text = "Дата открытия:"; + // + // OpenDateTimePicker + // + OpenDateTimePicker.Location = new Point(105, 60); + OpenDateTimePicker.Margin = new Padding(3, 2, 3, 2); + OpenDateTimePicker.Name = "OpenDateTimePicker"; + OpenDateTimePicker.Size = new Size(210, 23); + OpenDateTimePicker.TabIndex = 9; + // + // RepairsMaxCountLabel + // + RepairsMaxCountLabel.AutoSize = true; + RepairsMaxCountLabel.Location = new Point(9, 90); + RepairsMaxCountLabel.Name = "RepairsMaxCountLabel"; + RepairsMaxCountLabel.Size = new Size(83, 15); + RepairsMaxCountLabel.TabIndex = 10; + RepairsMaxCountLabel.Text = "Вместимость:"; + // + // RepairsMaxCountNumericUp + // + RepairsMaxCountNumericUp.Location = new Point(105, 87); + RepairsMaxCountNumericUp.Margin = new Padding(3, 2, 3, 2); + RepairsMaxCountNumericUp.Maximum = new decimal(new int[] { 10000, 0, 0, 0 }); + RepairsMaxCountNumericUp.Name = "RepairsMaxCountNumericUp"; + RepairsMaxCountNumericUp.Size = new Size(210, 23); + RepairsMaxCountNumericUp.TabIndex = 11; + // + // FormShop + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(460, 340); + Controls.Add(RepairsMaxCountNumericUp); + Controls.Add(RepairsMaxCountLabel); + Controls.Add(OpenDateTimePicker); + Controls.Add(OpeningDateLabel); + Controls.Add(ViewDataGrid); + Controls.Add(SaveButton); + Controls.Add(CancelButton); + Controls.Add(AddressTextBox); + Controls.Add(AddressLabel); + Controls.Add(NameTextBox); + Controls.Add(NameLabel); + Margin = new Padding(3, 2, 3, 2); + Name = "FormShop"; + Text = "Магазин"; + Load += FormShop_Load; + ((System.ComponentModel.ISupportInitialize)ViewDataGrid).EndInit(); + ((System.ComponentModel.ISupportInitialize)RepairsMaxCountNumericUp).EndInit(); + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private Label NameLabel; + private TextBox NameTextBox; + private TextBox AddressTextBox; + private Label AddressLabel; + private Button CancelButton; + private Button SaveButton; + private DataGridView ViewDataGrid; + private DataGridViewTextBoxColumn IdColumn; + private DataGridViewTextBoxColumn RepairNameColumn; + private DataGridViewTextBoxColumn CountColumn; + private Label OpeningDateLabel; + private DateTimePicker OpenDateTimePicker; + private Label RepairsMaxCountLabel; + private NumericUpDown RepairsMaxCountNumericUp; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/Shop/FormShop.cs b/AutoWorkshopView/Forms/Shop/FormShop.cs new file mode 100644 index 0000000..73a055c --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormShop.cs @@ -0,0 +1,136 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicsContracts; +using AutoWorkshopContracts.SearchModels; +using AutoWorkshopDataModels.Models; +using Microsoft.Extensions.Logging; +using System.Windows.Forms; + +namespace AutoWorkshopView.Forms.Shop +{ + public partial class FormShop : Form + { + private readonly ILogger _logger; + private readonly IShopLogic _logic; + + private int? _id; + + public int Id { set { _id = value; } } + + private Dictionary _shopRepairs; + private DateTime? _openingDate = null; + + 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("Загрузка магазина"); + + try + { + var View = _logic.ReadElement(new ShopSearchModel + { + Id = _id.Value + }); + + if (View != null) + { + NameTextBox.Text = View.ShopName; + AddressTextBox.Text = View.Address; + OpenDateTimePicker.Value = View.OpeningDate; + RepairsMaxCountNumericUp.Value = View.RepairsMaxCount; + _shopRepairs = View.ShopRepairs ?? new Dictionary(); + + LoadData(); + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + private void LoadData() + { + _logger.LogInformation("Загрузка ремонтов в магазине"); + + try + { + if (_shopRepairs != null) + { + ViewDataGrid.Rows.Clear(); + foreach (var ShopRepair in _shopRepairs) + { + ViewDataGrid.Rows.Add(new object[] { ShopRepair.Key, ShopRepair.Value.Item1.RepairName, ShopRepair.Value.Item2 }); + } + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки изделий магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void SaveButton_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(NameTextBox.Text)) + { + MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + if (string.IsNullOrEmpty(AddressTextBox.Text)) + { + MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + + _logger.LogInformation("Сохранение магазина"); + + try + { + var Model = new ShopBindingModel + { + Id = _id ?? 0, + ShopName = NameTextBox.Text, + Address = AddressTextBox.Text, + OpeningDate = OpenDateTimePicker.Value, + RepairsMaxCount = (int)RepairsMaxCountNumericUp.Value, + }; + + var OperationResult = _id.HasValue ? _logic.Update(Model) : _logic.Create(Model); + if (!OperationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + + MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + DialogResult = DialogResult.OK; + + Close(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void CancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} diff --git a/AutoWorkshopView/Forms/Shop/FormShop.resx b/AutoWorkshopView/Forms/Shop/FormShop.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/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/AutoWorkshopView/Forms/Shop/FormShops.Designer.cs b/AutoWorkshopView/Forms/Shop/FormShops.Designer.cs new file mode 100644 index 0000000..4e84a6b --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormShops.Designer.cs @@ -0,0 +1,136 @@ +namespace AutoWorkshopView.Forms.Shop +{ + 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() + { + ToolsPanel = new Panel(); + RefreshButton = new Button(); + DeleteButton = new Button(); + UpdateButton = new Button(); + AddButton = new Button(); + ViewDataGrid = new DataGridView(); + ToolsPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)ViewDataGrid).BeginInit(); + SuspendLayout(); + // + // ToolsPanel + // + ToolsPanel.Controls.Add(RefreshButton); + ToolsPanel.Controls.Add(DeleteButton); + ToolsPanel.Controls.Add(UpdateButton); + ToolsPanel.Controls.Add(AddButton); + ToolsPanel.Location = new Point(532, 9); + ToolsPanel.Margin = new Padding(3, 2, 3, 2); + ToolsPanel.Name = "ToolsPanel"; + ToolsPanel.Size = new Size(117, 320); + ToolsPanel.TabIndex = 3; + // + // RefreshButton + // + RefreshButton.Location = new Point(3, 105); + RefreshButton.Margin = new Padding(3, 2, 3, 2); + RefreshButton.Name = "RefreshButton"; + RefreshButton.Size = new Size(110, 27); + RefreshButton.TabIndex = 3; + RefreshButton.Text = "Обновить"; + RefreshButton.UseVisualStyleBackColor = true; + RefreshButton.Click += RefreshButton_Click; + // + // DeleteButton + // + DeleteButton.Location = new Point(3, 74); + DeleteButton.Margin = new Padding(3, 2, 3, 2); + DeleteButton.Name = "DeleteButton"; + DeleteButton.Size = new Size(110, 27); + DeleteButton.TabIndex = 2; + DeleteButton.Text = "Удалить"; + DeleteButton.UseVisualStyleBackColor = true; + DeleteButton.Click += DeleteButton_Click; + // + // UpdateButton + // + UpdateButton.Location = new Point(3, 43); + UpdateButton.Margin = new Padding(3, 2, 3, 2); + UpdateButton.Name = "UpdateButton"; + UpdateButton.Size = new Size(110, 27); + UpdateButton.TabIndex = 1; + UpdateButton.Text = "Изменить"; + UpdateButton.UseVisualStyleBackColor = true; + UpdateButton.Click += UpdateButton_Click; + // + // AddButton + // + AddButton.Location = new Point(3, 12); + AddButton.Margin = new Padding(3, 2, 3, 2); + AddButton.Name = "AddButton"; + AddButton.Size = new Size(110, 27); + AddButton.TabIndex = 0; + AddButton.Text = "Добавить"; + AddButton.UseVisualStyleBackColor = true; + AddButton.Click += AddButton_Click; + // + // ViewDataGrid + // + ViewDataGrid.AllowUserToAddRows = false; + ViewDataGrid.AllowUserToDeleteRows = false; + ViewDataGrid.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + ViewDataGrid.Location = new Point(10, 9); + ViewDataGrid.Margin = new Padding(3, 2, 3, 2); + ViewDataGrid.Name = "ViewDataGrid"; + ViewDataGrid.ReadOnly = true; + ViewDataGrid.RowHeadersWidth = 51; + ViewDataGrid.RowTemplate.Height = 29; + ViewDataGrid.Size = new Size(516, 320); + ViewDataGrid.TabIndex = 2; + // + // FormShops + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(660, 338); + Controls.Add(ToolsPanel); + Controls.Add(ViewDataGrid); + Margin = new Padding(3, 2, 3, 2); + Name = "FormShops"; + Text = "Магазины"; + Load += FormShops_Load; + ToolsPanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)ViewDataGrid).EndInit(); + ResumeLayout(false); + } + + #endregion + + private Panel ToolsPanel; + private Button RefreshButton; + private Button DeleteButton; + private Button UpdateButton; + private Button AddButton; + private DataGridView ViewDataGrid; + } +} \ No newline at end of file diff --git a/AutoWorkshopView/Forms/Shop/FormShops.cs b/AutoWorkshopView/Forms/Shop/FormShops.cs new file mode 100644 index 0000000..bfad6d7 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/FormShops.cs @@ -0,0 +1,113 @@ +using AutoWorkshopContracts.BindingModels; +using AutoWorkshopContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace AutoWorkshopView.Forms.Shop +{ + 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) + { + ViewDataGrid.DataSource = List; + ViewDataGrid.Columns["Id"].Visible = false; + ViewDataGrid.Columns["ShopRepairs"].Visible = false; + ViewDataGrid.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + + _logger.LogInformation("Загрузка магазинов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки магазинов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void AddButton_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormShop)); + + if (Service is FormShop Form) + { + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + + private void UpdateButton_Click(object sender, EventArgs e) + { + if (ViewDataGrid.SelectedRows.Count == 1) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormShop)); + if (Service is FormShop Form) + { + Form.Id = Convert.ToInt32(ViewDataGrid.SelectedRows[0].Cells["Id"].Value); + + if (Form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } + } + } + + private void DeleteButton_Click(object sender, EventArgs e) + { + if (ViewDataGrid.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int Id = Convert.ToInt32(ViewDataGrid.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Удаление магазина"); + + try + { + if (!_logic.Delete(new ShopBindingModel + { + Id = Id + })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка удаления магазина"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void RefreshButton_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/AutoWorkshopView/Forms/Shop/FormShops.resx b/AutoWorkshopView/Forms/Shop/FormShops.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/AutoWorkshopView/Forms/Shop/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/AutoWorkshopView/MainForm.Designer.cs b/AutoWorkshopView/MainForm.Designer.cs index 17b5abc..e6e2765 100644 --- a/AutoWorkshopView/MainForm.Designer.cs +++ b/AutoWorkshopView/MainForm.Designer.cs @@ -32,11 +32,19 @@ ToolStripMenu = new ToolStripMenuItem(); ComponentsStripMenuItem = new ToolStripMenuItem(); RepairStripMenuItem = new ToolStripMenuItem(); + ShopsToolStripMenuItem = new ToolStripMenuItem(); + OperationToolStripMenuItem = new ToolStripMenuItem(); + TransactionToolStripMenuItem = new ToolStripMenuItem(); + SaleToolStripMenuItem = new ToolStripMenuItem(); + ReportsToolStripMenuItem = new ToolStripMenuItem(); ClientsToolStripMenuItem = new ToolStripMenuItem(); ReportsToolStripMenuItem = new ToolStripMenuItem(); - ComponentsToolStripMenuItem1 = new ToolStripMenuItem(); - ComponentRepairToolStripMenuItem1 = new ToolStripMenuItem(); + ReportRepairsToolStripMenuItem = new ToolStripMenuItem(); + ReportRepCompToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); + ReportShopsToolStripMenuItem = new ToolStripMenuItem(); + RepostBusyShopsToolStripMenuItem = new ToolStripMenuItem(); + ReportGroupOrdersToolStripMenuItem = new ToolStripMenuItem(); DataGridView = new DataGridView(); CreateOrderButton = new Button(); TakeInWorkButton = new Button(); @@ -50,7 +58,7 @@ // MenuStrip // MenuStrip.ImageScalingSize = new Size(20, 20); - MenuStrip.Items.AddRange(new ToolStripItem[] { ToolStripMenu, ReportsToolStripMenuItem }); + MenuStrip.Items.AddRange(new ToolStripItem[] { ToolStripMenu, OperationToolStripMenuItem, ReportsToolStripMenuItem }); MenuStrip.Location = new Point(0, 0); MenuStrip.Name = "MenuStrip"; MenuStrip.Padding = new Padding(5, 2, 0, 2); @@ -60,24 +68,58 @@ // // ToolStripMenu // - ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { ComponentsStripMenuItem, RepairStripMenuItem, ClientsToolStripMenuItem }); ToolStripMenu.Name = "ToolStripMenu"; ToolStripMenu.Size = new Size(94, 20); + ToolStripMenu.DropDownItems.AddRange(new ToolStripItem[] { ComponentsStripMenuItem, RepairStripMenuItem, ClientsToolStripMenuItem, ShopsToolStripMenuItem }); ToolStripMenu.Text = "Справочники"; // // ComponentsStripMenuItem // ComponentsStripMenuItem.Name = "ComponentsStripMenuItem"; - ComponentsStripMenuItem.Size = new Size(145, 22); + ComponentsStripMenuItem.Size = new Size(180, 22); ComponentsStripMenuItem.Text = "Компоненты"; ComponentsStripMenuItem.Click += ComponentsStripMenuItem_Click; // // RepairStripMenuItem // RepairStripMenuItem.Name = "RepairStripMenuItem"; - RepairStripMenuItem.Size = new Size(145, 22); + RepairStripMenuItem.Size = new Size(180, 22); RepairStripMenuItem.Text = "Ремонты"; RepairStripMenuItem.Click += RepairsStripMenuItem_Click; + // + // ReportsToolStripMenuItem + // + ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem"; + ShopsToolStripMenuItem.Size = new Size(180, 22); + ShopsToolStripMenuItem.Text = "Магазины"; + ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; + // + // OperationToolStripMenuItem + // + OperationToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { TransactionToolStripMenuItem, SaleToolStripMenuItem }); + OperationToolStripMenuItem.Name = "OperationToolStripMenuItem"; + OperationToolStripMenuItem.Size = new Size(75, 20); + OperationToolStripMenuItem.Text = "Операции"; + // + // TransactionToolStripMenuItem + // + TransactionToolStripMenuItem.Name = "TransactionToolStripMenuItem"; + TransactionToolStripMenuItem.Size = new Size(180, 22); + TransactionToolStripMenuItem.Text = "Поставка"; + TransactionToolStripMenuItem.Click += TransactionToolStripMenuItem_Click; + // + // SaleToolStripMenuItem + // + SaleToolStripMenuItem.Name = "SaleToolStripMenuItem"; + SaleToolStripMenuItem.Size = new Size(180, 22); + SaleToolStripMenuItem.Text = "Продажа"; + SaleToolStripMenuItem.Click += SellToolStripMenuItem_Click; + // + // ReportsToolStripMenuItem + // + ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ReportRepairsToolStripMenuItem, ReportRepCompToolStripMenuItem, OrdersToolStripMenuItem, ReportShopsToolStripMenuItem, RepostBusyShopsToolStripMenuItem, ReportGroupOrdersToolStripMenuItem }); + ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; + ReportsToolStripMenuItem.Size = new Size(60, 20); // // ClientsToolStripMenuItem // @@ -92,33 +134,54 @@ ComponentsToolStripMenuItem1, ComponentRepairToolStripMenuItem1, OrdersToolStripMenuItem}); - ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; - ReportsToolStripMenuItem.Size = new Size(60, 20); ReportsToolStripMenuItem.Text = "Отчёты"; // - // ComponentsToolStripMenuItem1 + // ReportRepairsToolStripMenuItem // - ComponentsToolStripMenuItem1.Name = "ComponentsToolStripMenuItem1"; - ComponentsToolStripMenuItem1.Size = new Size(205, 22); - ComponentsToolStripMenuItem1.Text = "Ремонты"; - ComponentsToolStripMenuItem1.Click += new EventHandler(ComponentsToolStripMenuItem_Click); + ReportRepairsToolStripMenuItem.Name = "ReportRepairsToolStripMenuItem"; + ReportRepairsToolStripMenuItem.Size = new Size(219, 22); + ReportRepairsToolStripMenuItem.Text = "Ремонты"; + ReportRepairsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // - // ComponentRepairToolStripMenuItem1 + // ReportRepCompToolStripMenuItem // - ComponentRepairToolStripMenuItem1.Name = "ComponentRepairToolStripMenuItem1"; - ComponentRepairToolStripMenuItem1.Size = new Size(205, 22); - ComponentRepairToolStripMenuItem1.Text = "Ремонт с компонентами"; - ComponentRepairToolStripMenuItem1.Click += new EventHandler(ComponentRepairToolStripMenuItem_Click); + ReportRepCompToolStripMenuItem.Name = "ReportRepCompToolStripMenuItem"; + ReportRepCompToolStripMenuItem.Size = new Size(219, 22); + ReportRepCompToolStripMenuItem.Text = "Ремонт с компонентами"; + ReportRepCompToolStripMenuItem.Click += ComponentRepairToolStripMenuItem_Click; // // OrdersToolStripMenuItem // OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(205, 22); + OrdersToolStripMenuItem.Size = new Size(219, 22); OrdersToolStripMenuItem.Text = "Заказы"; - OrdersToolStripMenuItem.Click += new EventHandler(OrdersToolStripMenuItem_Click); + OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; + // + // ReportShopsToolStripMenuItem + // + ReportShopsToolStripMenuItem.Name = "ReportShopsToolStripMenuItem"; + ReportShopsToolStripMenuItem.Size = new Size(219, 22); + ReportShopsToolStripMenuItem.Text = "Список магазинов"; + ReportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click; + // + // RepostBusyShopsToolStripMenuItem + // + RepostBusyShopsToolStripMenuItem.Name = "RepostBusyShopsToolStripMenuItem"; + RepostBusyShopsToolStripMenuItem.Size = new Size(219, 22); + RepostBusyShopsToolStripMenuItem.Text = "Загруженность магазинов"; + RepostBusyShopsToolStripMenuItem.Click += ReportBusyShopsToolStripMenuItem_Click; + // + // ReportGroupOrdersToolStripMenuItem + // + ReportGroupOrdersToolStripMenuItem.Name = "ReportGroupOrdersToolStripMenuItem"; + ReportGroupOrdersToolStripMenuItem.Size = new Size(219, 22); + ReportGroupOrdersToolStripMenuItem.Text = "Объединенные заказы"; + ReportGroupOrdersToolStripMenuItem.Click += ReportGroupOrdersToolStripMenuItem_Click; // // DataGridView // + DataGridView.AllowUserToAddRows = false; + DataGridView.AllowUserToDeleteRows = false; DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; DataGridView.Location = new Point(10, 23); DataGridView.Margin = new Padding(3, 2, 3, 2); @@ -218,10 +281,19 @@ private Button ReadyButton; private Button IssuedButton; private Button RefreshButton; + private ToolStripMenuItem ShopsToolStripMenuItem; + private ToolStripMenuItem OperationToolStripMenuItem; + private ToolStripMenuItem TransactionToolStripMenuItem; + private ToolStripMenuItem SaleToolStripMenuItem; private ToolStripMenuItem ReportsToolStripMenuItem; - private ToolStripMenuItem ComponentsToolStripMenuItem1; - private ToolStripMenuItem ComponentRepairToolStripMenuItem1; + private ToolStripMenuItem ReportRepairsToolStripMenuItem; + private ToolStripMenuItem ReportRepCompToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem; + private ToolStripMenuItem OrdersToolStripMenuItem; + private ToolStripMenuItem ReportShopsToolStripMenuItem; private ToolStripMenuItem ClientsToolStripMenuItem; } + private ToolStripMenuItem ReportGroupOrdersToolStripMenuItem; + private ToolStripMenuItem ClientsToolStripMenuItem; + } } \ No newline at end of file diff --git a/AutoWorkshopView/MainForm.cs b/AutoWorkshopView/MainForm.cs index 7fcc9a8..fd46123 100644 --- a/AutoWorkshopView/MainForm.cs +++ b/AutoWorkshopView/MainForm.cs @@ -1,6 +1,7 @@ using AutoWorkshopContracts.BindingModels; using AutoWorkshopContracts.BusinessLogicContracts; using AutoWorkshopView.Forms; +using AutoWorkshopView.Forms.Shop; using Microsoft.Extensions.Logging; namespace AutoWorkshopView @@ -169,6 +170,36 @@ namespace AutoWorkshopView LoadData(); } + private void ShopsToolStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormShops)); + + if (Service is FormShops Form) + { + Form.ShowDialog(); + } + } + + private void TransactionToolStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormCreateSupply)); + + if (Service is FormCreateSupply Form) + { + Form.ShowDialog(); + } + } + + private void SellToolStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormSellRepair)); + + if (Service is FormSellRepair Form) + { + Form.ShowDialog(); + } + } + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) { using var Dialog = new SaveFileDialog { Filter = "docx|*.docx" }; @@ -200,6 +231,38 @@ namespace AutoWorkshopView } } + private void ReportShopsToolStripMenuItem_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 ReportBusyShopsToolStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormReportShop)); + + if (Service is FormReportShop Form) + { + Form.ShowDialog(); + } + } + + private void ReportGroupOrdersToolStripMenuItem_Click(object sender, EventArgs e) + { + var Service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders)); + + if (Service is FormReportGroupedOrders Form) + { + Form.ShowDialog(); + } + } + } + private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { var Service = Program.ServiceProvider?.GetService(typeof(FormClients)); diff --git a/AutoWorkshopView/Program.cs b/AutoWorkshopView/Program.cs index d5624c6..c84e042 100644 --- a/AutoWorkshopView/Program.cs +++ b/AutoWorkshopView/Program.cs @@ -2,9 +2,11 @@ using AutoWorkshopBusinessLogic.BusinessLogics; using AutoWorkshopBusinessLogic.OfficePackage.Implements; using AutoWorkshopBusinessLogic.OfficePackage; using AutoWorkshopContracts.BusinessLogicContracts; +using AutoWorkshopContracts.BusinessLogicsContracts; using AutoWorkshopContracts.StoragesContracts; using AutoWorkshopDatabaseImplement.Implements; using AutoWorkshopView.Forms; +using AutoWorkshopView.Forms.Shop; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; @@ -39,11 +41,13 @@ namespace AutoWorkshopView Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); @@ -58,8 +62,15 @@ namespace AutoWorkshopView Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); + Services.AddTransient(); + Services.AddTransient(); + } Services.AddTransient(); } } diff --git a/AutoWorkshopView/ReportGroupedOrders.rdlc b/AutoWorkshopView/ReportGroupedOrders.rdlc new file mode 100644 index 0000000..5250730 --- /dev/null +++ b/AutoWorkshopView/ReportGroupedOrders.rdlc @@ -0,0 +1,441 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 20791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + AutoWorkshopContractsViewModels + /* Local Query */ + + + + Date + System.DateTime + + + OrdersCount + System.Int32 + + + OrdersSum + System.Decimal + + + + AutoWorkshopContracts.ViewModels + AutoWorksReportGroupedOrdersViewModelhop + AutoWorkshopContracts.ViewModels.AutoWorksReportGroupedOrdersViewModelhop, AutoWorkshopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + Отчёт по заказам + + + + 0.6cm + 16.51cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + + + + ReportParameterPeriod + 0.6cm + 0.6cm + 16.51cm + 1 + + + 2pt + 2pt + 2pt + 2pt + + + + + + + 3.90406cm + + + 3.97461cm + + + 3.65711cm + + + + + 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!OrdersCount.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!OrdersSum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetGroupedOrders + 1.88242cm + 2.68676cm + 1.2cm + 11.53578cm + 2 + + + + + + true + true + + + + + Итого: + + + + 3.29409cm + 8.06542cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!OrdersSum.Value, "DataSetGroupedOrders") + + + + + + + 3.29409cm + 10.70653cm + 0.6cm + 3.48072cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 2in +