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 @@
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
+
+
+
+
+
+
+
+ $(SolutionDir)Plugins\System.IO.Packaging.dll
+
+
+
\ 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 @@
-
-
-
+
@@ -117,4 +57,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
\ No newline at end of file