4

KopLab1/Lab3Form/PluginsConvention.cs

@@ -22,10 +22,9 @@ namespace Lab3Form
     public class PluginsConvention : IPluginsConvention
     {
         private readonly IOrderLogic _orderLogic;
-    private readonly ICityLogic _selecteditemLogic;
+    private readonly ICityLogic _cityLogic;
     private readonly ControlDataTableTable _controlDataTableTable;
     private readonly ExcelTableComponent _excelComponent;
-    private readonly ComponentHistogramToPdf _componentHistogramToPdf;
 
     public string PluginName { get; set; } = "Plugin";
 
@@ -37,10 +36,9 @@ namespace Lab3Form
     public PluginsConvention()
     {
         _orderLogic = new OrderLogic(new OrderStorage());
-        _selecteditemLogic = new CityLogic(new CityStorage());
+        _cityLogic = new CityLogic(new CityStorage());
         _controlDataTableTable = new();
         _excelComponent = new();
-        _componentHistogramToPdf = new();
     }
 
     public PluginsConventionElement GetElement
@@ -59,11 +57,11 @@ namespace Lab3Form
     {
         if (element == null)
         {
-            return new FormOrder(_orderLogic, _selecteditemLogic);
+            return new FormOrder(_orderLogic, _cityLogic);
         }
         else
         {
-            FormOrder form = new FormOrder(_orderLogic, _selecteditemLogic);
+            FormOrder form = new FormOrder(_orderLogic, _cityLogic);
             form.Id = element.Id.GetHashCode();
             return form;
         }
@@ -71,7 +69,7 @@ namespace Lab3Form
 
     public Form GetThesaurus()
     {
-        return new FormCities(_selecteditemLogic);
+        return new FormCities(_cityLogic);
     }
 
     public bool DeleteElement(PluginsConventionElement element)

KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs

@@ -1,20 +0,0 @@
-using PluginsConventionLibrary.Plugins;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PluginsConventionLibrary
-{
-    public class MainPluginConventionElement : PluginsConventionElement
-    {
-        public string ProductCategoryName { get; set; }
-
-        public string PhotoFilePath { get; set; }
-
-        public string FIO { get; set; }
-
-        public string Email { get; set; }
-    }
-}

KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs

@@ -2,6 +2,6 @@
 {
     public class PluginsConventionSaveDocument
     {
-        public string FileName { get; set; }
+        public required string FileName { get; set; }
     }
 }