спать

Reviewed-on: #20

CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToExcelWorker.cs

@@ -0,0 +1,99 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToExcelWorker
+    {
+        public void CreateReport(ExcelInfoWorker info)
+        {
+            CreateExcel(info);
+
+            InsertCellInWorksheet(new ExcelCellParameters
+            {
+                ColumnName = "A",
+                RowIndex = 1,
+                Text = info.Title,
+                StyleInfo = ExcelStyleInfoType.Title
+            });
+
+            MergeCells(new ExcelMergeParameters
+            {
+                CellFromName = "A1",
+                CellToName = "C1"
+            });
+
+            InsertCellInWorksheet(new ExcelCellParameters
+            {
+                ColumnName = "A",
+                RowIndex = 2,
+                Text = "Предпродажные",
+                StyleInfo = ExcelStyleInfoType.Title
+            });
+            InsertCellInWorksheet(new ExcelCellParameters
+            {
+                ColumnName = "B",
+                RowIndex = 2,
+                Text = "Автомобили",
+                StyleInfo = ExcelStyleInfoType.Title
+            });
+
+            MergeCells(new ExcelMergeParameters
+            {
+                CellFromName = "B2",
+                CellToName = ColumnLetter(info.maxleng + 1) + "2"
+            });
+            uint rowIndex = 3;
+            foreach (var pc in info.carPresalesReport)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = pc.PresaleId.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                int place = 2;
+                foreach (var workshop in pc.Cars)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = ColumnLetter(place),
+                        RowIndex = rowIndex,
+                        Text = workshop,
+                        StyleInfo = ExcelStyleInfoType.TextWithBorder
+                    });
+
+                    place++;
+                }
+                rowIndex++;
+            }
+
+            SaveExcel(info);
+        }
+        private static string ColumnLetter(int columnIndex)
+        {
+            int dividend = columnIndex;
+            string columnName = String.Empty;
+            int modulo;
+
+            while (dividend > 0)
+            {
+                modulo = (dividend - 1) % 26;
+                columnName = Convert.ToChar(65 + modulo).ToString() + columnName;
+                dividend = (dividend - modulo) / 26;
+            }
+
+            return columnName;
+        }
+        protected abstract void CreateExcel(ExcelInfoWorker info);
+        protected abstract void InsertCellInWorksheet(ExcelCellParameters excelParams);
+        protected abstract void MergeCells(ExcelMergeParameters excelParams);
+        protected abstract void SaveExcel(ExcelInfoWorker info);
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToPdfWorker.cs

@@ -0,0 +1,68 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToPdfWorker
+    {
+        public void CreateDoc(PdfInfoWorker info)
+        {
+            CreatePdf(info);
+            CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+            CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+
+            CreateTable(new List<string> { "5cm", "10cm" });
+
+            foreach (var report in info.reportBundling)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { "Номер комплектации", "Покупка" },
+                    Style = "NormalTitle",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Center
+                });
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { report.OrderId.ToString(), "" },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+                foreach (var product in report.Bundlings)
+                    CreateRow(new PdfRowParameters
+                    {
+                        Texts = new List<string> { "", product },
+                        Style = "Normal",
+                        ParagraphAlignment = PdfParagraphAlignmentType.Left
+                    });
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { "", "Особенности" },
+                    Style = "NormalTitle",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Center
+                });
+                foreach (var production in report.Requests)
+                    CreateRow(new PdfRowParameters
+                    {
+                        Texts = new List<string> { "", production },
+                        Style = "Normal",
+                        ParagraphAlignment = PdfParagraphAlignmentType.Left
+                    });
+            }
+            SavePdf(info);
+        }
+        protected abstract void CreatePdf(PdfInfoWorker info);
+
+        protected abstract void CreateParagraph(PdfParagraph paragraph);
+
+        protected abstract void CreateTable(List<string> columns);
+
+        protected abstract void CreateRow(PdfRowParameters rowParameters);
+
+        protected abstract void SavePdf(PdfInfoWorker info);
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/AbstractSaveToWordWorker.cs

@@ -0,0 +1,45 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage
+{
+    public abstract class AbstractSaveToWordWorker
+    {
+        public void CreateDoc(WordInfoWorker 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.Both
+                }
+            });
+            foreach (var report in info.carPresalesReport)
+            {
+                CreateNumberedParagraph(1, 0, report.PresaleId.ToString());
+                foreach (var workshop in report.Cars)
+                {
+                    CreateNumberedParagraph(1, 1, workshop);
+                }
+
+            }
+
+            SaveWord(info);
+        }
+        protected abstract void CreateWord(WordInfoWorker info);
+        protected abstract void CreateParagraph(WordParagraph paragraph);
+        protected abstract void CreateNumberedParagraph(int numId, int ilvl, string text);
+        protected abstract void SaveWord(WordInfoWorker info);
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/ExcelInfoWorker.cs

