правки 1

LawFirm/AbstractLawFirmBusinessLogic/AbstractLawFirmBusinessLogic.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
-    <PackageReference Include="PDFsharp-MigraDoc-GDI" Version="1.50.5147" />
+    <PackageReference Include="PDFsharp-MigraDoc" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

LawFirm/AbstractLawFirmBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -1,5 +1,5 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
+using AbstractLawFirmBusinessLogic.OfficePackage;
-using AbstractLawFirmBusinessLogic.OfficePackage;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
 using AbstractLawFirmContracts.BindingModels;
 using AbstractLawFirmContracts.BusinessLogicsContracts;
 using AbstractLawFirmContracts.SearchModels;
@@ -11,7 +11,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace AbstractLawFirmBusinessLogic
+namespace AbstractLawFirmBusinessLogic.BusinessLogic
 {
     public class ReportLogic : IReportLogic
     {
@@ -39,24 +39,20 @@ namespace AbstractLawFirmBusinessLogic
         /// <returns></returns>
         public List<ReportDocumentComponentViewModel> GetDocumentComponent()
         {
-            var components = _componentStorage.GetFullList();
             var documents = _documentStorage.GetFullList();
             var list = new List<ReportDocumentComponentViewModel>();
-            foreach (var component in components)
+            foreach (var document in documents)
             {
                 var record = new ReportDocumentComponentViewModel
                 {
-                    ComponentName = component.ComponentName,
+                    DocumentName = document.DocumentName,
-                    Document = new List<Tuple<string, int>>(),
+                    Components = new List<(string Component, int Count)>(),
                     TotalCount = 0
                 };
-                foreach (var document in documents)
+                foreach (var component in document.DocumentComponents.Values)
                 {
-                    if (document.DocumentComponents.ContainsKey(component.Id))
+                    record.Components.Add((component.Item1.ComponentName, component.Item2));
-                    {
+                    record.TotalCount += component.Item2;
-                        record.Document.Add(new Tuple<string, int>(document.DocumentName, document.DocumentComponents[component.Id].Item2));
-                        record.TotalCount += document.DocumentComponents[component.Id].Item2;
-                    }
                 }
                 list.Add(record);
             }
@@ -71,7 +67,8 @@ namespace AbstractLawFirmBusinessLogic
         {
             return _orderStorage.GetFilteredList(new OrderSearchModel
             {
-                DateFrom = model.DateFrom,
+                DateFrom
+           = model.DateFrom,
                 DateTo = model.DateTo
             })
             .Select(x => new ReportOrdersViewModel
@@ -79,7 +76,8 @@ namespace AbstractLawFirmBusinessLogic
                 Id = x.Id,
                 DateCreate = x.DateCreate,
                 DocumentName = x.DocumentName,
-                Sum = x.Sum
+                Sum = x.Sum,
+                Status = x.Status.ToString(),
             })
            .ToList();
         }
@@ -87,13 +85,13 @@ namespace AbstractLawFirmBusinessLogic
         /// Сохранение компонент в файл-Word
         /// </summary>
         /// <param name="model"></param>
-        public void SaveComponentsToWordFile(ReportBindingModel model)
+        public void SaveDocumentsToWordFile(ReportBindingModel model)
         {
             _saveToWord.CreateDoc(new WordInfo
             {
                 FileName = model.FileName,
-                Title = "Список компонент",
+                Title = "Список пакетов документов",
-                Components = _componentStorage.GetFullList()
+                Documents = _documentStorage.GetFullList()
             });
         }
         /// <summary>
@@ -124,6 +122,6 @@ namespace AbstractLawFirmBusinessLogic
                 Orders = GetOrders(model)
             });
         }
-    }
 
-}
+    }
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -1,10 +1,10 @@
 using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
-using DocumentFormat.OpenXml;
+using System;
-using DocumentFormat.OpenXml.Office2010.Excel;
+using System.Collections.Generic;
-using DocumentFormat.OpenXml.Office2013.Excel;
+using System.Linq;
-using DocumentFormat.OpenXml.Packaging;
+using System.Text;
-using DocumentFormat.OpenXml.Spreadsheet;
+using System.Threading.Tasks;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage
 {
@@ -30,33 +30,31 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
                 CellToName = "C1"
             });
             uint rowIndex = 2;
