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 columnWidths = [3.0f, 3.0f, 3.0f, 3.0f]; + + var mergeColumns = new List<(int StartColumn, int EndColumn)> { (1, 2) }; + + var columnPropertyMapping = new Dictionary + { + { 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 @@ 145, 17 - - 384, 17 - 667, 17 + + 816, 17 + \ No newline at end of file