Что-то Брым, где-то Бам

ElectronicsShop/ElectronicsShopBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -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<ReportProductsViewModel> GetProduct()
-        {
-            var productsList = _productStorage.GetFullList();
-
-            var list = new List<ReportProductsViewModel>();
-
-            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<ReportOrdersVeiwModel> 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),// мейби нет
-            });
-        }
-    }
-}
-

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);
+        }
+
+        /// <summary>
+        /// Создание excel-файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void CreateExcel(ExcelInfoClient info);
+
+        /// <summary>
+        /// Добавляем новую ячейку в лист
+        /// </summary>
+        /// <param name="cellParameters"></param>
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+
+        /// <summary>
+        /// Объединение ячеек
+        /// </summary>
+        /// <param name="mergeParameters"></param>
+        protected abstract void MergeCells(ExcelMergeParameters excelParams);
+
+        /// <summary>
+        /// Сохранение файла
+        /// </summary>
+        /// <param name="info"></param>
+        protected abstract void SaveExcel(ExcelInfoClient info);
+    }
+}

ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToExcelEmployee.cs

@@ -4,9 +4,9 @@ using ElectronicsShopBusinessLogic.OfficePackage.HelperModels;
 
 namespace ElectronicsShopBusinessLogic.OfficePackage
 {
-    public abstract class AbstractSaveToExcel
+    public abstract class AbstractSaveToExcelEmployee
 	{
-        public void CreateReport(ExcelInfo info)
+        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);
         }
 
-        /// <summary>
+        protected abstract void CreateExcel(ExcelInfoEmployee info);
-        /// Создание excel-файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void CreateExcel(ExcelInfo info);
 
-        /// <summary>
-        /// Добавляем новую ячейку в лист
-        /// </summary>
-        /// <param name="cellParameters"></param>
         protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
 
-        /// <summary>
-        /// Объединение ячеек
-        /// </summary>
-        /// <param name="mergeParameters"></param>
         protected abstract void MergeCells(ExcelMergeParameters excelParams);
 
-        /// <summary>
+        protected abstract void SaveExcel(ExcelInfoEmployee info);
-        /// Сохранение файла
-        /// </summary>
-        /// <param name="info"></param>
-        protected abstract void SaveExcel(ExcelInfo info);
     }
 }

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);
+        }
+
+        /// <summary>
+		/// Создание doc-файла
+		/// </summary>
+		/// <param name="info"></param>
+        protected abstract void CreateWord(WordInfoClient info);
+
+        /// <summary>
+        /// Создание абзаца с текстом
+        /// </summary>
+        /// <param name="paragraph"></param>
+        /// <returns></returns>
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+
+        /// <summary>
+		/// Сохранение файла
+		/// </summary>
+		/// <param name="info"></param>
+        protected abstract void SaveWord(WordInfoClient info);
+    }
+}

ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/AbstractSaveToWordEmployee.cs