@@ -0,0 +1,17 @@
+using CarCenterContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.HelperModels
+{
+    public class ExcelInfoWorker
+    {
+        public MemoryStream memoryStream { get; set; } = new MemoryStream();
+        public string Title { get; set; } = string.Empty;
+        public List<ReportPresaleViewModel> carPresalesReport { get; set; } = new();
+        public int maxleng { get; set; }
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/PdfInfoWorker.cs

@@ -0,0 +1,18 @@
+using CarCenterContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.HelperModels
+{
+    public class PdfInfoWorker
+    {
+        public MemoryStream FileName { get; set; } = new();
+        public string Title { get; set; } = string.Empty;
+        public DateTime DateFrom { get; set; }
+        public DateTime DateTo { get; set; }
+        public List<ReportOrderViewModel> reportBundling { get; set; } = new();
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/HelperModels/WordInfoWorker.cs

@@ -0,0 +1,16 @@
+using CarCenterContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordInfoWorker
+    {
+        public MemoryStream memoryStream { get; set; } = new MemoryStream();
+        public string Title { get; set; } = string.Empty;
+        public List<ReportPresaleViewModel> carPresalesReport { get; set; } = new();
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToExcellWorker.cs

@@ -0,0 +1,288 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToExcelWorker : AbstractSaveToExcelWorker
+    {
+        private SpreadsheetDocument? _spreadsheetDocument;
+
+        private SharedStringTablePart? _shareStringPart;
+
+        private Worksheet? _worksheet;
+
+        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);
+        }
+
+        private static uint GetStyleValue(ExcelStyleInfoType styleInfo)
+        {
+            return styleInfo switch
+            {
+                ExcelStyleInfoType.Title => 2U,
+                ExcelStyleInfoType.TextWithBorder => 1U,
+                ExcelStyleInfoType.Text => 0U,
+                _ => 0U,
+            };
+        }
+
+        protected override void CreateExcel(ExcelInfoWorker info)
+        {
+            _spreadsheetDocument = SpreadsheetDocument.Create(info.memoryStream, 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(ExcelInfoWorker info)
+        {
+            if (_spreadsheetDocument == null)
+            {
+                return;
+            }
+            _spreadsheetDocument.WorkbookPart!.Workbook.Save();
+            _spreadsheetDocument.Dispose();
+        }
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToPdfWorker.cs

@@ -0,0 +1,119 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Tables;
+using MigraDoc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToPdfWorker : AbstractSaveToPdfWorker
+    {
+        private Document? _document;
+
+        private Section? _section;
+
+        private Table? _table;
+
+        private static ParagraphAlignment GetParagraphAlignment(PdfParagraphAlignmentType type)
+        {
+            return type switch
+            {
+                PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
+                PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
+                PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
+                _ => ParagraphAlignment.Justify,
+            };
+        }
+
+        /// <summary>
+        /// Создание стилей для документа
+        /// </summary>
+        /// <param name="document"></param>
+        private static void DefineStyles(Document document)
+        {
+            var style = document.Styles["Normal"];
+            style.Font.Name = "Times New Roman";
+            style.Font.Size = 14;
+
+            style = document.Styles.AddStyle("NormalTitle", "Normal");
+            style.Font.Bold = true;
+        }
+
+        protected override void CreatePdf(PdfInfoWorker info)
+        {
+            _document = new Document();
+            DefineStyles(_document);
+
+            _section = _document.AddSection();
+        }
+
+        protected override void CreateParagraph(PdfParagraph pdfParagraph)
+        {
+            if (_section == null)
+            {
+                return;
+            }
+            var paragraph = _section.AddParagraph(pdfParagraph.Text);
+            paragraph.Format.SpaceAfter = "1cm";
+            paragraph.Format.Alignment = GetParagraphAlignment(pdfParagraph.ParagraphAlignment);
+            paragraph.Style = pdfParagraph.Style;
+        }
+
+        protected override void CreateTable(List<string> columns)
+        {
+            if (_document == null)
+            {
+                return;
+            }
+            _table = _document.LastSection.AddTable();
+
+            foreach (var elem in columns)
+            {
+                _table.AddColumn(elem);
+            }
+        }
+
+        protected override void CreateRow(PdfRowParameters rowParameters)
+        {
+            if (_table == null)
+            {
+                return;
+            }
+            var row = _table.AddRow();
+            for (int i = 0; i < rowParameters.Texts.Count; ++i)
+            {
+                row.Cells[i].AddParagraph(rowParameters.Texts[i]);
+
+                if (!string.IsNullOrEmpty(rowParameters.Style))
+                {
+                    row.Cells[i].Style = rowParameters.Style;
+                }
+
+                Unit borderWidth = 0.5;
+
+                row.Cells[i].Borders.Left.Width = borderWidth;
+                row.Cells[i].Borders.Right.Width = borderWidth;
+                row.Cells[i].Borders.Top.Width = borderWidth;
+                row.Cells[i].Borders.Bottom.Width = borderWidth;
+
+                row.Cells[i].Format.Alignment = GetParagraphAlignment(rowParameters.ParagraphAlignment);
+                row.Cells[i].VerticalAlignment = VerticalAlignment.Center;
+            }
+        }
+
+        protected override void SavePdf(PdfInfoWorker info)
+        {
+            var renderer = new PdfDocumentRenderer(true)
+            {
+                Document = _document
+            };
+            renderer.RenderDocument();
+            renderer.PdfDocument.Save(info.FileName);
+        }
+    }
+}

CarCenter/CarCenterBusinessLogic/OfficePackage/Implements/SaveToWordWorker.cs

@@ -0,0 +1,138 @@
+using CarCenterBusinessLogic.OfficePackage.HelperEnums;
+using CarCenterBusinessLogic.OfficePackage.HelperModels;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CarCenterBusinessLogic.OfficePackage.Implements
+{
+    public class SaveToWordWorker : AbstractSaveToWordWorker
+    {
+        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(WordInfoWorker info)
+        {
+            _wordDocument = WordprocessingDocument.Create(info.memoryStream, 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 CreateNumberedParagraph(int numId, int ilvl, string text)
+        {
+            Paragraph paragraph = new Paragraph(
+            new ParagraphProperties(
+                new NumberingProperties(
+                    new NumberingLevelReference() { Val = ilvl },
+                    new NumberingId() { Val = numId })),
+            new Run(new Text(text)));
+
+            _docBody!.Append(paragraph);
+        }
+
+        protected override void SaveWord(WordInfoWorker info)
+        {
+            if (_docBody == null || _wordDocument == null)
+            {
+                return;
+            }
+            _docBody.AppendChild(CreateSectionProperties());
+
+            _wordDocument.MainDocumentPart!.Document.Save();
+
+            _wordDocument.Dispose();
+        }
+    }
+}

CarCenter/CarCenterContracts/SearchModels/CarSearchModel.cs

@@ -11,6 +11,8 @@ namespace CarCenterContracts.SearchModels
 		public int? Id { get; set; }
 		public long? VINnumber { get; set; }
         public int? StorekeeperId { get; set; }
+        public int? FeatureId {  get; set; }
+        public int? OrderId { get; set; }
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }

CarCenter/CarCenterContracts/SearchModels/PresaleSearchModel.cs

@@ -11,5 +11,6 @@ namespace CarCenterContracts.SearchModels
 		public int? Id { get; set; }
         public int? WorkerId { get; set; }
         public int? CarId { get; set; }
+        public int? OrderId { get; set; } 
     }
 }

CarCenter/CarCenterContracts/ViewModels/ReportOrderViewModel.cs

@@ -9,9 +9,8 @@ namespace CarCenterContracts.ViewModels
 {
 	public class ReportOrderViewModel
 	{
-		public int Id { get; set; }
-        //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька
-        public List<IBundlingModel> Bundlings { get; set; } = new();
-		public List<IRequestModel> Requests { get; set; } = new();
-	}
+        public int OrderId { get; set; }
+        public List<string> Bundlings { get; set; } = new();
+        public List<string> Requests { get; set; } = new();
+    }
 }

CarCenter/CarCenterContracts/ViewModels/ReportPresaleViewModel.cs

@@ -9,8 +9,7 @@ namespace CarCenterContracts.ViewModels
 {
 	public class ReportPresaleViewModel
 	{
-		public int Id { get; set; }
-        //Пока не ясно что конкретно передавать в отчет, поэтому передается моделька
-        public List<ICarModel> Cars { get; set; } = new();
-	}
+        public int PresaleId { get; set; }
+        public List<string> Cars { get; set; } = new();
+    }
 }

CarCenter/CarCenterDatabaseImplement/Implements/BundlingStorage.cs

@@ -3,6 +3,7 @@ using CarCenterContracts.SearchModels;
 using CarCenterContracts.StoragesContracts;
 using CarCenterContracts.ViewModels;
 using CarCenterDatabaseImplement.Models;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,7 +18,9 @@ namespace CarCenterDatabaseImplement.Implements
 		{
 			using var context = new CarCenterDatabase();
 			return context.Bundlings
-					.Select(x => x.GetViewModel)
+                 .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                    .Select(x => x.GetViewModel)
 					.ToList();
 		}
 		public List<BundlingViewModel> GetFilteredList(BundlingSearchModel model)
@@ -28,9 +31,15 @@ namespace CarCenterDatabaseImplement.Implements
             }
             using var context = new CarCenterDatabase();
             if (model.DateFrom.HasValue)
-                return context.Bundlings.Where(x => x.StorekeeperId == model.StorekeeperId).Where(x => x.DateCreate <= model.DateTo && x.DateCreate >= model.DateFrom).Select(x => x.GetViewModel).ToList();
+                return context.Bundlings
+                    .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                    .Where(x => x.StorekeeperId == model.StorekeeperId).Where(x => x.DateCreate <= model.DateTo && x.DateCreate >= model.DateFrom).Select(x => x.GetViewModel).ToList();
             else
-                return context.Bundlings.Where(x => x.StorekeeperId == model.StorekeeperId).Select(x => x.GetViewModel).ToList();
+                return context.Bundlings
+                     .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                    .Where(x => x.StorekeeperId == model.StorekeeperId).Select(x => x.GetViewModel).ToList();
 		}
 		public BundlingViewModel? GetElement(BundlingSearchModel model)
 		{
@@ -40,13 +49,15 @@ namespace CarCenterDatabaseImplement.Implements
 				return null;
 			}
 			return context.Bundlings
-				.FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
+                .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
 				?.GetViewModel;
 		}
 		public BundlingViewModel? Insert(BundlingBindingModel model)
 		{
 			using var context = new CarCenterDatabase();
-			var newBundling = Bundling.Create(model);
+			var newBundling = Bundling.Create(context, model);
 			if (newBundling == null)
 			{
 				return null;
@@ -54,7 +65,9 @@ namespace CarCenterDatabaseImplement.Implements
 			context.Bundlings.Add(newBundling);
 			context.SaveChanges();
 			return context.Bundlings
-				   .FirstOrDefault(x => x.Id == newBundling.Id)
+                .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                   .FirstOrDefault(x => x.Id == newBundling.Id)
 				   ?.GetViewModel;
 		}
 		public BundlingViewModel? Update(BundlingBindingModel model)
@@ -66,8 +79,11 @@ namespace CarCenterDatabaseImplement.Implements
 				return null;
 			}
 			order.Update(model);
+			order.UpdatePresales(context, model);
 			context.SaveChanges();
 			return context.Bundlings
+				.Include(x => x.PresaleBundling)
+				.ThenInclude(x => x.Presale)
 				   .FirstOrDefault(x => x.Id == model.Id)
 				   ?.GetViewModel;
 		}
@@ -75,11 +91,15 @@ namespace CarCenterDatabaseImplement.Implements
 		{
 			using var context = new CarCenterDatabase();
 			var element = context.Bundlings
-				.FirstOrDefault(rec => rec.Id == model.Id);
+                .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                .FirstOrDefault(rec => rec.Id == model.Id);
 			if (element != null)
 			{
 				var deletedElement = context.Bundlings
-					.FirstOrDefault(x => x.Id == model.Id)
+                       .Include(x => x.PresaleBundling)
+                .ThenInclude(x => x.Presale)
+                    .FirstOrDefault(x => x.Id == model.Id)
 					?.GetViewModel;
 				context.Bundlings.Remove(element);
 				context.SaveChanges();

CarCenter/CarCenterDatabaseImplement/Implements/CarStorage.cs

@@ -50,6 +50,19 @@ namespace CarCenterDatabaseImplement.Implements
 					.Select(x => x.GetViewModel)
 					.ToList();
 			}
+			else if (model.FeatureId.HasValue)
+			{
+				return context.Cars
+					.Include(x => x.Bundlings)
+					.ThenInclude(x => x.Bundling)
+					.Include(x => x.Feature)
+					.Where(x => x.FeatureID == model.FeatureId && x.OrderId == model.OrderId)
+					.Include(x => x.Order)
+					.Include(x => x.Storekeeper)
+					.Select(x => x.GetViewModel)
+					.ToList();
+
+            }
 			return new();
 		}
 		public CarViewModel? GetElement(CarSearchModel model)
