ProjectRepairCompany/ProjectRepairCompany/Forms/FormDirectoryReport.cs

@@ -40,13 +40,11 @@ namespace ProjectRepairCompany.Forms
                 }
                 if (_container.Resolve<DocReport>().CreateDoc(sfd.FileName, checkBoxMasters.Checked, checkBoxDetails.Checked, checkBoxStorages.Checked))
                 {
-                    MessageBox.Show("Документ сформирован", "Формирование документа",
-                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 else
                 {
-                    MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах","Формирование документа",
-                    MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах","Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             }
             catch (Exception ex)

ProjectRepairCompany/ProjectRepairCompany/ProjectRepairCompany.csproj

@@ -15,10 +15,10 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Npgsql" Version="9.0.1" />
-    <PackageReference Include="Serilog" Version="4.1.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />
+    <PackageReference Include="Npgsql" Version="9.0.2" />
+    <PackageReference Include="Serilog" Version="4.2.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
+    <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="Unity" Version="5.11.10" />
     <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />

ProjectRepairCompany/ProjectRepairCompany/Reports/DocReport.cs

@@ -57,16 +57,19 @@ internal class DocReport
     private List<string[]> GetMasters()
     {
         return [["Работник", "Должность", "Дата начала работы"],
-            .. _masterRepository.ReadMasters().Select(x => new string[] { x.MasterName, x.MasterPost.ToString(), x.StartDate.ToString("dd.MM.yyyy") }),];
+            .. _masterRepository.ReadMasters().Select(x => new string[] { x.MasterName, x.MasterPost.ToString(), x.StartDate.ToString("dd.MM.yyyy") }),
+        ];
     }
     private List<string[]> GetDetails()
     {
         return [["Название детали", "Цена", "Число", "Свойства"],
-            .. _detailRepository.ReadDetails().Select(x => new string[] { x.NameDetail, x.PriceDetail.ToString("N2"), x.NumberDetail.ToString(), x.DetailProperties.ToString() }),];
+            .. _detailRepository.ReadDetails().Select(x => new string[] { x.NameDetail, x.PriceDetail.ToString("N2"), x.NumberDetail.ToString(), x.DetailProperties.ToString() }),
+        ];
     }
     private List<string[]> GetStorages()
     {
         return [["Адрес", "Вместимость"],
-            .. _storageRepository.ReadStorages().Select(x => new string[] { x.StorageAddress, x.Capacity.ToString() }),];
+            .. _storageRepository.ReadStorages().Select(x => new string[] { x.StorageAddress, x.Capacity.ToString() }),
+        ];
     }
 }

ProjectRepairCompany/ProjectRepairCompany/Reports/ExcelBuilder.cs

