From d17275873b91d5ec33a18a218ce3f38a72f66d44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D0=B8=D0=BD=D0=B0=20=D0=A7=D1=83=D0=B1?=
 =?UTF-8?q?=D1=8B=D0=BA=D0=B8=D0=BD=D0=B0?= <polinakill04@gmail.com>
Date: Mon, 11 Nov 2024 15:28:10 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B2=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 COP/AppByPlugins/AppByPlugins.csproj          | 17 +++++
 COP/AppByPlugins/FormMain.Designer.cs         | 15 +++--
 COP/AppByPlugins/FormMain.resx                | 65 ++-----------------
 .../BindingModels/ClientBindingModel.cs       |  2 +-
 COP/WinFormsTest/PluginsConvention.cs         |  2 +-
 COP/WinFormsTest/WinFormsTest.csproj          | 23 +++++++
 6 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/COP/AppByPlugins/AppByPlugins.csproj b/COP/AppByPlugins/AppByPlugins.csproj
index 8c2f882..0e3581b 100644
--- a/COP/AppByPlugins/AppByPlugins.csproj
+++ b/COP/AppByPlugins/AppByPlugins.csproj
@@ -9,7 +9,24 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.20">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="7.0.0" />
+    <PackageReference Include="System.Text.Json" Version="7.0.3" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="..\ClientDataBaseImplement\ClientDataBaseImplement.csproj" />
     <ProjectReference Include="..\PluginsConventionLibrary\PluginsConventionLibrary.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Reference Include="System.IO.Packaging">
+      <HintPath>$(SolutionDir)Plugins\System.IO.Packaging.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/COP/AppByPlugins/FormMain.Designer.cs b/COP/AppByPlugins/FormMain.Designer.cs
index d736550..8b0b171 100644
--- a/COP/AppByPlugins/FormMain.Designer.cs
+++ b/COP/AppByPlugins/FormMain.Designer.cs
@@ -78,29 +78,33 @@
             // 
             this.ThesaurusToolStripMenuItem.Name = "ThesaurusToolStripMenuItem";
             this.ThesaurusToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.I)));
-            this.ThesaurusToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+            this.ThesaurusToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
             this.ThesaurusToolStripMenuItem.Text = "Справочник";
+            this.ThesaurusToolStripMenuItem.Click += new System.EventHandler(this.ThesaurusToolStripMenuItem_Click);
             // 
             // AddElementToolStripMenuItem
             // 
             this.AddElementToolStripMenuItem.Name = "AddElementToolStripMenuItem";
             this.AddElementToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.A)));
-            this.AddElementToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+            this.AddElementToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
             this.AddElementToolStripMenuItem.Text = "Добавить";
+            this.AddElementToolStripMenuItem.Click += new System.EventHandler(this.AddElementToolStripMenuItem_Click);
             // 
             // UpdElementToolStripMenuItem
             // 
             this.UpdElementToolStripMenuItem.Name = "UpdElementToolStripMenuItem";
             this.UpdElementToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.U)));
-            this.UpdElementToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+            this.UpdElementToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
             this.UpdElementToolStripMenuItem.Text = "Изменить";
+            this.UpdElementToolStripMenuItem.Click += new System.EventHandler(this.UpdElementToolStripMenuItem_Click);
             // 
             // DelElementToolStripMenuItem
             // 
             this.DelElementToolStripMenuItem.Name = "DelElementToolStripMenuItem";
             this.DelElementToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
-            this.DelElementToolStripMenuItem.Size = new System.Drawing.Size(223, 26);
+            this.DelElementToolStripMenuItem.Size = new System.Drawing.Size(224, 26);
             this.DelElementToolStripMenuItem.Text = "Удалить";
+            this.DelElementToolStripMenuItem.Click += new System.EventHandler(this.DelElementToolStripMenuItem_Click);
             // 
             // DocsToolStripMenuItem
             // 