@@ -8,9 +8,9 @@ using System.Threading.Tasks;
 
 namespace ElectronicsShopBusinessLogic.OfficePackage
 {
-    public abstract class AbstractSaveToWord
+    public abstract class AbstractSaveToWordEmployee
 	{
-        public void CreateDoc(WordInfo info)
+        public void CreateDoc(WordInfoEmployee info)
         {
             CreateWord(info);
 
@@ -28,16 +28,30 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
 			{
 				CreateParagraph(new WordParagraph
 				{
-                    Texts = new List<(string, WordTextProperties)> {
+					Texts = new List<(string, WordTextProperties)>
-                        (product.ProductName+' ', new WordTextProperties { Size = "24", Bold = true }),
+					{ (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 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);
@@ -47,7 +61,7 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
 		/// Создание doc-файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void CreateWord(WordInfo info);
+        protected abstract void CreateWord(WordInfoEmployee info);
 
         /// <summary>
         /// Создание абзаца с текстом
@@ -60,6 +74,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage
 		/// Сохранение файла
 		/// </summary>
 		/// <param name="info"></param>
-        protected abstract void SaveWord(WordInfo info);
+        protected abstract void SaveWord(WordInfoEmployee info);
     }
 }

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<ProductViewModel> ListProduct { get; set; } = new();
+        public List<ReportPaymeantsViewModel> Paymeants { get; set; } = new();
     }
 }

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<ReportProductsViewModel> Products { get; set; } = new();
+    }
+}

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<ReportOrdersVeiwModel> Orders { get; set; } = new();
+        public List<ReportPaymeantsViewModel> ListPaymeant { get; set; } = new();
     }
 }

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<ReportProductsViewModel> ListProduct { get; set; } = new();
+    }
+}

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)
             {

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;
+
+        /// <summary>
+        /// Настройка стилей для файла
+        /// </summary>
+        /// <param name="workbookpart"></param>
+        private static void CreateStyles(WorkbookPart workbookpart)
+        {
+            var sp = workbookpart.AddNewPart<WorkbookStylesPart>();
+            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);
+        }
+
+        /// <summary>
+        /// Получение номера стиля из типа
+        /// </summary>
+        /// <param name="styleInfo"></param>
+        /// <returns></returns>
+        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<SharedStringTablePart>().Any()
+                ? _spreadsheetDocument.WorkbookPart.GetPartsOfType<SharedStringTablePart>().First()
+                : _spreadsheetDocument.WorkbookPart.AddNewPart<SharedStringTablePart>();
+
+            // Создаем SharedStringTable, если его нет
+            if (_shareStringPart.SharedStringTable == null)
+            {
+                _shareStringPart.SharedStringTable = new SharedStringTable();
+            }
+
+            // Создаем лист в книгу
+            var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+            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<SheetData>();
+            if (sheetData == null)
+            {
+                return;
+            }
+
+            // Ищем строку, либо добавляем ее
+            Row row;
+            if (sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).Any())
+            {
+                row = sheetData.Elements<Row>().Where(r => r.RowIndex! == excelParams.RowIndex).First();
+            }
+            else
+            {
+                row = new Row() { RowIndex = excelParams.RowIndex };
+                sheetData.Append(row);
+            }
+
+            // Ищем нужную ячейку  
+            Cell cell;
+            if (row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).Any())
+            {
+                cell = row.Elements<Cell>().Where(c => c.CellReference!.Value == excelParams.CellReference).First();
+            }
+            else
+            {
+                // Все ячейки должны быть последовательно друг за другом расположены
+                // нужно определить, после какой вставлять
+                Cell? refCell = null;
+                foreach (Cell rowCell in row.Elements<Cell>())
+                {
+                    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<SharedStringItem>().Count() - 1).ToString());
+            cell.DataType = new EnumValue<CellValues>(CellValues.SharedString);
+            cell.StyleIndex = GetStyleValue(excelParams.StyleInfo);
+        }
+
+        protected override void MergeCells(ExcelMergeParameters excelParams)
+        {
+            if (_worksheet == null)
+            {
+                return;
+            }
+            MergeCells mergeCells;
+
+            if (_worksheet.Elements<MergeCells>().Any())
+            {
+                mergeCells = _worksheet.Elements<MergeCells>().First();
+            }
+            else
+            {
+                mergeCells = new MergeCells();
+
+                if (_worksheet.Elements<CustomSheetView>().Any())
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<CustomSheetView>().First());
+                }
+                else
+                {
+                    _worksheet.InsertAfter(mergeCells, _worksheet.Elements<SheetData>().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();
+        }
+    }
+}

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)
             {

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;
+
+        /// <summary>
+        /// Получение типа выравнивания
+        /// </summary>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        private static JustificationValues GetJustificationValues(WordJustificationType type)
+        {
+            return type switch
+            {
+                WordJustificationType.Both => JustificationValues.Both,
+                WordJustificationType.Center => JustificationValues.Center,
+                _ => JustificationValues.Left,
+            };
+        }
+
+        /// <summary>
+        /// Настройки страницы
+        /// </summary>
+        /// <returns></returns>
+        private static SectionProperties CreateSectionProperties()
+        {
+            var properties = new SectionProperties();
+
+            var pageSize = new PageSize
+            {
+                Orient = PageOrientationValues.Portrait
+            };
+
+            properties.AppendChild(pageSize);
+
+            return properties;
+        }
+
+        /// <summary>
+        /// Задание форматирования для абзаца
+        /// </summary>
+        /// <param name="paragraphProperties"></param>
+        /// <returns></returns>
+        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();
+        }
+    }
+}

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 int? ID { get; set; }
-
+		public int? ClientID { get; set; }
-        public DateTime? DateFrom { get; set; }
+		public string? ProductName { get; set; } = string.Empty;
-
+		public double? ProductPrice { get; set; }
-        public DateTime? DateTo { get; set; }
+		public PaymeantOption Status { get; set; } = PaymeantOption.Неоплачено;
+		public DateTime? DateStart { get; set; }
+		public DateTime? DateFinish { get; set; }
+		public Dictionary<int, IProductModel> PaymeantProduct
+		{
+			get;
+			set;
+		} = new();
 	}
 }

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<int>? Paymeants { get; set; }
+	}
+}

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<int>? Product { get; set; }
+	}
+}

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<ReportPaymeantsViewModel> GetPaymeants(ReportPaymeantBindingModel model);
+		void SavePreservesToWordFile(ReportPaymeantBindingModel model);
+		void SavePreservesToExcelFile(ReportPaymeantBindingModel model);
+	}
+}

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<ReportProductsViewModel> GetRoute(ReportProductBindingModel model);
+		void SaveRoutesToWordFile(ReportProductBindingModel model);
+		void SaveRoutesToExcelFile(ReportProductBindingModel model);
+	}
+}

ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportLogic.cs

@@ -1,18 +0,0 @@
-using ElectronicsShopContracts.BindingModels;
-using ElectronicsShopContracts.ViewModels;
-
-
-namespace ElectronicsShopContracts.BusinessLogicContracts
-{
-    public interface IReportLogic
-    {
-        List<ReportProductsViewModel> GetProduct();//Это наш список продуктов
-
-        List<ReportOrdersVeiwModel> GetOrders(ReportBindingModel model);//это наш список заказов
-
-        void SaveListToWordFile(ReportBindingModel model);
-
-        void SaveProductToExcelFile(ReportBindingModel model);
-
-    }
-}

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<int>? PaymeantIDs { get; set; }
+	}
+}

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<int>? ProductIds { get; set; }
+	}
+}

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; }
+	}
+}

ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportOrdersVeiwModel.cs

@@ -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<int, (IProductModel, int)> ProductList { get; set; } = new();
-
-        public double Sum { get; set; }
-    }
-}

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<PaymeantViewModel> PaymeantsList { get; set; } = new();
+	}
+}

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 List<ProductViewModel> Products { get; set; } = new();
-        public double Price { get; set; }
-
-        public string CostItemName { get; set; } = string.Empty;
 	}
 }

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);
 		}

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")]
+    [Migration("20240531153626_Init")]
-    partial class InitMigration
+    partial class Init
     {
         /// <inheritdoc />
         protected override void BuildTargetModel(ModelBuilder modelBuilder)

ElectronicsShop/ElectronicsShopDataBaseImplement/Migrations/20240531153626_Init.cs

@@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Migrations;
 namespace ElectronicsShopDataBaseImplement.Migrations
 {
     /// <inheritdoc />
-    public partial class InitMigration : Migration
+    public partial class Init : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)