diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs index 02117fd..68128dc 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -185,7 +185,7 @@ namespace FurnitureAssemblyBusinessLogic.OfficePackage.Implements var stylesheetExtensionList = new StylesheetExtensionList(); var stylesheetExtension1 = new StylesheetExtension() - { + { Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" }; diff --git a/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs b/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs index e0f8bf4..79a6dde 100644 --- a/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs +++ b/FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs @@ -20,7 +20,7 @@ namespace FurnitureAssemblyFileImplement.Models public int ClientId { get; private set; } - public int? ImplementerId { get; set; } + public int? ImplementerId { get; private set; } public int Count { get; private set; } diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs index cd916a9..a65f8d3 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs @@ -24,7 +24,7 @@ namespace FurnitureAssemblyListImplement // Список для хранения Магазинов public List Shops { get; set; } - // Список для хранения Клиентов + // Список для хранения клиентов public List Clients { get; set; } // Список для хранения исполнителей @@ -46,7 +46,7 @@ namespace FurnitureAssemblyListImplement public static DataListSingleton GetInstance() { - if(_instance == null) + if (_instance == null) { _instance = new DataListSingleton(); } diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs index ed52e5e..462780d 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/MessageInfoStorage.cs @@ -13,7 +13,9 @@ namespace FurnitureAssemblyListImplement.Implements { public class MessageInfoStorage : IMessageInfoStorage { + // Поле для работы со списком изделий private readonly DataListSingleton _source; + public MessageInfoStorage() { _source = DataListSingleton.GetInstance(); diff --git a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs index 4b68564..5f48b47 100644 --- a/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs @@ -107,7 +107,7 @@ namespace FurnitureAssemblyListImplement.Implements return null; } - // Метод для записи названия изделия на форме с заказами + // Метод для записи названия изделия на форме с заказами и исполнителями private OrderViewModel GetViewModel(Order order) { var viewModel = order.GetViewModel; diff --git a/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs b/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs index 858d3ec..9354e23 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/FormMain.cs @@ -51,7 +51,7 @@ namespace FurnitureAssemblyView { dataGridView.DataSource = list; dataGridView.Columns["FurnitureId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["ClientId"].Visible = false; dataGridView.Columns["ImplementerId"].Visible = false; dataGridView.Columns["FurnitureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; @@ -115,7 +115,7 @@ namespace FurnitureAssemblyView if (!operationResult) { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + throw new Exception("Заказ не в статусе готовности. Дополнительная информация в логах."); } _logger.LogInformation("Заказ №{id} выдан", id); diff --git a/FurnitureAssembly/FurnitureAssemblyView/Program.cs b/FurnitureAssembly/FurnitureAssemblyView/Program.cs index 827e41a..78c5777 100644 --- a/FurnitureAssembly/FurnitureAssemblyView/Program.cs +++ b/FurnitureAssembly/FurnitureAssemblyView/Program.cs @@ -55,7 +55,7 @@ namespace FurnitureAssemblyView logger?.LogError(ex, ""); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(_serviceProvider.GetRequiredService()); } private static void ConfigureServices(ServiceCollection services)