@@ -118,6 +122,7 @@
             this.SimpleDocToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S)));
             this.SimpleDocToolStripMenuItem.Size = new System.Drawing.Size(313, 26);
             this.SimpleDocToolStripMenuItem.Text = "Простой документ";
+            this.SimpleDocToolStripMenuItem.Click += new System.EventHandler(this.SimpleDocToolStripMenuItem_Click);
             // 
             // TableDocToolStripMenuItem
             // 
@@ -125,6 +130,7 @@
             this.TableDocToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.T)));
             this.TableDocToolStripMenuItem.Size = new System.Drawing.Size(313, 26);
             this.TableDocToolStripMenuItem.Text = "Документ с таблицой";
+            this.TableDocToolStripMenuItem.Click += new System.EventHandler(this.TableDocToolStripMenuItem_Click);
             // 
             // ChartDocToolStripMenuItem
             // 
@@ -132,6 +138,7 @@
             this.ChartDocToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
             this.ChartDocToolStripMenuItem.Size = new System.Drawing.Size(313, 26);
             this.ChartDocToolStripMenuItem.Text = "Документ с диаграммой";
+            this.ChartDocToolStripMenuItem.Click += new System.EventHandler(this.ChartDocToolStripMenuItem_Click);
             // 
             // panelControl
             // 
diff --git a/COP/AppByPlugins/FormMain.resx b/COP/AppByPlugins/FormMain.resx
index 1af7de1..81a9e3d 100644
--- a/COP/AppByPlugins/FormMain.resx
+++ b/COP/AppByPlugins/FormMain.resx
@@ -1,64 +1,4 @@
-<?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.
-    -->
+<root>
   <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">
@@ -117,4 +57,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/COP/ClientsContracts/BindingModels/ClientBindingModel.cs b/COP/ClientsContracts/BindingModels/ClientBindingModel.cs
index 5b01141..4782212 100644
--- a/COP/ClientsContracts/BindingModels/ClientBindingModel.cs
+++ b/COP/ClientsContracts/BindingModels/ClientBindingModel.cs
@@ -17,6 +17,6 @@ namespace ClientsContracts.BindingModels
 
         public int CategoryId { get; set; }
 
-        public string Photo { get; set; }
+        public string Photo { get; set; } = string.Empty;
     }
 }
diff --git a/COP/WinFormsTest/PluginsConvention.cs b/COP/WinFormsTest/PluginsConvention.cs
index ffb3aca..b76ad33 100644
--- a/COP/WinFormsTest/PluginsConvention.cs
+++ b/COP/WinFormsTest/PluginsConvention.cs
@@ -142,7 +142,7 @@ namespace WinFormsTest
                 ("CategoryName", "Выбранная категория")
             };
 
-            _wordTableComponent.createWithTable(path, "Список аккаунтов", merges, widths, headers, _clientLogic.ReadList(null));
+            _wordTableComponent.createWithTable(path, "Список клиентов", merges, widths, headers, _clientLogic.ReadList(null));
             MessageBox.Show("Документ создан");
             return true;
         }
diff --git a/COP/WinFormsTest/WinFormsTest.csproj b/COP/WinFormsTest/WinFormsTest.csproj
index f1a1107..0aa955e 100644
--- a/COP/WinFormsTest/WinFormsTest.csproj
+++ b/COP/WinFormsTest/WinFormsTest.csproj
@@ -25,4 +25,27 @@
     <ProjectReference Include="..\PluginsConventionLibrary\PluginsConventionLibrary.csproj" />
   </ItemGroup>
 
+  <Target Name="CreatePluginsFolder" BeforeTargets="PreBuildEvent" Condition="!Exists('$(SolutionDir)Plugins')">
+    <MakeDir Directories="$(SolutionDir)Plugins" />
+  </Target>
+
+  <Target Name="CopyPlugins" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)Plugins\*.dll&quot;" />
+  </Target>
+
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
\ No newline at end of file