From 12dd661a805c04ade167e4db4d79916c18d60fed Mon Sep 17 00:00:00 2001
From: malimova <nemarina73@list.ru>
Date: Fri, 26 Apr 2024 00:24:30 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0=20=D0=B4=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D1=86=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfectioneryBusinessLogic.csproj         |  2 +-
 .../ConfectioneryBusinessLogic/SaveToPdf.cs   |  2 +
 .../ConfectioneryView/FormMain.Designer.cs    | 17 +++--
 Confectionery/ConfectioneryView/FormMain.cs   |  2 +-
 Confectionery/ConfectioneryView/FormMain.resx | 62 ++++++++++++++++++-
 5 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj
index 7cfc245..06e699f 100644
--- a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj
+++ b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj
@@ -12,8 +12,8 @@
     <PackageReference Include="MigraDocCore.DocumentObjectModel" Version="1.3.63" />
     <PackageReference Include="MigraDocCore.Rendering" Version="1.3.63" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
-    <PackageReference Include="PDFsharp-MigraDoc" Version="6.0.0" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
+    <PackageReference Include="PdfSharpStand.MigraDoc.DocumentObjectModel.NetStandard" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs b/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs
index bad48d4..993956b 100644
--- a/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs
+++ b/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs
@@ -3,6 +3,7 @@ using MigraDoc.DocumentObjectModel.Tables;
 using MigraDoc.Rendering;
 using ConfectioneryBusinessLogic.OfficePackage.HelperEnums;
 using ConfectioneryBusinessLogic.OfficePackage.HelperModels;
+using MigraDoc.DocumentObjectModel.Visitors;
 
 
 namespace ConfectioneryBusinessLogic
@@ -32,6 +33,7 @@ namespace ConfectioneryBusinessLogic
             var style = document.Styles["Normal"];
             style.Font.Name = "Times New Roman";
             style.Font.Size = 14;
+
             style = document.Styles.AddStyle("NormalTitle", "Normal");
             style.Font.Bold = true;
         }
diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs
index fdff896..9d730d6 100644
--- a/Confectionery/ConfectioneryView/FormMain.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs
@@ -34,7 +34,7 @@
             componentsToolStripMenuItem = new ToolStripMenuItem();
             pastryToolStripMenuItem = new ToolStripMenuItem();
             отчетыToolStripMenuItem = new ToolStripMenuItem();
-            componentsListToolStripMenuItem = new ToolStripMenuItem();
+            pastrysListToolStripMenuItem = new ToolStripMenuItem();
             componentPastryToolStripMenuItem = new ToolStripMenuItem();
             ordersListToolStripMenuItem = new ToolStripMenuItem();
             buttonCreateOrder = new Button();
@@ -53,7 +53,6 @@
             dataGridView.Location = new Point(12, 60);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 62;
-            dataGridView.RowTemplate.Height = 33;
             dataGridView.Size = new Size(1068, 549);
             dataGridView.TabIndex = 0;
             // 
@@ -90,17 +89,17 @@
             // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsListToolStripMenuItem, componentPastryToolStripMenuItem, ordersListToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { pastrysListToolStripMenuItem, componentPastryToolStripMenuItem, ordersListToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(88, 29);
             отчетыToolStripMenuItem.Text = "Отчеты";
             // 
-            // componentsListToolStripMenuItem
+            // pastrysListToolStripMenuItem
             // 
-            componentsListToolStripMenuItem.Name = "componentsListToolStripMenuItem";
-            componentsListToolStripMenuItem.Size = new Size(327, 34);
-            componentsListToolStripMenuItem.Text = "Список компонентов";
-            componentsListToolStripMenuItem.Click += componentsListToolStripMenuItem_Click;
+            pastrysListToolStripMenuItem.Name = "pastrysListToolStripMenuItem";
+            pastrysListToolStripMenuItem.Size = new Size(327, 34);
+            pastrysListToolStripMenuItem.Text = "Список изделий";
+            pastrysListToolStripMenuItem.Click += pastrysListToolStripMenuItem_Click;
             // 
             // componentPastryToolStripMenuItem
             // 
@@ -207,7 +206,7 @@
         private ToolStripMenuItem componentsToolStripMenuItem;
         private ToolStripMenuItem pastryToolStripMenuItem;
         private ToolStripMenuItem отчетыToolStripMenuItem;
-        private ToolStripMenuItem componentsListToolStripMenuItem;
+        private ToolStripMenuItem pastrysListToolStripMenuItem;
         private ToolStripMenuItem componentPastryToolStripMenuItem;
         private ToolStripMenuItem ordersListToolStripMenuItem;
     }
diff --git a/Confectionery/ConfectioneryView/FormMain.cs b/Confectionery/ConfectioneryView/FormMain.cs
index 8e93937..af36c90 100644
--- a/Confectionery/ConfectioneryView/FormMain.cs
+++ b/Confectionery/ConfectioneryView/FormMain.cs
@@ -180,7 +180,7 @@ namespace ConfectioneryView
             }
         }
 
-        private void componentsListToolStripMenuItem_Click(object sender, EventArgs e)
+        private void pastrysListToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
diff --git a/Confectionery/ConfectioneryView/FormMain.resx b/Confectionery/ConfectioneryView/FormMain.resx
index 81a9e3d..6c82d08 100644
--- a/Confectionery/ConfectioneryView/FormMain.resx
+++ b/Confectionery/ConfectioneryView/FormMain.resx
@@ -1,4 +1,64 @@
-<root>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
     <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">