@@ -0,0 +1,330 @@
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectRepairCompany.Reports;
+
+internal class ExcelBuilder
+{
+    private readonly string _filePath;
+    private readonly SheetData _sheetData;
+    private readonly MergeCells _mergeCells;
+    private readonly Columns _columns;
+    private uint _rowIndex = 0;
+    public ExcelBuilder(string filePath)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath);
+        }
+        _filePath = filePath;
+        _sheetData = new SheetData();
+        _mergeCells = new MergeCells();
+        _columns = new Columns();
+        _rowIndex = 1;
+    }
+    public ExcelBuilder AddHeader(string header, int startIndex, int count)
+    {
+        CreateCell(startIndex, _rowIndex, header,
+        StyleIndex.SimpleTextWithoutBorder);
+        for (int i = startIndex + 1; i < startIndex + count; ++i)
+        {
+            CreateCell(i, _rowIndex, "",
+            StyleIndex.SimpleTextWithoutBorder);
+        }
+        _mergeCells.Append(new MergeCell()
+        {
+            Reference =
+        new
+        StringValue($"{GetExcelColumnName(startIndex)}{_rowIndex}:{GetExcelColumnName(startIndex + count - 1)}{_rowIndex}")
+        });
+        _rowIndex++;
+        return this;
+    }
+    public ExcelBuilder AddParagraph(string text, int columnIndex)
+    {
+        CreateCell(columnIndex, _rowIndex++, text,
+        StyleIndex.SimpleTextWithoutBorder);
+        return this;
+    }
+    public ExcelBuilder AddTable(int[] columnsWidths, List<string[]> data)
+    {
+        if (columnsWidths == null || columnsWidths.Length == 0)
+        {
+            throw new ArgumentNullException(nameof(columnsWidths));
+        }
+        if (data == null || data.Count == 0)
+        {
+            throw new ArgumentNullException(nameof(data));
+        }
+        if (data.Any(x => x.Length != columnsWidths.Length))
+        {
+            throw new InvalidOperationException("widths.Length != data.Length");
+        }
+        uint counter = 1;
+        int coef = 2;
+        _columns.Append(columnsWidths.Select(x => new Column
+        {
+            Min = counter,
+            Max = counter++,
+            Width = x * coef,
+            CustomWidth = true
+        }));
+        for (var j = 0; j < data.First().Length; ++j)
+        {
+            CreateCell(j, _rowIndex, data.First()[j],
+            StyleIndex.SimpleTextWithoutBorder);
+        }
+        _rowIndex++;
+        for (var i = 1; i < data.Count - 1; ++i)
+        {
+            for (var j = 0; j < data[i].Length; ++j)
+            {
+                CreateCell(j, _rowIndex, data[i][j],
+                StyleIndex.SimpleTextWithoutBorder);
+            }
+            _rowIndex++;
+        }
+        for (var j = 0; j < data.Last().Length; ++j)
+        {
+            CreateCell(j, _rowIndex, data.Last()[j],
+            StyleIndex.SimpleTextWithoutBorder);
+        }
+        _rowIndex++;
+        return this;
+    }
+    public void Build()
+    {
+        using var spreadsheetDocument = SpreadsheetDocument.Create(_filePath,
+        SpreadsheetDocumentType.Workbook);
+        var workbookpart = spreadsheetDocument.AddWorkbookPart();
+        GenerateStyle(workbookpart);
+        workbookpart.Workbook = new Workbook();
+        var worksheetPart = workbookpart.AddNewPart<WorksheetPart>();
+        worksheetPart.Worksheet = new Worksheet();
+        if (_columns.HasChildren)
+        {
+            worksheetPart.Worksheet.Append(_columns);
+        }
+        worksheetPart.Worksheet.Append(_sheetData);
+        var sheets =
+        spreadsheetDocument.WorkbookPart!.Workbook.AppendChild(new Sheets());
+        var sheet = new Sheet()
+        {
+            Id =
+        spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart),
+            SheetId = 1,
+            Name = "Лист 1"
+        };
+        sheets.Append(sheet);
+        if (_mergeCells.HasChildren)
+        {
+            worksheetPart.Worksheet.InsertAfter(_mergeCells,
+            worksheetPart.Worksheet.Elements<SheetData>().First());
+        }
+    }
+    private static void GenerateStyle(WorkbookPart workbookPart)
+    {
+        var workbookStylesPart = workbookPart.AddNewPart<WorkbookStylesPart>();
+        workbookStylesPart.Stylesheet = new Stylesheet();
+        var fonts = new Fonts()
+        {
+            Count = 2,
+            KnownFonts = BooleanValue.FromBoolean(true)
+        };
+        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
+        {
+            FontSize = new FontSize() { Val = 11 },
+            FontName = new FontName() { Val = "Calibri" },
+            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
+            FontScheme = new FontScheme()
+            {
+                Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
+            }
+        });
+        // TODO добавить шрифт с жирным
+        // Шрифт с жирным текстом
+        fonts.Append(new DocumentFormat.OpenXml.Spreadsheet.Font
+        {
+            Bold = new Bold(), // Жирный текст
+            FontSize = new FontSize() { Val = 11 },
+            FontName = new FontName() { Val = "Calibri" },
+            FontFamilyNumbering = new FontFamilyNumbering() { Val = 2 },
+            FontScheme = new FontScheme()
+            {
+                Val = new EnumValue<FontSchemeValues>(FontSchemeValues.Minor)
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(fonts);
+        // Default Fill
+        var fills = new Fills() { Count = 1 };
+        fills.Append(new Fill
+        {
+            PatternFill = new PatternFill()
+            {
+                PatternType = new EnumValue<PatternValues>(PatternValues.None)
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(fills);
+        // Default Border
+
+        var borders = new Borders() { Count = 2 };
+        borders.Append(new Border
+        {
+            LeftBorder = new LeftBorder(),
+            RightBorder = new RightBorder(),
+            TopBorder = new TopBorder(),
+            BottomBorder = new BottomBorder(),
+            DiagonalBorder = new DiagonalBorder()
+        });
+        // TODO добавить настройку с границами
+        borders.Append(new Border
+        {
+            LeftBorder = new LeftBorder() { Style = BorderStyleValues.Thin },
+            RightBorder = new RightBorder() { Style = BorderStyleValues.Thin },
+            TopBorder = new TopBorder() { Style = BorderStyleValues.Thin },
+            BottomBorder = new BottomBorder() { Style = BorderStyleValues.Thin },
+            DiagonalBorder = new DiagonalBorder()
+        });
+        
+        workbookStylesPart.Stylesheet.Append(borders);
+        // Default cell format and a date cell format
+        var cellFormats = new CellFormats() { Count = 4 };
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 0,
+            FormatId = 0,
+            FontId = 0,
+            BorderId = 0,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        // TODO дополнить форматы
+        // Жирный текст без границ
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 0,
+            FormatId = 0,
+            FontId = 1, 
+            BorderId = 0,
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+
+        // Обычный текст с границами
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 0,
+            FormatId = 0,
+            FontId = 0,
+            BorderId = 1, 
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Left,
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        // Жирный текст с границами
+        cellFormats.Append(new CellFormat
+        {
+            NumberFormatId = 0,
+            FormatId = 0,
+            FontId = 1, 
+            BorderId = 1, 
+            FillId = 0,
+            Alignment = new Alignment()
+            {
+                Horizontal = HorizontalAlignmentValues.Center, 
+                Vertical = VerticalAlignmentValues.Center,
+                WrapText = true
+            }
+        });
+        workbookStylesPart.Stylesheet.Append(cellFormats);
+    }
+    private enum StyleIndex
+    {
+        SimpleTextWithoutBorder = 0,
+        // TODO дополнить стили
+        BoldTextWithoutBorder = 1,
+        SimpleTextWithBorder = 2,
+        BoldTextWithBorder = 3
+    }
+    private void CreateCell(int columnIndex, uint rowIndex, string text, StyleIndex styleIndex)
+    {
+        var columnName = GetExcelColumnName(columnIndex);
+        var cellReference = columnName + rowIndex;
+        var row = _sheetData.Elements<Row>().FirstOrDefault(r => r.RowIndex!
+        == rowIndex);
+        if (row == null)
+        {
+            row = new Row() { RowIndex = rowIndex };
+            _sheetData.Append(row);
+        }
+        var newCell = row.Elements<Cell>()
+        .FirstOrDefault(c => c.CellReference != null &&
+        c.CellReference.Value == columnName + rowIndex);
+        if (newCell == null)
+        {
+            Cell? refCell = null;
+            foreach (Cell cell in row.Elements<Cell>())
+            {
+                if (cell.CellReference?.Value != null &&
+                cell.CellReference.Value.Length == cellReference.Length)
+                {
+                    if (string.Compare(cell.CellReference.Value,
+                    cellReference, true) > 0)
+                    {
+                        refCell = cell;
+                        break;
+                    }
+                }
+            }
+            newCell = new Cell() { CellReference = cellReference };
+            row.InsertBefore(newCell, refCell);
+        }
+        newCell.CellValue = new CellValue(text);
+        newCell.DataType = CellValues.String;
+        newCell.StyleIndex = (uint)styleIndex;
+    }
+    private static string GetExcelColumnName(int columnNumber)
+    {
+        columnNumber += 1;
+        int dividend = columnNumber;
+        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;
+    }
+}
+
+
+
+
+

ProjectRepairCompany/ProjectRepairCompany/Reports/WordBuilder.cs

@@ -17,7 +17,10 @@ internal class WordBuilder
 
     public WordBuilder(string filePath)
     {
-        if (string.IsNullOrWhiteSpace(filePath)) throw new ArgumentNullException(nameof(filePath));
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
         if (File.Exists(filePath))
         {
             File.Delete(filePath);
@@ -32,10 +35,7 @@ internal class WordBuilder
     {
         var paragraph = _body.AppendChild(new Paragraph());
         var run = paragraph.AppendChild(new Run());
-        var runProperties = new RunProperties();
-
-        runProperties.AppendChild(new Bold()); 
-        run.PrependChild(runProperties);
+        var runProperties = run.AppendChild(new RunProperties());
         run.AppendChild(new Text(header));
         
         return this;
@@ -50,7 +50,7 @@ internal class WordBuilder
     }
     public WordBuilder AddTable(int[] widths, List<string[]> data)
     {
-        if (widths == null)
+        if (widths == null || widths.Length == 0)
         {
             throw new ArgumentNullException(nameof(widths));
         }