-            foreach (var dc in info.DocumentComponents)
+            foreach (var pc in info.DocumentComponents)
             {
                 InsertCellInWorksheet(new ExcelCellParameters
                 {
                     ColumnName = "A",
                     RowIndex = rowIndex,
-                    Text = dc.ComponentName,
+                    Text = pc.DocumentName,
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
-                foreach (var document in dc.Document)
+                foreach (var (Component, Count) in pc.Components)
                 {
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "B",
                         RowIndex = rowIndex,
-                        Text = document.Item1,
+                        Text = Component,
-                        StyleInfo =
+                        StyleInfo = ExcelStyleInfoType.TextWithBorder
-                    ExcelStyleInfoType.TextWithBroder
                     });
                     InsertCellInWorksheet(new ExcelCellParameters
                     {
                         ColumnName = "C",
                         RowIndex = rowIndex,
-                        Text = document.Item2.ToString(),
+                        Text = Count.ToString(),
-                        StyleInfo =
+                        StyleInfo = ExcelStyleInfoType.TextWithBorder
-                    ExcelStyleInfoType.TextWithBroder
                     });
                     rowIndex++;
                 }
@@ -71,7 +69,7 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
                 {
                     ColumnName = "C",
                     RowIndex = rowIndex,
-                    Text = dc.TotalCount.ToString(),
+                    Text = pc.TotalCount.ToString(),
                     StyleInfo = ExcelStyleInfoType.Text
                 });
                 rowIndex++;
@@ -100,5 +98,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
         /// <param name="info"></param>
         protected abstract void SaveExcel(ExcelInfo info);
     }