@@ -96,6 +109,7 @@ namespace CarCenterDatabaseImplement.Implements
 				return null;
 			}
 			car.Update(model);
+			car.UpdateBundlings(context, model);
 			context.SaveChanges();
 			return context.Cars
 				   .Include(x => x.Bundlings)

CarCenter/CarCenterDatabaseImplement/Implements/OrderStorage.cs

@@ -3,6 +3,7 @@ using CarCenterContracts.SearchModels;
 using CarCenterContracts.StoragesContracts;
 using CarCenterContracts.ViewModels;
 using CarCenterDatabaseImplement.Models;
+using CarCenterDataModels.Models;
 using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
@@ -57,21 +58,36 @@ namespace CarCenterDatabaseImplement.Implements
             
             if (model.DateFrom.HasValue && model.DateTo.HasValue) //для списка Сагиров
             {
-				//будет применятся в ReportLogic
-                return context.Orders
-                    .Where(x => x.WorkerId == model.WorkerId)
-                    .Include(x => x.Worker)
-                    .Include(x => x.Cars)
-                    .Include(x => x.Presales)
-                    .ThenInclude(x => x.Presale)
-					.ThenInclude(x => x.Requests)
-                    .Include(x => x.Presales)
-                    .ThenInclude(x => x.Presale)
-                    .ThenInclude(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
-                    .Where(x => x.PaymentDate >= model.DateFrom && x.PaymentDate <= model.DateTo)
-                    .Select(x => x.GetViewModel)
-                    .ToList();
+				if(model.WorkerId.HasValue)
+				{
+                    return context.Orders
+                   .Include(x => x.Worker)
+                   .Where(x => x.WorkerId == model.WorkerId)
+                   .Include(x => x.Cars)
+                   .Include(x => x.Presales)
+                   .ThenInclude(x => x.Presale)
+                   .ThenInclude(x => x.Requests)
+                   .Include(x => x.Presales)
+                   //.Where(x => x.PaymentDate >= model.DateFrom && x.PaymentDate <= model.DateTo)
+                   .Select(x => x.GetViewModel)
+                   .ToList();
+                }
+				else
+				{
+                    return context.Orders
+                   .Include(x => x.Worker)
+                   //.Where(x => x.WorkerId == model.WorkerId)
+                   .Include(x => x.Cars)
+				   .ThenInclude(y => y.Bundlings.Where(b => b.BundlingId == model.BundlingId))
+                   .Include(x => x.Presales)
+                   .ThenInclude(x => x.Presale)
+                   .ThenInclude(x => x.Requests)
+                   .Include(x => x.Presales)
+                   //.Where(x => x.PaymentDate >= model.DateFrom && x.PaymentDate <= model.DateTo)
+                   .Select(x => x.GetViewModel)
+                   .ToList();
+                }
+               
             }
             else if (model.Presales.Count > 0) //для отчета Сагиров
             {
@@ -152,6 +168,8 @@ namespace CarCenterDatabaseImplement.Implements
 				return null;
 			}
 			order.Update(model);
+			order.UpdateCars(context, model);
+			order.UpdatePresales(context, model);
 			context.SaveChanges();
 			return context.Orders
 				   .Include(x => x.Worker)

CarCenter/CarCenterDatabaseImplement/Implements/PresaleStorage.cs

@@ -23,7 +23,6 @@ namespace CarCenterDatabaseImplement.Implements
 			{
 				var deletedElement = context.Presales
 					.Include(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
                     .Include(x => x.Requests)
                     .FirstOrDefault(x => x.Id == model.Id)
 					?.GetViewModel;
@@ -43,7 +42,6 @@ namespace CarCenterDatabaseImplement.Implements
 			}
 			return context.Presales
 				.Include(x => x.Bundlings)
-				.ThenInclude(x => x.Bundling)
                 .Include(x => x.Requests)
                 .FirstOrDefault(x => model.Id.HasValue && x.Id == model.Id)
 				?.GetViewModel;
@@ -52,12 +50,22 @@ namespace CarCenterDatabaseImplement.Implements
 		public List<PresaleViewModel> GetFilteredList(PresaleSearchModel model)
 		{
 			using var context = new CarCenterDatabase();
-			if (model.WorkerId.HasValue)
+			if (model.OrderId.HasValue)
+			{
+                return context.Presales
+                    .Include(x => x.Bundlings)
+					.ThenInclude(x => x.Bundling)
+                    .Include(x => x.Requests)
+					.Include(x => x.OrderPresales.Where(y => y.OrderId == model.OrderId))
+                    .Select(x => x.GetViewModel)
+                    .ToList();
+            }
+			else if (model.WorkerId.HasValue)
 			{
 				return context.Presales
 					.Include(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
-					.Include(x => x.Requests)
+                    .ThenInclude(x => x.Bundling)
+                    .Include(x => x.Requests)
 					.Where(x => x.WorkerId == model.WorkerId)
 					.Select(x => x.GetViewModel)
 					.ToList();
@@ -70,7 +78,7 @@ namespace CarCenterDatabaseImplement.Implements
 			using var context = new CarCenterDatabase();
 			return context.Presales
 					.Include(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
+                    .ThenInclude(x => x.Bundling)
                     .Include(x => x.Requests)
                     .Select(x => x.GetViewModel)
 					.ToList();
@@ -88,7 +96,7 @@ namespace CarCenterDatabaseImplement.Implements
 			context.SaveChanges();
 			return context.Presales
 				   .Include(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
+                   .ThenInclude(x => x.Bundling)
                     .Include(x => x.Requests)
                    .FirstOrDefault(x => x.Id == newPresale.Id)
 				   ?.GetViewModel;
@@ -104,11 +112,11 @@ namespace CarCenterDatabaseImplement.Implements
 			}
 			order.Update(model);
 			order.UpdateBundlings(context, model);
-			order.UpdateBundlings(context, model);
+			order.UpdateRequests(context, model);
 			context.SaveChanges();
 			return context.Presales
 				   .Include(x => x.Bundlings)
-					.ThenInclude(x => x.Bundling)
+                   .ThenInclude(x => x.Bundling)
                     .Include(x => x.Requests)
                    .FirstOrDefault(x => x.Id == model.Id)
 				   ?.GetViewModel;

CarCenter/CarCenterDatabaseImplement/Migrations/20240529194318_pochti.Designer.cs

@@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 namespace CarCenterDatabaseImplement.Migrations
 {
     [DbContext(typeof(CarCenterDatabase))]
-    [Migration("20240529170508_predFin2")]
-    partial class predFin2
+    [Migration("20240529194318_pochti")]
+    partial class pochti
     {
         protected override void BuildTargetModel(ModelBuilder modelBuilder)
         {

CarCenter/CarCenterDatabaseImplement/Migrations/20240529194318_pochti.cs

@@ -6,7 +6,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 
 namespace CarCenterDatabaseImplement.Migrations
 {
-    public partial class predFin2 : Migration
+    public partial class pochti : Migration
     {
         protected override void Up(MigrationBuilder migrationBuilder)
         {

CarCenter/CarCenterDatabaseImplement/Models/Bundling.cs

@@ -31,7 +31,21 @@ namespace CarCenterDatabaseImplement.Models
 		public virtual List<CarBundling> CarBundling { get; set; } = new();
 		[ForeignKey("BundlingId")]
 		public virtual List<PresaleBundling> PresaleBundling { get; set; } = new();
-		public static Bundling? Create(BundlingBindingModel model)
+        private Dictionary<int, IPresaleModel>? _bundlingPresales = null;
+        public Dictionary<int, IPresaleModel> BundlingPresales
+        {
+            get
+            {
+                if (_bundlingPresales == null)
+                {
+                    _bundlingPresales = PresaleBundling
+                        .GroupBy(recPc => recPc.PresaleId)
+                        .ToDictionary(g => g.Key, g => g.First().Presale as IPresaleModel);
+                }
+                return _bundlingPresales;
+            }
+        }
+        public static Bundling? Create(CarCenterDatabase context, BundlingBindingModel model)
 		{
 			if (model == null)
 			{
@@ -46,20 +60,11 @@ namespace CarCenterDatabaseImplement.Models
 				ToolKit = model.ToolKit,
 				Price = model.Price,		
 				DateCreate = model.DateCreate,
-			};
-		}
-		public static Bundling Create(BundlingViewModel model)
-		{
-			return new Bundling
-			{
-				Id = model.Id,
-				StorekeeperId=model.StorekeeperId,
-				EquipmentPackage = model.EquipmentPackage,
-				TirePackage = model.TirePackage,
-				ToolKit = model.ToolKit,
-				Price = model.Price,
-				DateCreate = model.DateCreate,
-			};
+                PresaleBundling = model.BundlingsPresale.Select(x => new PresaleBundling
+                {
+                    Presale = context.Presales.First(y => y.Id == x.Value.Id)
+                }).ToList()
+            };
 		}
 		public void Update(BundlingBindingModel model)
 		{
@@ -74,7 +79,29 @@ namespace CarCenterDatabaseImplement.Models
 			ToolKit = model.ToolKit;
 			Price = model.Price;
 		}
-		public BundlingViewModel GetViewModel => new()
+        public void UpdatePresales(CarCenterDatabase context, BundlingBindingModel model)
+        {
+            var bundling = context.Bundlings.First(x => x.Id == Id);
+            var existingPresaleBundlings = context.PresaleBundlings.Where(pb => pb.BundlingId == bundling.Id).ToList();
+            context.PresaleBundlings.RemoveRange(existingPresaleBundlings);
+            context.SaveChanges();
+            foreach (var pc in model.BundlingsPresale)
+            {
+                var tmp = new PresaleBundling
+                {
+                    Bundling = bundling,
+                    Presale = context.Presales.First(x => x.Id == pc.Value.Id),
+                };
+                if (context.PresaleBundlings.Contains(tmp))
+                {
+                    continue;
+                }
+                context.PresaleBundlings.Add(tmp);
+                context.SaveChanges();
+            }
+			_bundlingPresales = null;
+        }
+        public BundlingViewModel GetViewModel => new()
 		{
 			Id = Id,
 			StorekeeperId = StorekeeperId,
@@ -83,6 +110,7 @@ namespace CarCenterDatabaseImplement.Models
 			ToolKit = ToolKit,
 			Price = Price,		
 			DateCreate = DateCreate,
+			BundlingsPresale = BundlingPresales,
 		};
 	}
 }

CarCenter/CarCenterDatabaseImplement/Models/Car.cs

@@ -85,7 +85,10 @@ namespace CarCenterDatabaseImplement.Models
 		public void UpdateBundlings(CarCenterDatabase context, CarBindingModel model)
 		{
 			var car = context.Cars.First(x => x.Id == Id);
-			foreach (var pc in model.CarBundlings)
+            var existingBundling = context.CarBundlings.Where(pb => pb.CarId == car.Id).ToList();
+            context.CarBundlings.RemoveRange(existingBundling);
+            context.SaveChanges();
+            foreach (var pc in model.CarBundlings)
 			{
 				context.CarBundlings.Add(new CarBundling
 				{

CarCenter/CarCenterDatabaseImplement/Models/Order.cs

@@ -38,7 +38,9 @@ namespace CarCenterDatabaseImplement.Models
 			{
 				if(_orderPresales == null)
 				{
-					_orderPresales = Presales.ToDictionary(recPc => recPc.PresaleId, recPc => recPc.Presale as IPresaleModel);
+					_orderPresales = Presales
+                         .GroupBy(recPc => recPc.PresaleId)
+						.ToDictionary(g => g.Key, g => g.First().Presale as IPresaleModel);
 				}
 				return _orderPresales;
 			}
@@ -91,18 +93,44 @@ namespace CarCenterDatabaseImplement.Models
 		public void UpdatePresales(CarCenterDatabase context, OrderBindingModel model)
 		{
 			var order = context.Orders.First(x => x.Id == Id);
-			foreach (var pc in model.OrderPresales)
+            var existingPresale = context.OrderPresales.Where(pb => pb.OrderId == order.Id).ToList();
+            context.OrderPresales.RemoveRange(existingPresale);
+            context.SaveChanges();
+            foreach (var pc in model.OrderPresales)
 			{
-				context.OrderPresales.Add(new OrderPresale
+				var tmp = new OrderPresale
 				{
 					Order = order,
-					Presale = context.Presales.First(x => x.Id == pc.Key),
-				});
+					Presale = context.Presales.First(x => x.Id == pc.Value.Id),
+				};
+				if (context.OrderPresales.Contains(tmp))
+				{
+					continue;
+				}
+				context.OrderPresales.Add(tmp);
 				context.SaveChanges();
 			}
 			_orderPresales = null;
 		}
-		public OrderViewModel GetViewModel => new()
+        public void UpdateCars(CarCenterDatabase context, OrderBindingModel model)
+        {
+            var order = context.Orders.First(x => x.Id == Id);
+            order.Cars.Clear();
+            foreach (var car in model.Cars)
+            {
+                var cartmp = context.Cars.FirstOrDefault(x => x.Id == car.Value.Id);
+                if (cartmp != null)
+                {
+					if (order.Cars.Contains(cartmp))
+					{
+						continue;
+					}
+                    order.Cars.Add(cartmp);
+                }
+            }
+            context.SaveChanges();
+        }
+        public OrderViewModel GetViewModel => new()
 		{
 			Id = Id,
 			WorkerId = WorkerId,

CarCenter/CarCenterDatabaseImplement/Models/Presale.cs

@@ -31,15 +31,16 @@ namespace CarCenterDatabaseImplement.Models
 
 		private Dictionary<int, IBundlingModel>? _presaleBundlings = null;
 		[ForeignKey("PresaleId")]
-		public virtual List<PresaleBundling> Bundlings { get; set; } = new();
-		public Dictionary<int, IBundlingModel> PresaleBundlings
+		public virtual List<PresaleBundling>? Bundlings { get; set; } = new();
+        [NotMapped]
+        public Dictionary<int, IBundlingModel> PresaleBundlings
 		{
 			get
 			{
 				if (_presaleBundlings == null)
 				{
-					_presaleBundlings = Bundlings.ToDictionary(recPc => recPc.BundlingId, recPc => recPc.Bundling as IBundlingModel);
-				}
+                    _presaleBundlings = Bundlings.ToDictionary(recPc => recPc.BundlingId, recPc => recPc.Bundling as IBundlingModel);
+                }
 				return _presaleBundlings;
 			}
 		}
@@ -75,7 +76,7 @@ namespace CarCenterDatabaseImplement.Models
             return presale;
 		}
 
-		public void UpdateBundlings(CarCenterDatabase context, PresaleBindingModel model)
+		public void UpdateRequests(CarCenterDatabase context, PresaleBindingModel model)
 		{
 			var presale = context.Presales.First(x => x.Id == Id);
             foreach (var request in model.Requests)
@@ -83,21 +84,33 @@ namespace CarCenterDatabaseImplement.Models
                 var requesttmp = context.Requests.FirstOrDefault(x => x.Id == request.Value.Id);
                 if (requesttmp != null)
                 {
+					if (presale.Requests.Contains(requesttmp))
+					{
+						continue;
+					}
                     presale.Requests.Add(requesttmp);
                 }
             }
         }
 
-        public void UpdateRequests(CarCenterDatabase context, PresaleBindingModel model)
+        public void UpdateBundlings(CarCenterDatabase context, PresaleBindingModel model)
         {
             var presale = context.Presales.First(x => x.Id == Id);
+            var existingBundling = context.PresaleBundlings.Where(pb => pb.PresaleId == presale.Id).ToList();
+            context.PresaleBundlings.RemoveRange(existingBundling);
+            context.SaveChanges();
             foreach (var pc in model.PresaleBundlings)
             {
-                context.PresaleBundlings.Add(new PresaleBundling
+                var tmp = new PresaleBundling
                 {
                     Presale = presale,
                     Bundling = context.Bundlings.First(x => x.Id == pc.Value.Id),
-                });
+                };
+				if (context.PresaleBundlings.Contains(tmp))
+				{
+					continue;
+				}
+				context.PresaleBundlings.Add(tmp);
                 context.SaveChanges();
             }
             _presaleBundlings = null;

CarCenter/CarCenterStorekeeperApp/StorekeeperData.cs

@@ -5,6 +5,8 @@ using CarCenterContracts.StoragesContracts;
 using CarCenterContracts.SearchModels;
 using CarCenterBusinessLogic.MailWorker;
 using CarCenterBusinessLogic.OfficePackage;
+using CarCenterDatabaseImplement.Models;
+using DocumentFormat.OpenXml.Bibliography;
 
 namespace StorekeeperApp
 {
@@ -120,24 +122,56 @@ namespace StorekeeperApp
         {
             return _carLogic.Delete(new() { Id = carId });
         }
-        public List<ReportBundlingViewModel> GetTimeReport(DateTime? startDate, DateTime? endDate, int UserId)
+        public List<ReportBundlingViewModel> GetTimeReport(DateTime? startDate, DateTime? endDate, int userId)
         {
-            var bundlings = _bundlingLogic.ReadList(new() { DateFrom = startDate, DateTo = endDate, StorekeeperId = UserId });
+            var bundlings = _bundlingLogic.ReadList(new BundlingSearchModel { StorekeeperId = userId });
             if (bundlings == null)
-                return new();
+                return new List<ReportBundlingViewModel>();
+
             List<ReportBundlingViewModel> bundlingTimeReports = new List<ReportBundlingViewModel>();
+
             foreach (var bundling in bundlings)
             {
-                var report = new ReportBundlingViewModel();
-                report.BundlingId = bundling.Id;
-                var features = _featureLogic.ReadList(new() { BundlingId = bundling.Id, StorekeeperId = UserId });
-                if (features != null)
-                    report.Features = features.Select(p => p.Id.ToString()).ToList();
-                var orders = _orderLogic.ReadList(new() { BundlingId = bundling.Id, WorkerId = UserId });
-                if (orders != null)
-                    report.Orders = orders.Select(p => p.Id.ToString()).ToList();
+                var report = new ReportBundlingViewModel
+                {
+                    BundlingId = bundling.Id,
+                    Features = new List<string>(),
+                    Orders = new List<string>()
+                };
+
+                // Получение Orders
+                var orders = _orderLogic.ReadList(new OrderSearchModel { BundlingId = bundling.Id, DateFrom = startDate, DateTo = endDate });
+                if (orders?.Count != 0 && orders != null) 
+                {
+                    // Получение Features из машин в заказах
+                    var features = new List<string>();
+                    foreach (var order in orders)
+                    {
+                        bool fnd = false;
+                        var cars = order.Cars; 
+                        foreach (var car in cars) { 
+                            if(car.Value.CarBundlings.Count <= 0)
+                            {
+                                continue;
+                            }
+                            var carFeatures = _carLogic.ReadList(new CarSearchModel { FeatureId = car.Value.FeatureID, OrderId = order.Id });
+                            if (carFeatures?.Count != 0 && carFeatures != null)
+                            {
+                                fnd = true;
+                                features.AddRange(carFeatures.Select(f => f.FeatureID.ToString()));
+                            }
+                        }
+                        if (fnd)
+                        {
+                            report.Orders.Add(order.Id.ToString());
+                        }
+                    }
+                    report.Features = features.Distinct().ToList(); // Удаление дубликатов
+                }
+
                 bundlingTimeReports.Add(report);
             }
+
             return bundlingTimeReports;
         }
         public List<PresaleViewModel>? GetPresales()
@@ -149,18 +183,25 @@ namespace StorekeeperApp
             return _orderLogic.ReadList(null);
         }
 
-        public List<ReportCarViewModel>? GetPresaleReports(List<int> bundlings)
+        public List<ReportCarViewModel>? GetPresaleReports(List<int> cars)
         {
             List<ReportCarViewModel> reports = new();
-            foreach (int i in bundlings)
+
+            var orders = _orderLogic.ReadList(null);
+            foreach (var order in orders)
             {
-                ReportCarViewModel report = new();
-                var bundling = _carLogic.ReadElement(new() { Id = i });
-                report.VINnumber = (int)bundling!.VINnumber;
-                var presales = _presaleLogic.ReadList(new() { CarId = i });
-                if (presales != null)
-                    report.Presales = presales.Select(w => w.Id.ToString()).ToList();
-                reports.Add(report);
+                var Cars = order.Cars;
+                foreach (var car in Cars)
+                {
+                    ReportCarViewModel report = new();
+                    report.VINnumber = (int)car.Value.VINnumber;
+                    if (cars.Contains(car.Value.Id))
+                    {
+                        report.Presales = order.OrderPresales.Select(p => p.Value.Id.ToString()).ToList();
+                    }
+                    reports.Add(report);
+                }
+                
             }
             return reports;
         }

CarCenter/CarCenterStorekeeperApp/Views/Home/CreateBundling.cshtml

@@ -16,7 +16,7 @@
             <select name="EquipmentPackage" id="EquipmentPackage" value="@Model.EquipmentPackage">
                 @foreach (var value in Enum.GetValues(typeof(EquipmentPackage)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.EquipmentPackage) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="EquipmentPackageError" class="text-danger"></span>
@@ -28,7 +28,7 @@
             <select name="TirePackage" id="TirePackage" value="@Model.TirePackage">
                 @foreach (var value in Enum.GetValues(typeof(TirePackage)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.TirePackage) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="TirePackageError" class="text-danger"></span>
@@ -40,7 +40,7 @@
             <select name="ToolKit" id="ToolKit" value="@Model.ToolKit">
                 @foreach (var value in Enum.GetValues(typeof(ToolKit)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.ToolKit) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="ToolKiteError" class="text-danger"></span>
@@ -99,6 +99,11 @@
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 <script>
     $(document).ready(function () {
+        $(document).on('click', '.deletePresale', function () {
+            var row = $(this).closest('tr');
+            row.remove();
+            updateSum();
+        });
         $('#addPresale').click(function () {
             var selectedPresale = $('#presaleSelect option:selected');
             if (selectedPresale.val()) {
@@ -111,20 +116,23 @@
                     }
                 });
                 if (exists) {
-                    alert('Эта комплектация уже добавлена.');
+                    alert('Эта работа уже добавлена.');
                     return;
                 }
 
                 var presaleName = selectedPresale.text();
+                var presalePrice = selectedPresale.data('price');
 
                 var newRow = `
-                                            <tr data-presale-id="${presaleId}">
+                                                    <tr data-presale-id="${presaleId}">
                                                 <td>
-                                                    <input type="hidden" name="presaleIds" value="${presaleId}" />
-                                                    ${presaleId}
+                                                            <input type="hidden" name="presaleIds" value="${presaleId}" />
+                                                        ${presaleId}
                                                 </td>
                                                 <th>     </th>
-                                                <td><button type="button" class="deletePresale" data-presale-id="${presaleId}">Удалить</button></td>
+                                                            <td class="presale-price" data-price="${presalePrice}">${presalePrice}</td>
+                                                <th>     </th>
+                                                            <td><button type="button" class="deletePresale" data-presale-id="${presaleId}">Удалить</button></td>
                                             </tr>
                                         `;
                 $('#presalesTable tbody').append(newRow);
@@ -139,7 +147,7 @@
 
                 updateSum();
             } else {
-                alert('Выберите комплектацию для добавления');
+                alert('Выберите работу для добавления');
             }
         });
         $('#bundlinglForm').submit(function (event) {

CarCenter/CarCenterStorekeeperApp/Views/Home/CreateCar.cshtml

@@ -17,7 +17,7 @@
             <select name="CarBrand" id="CarBrand" value="@Model.CarBrand">
                 @foreach (var value in Enum.GetValues(typeof(CarBrand)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.CarBrand) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="CarBrandError" class="text-danger"></span>
@@ -36,7 +36,7 @@
             <select name="CarClass" id="CarClass" value="@Model.CarClass">
                 @foreach (var value in Enum.GetValues(typeof(CarClass)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.CarClass) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="CarClassError" class="text-danger"></span>
@@ -62,7 +62,7 @@
             <select name="FeatureId" id="FeatureId">
                 @foreach (var feature in ViewBag.Features)
                 {
-                    <option value="@feature.Id">Особенность @feature.Id</option>
+                    <option value="@feature.Id" selected="@(feature.Id.Equals(Model.FeatureID) ? "selected" : null)">Особенность @feature.Id</option>
                 }
             </select>
             <span id="FeatureIdError" class="text-danger"></span>

CarCenter/CarCenterStorekeeperApp/Views/Home/CreateFeature.cshtml

@@ -17,7 +17,7 @@
             <select name="HelpDevice" id="HelpDevice" value="@Model.HelpDevice">
                 @foreach (var value in Enum.GetValues(typeof(HelpDevices)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.HelpDevice) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="HelpDeviceError" class="text-danger"></span>
@@ -29,7 +29,7 @@
             <select name="DriveType" id="DriveType" value="@Model.DriveType">
                 @foreach (var value in Enum.GetValues(typeof(DriveTypes)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.DriveType) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="DriveTypeeError" class="text-danger"></span>

CarCenter/CarCenterWorkerApp/CarCenterWorkerApp.csproj

@@ -13,4 +13,10 @@
     <ProjectReference Include="..\CarCenterDataModels\CarCenterDataModels.csproj" />
   </ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.26" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+	</ItemGroup>
+
 </Project>

CarCenter/CarCenterWorkerApp/Controllers/HomeController.cs

@@ -164,13 +164,13 @@ namespace CarCenterWorkerApp.Controllers
             for (int i = 0; i < bundlingIds.Length; i++)
             {
                 var bundling = bundlings!.FirstOrDefault(x => x.Id == bundlingIds[i])!;
-                model.PresaleBundlings.Add(i, bundling);
+                model.PresaleBundlings.TryAdd(bundling.Id, bundling);
             }
             var requests = _data.GetRequests(UserWorker.user!.Id);
             for (int i = 0; i < requestIds.Length; i++)
             {
                 var request = requests!.FirstOrDefault(x => x.Id == requestIds[i])!;
-                model.Requests.Add(i, request);
+                model.Requests.TryAdd(request.Id, request);
             }
             model.WorkerId = UserWorker.user!.Id;
             bool changed = false;
@@ -240,7 +240,7 @@ namespace CarCenterWorkerApp.Controllers
                 model.OrderPresales.Add(i, presale);
             }
             model.WorkerId = UserWorker.user!.Id;
-            if(double.TryParse(Sum, out double val))
+            if(double.TryParse(Sum, System.Globalization.CultureInfo.InvariantCulture, out double val))
             {
                 model.Sum = val;
             }
@@ -264,5 +264,135 @@ namespace CarCenterWorkerApp.Controllers
                 return View(model);
             }
         }
+        [HttpGet]
+        public IActionResult OrderTimeChoose()
+        {
+            if (!IsLoggedIn)
+                return RedirectToAction("IndexNonReg");
+            return View();
+        }
+        [HttpPost]
+        public IActionResult SendReport(DateTime startDate, DateTime endDate)
+        {
+
+            return Ok();
+        }
+        [HttpGet]
+        public IActionResult OrderTimeReport()
+        {
+            var startDateStr = HttpContext.Session.GetString("StartDate");
+            var endDateStr = HttpContext.Session.GetString("EndDate");
+
+            if (string.IsNullOrEmpty(startDateStr) || string.IsNullOrEmpty(endDateStr))
+            {
+                return RedirectToAction("OrderTimeChoose");
+            }
+
+            var startDate = DateTime.Parse(startDateStr);
+            var endDate = DateTime.Parse(endDateStr).AddDays(1);
+
+            var values = _data.GetTimeReport(startDate, endDate, UserId);
+
+            ViewBag.StartDate = startDate;
+            ViewBag.EndDate = endDate;
+
+            return View(values);
+        }
+        [HttpPost]
+        public IActionResult TimeReportWeb(DateTime startDate, DateTime endDate)
+        {
+            if (!IsLoggedIn)
+                return RedirectToAction("IndexNonReg");
+
+            HttpContext.Session.SetString("StartDate", startDate.ToString("yyyy-MM-dd"));
+            HttpContext.Session.SetString("EndDate", endDate.ToString("yyyy-MM-dd"));
+
+            return RedirectToAction("OrderTimeReport");
+        }
+        [HttpPost]
+        public void OrderTimeMail()
+        {
+            var startDateStr = HttpContext.Session.GetString("StartDate");
+            var endDateStr = HttpContext.Session.GetString("EndDate");
+            var startDate = DateTime.Parse(startDateStr);
+            var endDate = DateTime.Parse(endDateStr).AddDays(1);
+            using (MemoryStream memoryStream = new MemoryStream())
+            {
+                _data.SendMailReport(startDate, endDate, UserId, memoryStream);
+            }
+            Response.Redirect("OrderTimeReport");
+        }
+        [HttpGet]
+        public IActionResult PresaleCarChoose()
+        {
+            if (!IsLoggedIn)
+                return RedirectToAction("IndexNonReg");
+            var details = _data.GetPresales(UserId);
+            return View(details);
+        }
+        [HttpPost]
+        public IActionResult PresaleCarChoose(List<int> selectedItems, string reportType)
+        {
+            string value = string.Join("/", selectedItems);
+            HttpContext.Session.SetString("Presales", value);
+            if (reportType.Equals("default"))
+                return RedirectToAction("PresaleCarReport");
+            else if (reportType.Equals("excel"))
+                return RedirectToAction("ExcelGenerate");
+            else
+                return RedirectToAction("WordGenerate");
+        }
+        public async Task<IActionResult> ExcelGenerate()
+        {
+            var value = HttpContext.Session.GetString("Presales");
+            if (value != null)
+            {
+                List<int> rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList();
+                using (MemoryStream memoryStream = new MemoryStream())
+                {
+                    _data.SaveReportExcel(rawReports, memoryStream);
+                    memoryStream.Seek(0, SeekOrigin.Begin);
+                    var outputStream = new MemoryStream();
+                    await memoryStream.CopyToAsync(outputStream);
+                    outputStream.Seek(0, SeekOrigin.Begin);
+                    return File(outputStream, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "ReportExcel.xlsx");
+                }
+            }
+            return RedirectToAction("PresaleCarChoose");
+        }
+        public async Task<IActionResult> WordGenerate()
+        {
+            var value = HttpContext.Session.GetString("Presales");
+            if (value != null)
+            {
+                List<int> rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList();
+                using (MemoryStream memoryStream = new MemoryStream())
+                {
+                    _data.SaveReportWord(rawReports, memoryStream);
+                    memoryStream.Seek(0, SeekOrigin.Begin);
+                    var outputStream = new MemoryStream();
+                    await memoryStream.CopyToAsync(outputStream);
+                    outputStream.Seek(0, SeekOrigin.Begin);
+                    return File(outputStream, "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "ReportWord.docx");
+                }
+            }
+            return RedirectToAction("PresaleCarChoose");
+        }
+        [HttpGet]
+        public IActionResult PresaleCarReport()
+        {
+            var value = HttpContext.Session.GetString("Presales");
+            if (value != null)
+            {
+                List<int> rawReports = value!.Split('/').Select(x => int.Parse(x)).ToList();
+                var reports = _data.GetPresaleReports(rawReports);
+                return View(reports);
+            }
+            return View(new List<ReportCarViewModel>());
+        }
+        public IActionResult ReportMenu()
+        {
+            return View();
+        }
     }
 }

CarCenter/CarCenterWorkerApp/Program.cs

@@ -1,14 +1,18 @@
 using CarCenterBusinessLogic.BusinessLogics;
+using CarCenterBusinessLogic.MailWorker;
+using CarCenterBusinessLogic.OfficePackage;
+using CarCenterBusinessLogic.OfficePackage.Implements;
 using CarCenterContracts.BusinessLogicsContracts;
 using CarCenterContracts.StoragesContracts;
 using CarCenterDatabaseImplement.Implements;
 using WorkerApp;
+
 var builder = WebApplication.CreateBuilder(args);
 
 // Add services to the container.
 builder.Services.AddControllersWithViews();
 
-
+builder.Logging.SetMinimumLevel(LogLevel.Trace);
 
 builder.Services.AddTransient<IBundlingStorage, BundlingStorage>();
 builder.Services.AddTransient<ICarStorage, CarStorage>();
@@ -18,7 +22,6 @@ builder.Services.AddTransient<IPresaleStorage, PresaleStorage>();
 builder.Services.AddTransient<IRequestStorage, RequestStorage>();
 builder.Services.AddTransient<IStorekeeperStorage, StorekeeperStorage>();
 builder.Services.AddTransient<IWorkerStorage, WorkerStorage>();
-
 builder.Services.AddTransient<IBundlingLogic, BundlingLogic>();
 builder.Services.AddTransient<ICarLogic, CarLogic>();
 builder.Services.AddTransient<IFeatureLogic, FeatureLogic>();
@@ -27,28 +30,48 @@ builder.Services.AddTransient<IPresaleLogic, PresaleLogic>();
 builder.Services.AddTransient<IRequestLogic, RequestLogic>();
 builder.Services.AddTransient<IStorekeeperLogic, StorekeeperLogic>();
 builder.Services.AddTransient<IWorkerLogic, WorkerLogic>();
+builder.Services.AddTransient<AbstractSaveToExcelWorker, SaveToExcelWorker>();
+builder.Services.AddTransient<AbstractSaveToWordWorker, SaveToWordWorker>();
+builder.Services.AddTransient<AbstractSaveToPdfWorker, SaveToPdfWorker>();
+builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 builder.Services.AddTransient<WorkerData>();
 
+builder.Services.AddSession(options =>
+{
+    options.IdleTimeout = TimeSpan.FromMinutes(30);
+    options.Cookie.HttpOnly = true;
+    options.Cookie.IsEssential = true;
+});
 var app = builder.Build();
+var mailSender = app.Services.GetService<AbstractMailWorker>();
+mailSender?.MailConfig(new()
+{
+    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
+    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
+    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
+    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
+    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
+    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
 
+});
 
 // Configure the HTTP request pipeline.
 if (!app.Environment.IsDevelopment())
 {
-    app.UseExceptionHandler("/Home/Error");
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
+	app.UseExceptionHandler("/Home/Error");
+	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+	app.UseHsts();
 }
 
 app.UseHttpsRedirection();
 app.UseStaticFiles();
 
 app.UseRouting();
-
+app.UseSession();
 app.UseAuthorization();
 
 app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
+	name: "default",
+	pattern: "{controller=Home}/{action=Index}/{id?}");
 
 app.Run();

CarCenter/CarCenterWorkerApp/Views/Home/CreateOrder.cshtml

@@ -18,7 +18,7 @@
             <select name="PaymentType" id="PaymentType" value="@Model.PaymentType">
                 @foreach (var value in Enum.GetValues(typeof(PaymentType)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.PaymentType) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="PaymentTypeError" class="text-danger"></span>
@@ -32,7 +32,7 @@
                 <select name="PaymentStatus" id="PaymentStatus" value="@Model.PaymentStatus">
                     @foreach (var value in Enum.GetValues(typeof(PaymentStatus)))
                     {
-                        <option value="@value">@value</option>
+                        <option value="@value" selected="@(value.Equals(Model.PaymentStatus) ? "selected" : null)">@value</option>
                     }
                 </select>
                 <span id="PaymentStatusError" class="text-danger"></span>

CarCenter/CarCenterWorkerApp/Views/Home/CreatePresale.cshtml

@@ -19,7 +19,7 @@
             <select name="PresaleStatus" id="PresaleStatus" value="@Model.PresaleStatus">
                 @foreach (var value in Enum.GetValues(typeof(PresaleStatus)))
                 {
-                    <option value="@value">@value</option>
+                        <option value="@value" selected="@(value.Equals(Model.PresaleStatus) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="PresaleStatusError" class="text-danger"></span>

CarCenter/CarCenterWorkerApp/Views/Home/CreateRequest.cshtml

@@ -24,7 +24,7 @@
             <select name="RequestType" id="RequestType" value="@Model.RequestType">
                 @foreach (var value in Enum.GetValues(typeof(RequestTypes)))
                 {
-                    <option value="@value">@value</option>
+                    <option value="@value" selected="@(value.Equals(Model.RequestType) ? "selected" : null)">@value</option>
                 }
             </select>
             <span id="RequestTypeError" class="text-danger"></span>

CarCenter/CarCenterWorkerApp/Views/Home/Index.cshtml

@@ -9,7 +9,7 @@
         <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexPresale">Предпродажные</a>
         <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="IndexOrder">Покупки</a>
         <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
-        @* <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ReportsMenu">Меню отчетов</a> *@
+        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ReportMenu">Меню отчетов</a>
         <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Logout">Выйти</a>
 
     </div>

CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeChoose.cshtml

@@ -0,0 +1,85 @@
+@{
+    ViewData["Title"] = "Создание отчета";
+}
+
+<div class="text-center">
+    <h2 class="display-4">Создание отчета</h2>
+</div>
+<form id="TimeReportWeb" asp-controller="Home" method="post">
+    <div class="row mb-3">
+        <div class="col-4 text-right">
+            <label for="startDate">Дата начала:</label>
+        </div>
+        <div class="col-6">
+            <input type="date" id="startDate" name="startDate" class="form-control" required />
+            <span id="startDateError" class="text-danger"></span>
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-4 text-right">
+            <label for="endDate">Дата окончания:</label>
+        </div>
+        <div class="col-6">
+            <input type="date" id="endDate" name="endDate" class="form-control" required />
+            <span id="endDateError" class="text-danger"></span>
+        </div>
+    </div>
+    <div class="row mb-3">
+        <div class="col-6 text-right">
+            <button type="button" id="generateReport" class="btn btn-primary">Создать отчет</button>
+        </div>
+    </div>
+</form>
+
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+<script>
+    $(document).ready(function () {
+        function validateDates() {
+            var startDate = $('#startDate').val();
+            var endDate = $('#endDate').val();
+            var today = new Date().toISOString().split('T')[0];
+            var isValid = true;
+
+            $('#startDateError').text('');
+            $('#endDateError').text('');
+
+            if (!startDate) {
+                $('#startDateError').text('Пожалуйста, выберите дату начала.');
+                isValid = false;
+            }
+            if (!endDate) {
+                $('#endDateError').text('Пожалуйста, выберите дату окончания.');
+                isValid = false;
+            }
+
+            if (isValid) {
+                if (startDate > today) {
+                    $('#startDateError').text('Дата начала не может быть больше сегодняшней даты.');
+                    isValid = false;
+                }
+                if (endDate > today) {
+                    $('#endDateError').text('Дата окончания не может быть больше сегодняшней даты.');
+                    isValid = false;
+                }
+                if (startDate > endDate) {
+                    $('#endDateError').text('Дата окончания не может быть раньше даты начала.');
+                    isValid = false;
+                }
+            }
+
+            return isValid;
+        }
+
+        $('#generateReport').click(function () {
+            if (validateDates()) {
+                var formData = $('#TimeReportWeb').serialize();
+
+                $.post('/Home/TimeReportWeb', formData, function (response) {
+                    window.location.href = '/Home/OrderTimeReport';
+                }).fail(function () {
+                    alert('Произошла ошибка при создании отчета.');
+                });
+            }
+        });
+    });
+</script>

CarCenter/CarCenterWorkerApp/Views/Home/OrderTimeReport.cshtml

@@ -0,0 +1,50 @@
+@using CarCenterContracts.ViewModels
+
+@model List<ReportOrderViewModel>
+
+@{
+    ViewData["Title"] = "Bundlings on Time Bundlings";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Список покупок в диапазоне времени</h1>
+</div>
+
+<form asp-action="BundlingTimeMail" asp-controller="Home" method="post">
+    <button type="submit" class="btn btn-primary">Отправить отчет на почту</button>
+</form>
+
+
+<table class="table">
+    <thead>
+        <tr>
+            <th>Покупка</th>
+            <th>Комплектация</th>
+            <th>Пожелания</th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach (var detail in Model)
+        {
+            <tr>
+                <td>@detail.OrderId</td>
+                <td>
+                    <ul>
+                        @foreach (var product in detail.Bundlings)
+                        {
+                            <li>@product</li>
+                        }
+                    </ul>
+                </td>
+                <td>
+                    <ul>
+                        @foreach (var production in detail.Requests)
+                        {
+                            <li>@production</li>
+                        }
+                    </ul>
+                </td>
+            </tr>
+        }
+    </tbody>
+</table>

CarCenter/CarCenterWorkerApp/Views/Home/PresaleCarChoose.cshtml

@@ -0,0 +1,54 @@
+@using CarCenterContracts.ViewModels;
+@model List<PresaleViewModel>
+
+@{
+    ViewData["Title"] = "Выбор машин для отчета";
+}
+
+<h2>Выберите детали для отчета</h2>
+
+<form asp-controller="Home" asp-action="PresaleCarChoose" method="post" onsubmit="return validateForm()">
+    <table class="table">
+        <thead>
+            <tr>
+                <th>Select</th>
+                <th>Выберите работу:</th>
+            </tr>
+        </thead>
+        <tbody>
+            @for (int i = 0; i < Model.Count; i++)
+            {
+                <tr>
+                    <td>
+                        <input type="checkbox" name="selectedItems" value="@Model[i].Id" />
+                    </td>
+                    <td>@Model[i].Description</td>
+                </tr>
+            }
+        </tbody>
+    </table>
+    <input type="hidden" id="reportType" name="reportType" value="default" />
+    <button type="submit" class="btn btn-primary" onclick="setReportType('default')">Сгенерировать отчет</button>
+    <button type="submit" class="btn btn-secondary" onclick="setReportType('excel')">Сгенерировать отчет в Excel</button>
+    <button type="submit" class="btn btn-secondary" onclick="setReportType('word')">Сгенерировать отчет в Word</button>
+    <div id="validationMessage" style="display:none;color:red;">Пожалуйста, выберите хотя бы одну деталь.</div>
+</form>
+
+@section Scripts {
+    <script>
+        function validateForm() {
+            var checkboxes = document.querySelectorAll('input[name="selectedItems"]:checked');
+            if (checkboxes.length === 0) {
+                document.getElementById('validationMessage').style.display = 'block';
+                return false;
+            } else {
+                document.getElementById('validationMessage').style.display = 'none';
+                return true;
+            }
+        }
+
+        function setReportType(type) {
+            document.getElementById('reportType').value = type;
+        }
+    </script>
+}

CarCenter/CarCenterWorkerApp/Views/Home/PresaleCarReport.cshtml

@@ -0,0 +1,35 @@
+@using CarCenterContracts.ViewModels
+
+@model List<ReportPresaleViewModel>
+
+@{
+    ViewData["Title"] = "Отчет машина - предпродажные";
+}
+<div class="text-center">
+    <h1 class="display-4">Список  предпродажных с  машинами </h1>
+</div>
+
+<table class="table">
+    <thead>
+        <tr>
+            <th>Предпродажная</th>
+            <th>Машины</th>
+        </tr>
+    </thead>
+    <tbody>
+        @foreach (var detail in Model)
+        {
+            <tr>
+                <td>@detail.PresaleId</td>
+                <td>
+                    <ul>
+                        @foreach (var workshop in detail.Cars)
+                        {
+                            <li>@workshop</li>
+                        }
+                    </ul>
+                </td>
+            </tr>
+        }
+    </tbody>
+</table>

CarCenter/CarCenterWorkerApp/Views/Home/ReportMenu.cshtml

@@ -0,0 +1,11 @@
+@{
+    ViewData["Title"] = "Report Menu";
+}
+
+<div class="text-center">
+    <h1 class="display-4">Меню создания отчетов</h1>
+    <div class="list-group">
+        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="PresaleCarChoose">Отчет предпродажные - машина</a>
+        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="OrderTimeChoose">Отчет по покупкам по пожеланиям и комплектациям</a>
+    </div>
+</div>

CarCenter/CarCenterWorkerApp/WorkerData.cs

@@ -4,6 +4,10 @@ using CarCenterContracts.BindingModels;
 using CarCenterContracts.StoragesContracts;
 using CarCenterContracts.SearchModels;
 using CarCenterBusinessLogic.BusinessLogics;
+using DocumentFormat.OpenXml.ExtendedProperties;
+using DocumentFormat.OpenXml.Spreadsheet;
+using CarCenterBusinessLogic.MailWorker;
+using CarCenterBusinessLogic.OfficePackage;
 
 namespace WorkerApp
 {
@@ -16,8 +20,16 @@ namespace WorkerApp
 		private readonly IOrderLogic _orderLogic;
 		private readonly ICarLogic _carLogic;
         private readonly IBundlingLogic _bundlingLogic;
+        private readonly AbstractSaveToExcelWorker _excel;
+        private readonly AbstractSaveToWordWorker _word;
+        private readonly AbstractSaveToPdfWorker _pdf;
+        private readonly AbstractMailWorker _mail;
 
-        public WorkerData(ILogger<WorkerData> logger, IWorkerLogic storekeeperLogic, IPresaleLogic presaleLogic, IRequestLogic requestLogic, IOrderLogic orderLogic, IBundlingLogic bundlingLogic, ICarLogic carLogic)
+        public WorkerData(ILogger<WorkerData> logger, IWorkerLogic storekeeperLogic, IPresaleLogic presaleLogic, IRequestLogic requestLogic, IOrderLogic orderLogic, IBundlingLogic bundlingLogic, ICarLogic carLogic,
+            AbstractSaveToExcelWorker excel,
+                         AbstractSaveToWordWorker word,
+                         AbstractMailWorker mail,
+                         AbstractSaveToPdfWorker pdf)
         {
             _logger = logger;
             _storekeeperLogic = storekeeperLogic;
@@ -26,6 +38,10 @@ namespace WorkerApp
             _orderLogic = orderLogic;
             _bundlingLogic = bundlingLogic;
             _carLogic = carLogic;
+            _excel = excel;
+            _word = word;
+            _mail = mail;
+            _pdf = pdf;
         }
 
         public WorkerViewModel? Login(string email, string password)
@@ -114,5 +130,101 @@ namespace WorkerApp
         {
             return _carLogic.ReadList(null);
         }
+        public List<ReportPresaleViewModel>? GetPresaleReports(List<int> presales)
+        {
+            List<ReportPresaleViewModel> reports = new();
+
+            var orders = _orderLogic.ReadList(null);
+            foreach (var order in orders)
+            {
+                ReportPresaleViewModel report = new();
+                if (order.OrderPresales.Select(x => x.Value).Any(y => presales.Contains(y.Id)))
+                {
+                    report.PresaleId = order.OrderPresales.Keys.FirstOrDefault();
+                    report.Cars = order.Cars.Select(x => x.Key.ToString()).ToList();
+                }
+                reports.Add(report);
+
+            }
+            return reports;
+        }
+        public List<ReportOrderViewModel> GetTimeReport(DateTime? startDate, DateTime? endDate, int userId)
+        {
+            var orders = _orderLogic.ReadList(new OrderSearchModel { WorkerId = userId, DateFrom = startDate, DateTo = endDate});
+            if (orders == null)
+                return new List<ReportOrderViewModel>();
+
+            List<ReportOrderViewModel> bundlingTimeReports = new List<ReportOrderViewModel>();
+
+            foreach (var order in orders)
+            {
+                var report = new ReportOrderViewModel
+                {
+                    OrderId = order.Id,
+                    Bundlings = new List<string>(),
+                    Requests = new List<string>()
+                };
+
+                // Получение Presales
+                var presales = _presaleLogic.ReadList(new PresaleSearchModel { OrderId = order.Id});
+                if (presales?.Count != 0 && presales != null)
+                {
+                    var Requests = new List<string>();
+                    foreach (var p in presales)
+                    {
+                        report.Bundlings = p.PresaleBundlings.Select(x => x.Key.ToString()).ToList();
+                        report.Requests = p.Requests.Select(x => x.Value.Description.ToString()).ToList()!;
+                    }
+                }
+                bundlingTimeReports.Add(report);
+            }
+
+            return bundlingTimeReports;
+        }
+        public void SaveReportExcel(List<int> bundlings, MemoryStream stream)
+        {
+            var reports = GetPresaleReports(bundlings);
+            if (reports == null)
+                return;
+            int maxsize = 0;
+            foreach (var report in reports) { maxsize = Math.Max(maxsize, report.Cars.Count); }
+            _excel.CreateReport(new()
+            {
+                carPresalesReport = reports,
+                Title = "Отчет Номер_автомобиля предпродажные",
+                memoryStream = stream,
+                maxleng = maxsize
+            });
+        }
+
+        public void SaveReportWord(List<int> bundlings, MemoryStream stream)
+        {
+            var reports = GetPresaleReports(bundlings);
+            if (reports == null)
+                return;
+            _word.CreateDoc(new()
+            {
+                memoryStream = stream,
+                Title = "Отчет.VIN-Номер автомобиля: - предпродажные",
+                carPresalesReport = reports
+            });
+        }
+
+        public void SendMailReport(DateTime? startDate, DateTime? endDate, int UserId, MemoryStream stream)
+        {
+            var reports = GetTimeReport(startDate, endDate, UserId);
+            if (reports == null)
+                return;
+            _pdf.CreateDoc(new()
+            {
+                DateFrom = startDate!.Value,
+                DateTo = endDate!.Value,
+                FileName = stream,
+                reportBundling = reports,
+                Title = "Отчет"
+            });
+            byte[] report = stream.GetBuffer();
+            _mail.MailSendAsync(new() { MailAddress = UserWorker.user!.Email, Subject = "Отчет", FileName = "PdfReport.pdf", Pdf = report });
+        }
     }
 }

CarCenter/CarCenterWorkerApp/appsettings.json

@@ -5,5 +5,12 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
-}
+  "AllowedHosts": "*",
+
+  "SmtpClientHost": "smtp.mail.ru",
+  "SmtpClientPort": "587",
+  "PopHost": "pop.mail.ru",
+  "PopPort": "995",
+  "MailLogin": "aboba.russian@mail.ru",
+  "MailPassword": "5qnSMftuH4MPnFMyW7rD"
+}

CarCenter/CarCenterWorkerApp/log4net.config

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<log4net>
+	<appender name="RollingFile" type="log4net.Appender.RollingFileAppender">
+		<file value="c:/temp/GoWorkCourse.log" />
+		<appendToFile value="true" />
+		<maximumFileSize value="100KB" />
+		<maxSizeRollBackups value="2" />
+		<layout type="log4net.Layout.PatternLayout">
+			<conversionPattern value="%date %5level %logger.%method [%line] - MESSAGE: %message%newline %exception" />
+		</layout>
+	</appender>
+	<root>
+		<level value="TRACE" />
+		<appender-ref ref="RollingFile" />
+	</root>
+</log4net>