From f143710f195426ef1535c54ff3418158b920c0ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?=
 <raspaev.niko@mail.ru>
Date: Fri, 24 Mar 2023 16:31:56 +0400
Subject: [PATCH] fix

---
 .../OfficePackage/AbstractSaveToExcel.cs                      | 2 +-
 .../OfficePackage/AbstractSaveToPdf.cs                        | 2 +-
 .../OfficePackage/AbstractSaveToWord.cs                       | 2 +-
 .../OfficePackage/HelperEnums/ExcelStyleInfoType.cs           | 4 ++++
 .../HelperModels/{ => Excel}/ExcelCellParameters.cs           | 2 +-
 .../OfficePackage/HelperModels/{ => Excel}/ExcelInfo.cs       | 2 +-
 .../HelperModels/{ => Excel}/ExcelMergeParameters.cs          | 2 +-
 .../OfficePackage/HelperModels/{ => Pdf}/PdfInfo.cs           | 2 +-
 .../OfficePackage/HelperModels/{ => Pdf}/PdfParagraph.cs      | 2 +-
 .../OfficePackage/HelperModels/{ => Pdf}/PdfRowParameters.cs  | 2 +-
 .../OfficePackage/HelperModels/{ => Word}/WordInfo.cs         | 2 +-
 .../OfficePackage/HelperModels/{ => Word}/WordParagraph.cs    | 2 +-
 .../HelperModels/{ => Word}/WordTextProperties.cs             | 4 +++-
 .../OfficePackage/Implements/SaveToExcel.cs                   | 2 +-
 .../OfficePackage/Implements/SaveToPdf.cs                     | 2 +-
 .../OfficePackage/Implements/SaveToWord.cs                    | 2 +-
 ...tComponentViewModel.cs => ReportDishComponentViewModel.cs} | 0
 17 files changed, 21 insertions(+), 15 deletions(-)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Excel}/ExcelCellParameters.cs (85%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Excel}/ExcelInfo.cs (81%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Excel}/ExcelMergeParameters.cs (77%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Pdf}/PdfInfo.cs (84%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Pdf}/PdfParagraph.cs (81%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Pdf}/PdfRowParameters.cs (81%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Word}/WordInfo.cs (80%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Word}/WordParagraph.cs (72%)
 rename FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/{ => Word}/WordTextProperties.cs (61%)
 rename FoodOrders/FoodOrdersContracts/ViewModels/{ReportProductComponentViewModel.cs => ReportDishComponentViewModel.cs} (100%)

diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
index 5bfefca..7466fb7 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToExcel.cs
@@ -1,5 +1,5 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel;
 
 namespace FoodOrdersBusinessLogic.OfficePackage
 {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
index 86b71d3..a36fb4a 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToPdf.cs
@@ -1,5 +1,5 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf;
 
 namespace FoodOrdersBusinessLogic.OfficePackage
 {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 8b7cd15..50d1c05 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -1,5 +1,5 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word;
 
 namespace FoodOrdersBusinessLogic.OfficePackage
 {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
index 3417e00..550ddcd 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs
@@ -1,11 +1,15 @@
 namespace FoodOrdersBusinessLogic.OfficePackage.HelperEnums
 {
+    //для задачи стиля вывода
     public enum ExcelStyleInfoType
     {
+        //заголовок
         Title,
 
+        //текст
         Text,
 
+        //текст в рамке
         TextWithBroder
     }
 }
\ No newline at end of file
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelCellParameters.cs
similarity index 85%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelCellParameters.cs
index d8111d7..c03bf3d 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelCellParameters.cs
@@ -1,6 +1,6 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel
 {
     public class ExcelCellParameters
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelInfo.cs
similarity index 81%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelInfo.cs
index 460fd62..c2df5bd 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelInfo.cs
@@ -1,6 +1,6 @@
 using FoodOrdersContracts.ViewModels;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel
 {
     public class ExcelInfo
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelMergeParameters.cs
similarity index 77%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelMergeParameters.cs
index 46d8d11..85053cc 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Excel/ExcelMergeParameters.cs
@@ -1,4 +1,4 @@
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel
 {
     public class ExcelMergeParameters
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfInfo.cs
similarity index 84%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfInfo.cs
index 6334199..3ba5a2f 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfInfo.cs
@@ -1,6 +1,6 @@
 using FoodOrdersContracts.ViewModels;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf
 {
     public class PdfInfo
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfParagraph.cs
similarity index 81%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfParagraph.cs
index 281ed7e..0481ebb 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfParagraph.cs
@@ -1,6 +1,6 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf
 {
     public class PdfParagraph
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfRowParameters.cs
similarity index 81%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfRowParameters.cs
index 1f7116c..c7996f3 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Pdf/PdfRowParameters.cs
@@ -1,6 +1,6 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf
 {
     public class PdfRowParameters
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordInfo.cs
similarity index 80%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordInfo.cs
index 8b2fad1..a3ab218 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordInfo.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordInfo.cs
@@ -1,6 +1,6 @@
 using FoodOrdersContracts.ViewModels;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word
 {
     public class WordInfo
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordParagraph.cs
similarity index 72%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordParagraph.cs
index 6a76f1f..25fbe58 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordParagraph.cs
@@ -1,4 +1,4 @@
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word
 {
     public class WordParagraph
     {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordTextProperties.cs
similarity index 61%
rename from FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
rename to FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordTextProperties.cs
index 21ea4ea..db05f38 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/HelperModels/Word/WordTextProperties.cs
@@ -1,13 +1,15 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
 
-namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels
+namespace FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word
 {
+    //информация по свойствам текста
     public class WordTextProperties
     {
         public string Size { get; set; } = string.Empty;
 
         public bool Bold { get; set; }
 
+        //выравнивание текста
         public WordJustificationType JustificationType { get; set; }
     }
 }
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
index fd3f9ee..ea333ff 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToExcel.cs
@@ -1,10 +1,10 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Office2010.Excel;
 using DocumentFormat.OpenXml.Office2013.Excel;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Spreadsheet;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel;
 
 namespace FoodOrdersBusinessLogic.OfficePackage.Implements
 {
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
index 3d60ad9..c7c2c51 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToPdf.cs
@@ -1,5 +1,5 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf;
 using MigraDoc.DocumentObjectModel;
 using MigraDoc.DocumentObjectModel.Tables;
 using MigraDoc.Rendering;
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToWord.cs
index 2ba6732..91f4f89 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToWord.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -1,8 +1,8 @@
 using FoodOrdersBusinessLogic.OfficePackage.HelperEnums;
-using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word;
 
 namespace FoodOrdersBusinessLogic.OfficePackage.Implements
 {
diff --git a/FoodOrders/FoodOrdersContracts/ViewModels/ReportProductComponentViewModel.cs b/FoodOrders/FoodOrdersContracts/ViewModels/ReportDishComponentViewModel.cs
similarity index 100%
rename from FoodOrders/FoodOrdersContracts/ViewModels/ReportProductComponentViewModel.cs
rename to FoodOrders/FoodOrdersContracts/ViewModels/ReportDishComponentViewModel.cs