-}
+}
-

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -1,10 +1,10 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage
 {
@@ -16,18 +16,19 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
             CreateParagraph(new PdfParagraph
             {
                 Text = info.Title,
-                Style =
+                Style = "NormalTitle",
-           "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
             CreateParagraph(new PdfParagraph
             {
-                Text = $"с{ info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style= "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center
+                Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm" });
+            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "4cm" });
             CreateRow(new PdfRowParameters
             {
-                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма" },
+                Texts = new List<string> { "Номер", "Дата заказа", "Пакет документов", "Сумма", "Статус" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
@@ -36,7 +37,7 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
                 CreateRow(new PdfRowParameters
                 {
                     Texts = new List<string> { order.Id.ToString(),
-                    order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString() },
+                    order.DateCreate.ToShortDateString(), order.DocumentName, order.Sum.ToString(), order.Status },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
@@ -78,4 +79,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
         /// <param name="info"></param>
         protected abstract void SavePdf(PdfInfo info);
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -1,10 +1,10 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage
 {
@@ -22,11 +22,14 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
                     JustificationType = WordJustificationType.Center
                 }
             });
-            foreach (var component in info.Components)
+            foreach (var document in info.Documents)
             {
                 CreateParagraph(new WordParagraph
                 {
-                    Texts = new List<(string, WordTextProperties)> { (component.ComponentName, new WordTextProperties { Size = "24", }) },
+                    Texts = new List<(string, WordTextProperties)> {
+                        (document.DocumentName + " - ", new WordTextProperties { Size = "24", Bold = true}),
+                        (document.Price.ToString(), new WordTextProperties { Size = "24", })
+                    },
                     TextProperties = new WordTextProperties
                     {
                         Size = "24",
@@ -53,4 +56,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage
         /// <param name="info"></param>
         protected abstract void SaveWord(WordInfo info);
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperEnums/ExelStyleInfoType.cs

@@ -10,7 +10,7 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums
     {
         Title,
         Text,
-        TextWithBroder
+        TextWithBorder
     }
 
 }

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs

@@ -10,7 +10,6 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums
     {
         Center,
         Left,
-
         Rigth
     }
 

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs

@@ -12,4 +12,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public string CellToName { get; set; } = string.Empty;
         public string Merge => $"{CellFromName}:{CellToName}";
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/ExelCellParameters.cs

@@ -1,9 +1,9 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
 {
@@ -15,4 +15,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public string CellReference => $"{ColumnName}{RowIndex}";
         public ExcelStyleInfoType StyleInfo { get; set; }
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/ExelInfo.cs

@@ -1,9 +1,9 @@
-using AbstractLawFirmContracts.ViewModels;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmContracts.ViewModels;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
 {
@@ -16,6 +16,6 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
             get;
             set;
         } = new();
-    }
 
-}
+    }
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -15,4 +15,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public DateTime DateTo { get; set; }
         public List<ReportOrdersViewModel> Orders { get; set; } = new();
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs

@@ -1,9 +1,9 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
 {
@@ -13,4 +13,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public string Style { get; set; } = string.Empty;
         public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs

@@ -1,9 +1,9 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
 {
@@ -13,5 +13,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public string Style { get; set; } = string.Empty;
         public PdfParagraphAlignmentType ParagraphAlignment { get; set; }
     }
-
+}
-}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -11,6 +11,6 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
     {
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
-        public List<ComponentViewModel> Components { get; set; } = new();
+        public List<DocumentViewModel> Documents { get; set; } = new();
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -11,4 +11,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public List<(string, WordTextProperties)> Texts { get; set; } = new();
         public WordTextProperties? TextProperties { get; set; }
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs

@@ -13,4 +13,4 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.HelperModels
         public bool Bold { get; set; }
         public WordJustificationType JustificationType { get; set; }
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/Implements/SaveToExel.cs

@@ -1,16 +1,16 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
-using DocumentFormat.OpenXml.Office2010.Excel;
-using DocumentFormat.OpenXml.Office2013.Excel;
-using DocumentFormat.OpenXml.Office2016.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;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Office2013.Excel;
+using DocumentFormat.OpenXml;
+using DocumentFormat.OpenXml.Packaging;
+using DocumentFormat.OpenXml.Spreadsheet;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+
+
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
 {
@@ -105,8 +105,7 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
             var cellFormatFont = new CellFormat()
             {
                 NumberFormatId = 0U,
-                FontId =
+                FontId = 0U,
-           0U,
                 FillId = 0U,
                 BorderId = 0U,
                 FormatId = 0U,
@@ -206,7 +205,7 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
             return styleInfo switch
             {
                 ExcelStyleInfoType.Title => 2U,
-                ExcelStyleInfoType.TextWithBroder => 1U,
+                ExcelStyleInfoType.TextWithBorder => 1U,
                 ExcelStyleInfoType.Text => 0U,
                 _ => 0U,
             };
@@ -283,8 +282,8 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
             else
             {
                 // Все ячейки должны быть последовательно друг за другом расположены
-                 // нужно определить, после какой вставлять
+                // нужно определить, после какой вставлять
-                 Cell? refCell = null;
+                Cell? refCell = null;
                 foreach (Cell rowCell in row.Elements<Cell>())
                 {
                     if (string.Compare(rowCell.CellReference!.Value,
@@ -350,8 +349,8 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
                 return;
             }
             _spreadsheetDocument.WorkbookPart!.Workbook.Save();
-            //_spreadsheetDocument.Close();
+            _spreadsheetDocument.Dispose();
         }
-    }
 
-}
+    }
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -1,13 +1,13 @@
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using System;
-using AbstractLawFirmBusinessLogic.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;
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.Rendering;
+using MigraDoc.DocumentObjectModel.Tables;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
 
 namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
 {
@@ -102,5 +102,6 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
             renderer.RenderDocument();
             renderer.PdfDocument.Save(info.FileName);
         }
+
     }
-}
+}

LawFirm/AbstractLawFirmBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -1,15 +1,14 @@
-using System;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
+using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperEnums;
-using AbstractLawFirmBusinessLogic.OfficePackage.HelperModels;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
 
-
 namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
 {
     public class SaveToWord : AbstractSaveToWord
@@ -125,7 +124,8 @@ namespace AbstractLawFirmBusinessLogic.OfficePackage.Implements
             }
             _docBody.AppendChild(CreateSectionProperties());
             _wordDocument.MainDocumentPart!.Document.Save();
-            //_wordDocument.Close();
+            _wordDocument.Dispose();
         }
+
     }
-}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/ReportBindingModel.cs

@@ -12,4 +12,4 @@ namespace AbstractLawFirmContracts.BindingModels
         public DateTime? DateFrom { get; set; }
         public DateTime? DateTo { get; set; }
     }
