diff --git a/KopLab1/Lab3Form/PluginsConvention.cs b/KopLab1/Lab3Form/PluginsConvention.cs index 8969af5..b179979 100644 --- a/KopLab1/Lab3Form/PluginsConvention.cs +++ b/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) diff --git a/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll b/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll index 6dd832e..7264489 100644 Binary files a/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll and b/KopLab1/Plugins/InternetShopOrdersBusinessLogic.dll differ diff --git a/KopLab1/Plugins/InternetShopOrdersContracts.dll b/KopLab1/Plugins/InternetShopOrdersContracts.dll index ff93921..bc0cb52 100644 Binary files a/KopLab1/Plugins/InternetShopOrdersContracts.dll and b/KopLab1/Plugins/InternetShopOrdersContracts.dll differ diff --git a/KopLab1/Plugins/InternetShopOrdersDataModels.dll b/KopLab1/Plugins/InternetShopOrdersDataModels.dll index 1366b3b..1efa2bb 100644 Binary files a/KopLab1/Plugins/InternetShopOrdersDataModels.dll and b/KopLab1/Plugins/InternetShopOrdersDataModels.dll differ diff --git a/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll b/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll index f36f733..a617b9f 100644 Binary files a/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll and b/KopLab1/Plugins/InternetShopOrdersDatabaseImplement.dll differ diff --git a/KopLab1/Plugins/Lab3Form.dll b/KopLab1/Plugins/Lab3Form.dll index b91e0f2..9f94f92 100644 Binary files a/KopLab1/Plugins/Lab3Form.dll and b/KopLab1/Plugins/Lab3Form.dll differ diff --git a/KopLab1/Plugins/PluginsConventionLibrary.dll b/KopLab1/Plugins/PluginsConventionLibrary.dll index 73e9997..7b2e0a2 100644 Binary files a/KopLab1/Plugins/PluginsConventionLibrary.dll and b/KopLab1/Plugins/PluginsConventionLibrary.dll differ diff --git a/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs b/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs deleted file mode 100644 index ac57cb5..0000000 --- a/KopLab1/PluginsConventionLibrary/MainPluginConventionElement.cs +++ /dev/null @@ -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; } - } -} diff --git a/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs b/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs index a0a7ce1..cd3fdd9 100644 --- a/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs +++ b/KopLab1/PluginsConventionLibrary/Plugins/PluginsConventionSaveDocument.cs @@ -2,6 +2,6 @@ { public class PluginsConventionSaveDocument { - public string FileName { get; set; } + public required string FileName { get; set; } } }