From 6c04fe617ab550ef7a1bab1675dd42affcaf6365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?= =?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com> Date: Fri, 31 May 2024 19:49:56 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A7=D1=82=D0=BE-=D1=82=D0=BE=20=D0=91=D1=80?= =?UTF-8?q?=D1=8B=D0=BC,=20=D0=B3=D0=B4=D0=B5-=D1=82=D0=BE=20=D0=91=D0=B0?= =?UTF-8?q?=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogic/ReportLogic.cs | 88 ------ .../AbstractSaveToExcelClient.cs | 90 ++++++ ...xcel.cs => AbstractSaveToExcelEmployee.cs} | 50 +-- .../OfficePackage/AbstractSaveToWordClient.cs | 79 +++++ ...oWord.cs => AbstractSaveToWordEmployee.cs} | 56 ++-- .../{WordInfo.cs => ExcelInfoClient.cs} | 5 +- .../HelperModels/ExcelInfoEmployee.cs | 13 + .../{ExcelInfo.cs => WordInfoClient.cs} | 5 +- .../HelperModels/WordInfoEmployee.cs | 14 + .../{SaveToExcel.cs => SaveToExcelClient.cs} | 6 +- .../Implements/SaveToExcelEmployee.cs | 293 ++++++++++++++++++ .../{SaveToWord.cs => SaveToWordClient.cs} | 6 +- .../Implements/SaveToWordEmployee.cs | 135 ++++++++ .../BindingModels/ReportBindingModel.cs | 23 +- .../ReportPaymeantBindingModel.cs | 15 + .../ReportProductBindingModel.cs | 15 + .../IReportClientLogic.cs | 17 + .../IReportEmployeeLogic.cs | 17 + .../BusinessLogicContracts/IReportLogic.cs | 18 -- .../SearchModels/ReportPaymeantSearchModel.cs | 13 + .../SearchModels/ReportProductSearchModel.cs | 13 + .../SearchModels/ReportSearchModel.cs | 20 ++ .../ViewModels/ReportOrdersVeiwModel.cs | 22 -- .../ViewModels/ReportPaymeantsViewModel.cs | 14 + .../ViewModels/ReportProductsViewModel.cs | 11 +- .../DataBase.cs | 2 +- ...ner.cs => 20240531153626_Init.Designer.cs} | 4 +- ...nitMigration.cs => 20240531153626_Init.cs} | 2 +- 28 files changed, 827 insertions(+), 219 deletions(-) delete mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportLogic.cs create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/{AbstractSaveToExcel.cs => AbstractSaveToExcelEmployee.cs} (51%) create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordClient.cs rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/{AbstractSaveToWord.cs => AbstractSaveToWordEmployee.cs} (52%) rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/{WordInfo.cs => ExcelInfoClient.cs} (69%) create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/{ExcelInfo.cs => WordInfoClient.cs} (68%) create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/{SaveToExcel.cs => SaveToExcelClient.cs} (98%) create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelEmployee.cs rename ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/{SaveToWord.cs => SaveToWordClient.cs} (95%) create mode 100644 ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordEmployee.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportPaymeantBindingModel.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportProductBindingModel.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs delete mode 100644 ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportLogic.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportPaymeantSearchModel.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportProductSearchModel.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportSearchModel.cs delete mode 100644 ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportOrdersVeiwModel.cs create mode 100644 ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs rename ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/{20240531061328_InitMigration.Designer.cs => 20240531153626_Init.Designer.cs} (99%) rename ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/{20240531061328_InitMigration.cs => 20240531153626_Init.cs} (99%) diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportLogic.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportLogic.cs deleted file mode 100644 index dcc80c3..0000000 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportLogic.cs +++ /dev/null @@ -1,88 +0,0 @@ -using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; -using ElectronicsShopBusinessLogic.OfficePackage; -using ElectronicsShopContracts.SearchModels; -using ElectronicsShopContracts.StorageContracts; -using ElectronicsShopContracts.ViewModels; -using ElectronicsShopContracts.BindingModels; -using ElectronicsShopContracts.BusinessLogicContracts; - - -namespace ElectronicsShopBusinessLogic.BusinessLogic -{ - public class ReportLogic : IReportLogic - { - - private readonly IProductStorage _productStorage; - - private readonly IOrderStorage _orderStorage; - - private readonly AbstractSaveToExcel _saveToExcel; - - private readonly AbstractSaveToWord _saveToWord; - - public ReportLogic(IProductStorage productStorage, IOrderStorage orderStorage, - AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord) - { - _productStorage = productStorage; - _orderStorage = orderStorage; - - _saveToExcel = saveToExcel; - _saveToWord = saveToWord; - } - - public List GetProduct() - { - var productsList = _productStorage.GetFullList(); - - var list = new List(); - - foreach (var product in productsList) - { - var record = new ReportProductsViewModel - { - CostItemID = product.CostItemID, - ProductName = product.ProductName, - Price = product.Price, - CostItemName = product.CostItemName, - }; - list.Add(record); - } - return list; - } - - public List GetOrders(ReportBindingModel model) - { - return _orderStorage.GetFilteredList(new OrderSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }) - .Select(x => new ReportOrdersVeiwModel - { - ID = x.ID, - ClientID = x.ClientID, - DateCreate = x.DateCreate, - ProductList = x.ProductList, - Sum = x.Sum - }) - .ToList(); - } - - public void SaveListToWordFile(ReportBindingModel model) - { - _saveToWord.CreateDoc(new WordInfo - { - FileName = model.FileName, - Title = "Список продуктов", - ListProduct = _productStorage.GetFullList() - }); - } - - public void SaveProductToExcelFile(ReportBindingModel model) - { - _saveToExcel.CreateReport(new ExcelInfo - { - FileName = model.FileName, - Title = "Список Заказов", - Orders = GetOrders(model),// мейби нет - }); - } - } -} - diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs new file mode 100644 index 0000000..9ffdf9d --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelClient.cs @@ -0,0 +1,90 @@ +using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums; +using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; + + +namespace ElectronicsShopBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcelClient + { + public void CreateReport(ExcelInfoClient 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 pc in info.Paymeants) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.PaymeantName.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + + foreach (var payment in pc.PaymeantsList) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = payment.PayOption.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = payment.SumPayment.ToString(), + StyleInfo = ExcelStyleInfoType.TextWithBroder + }); + //Не хорошо, что доступны ID а не название продукта, в идеале пофиксить надо + //Это AbstractSaveToExcelClient + rowIndex++; + } + + rowIndex++; + } + + SaveExcel(info); + } + + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfoClient info); + + /// + /// Добавляем новую ячейку в лист + /// + /// + protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); + + /// + /// Объединение ячеек + /// + /// + protected abstract void MergeCells(ExcelMergeParameters excelParams); + + /// + /// Сохранение файла + /// + /// + protected abstract void SaveExcel(ExcelInfoClient info); + } +} diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs similarity index 51% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs index 8d3dcca..b0c3432 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs @@ -4,9 +4,9 @@ using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; namespace ElectronicsShopBusinessLogic.OfficePackage { - public abstract class AbstractSaveToExcel - { - public void CreateReport(ExcelInfo info) + public abstract class AbstractSaveToExcelEmployee + { + public void CreateReport(ExcelInfoEmployee info) { CreateExcel(info); @@ -25,24 +25,24 @@ namespace ElectronicsShopBusinessLogic.OfficePackage }); uint rowIndex = 2; - foreach (var pc in info.Orders) + foreach (var pc in info.Products) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "A", RowIndex = rowIndex, - Text = pc.ProductList.ToString(), + Text = pc.ProductName.ToString(), StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var (product , Count) in pc.ProductList) + foreach (var product in pc.Products) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "B", RowIndex = rowIndex, - Text = product.ToString(), + Text = product.ProductName.ToString(), StyleInfo = ExcelStyleInfoType.TextWithBroder }); @@ -50,55 +50,25 @@ namespace ElectronicsShopBusinessLogic.OfficePackage { ColumnName = "C", RowIndex = rowIndex, - Text = Count.ToString(), + Text = product.Price.ToString(), StyleInfo = ExcelStyleInfoType.TextWithBroder }); rowIndex++; } - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "A", - RowIndex = rowIndex, - Text = "Итого", - StyleInfo = ExcelStyleInfoType.Text - }); - InsertCellInWorksheet(new ExcelCellParameters - { - ColumnName = "C", - RowIndex = rowIndex, - Text = pc.ClientID.ToString(),//Тут в исходние был счётчик, ClientID как заглушка от ошибки - StyleInfo = ExcelStyleInfoType.Text - }); rowIndex++; } SaveExcel(info); } - /// - /// Создание excel-файла - /// - /// - protected abstract void CreateExcel(ExcelInfo info); + protected abstract void CreateExcel(ExcelInfoEmployee info); - /// - /// Добавляем новую ячейку в лист - /// - /// protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams); - /// - /// Объединение ячеек - /// - /// protected abstract void MergeCells(ExcelMergeParameters excelParams); - /// - /// Сохранение файла - /// - /// - protected abstract void SaveExcel(ExcelInfo info); + protected abstract void SaveExcel(ExcelInfoEmployee info); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordClient.cs new file mode 100644 index 0000000..7821c34 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordClient.cs @@ -0,0 +1,79 @@ +using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums; +using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWordClient + { + public void CreateDoc(WordInfoClient 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 + } + }); + + foreach (var pre in info.ListPaymeant) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { (pre.PaymeantName, new WordTextProperties { Size = "24", Bold=true})}, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + + foreach (var route in pre.PaymeantsList) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { (route.PayOption.ToString(), new WordTextProperties { Size = "20", Bold=false})}, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + //Вот тут явно этого будет не хватать, но пока пусть будет только статуст + //Это AbstractSaveToWordClient + } + } + + SaveWord(info); + } + + /// + /// Создание doc-файла + /// + /// + protected abstract void CreateWord(WordInfoClient info); + + /// + /// Создание абзаца с текстом + /// + /// + /// + protected abstract void CreateParagraph(WordParagraph paragraph); + + /// + /// Сохранение файла + /// + /// + protected abstract void SaveWord(WordInfoClient info); + } +} diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs similarity index 52% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs index b0f7f94..93914e1 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs @@ -8,9 +8,9 @@ using System.Threading.Tasks; namespace ElectronicsShopBusinessLogic.OfficePackage { - public abstract class AbstractSaveToWord - { - public void CreateDoc(WordInfo info) + public abstract class AbstractSaveToWordEmployee + { + public void CreateDoc(WordInfoEmployee info) { CreateWord(info); @@ -24,30 +24,44 @@ namespace ElectronicsShopBusinessLogic.OfficePackage } }); - foreach (var product in info.ListProduct) - { - CreateParagraph(new WordParagraph - { - Texts = new List<(string, WordTextProperties)> { - (product.ProductName+' ', new WordTextProperties { Size = "24", Bold = true }), - (product.Price.ToString(), new WordTextProperties { Size = "24" }) - }, - TextProperties = new WordTextProperties - { - Size = "24", - JustificationType = WordJustificationType.Both - } - }); - } + foreach (var product in info.ListProduct) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { (product.ProductName, new WordTextProperties { Size = "24", Bold=true})}, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); - SaveWord(info); + foreach (var pre in product.Products) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> + { (pre.ProductName, new WordTextProperties { Size = "20", Bold=false})}, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + //Добавить ещё поля кроме названия продукта + //Это AbstractSaveToWordEmployee + } + } + + SaveWord(info); } /// /// Создание doc-файла /// /// - protected abstract void CreateWord(WordInfo info); + protected abstract void CreateWord(WordInfoEmployee info); /// /// Создание абзаца с текстом @@ -60,6 +74,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage /// Сохранение файла /// /// - protected abstract void SaveWord(WordInfo info); + protected abstract void SaveWord(WordInfoEmployee info); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs similarity index 69% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs index 32309dc..f2499b6 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoClient.cs @@ -1,14 +1,13 @@ using ElectronicsShopContracts.ViewModels; - namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { - public class WordInfo + public class ExcelInfoClient { public string FileName { get; set; } = string.Empty; public string Title { get; set; } = string.Empty; - public List ListProduct { get; set; } = new(); + public List Paymeants { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs new file mode 100644 index 0000000..9e5b755 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs @@ -0,0 +1,13 @@ +using ElectronicsShopContracts.ViewModels; + +namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfoEmployee + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List Products { get; set; } = new(); + } +} diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs similarity index 68% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs index f83ed8b..101c841 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs @@ -1,13 +1,14 @@ using ElectronicsShopContracts.ViewModels; + namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels { - public class ExcelInfo + public class WordInfoClient { public string FileName { get; set; } = string.Empty; public string Title { get; set; } = string.Empty; - public List Orders { get; set; } = new(); + public List ListPaymeant { get; set; } = new(); } } diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs new file mode 100644 index 0000000..ff98c64 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs @@ -0,0 +1,14 @@ +using ElectronicsShopContracts.ViewModels; + + +namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfoEmployee + { + public string FileName { get; set; } = string.Empty; + + public string Title { get; set; } = string.Empty; + + public List ListProduct { get; set; } = new(); + } +} diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs similarity index 98% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs index be76f31..eab254e 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelClient.cs @@ -9,7 +9,7 @@ using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; namespace ElectronicsShopBusinessLogic.OfficePackage.Implements { - public class SaveToExcel : AbstractSaveToExcel + public class SaveToExcelClient : AbstractSaveToExcelClient { private SpreadsheetDocument? _spreadsheetDocument; @@ -151,7 +151,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements }; } - protected override void CreateExcel(ExcelInfo info) + protected override void CreateExcel(ExcelInfoClient info) { _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook); // Создаем книгу (в ней хранятся листы) @@ -280,7 +280,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements mergeCells.Append(mergeCell); } - protected override void SaveExcel(ExcelInfo info) + protected override void SaveExcel(ExcelInfoClient info) { if (_spreadsheetDocument == null) { diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelEmployee.cs new file mode 100644 index 0000000..bd70960 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToExcelEmployee.cs @@ -0,0 +1,293 @@ +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums; +using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; + + +namespace ElectronicsShopBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcelEmployee : AbstractSaveToExcelEmployee + { + private SpreadsheetDocument? _spreadsheetDocument; + + private SharedStringTablePart? _shareStringPart; + + private Worksheet? _worksheet; + + /// + /// Настройка стилей для файла + /// + /// + private static void CreateStyles(WorkbookPart workbookpart) + { + var sp = workbookpart.AddNewPart(); + sp.Stylesheet = new Stylesheet(); + + var fonts = new Fonts() { Count = 2U, KnownFonts = true }; + + var fontUsual = new Font(); + fontUsual.Append(new FontSize() { Val = 12D }); + fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontUsual.Append(new FontName() { Val = "Times New Roman" }); + fontUsual.Append(new FontFamilyNumbering() { Val = 2 }); + fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + + var fontTitle = new Font(); + fontTitle.Append(new Bold()); + fontTitle.Append(new FontSize() { Val = 14D }); + fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Theme = 1U }); + fontTitle.Append(new FontName() { Val = "Times New Roman" }); + fontTitle.Append(new FontFamilyNumbering() { Val = 2 }); + fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + + fonts.Append(fontUsual); + fonts.Append(fontTitle); + + var fills = new Fills() { Count = 2U }; + + var fill1 = new Fill(); + fill1.Append(new PatternFill() { PatternType = PatternValues.None }); + + var fill2 = new Fill(); + fill2.Append(new PatternFill() { PatternType = PatternValues.Gray125 }); + + fills.Append(fill1); + fills.Append(fill2); + + var borders = new Borders() { Count = 2U }; + + var borderNoBorder = new Border(); + borderNoBorder.Append(new LeftBorder()); + borderNoBorder.Append(new RightBorder()); + borderNoBorder.Append(new TopBorder()); + borderNoBorder.Append(new BottomBorder()); + borderNoBorder.Append(new DiagonalBorder()); + + var borderThin = new Border(); + + var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }; + leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var rightBorder = new RightBorder() { Style = BorderStyleValues.Thin }; + rightBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var topBorder = new TopBorder() { Style = BorderStyleValues.Thin }; + topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + var bottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin }; + bottomBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() { Indexed = 64U }); + + borderThin.Append(leftBorder); + borderThin.Append(rightBorder); + borderThin.Append(topBorder); + borderThin.Append(bottomBorder); + borderThin.Append(new DiagonalBorder()); + + borders.Append(borderNoBorder); + borders.Append(borderThin); + + var cellStyleFormats = new CellStyleFormats() { Count = 1U }; + var cellFormatStyle = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U }; + + cellStyleFormats.Append(cellFormatStyle); + + var cellFormats = new CellFormats() { Count = 3U }; + var cellFormatFont = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 0U, FormatId = 0U, ApplyFont = true }; + var cellFormatFontAndBorder = new CellFormat() { NumberFormatId = 0U, FontId = 0U, FillId = 0U, BorderId = 1U, FormatId = 0U, ApplyFont = true, ApplyBorder = true }; + var cellFormatTitle = new CellFormat() { NumberFormatId = 0U, FontId = 1U, FillId = 0U, BorderId = 0U, FormatId = 0U, Alignment = new Alignment() { Vertical = VerticalAlignmentValues.Center, WrapText = true, Horizontal = HorizontalAlignmentValues.Center }, ApplyFont = true }; + + cellFormats.Append(cellFormatFont); + cellFormats.Append(cellFormatFontAndBorder); + cellFormats.Append(cellFormatTitle); + + var cellStyles = new CellStyles() { Count = 1U }; + + cellStyles.Append(new CellStyle() { Name = "Normal", FormatId = 0U, BuiltinId = 0U }); + + var differentialFormats = new DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() { Count = 0U }; + + var tableStyles = new TableStyles() { Count = 0U, DefaultTableStyle = "TableStyleMedium2", DefaultPivotStyle = "PivotStyleLight16" }; + + var stylesheetExtensionList = new StylesheetExtensionList(); + + var stylesheetExtension1 = new StylesheetExtension() { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" }; + stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"); + stylesheetExtension1.Append(new SlicerStyles() { DefaultSlicerStyle = "SlicerStyleLight1" }); + + var stylesheetExtension2 = new StylesheetExtension() { Uri = "{9260A510-F301-46a8-8635-F512D64BE5F5}" }; + stylesheetExtension2.AddNamespaceDeclaration("x15", "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"); + stylesheetExtension2.Append(new TimelineStyles() { DefaultTimelineStyle = "TimeSlicerStyleLight1" }); + + stylesheetExtensionList.Append(stylesheetExtension1); + stylesheetExtensionList.Append(stylesheetExtension2); + + sp.Stylesheet.Append(fonts); + sp.Stylesheet.Append(fills); + sp.Stylesheet.Append(borders); + sp.Stylesheet.Append(cellStyleFormats); + sp.Stylesheet.Append(cellFormats); + sp.Stylesheet.Append(cellStyles); + sp.Stylesheet.Append(differentialFormats); + sp.Stylesheet.Append(tableStyles); + sp.Stylesheet.Append(stylesheetExtensionList); + } + + /// + /// Получение номера стиля из типа + /// + /// + /// + private static uint GetStyleValue(ExcelStyleInfoType styleInfo) + { + return styleInfo switch + { + ExcelStyleInfoType.Title => 2U, + ExcelStyleInfoType.TextWithBroder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + + protected override void CreateExcel(ExcelInfoEmployee info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, SpreadsheetDocumentType.Workbook); + // Создаем книгу (в ней хранятся листы) + var workbookpart = _spreadsheetDocument.AddWorkbookPart(); + workbookpart.Workbook = new Workbook(); + + CreateStyles(workbookpart); + + // Получаем/создаем хранилище текстов для книги + _shareStringPart = _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any() + ? _spreadsheetDocument.WorkbookPart.GetPartsOfType().First() + : _spreadsheetDocument.WorkbookPart.AddNewPart(); + + // Создаем SharedStringTable, если его нет + if (_shareStringPart.SharedStringTable == null) + { + _shareStringPart.SharedStringTable = new SharedStringTable(); + } + + // Создаем лист в книгу + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(new SheetData()); + + // Добавляем лист в книгу + var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист" + }; + sheets.Append(sheet); + + _worksheet = worksheetPart.Worksheet; + } + + protected override void InsertCellInWorksheet(ExcelCellParameters excelParams) + { + if (_worksheet == null || _shareStringPart == null) + { + return; + } + var sheetData = _worksheet.GetFirstChild(); + if (sheetData == null) + { + return; + } + + // Ищем строку, либо добавляем ее + Row row; + if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any()) + { + row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First(); + } + else + { + row = new Row() { RowIndex = excelParams.RowIndex }; + sheetData.Append(row); + } + + // Ищем нужную ячейку + Cell cell; + if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any()) + { + cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First(); + } + else + { + // Все ячейки должны быть последовательно друг за другом расположены + // нужно определить, после какой вставлять + Cell? refCell = null; + foreach (Cell rowCell in row.Elements()) + { + if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0) + { + refCell = rowCell; + break; + } + } + + var newCell = new Cell() { CellReference = excelParams.CellReference }; + row.InsertBefore(newCell, refCell); + + cell = newCell; + } + + // вставляем новый текст + _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text))); + _shareStringPart.SharedStringTable.Save(); + + cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString()); + cell.DataType = new EnumValue(CellValues.SharedString); + cell.StyleIndex = GetStyleValue(excelParams.StyleInfo); + } + + protected override void MergeCells(ExcelMergeParameters excelParams) + { + if (_worksheet == null) + { + return; + } + MergeCells mergeCells; + + if (_worksheet.Elements().Any()) + { + mergeCells = _worksheet.Elements().First(); + } + else + { + mergeCells = new MergeCells(); + + if (_worksheet.Elements().Any()) + { + _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First()); + } + else + { + _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First()); + } + } + + var mergeCell = new MergeCell() + { + Reference = new StringValue(excelParams.Merge) + }; + mergeCells.Append(mergeCell); + } + + protected override void SaveExcel(ExcelInfoEmployee info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Dispose(); + } + } +} diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordClient.cs similarity index 95% rename from ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs rename to ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordClient.cs index 7e42b6a..c741531 100644 --- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWord.cs +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordClient.cs @@ -6,7 +6,7 @@ using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; namespace ElectronicsShopBusinessLogic.OfficePackage.Implements { - public class SaveToWord : AbstractSaveToWord + public class SaveToWordClient : AbstractSaveToWordClient { private WordprocessingDocument? _wordDocument; @@ -81,7 +81,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements return properties; } - protected override void CreateWord(WordInfo info) + protected override void CreateWord(WordInfoClient info) { _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document); MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); @@ -119,7 +119,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.Implements _docBody.AppendChild(docParagraph); } - protected override void SaveWord(WordInfo info) + protected override void SaveWord(WordInfoClient info) { if (_docBody == null || _wordDocument == null) { diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordEmployee.cs new file mode 100644 index 0000000..34bf313 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/Implements/SaveToWordEmployee.cs @@ -0,0 +1,135 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; +using ElectronicsShopBusinessLogic.OfficePackage.HelperEnums; +using ElectronicsShopBusinessLogic.OfficePackage.HelperModels; + +namespace ElectronicsShopBusinessLogic.OfficePackage.Implements +{ + public class SaveToWordEmployee : AbstractSaveToWordEmployee + { + private WordprocessingDocument? _wordDocument; + + private Body? _docBody; + + /// + /// Получение типа выравнивания + /// + /// + /// + private static JustificationValues GetJustificationValues(WordJustificationType type) + { + return type switch + { + WordJustificationType.Both => JustificationValues.Both, + WordJustificationType.Center => JustificationValues.Center, + _ => JustificationValues.Left, + }; + } + + /// + /// Настройки страницы + /// + /// + private static SectionProperties CreateSectionProperties() + { + var properties = new SectionProperties(); + + var pageSize = new PageSize + { + Orient = PageOrientationValues.Portrait + }; + + properties.AppendChild(pageSize); + + return properties; + } + + /// + /// Задание форматирования для абзаца + /// + /// + /// + private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties) + { + if (paragraphProperties == null) + { + return null; + } + + var properties = new ParagraphProperties(); + + properties.AppendChild(new Justification() + { + Val = GetJustificationValues(paragraphProperties.JustificationType) + }); + + properties.AppendChild(new SpacingBetweenLines + { + LineRule = LineSpacingRuleValues.Auto + }); + + properties.AppendChild(new Indentation()); + + var paragraphMarkRunProperties = new ParagraphMarkRunProperties(); + if (!string.IsNullOrEmpty(paragraphProperties.Size)) + { + paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size }); + } + properties.AppendChild(paragraphMarkRunProperties); + + return properties; + } + + protected override void CreateWord(WordInfoEmployee info) + { + _wordDocument = WordprocessingDocument.Create(info.FileName, WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + + protected override void CreateParagraph(WordParagraph paragraph) + { + if (_docBody == null || paragraph == null) + { + return; + } + var docParagraph = new Paragraph(); + + 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); + } + + _docBody.AppendChild(docParagraph); + } + + protected override void SaveWord(WordInfoEmployee info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + + _wordDocument.MainDocumentPart!.Document.Save(); + + _wordDocument.Dispose(); + } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportBindingModel.cs b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportBindingModel.cs index f3609f4..9c3d9e6 100644 --- a/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportBindingModel.cs +++ b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportBindingModel.cs @@ -1,4 +1,6 @@ -using System; +using ElectronicsShopDataModels.Enums; +using ElectronicsShopDataModels.Models; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -8,10 +10,17 @@ namespace ElectronicsShopContracts.BindingModels { public class ReportBindingModel { - public string FileName { get; set; } = string.Empty; - - public DateTime? DateFrom { get; set; } - - public DateTime? DateTo { get; set; } - } + public int? ID { get; set; } + public int? ClientID { get; set; } + public string? ProductName { get; set; } = string.Empty; + public double? ProductPrice { get; set; } + public PaymeantOption Status { get; set; } = PaymeantOption.Неоплачено; + public DateTime? DateStart { get; set; } + public DateTime? DateFinish { get; set; } + public Dictionary PaymeantProduct + { + get; + set; + } = new(); + } } diff --git a/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportPaymeantBindingModel.cs b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportPaymeantBindingModel.cs new file mode 100644 index 0000000..3a84506 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportPaymeantBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.BindingModels +{ + public class ReportPaymeantBindingModel + { + public string FileName { get; set; } = string.Empty; + + public List? Paymeants { get; set; } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportProductBindingModel.cs b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportProductBindingModel.cs new file mode 100644 index 0000000..ebfdf34 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/BindingModels/ReportProductBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.BindingModels +{ + public class ReportProductBindingModel + { + public string FileName { get; set; } = string.Empty; + + public List? Product { get; set; } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs new file mode 100644 index 0000000..4132e7f --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs @@ -0,0 +1,17 @@ +using ElectronicsShopContracts.BindingModels; +using ElectronicsShopContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.BusinessLogicContracts +{ + public interface IReportClientLogic + { + List GetPaymeants(ReportPaymeantBindingModel model); + void SavePreservesToWordFile(ReportPaymeantBindingModel model); + void SavePreservesToExcelFile(ReportPaymeantBindingModel model); + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs new file mode 100644 index 0000000..4f58760 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs @@ -0,0 +1,17 @@ +using ElectronicsShopContracts.BindingModels; +using ElectronicsShopContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.BusinessLogicContracts +{ + public interface IReportEmployeeLogic + { + List GetRoute(ReportProductBindingModel model); + void SaveRoutesToWordFile(ReportProductBindingModel model); + void SaveRoutesToExcelFile(ReportProductBindingModel model); + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportLogic.cs deleted file mode 100644 index 7ea7086..0000000 --- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportLogic.cs +++ /dev/null @@ -1,18 +0,0 @@ -using ElectronicsShopContracts.BindingModels; -using ElectronicsShopContracts.ViewModels; - - -namespace ElectronicsShopContracts.BusinessLogicContracts -{ - public interface IReportLogic - { - List GetProduct();//Это наш список продуктов - - List GetOrders(ReportBindingModel model);//это наш список заказов - - void SaveListToWordFile(ReportBindingModel model); - - void SaveProductToExcelFile(ReportBindingModel model); - - } -} diff --git a/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportPaymeantSearchModel.cs b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportPaymeantSearchModel.cs new file mode 100644 index 0000000..eafb148 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportPaymeantSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.SearchModels +{ + public class ReportPaymeantSearchModel + { + public List? PaymeantIDs { get; set; } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportProductSearchModel.cs b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportProductSearchModel.cs new file mode 100644 index 0000000..82f7398 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportProductSearchModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.SearchModels +{ + public class ReportProductSearchModel + { + public List? ProductIds { get; set; } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportSearchModel.cs b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportSearchModel.cs new file mode 100644 index 0000000..4001bad --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/SearchModels/ReportSearchModel.cs @@ -0,0 +1,20 @@ +using ElectronicsShopDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.SearchModels +{ + public class ReportSearchModel + { + public int? ID { get; set; } + public int? ClientID { get; set; } + public string? ProductName { get; set; } = string.Empty; + public double? ProductPrice { get; set; } + public PaymeantOption Status { get; set; } = PaymeantOption.Неоплачено; + public DateTime? DateStart { get; set; } + public DateTime? DateFinish { get; set; } + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportOrdersVeiwModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportOrdersVeiwModel.cs deleted file mode 100644 index 21b891f..0000000 --- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportOrdersVeiwModel.cs +++ /dev/null @@ -1,22 +0,0 @@ -using ElectronicsShopDataModels.Models; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ElectronicsShopContracts.ViewModels -{ - public class ReportOrdersVeiwModel - { - public int ID { get; set; } - - public int ClientID { get; set; } - - public DateTime DateCreate { get; set; } - - public Dictionary ProductList { get; set; } = new(); - - public double Sum { get; set; } - } -} diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs new file mode 100644 index 0000000..dca6f74 --- /dev/null +++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ElectronicsShopContracts.ViewModels +{ + public class ReportPaymeantsViewModel + { + public string PaymeantName { get; set; } = string.Empty; + public List PaymeantsList { get; set; } = new(); + } +} diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs index 50f7ecf..ddb61c8 100644 --- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs +++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportProductsViewModel.cs @@ -9,12 +9,7 @@ namespace ElectronicsShopContracts.ViewModels { public class ReportProductsViewModel { - public int CostItemID { get; set; } - - public string ProductName { get; set; } = string.Empty; - - public double Price { get; set; } - - public string CostItemName { get; set; } = string.Empty; - } + public string ProductName { get; set; } = string.Empty; + public List Products { get; set; } = new(); + } } diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs index 2830f99..247925f 100644 --- a/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs +++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/DataBase.cs @@ -12,7 +12,7 @@ namespace ElectronicsShopDataBaseImplement optionsBuilder) { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-O0N00SH\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-E2VPEN3\SQLEXPRESS;Initial Catalog=ElectronicsShopDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.Designer.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.Designer.cs similarity index 99% rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.Designer.cs rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.Designer.cs index 2b6c0ab..e9218ef 100644 --- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.Designer.cs +++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.Designer.cs @@ -12,8 +12,8 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace ElectronicsShopDataBaseImplement.Migrations { [DbContext(typeof(Database))] - [Migration("20240531061328_InitMigration")] - partial class InitMigration + [Migration("20240531153626_Init")] + partial class Init { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.cs b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.cs similarity index 99% rename from ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.cs rename to ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.cs index 6c6ae62..dc157cf 100644 --- a/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531061328_InitMigration.cs +++ b/ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace ElectronicsShopDataBaseImplement.Migrations { /// - public partial class InitMigration : Migration + public partial class Init : Migration { /// protected override void Up(MigrationBuilder migrationBuilder)