-}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -25,7 +25,7 @@ namespace AbstractLawFirmContracts.BusinessLogicsContracts
         /// Сохранение компонент в файл-Word
         /// </summary>
         /// <param name="model"></param>
-        void SaveComponentsToWordFile(ReportBindingModel model);
+        void SaveDocumentsToWordFile(ReportBindingModel model);
         /// <summary>
         /// Сохранение компонент с указаеним продуктов в файл-Excel
         /// </summary>
@@ -37,4 +37,4 @@ namespace AbstractLawFirmContracts.BusinessLogicsContracts
         /// <param name="model"></param>
         void SaveOrdersToPdfFile(ReportBindingModel model);
     }
-}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ReportDocumentComponentViewModel.cs

@@ -8,8 +8,8 @@ namespace AbstractLawFirmContracts.ViewModels
 {
     public class ReportDocumentComponentViewModel
     {
-        public string ComponentName { get; set; } = string.Empty;
+        public string DocumentName { get; set; } = string.Empty;
         public int TotalCount { get; set; }
-        public List<Tuple<string, int>> Document { get; set; } = new();
+        public List<(string Component, int Count)> Components { get; set; } = new();
     }
-}
+}

LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ReportOrdersViewModel.cs

@@ -12,6 +12,6 @@ namespace AbstractLawFirmContracts.ViewModels
         public DateTime DateCreate { get; set; }
         public string DocumentName { get; set; } = string.Empty;
         public double Sum { get; set; }
-
+        public String Status { get; set; } = string.Empty;
     }
-}
+}

LawFirm/AbstractLawFirmDatabaseImplement/Implements/OrderStorage.cs

@@ -42,13 +42,13 @@ namespace AbstractLawFirmDatabaseImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
             {
                 return new();
             }
             using var context = new AbstractLawFirmDataBase();
             return context.Orders
-            .Where(x => x.Id == model.Id)
+            .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
            .Select(x => x.GetViewModel)
            .ToList();
         }

LawFirm/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs

@@ -32,11 +32,11 @@ namespace AbstractLawFirmFileImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue)
+            if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
             {
                 return new();
             }
-            return source.Orders.Where(x => x.Id == model.Id).Select(x => GetViewModel(x)).ToList();
+            return source.Orders.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo).Select(x => x.GetViewModel).ToList();
         }
 
         public List<OrderViewModel> GetFullList()

LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs

@@ -37,7 +37,7 @@ namespace AbstractLawFirmListImplement.Implements
             }
             foreach (var order in _source.Orders)
             {
-                if (order.Id == model.Id)
+                if (order.Id == model.Id || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
                 {
                     result.Add(AccessDocumentStorage(order.GetViewModel));
                 }

LawFirm/LawFirmView/FormMain.cs

@@ -184,7 +184,7 @@ namespace LawFirmView
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
-                _reportLogic.SaveComponentsToWordFile(new ReportBindingModel
+                _reportLogic.SaveDocumentsToWordFile(new ReportBindingModel
                 {
                     FileName = dialog.FileName
                 });

LawFirm/LawFirmView/FormReportDocumentComponents.cs

@@ -35,8 +35,8 @@ namespace LawFirmView
                     foreach (var elem in dict)
                     {
                         // проверить ComponentName Document (поменять местами)
-                        dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" });
+                        dataGridView.Rows.Add(new object[] { elem.DocumentName, "", "" });
-                        foreach (var listElem in elem.Document)
+                        foreach (var listElem in elem.Components)
                         {
                             dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
                         }

LawFirm/LawFirmView/LawFirmView.csproj

@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.Tools.Msbuild" Version="16.0.62004.28040" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.28">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

LawFirm/LawFirmView/Program.cs

@@ -1,4 +1,3 @@
-using AbstractLawFirmBusinessLogic;
 using AbstractLawFirmBusinessLogic.BusinessLogic;
 using AbstractLawFirmBusinessLogic.OfficePackage.Implements;
 using AbstractLawFirmBusinessLogic.OfficePackage;