From 4144f645ad11f2246dcd9f2b215bbfdc7e85149e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9F=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=BE=D0=B2?= <ns.potapov@yandex.ru>
Date: Fri, 6 Dec 2024 15:14:50 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=20=D0=B2=20?=
 =?UTF-8?q?word?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Orders/FormOrdersList.Designer.cs         |  4 +-
 .../Orders/FormOrdersList.cs                  | 39 ++++++++++++++++++-
 .../Orders/FormOrdersList.resx                |  6 +--
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs
index f9689ad..757ef2f 100644
--- a/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs
+++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.Designer.cs
@@ -37,8 +37,8 @@
             reportOrdersWordToolStripMenuItem = new ToolStripMenuItem();
             reportProductsPDFToolStripMenuItem = new ToolStripMenuItem();
             componentExcelWithImage = new Components.ComponentExcelWithImage(components);
-            bigTextWordNoVisibleComponent = new UserComponentsOption19.BigTextWordNoVisibleComponent(components);
             pdfHistogram = new WinFormsLibrary1.PDFHistogram(components);
+            tableWordNoVisibleComponent = new UserComponentsOption19.TableWordNoVisibleComponent(components);
             menuStrip.SuspendLayout();
             SuspendLayout();
             // 
@@ -123,7 +123,7 @@
         private ToolStripMenuItem reportOrdersWordToolStripMenuItem;
         private ToolStripMenuItem reportProductsPDFToolStripMenuItem;
         private Components.ComponentExcelWithImage componentExcelWithImage;
-        private UserComponentsOption19.BigTextWordNoVisibleComponent bigTextWordNoVisibleComponent;
         private WinFormsLibrary1.PDFHistogram pdfHistogram;
+        private UserComponentsOption19.TableWordNoVisibleComponent tableWordNoVisibleComponent;
     }
 }
diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
index 184e3b5..7d69bf8 100644
--- a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
+++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
@@ -218,7 +218,42 @@ namespace InternetShopForms
             var orders = _orderLogic.ReadList();
             try
             {
-                bigTextWordNoVisibleComponent.CreateAndSaveDocument(exportFileName, "Отчет по заказам", );
+                string[] headerRow1 = {
+                    "ID",
+                    "Личные данные",
+                    "Личные данные",
+                    "Товары",
+                };
+
+                string[] headerRow2 = {
+                    "ID",
+                    "ФИО",
+                    "Email",
+                    "Товары",
+                };
+
+                List<float> columnWidths = [3.0f, 3.0f, 3.0f, 3.0f];
+
+                var mergeColumns = new List<(int StartColumn, int EndColumn)> { (1, 2) };
+
+                var columnPropertyMapping = new Dictionary<int, string>
+                    {
+                        { 0, "Id" },
+                        { 1, "CustomerFIO" },
+                        { 2, "CustomerEmail" },
+                        { 3, "ProductsString" },
+                    };
+
+                tableWordNoVisibleComponent.CreateTableInWordDocument(
+                    exportFileName,
+                    "Отчет по заказам",
+                    mergeColumns,
+                    columnWidths,
+                    headerRow1,
+                    headerRow2,
+                    columnPropertyMapping,
+                    orders
+                );
                 MessageBox.Show("Отчет успешно сформирован", "Создание отчета", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
             catch (Exception ex)
@@ -244,7 +279,7 @@ namespace InternetShopForms
             {
                 MessageBox.Show("Произошла ошибка при создании отчета:\n" + ex.Message, "Создание отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-            
+
         }
 
         private void CreatePDF()
diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.resx b/InternetShop/InternetShopForms/Orders/FormOrdersList.resx
index 8dd43b1..2141e82 100644
--- a/InternetShop/InternetShopForms/Orders/FormOrdersList.resx
+++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.resx
@@ -123,10 +123,10 @@
   <metadata name="componentExcelWithImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>145, 17</value>
   </metadata>
-  <metadata name="bigTextWordNoVisibleComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>384, 17</value>
-  </metadata>
   <metadata name="pdfHistogram.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>667, 17</value>
   </metadata>
+  <metadata name="tableWordNoVisibleComponent.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>816, 17</value>
+  </metadata>
 </root>
\ No newline at end of file