From c7254999b06ba79a1e99895e9279f8cfc2f95f03 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 20:15:06 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D1=8D=D0=BA=D1=81=D0=BF=D0=BE=D1=80=D1=82=20=D0=BE?=
 =?UTF-8?q?=D1=82=D1=87=D0=B5=D1=82=D0=B0=20=D0=B2=20=D0=B2=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B4=20=D0=BF=D0=BE=D0=B4=20=D0=BD=D0=BE=D0=B2=D1=83=D1=8E=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=B1=D0=B8=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternetShopForms/InternetShopForms.csproj         |  2 +-
 .../InternetShopForms/Orders/FormOrdersList.cs         | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/InternetShop/InternetShopForms/InternetShopForms.csproj b/InternetShop/InternetShopForms/InternetShopForms.csproj
index bfc8ef2..64a09c3 100644
--- a/InternetShop/InternetShopForms/InternetShopForms.csproj
+++ b/InternetShop/InternetShopForms/InternetShopForms.csproj
@@ -15,7 +15,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="UserComponentsOption19" Version="1.0.0" />
+    <PackageReference Include="UserComponentsOption19" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
index 2befcbc..9d91204 100644
--- a/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
+++ b/InternetShop/InternetShopForms/Orders/FormOrdersList.cs
@@ -235,7 +235,12 @@ namespace InternetShopForms
                     "Товары",
                 };
 
-                List<float> columnWidths = [3.0f, 3.0f, 3.0f, 3.0f];
+                List<(float columnWidth, string headerRowCell1, string headerRowCell2, string property)> columnWidths = 
+                    [ (3.0f, "ID", "ID", "Id"),
+                    (5.0f, "Личные данные", "ФИО", "CustomerFIO"),
+                    (5.0f, "Личные данные", "Email", "CustomerEmail"),
+                    (5.0f, "Товары", "Товары", "ProductsString"),
+                ];
 
                 var mergeColumns = new List<(int StartColumn, int EndColumn)> { (1, 2) };
 
@@ -252,9 +257,6 @@ namespace InternetShopForms
                     "Отчет по заказам",
                     mergeColumns,
                     columnWidths,
-                    headerRow1,
-                    headerRow2,
-                    columnPropertyMapping,
                     orders
                 );
                 MessageBox.Show("Отчет успешно сформирован", "Создание отчета", MessageBoxButtons.OK, MessageBoxIcon.Information);