From cdce51272a014c35e091419672e2746cf334f8a9 Mon Sep 17 00:00:00 2001 From: Katanaa Die Date: Fri, 17 May 2024 23:32:45 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/BackUpLogic.cs | 103 +++++ .../MailWorker/AbstractMailWorker.cs | 2 +- .../Attributes/ColumnAttribute.cs | 31 ++ .../Attributes/GridViewAutoSize.cs | 27 ++ Bar/BarContracts/BarContracts.csproj | 3 +- .../BindingModels/BackUpSaveBinidngModel.cs | 13 + .../BindingModels/MessageInfoBindingModel.cs | 2 + .../BusinessLogicsContracts/IBackUpLogic.cs | 9 + Bar/BarContracts/DI/DependencyManager.cs | 66 +++ Bar/BarContracts/DI/IDependencyContainer.cs | 40 ++ .../DI/IImplementationExtension.cs | 17 + .../DI/ServiceDependencyContainer.cs | 62 +++ Bar/BarContracts/DI/ServiceProviderLoader.cs | 56 +++ .../StoragesContracts/IBackUpInfo.cs | 15 + .../ViewModels/ClientViewModel.cs | 18 +- .../ViewModels/CocktailViewModel.cs | 17 +- .../ViewModels/ComponentViewModel.cs | 14 +- .../ViewModels/ImplementerViewModel.cs | 12 +- .../ViewModels/MessageInfoViewModel.cs | 17 +- Bar/BarContracts/ViewModels/OrderViewModel.cs | 44 +- Bar/BarDataModels/Models/IMessageInfoModel.cs | 5 +- .../BarDatabaseImplement.csproj | 5 + .../ImplementationExtension.cs | 22 + .../Implements/BackUpInfo.cs | 27 ++ .../Implements/MessageInfoStorage.cs | 12 +- ...ner.cs => 20240517114824_init.Designer.cs} | 2 +- ...7095734_init.cs => 20240517114824_init.cs} | 0 Bar/BarDatabaseImplement/Models/Client.cs | 18 +- Bar/BarDatabaseImplement/Models/Cocktail.cs | 19 +- Bar/BarDatabaseImplement/Models/Component.cs | 13 +- .../Models/Implementer.cs | 7 + .../Models/MessageInfo.cs | 10 + Bar/BarDatabaseImplement/Models/Order.cs | 35 +- Bar/BarFileImplement/BarFileImplement.csproj | 4 + .../ImplementationExtension.cs | 22 + Bar/BarFileImplement/Implements/BackUpInfo.cs | 45 ++ .../Implements/OrderStorage.cs | 28 +- Bar/BarFileImplement/Models/Client.cs | 9 + Bar/BarFileImplement/Models/Cocktail.cs | 16 +- Bar/BarFileImplement/Models/Component.cs | 15 +- Bar/BarFileImplement/Models/Implementer.cs | 7 + Bar/BarFileImplement/Models/MessageInfo.cs | 11 + Bar/BarFileImplement/Models/Order.cs | 40 +- Bar/BarListImplement/BarListImplement.csproj | 4 + .../ImplementationExtension.cs | 22 + Bar/BarListImplement/Implements/BackUpInfo.cs | 22 + .../Implements/OrderStorage.cs | 80 ++-- Bar/BarListImplement/Models/MessageInfo.cs | 2 + Bar/BarView/DataGridViewExtension.cs | 46 +++ Bar/BarView/FormClients.cs | 8 +- Bar/BarView/FormCocktail.Designer.cs | 48 +-- Bar/BarView/FormCocktail.cs | 99 ++--- Bar/BarView/FormCocktailComponent.Designer.cs | 14 +- Bar/BarView/FormCocktails.cs | 41 +- Bar/BarView/FormComponents.cs | 31 +- Bar/BarView/FormImplementers.cs | 9 +- Bar/BarView/FormMail.cs | 9 +- Bar/BarView/FormMain.Designer.cs | 383 +++++++++--------- Bar/BarView/FormMain.cs | 296 +++++++------- Bar/BarView/Program.cs | 84 ++-- 60 files changed, 1439 insertions(+), 699 deletions(-) create mode 100644 Bar/BarBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 Bar/BarContracts/Attributes/ColumnAttribute.cs create mode 100644 Bar/BarContracts/Attributes/GridViewAutoSize.cs create mode 100644 Bar/BarContracts/BindingModels/BackUpSaveBinidngModel.cs create mode 100644 Bar/BarContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 Bar/BarContracts/DI/DependencyManager.cs create mode 100644 Bar/BarContracts/DI/IDependencyContainer.cs create mode 100644 Bar/BarContracts/DI/IImplementationExtension.cs create mode 100644 Bar/BarContracts/DI/ServiceDependencyContainer.cs create mode 100644 Bar/BarContracts/DI/ServiceProviderLoader.cs create mode 100644 Bar/BarContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 Bar/BarDatabaseImplement/ImplementationExtension.cs create mode 100644 Bar/BarDatabaseImplement/Implements/BackUpInfo.cs rename Bar/BarDatabaseImplement/Migrations/{20240517095734_init.Designer.cs => 20240517114824_init.Designer.cs} (99%) rename Bar/BarDatabaseImplement/Migrations/{20240517095734_init.cs => 20240517114824_init.cs} (100%) create mode 100644 Bar/BarFileImplement/ImplementationExtension.cs create mode 100644 Bar/BarFileImplement/Implements/BackUpInfo.cs create mode 100644 Bar/BarListImplement/ImplementationExtension.cs create mode 100644 Bar/BarListImplement/Implements/BackUpInfo.cs create mode 100644 Bar/BarView/DataGridViewExtension.cs diff --git a/Bar/BarBusinessLogic/BusinessLogics/BackUpLogic.cs b/Bar/BarBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..e361cda --- /dev/null +++ b/Bar/BarBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,103 @@ +using BarContracts.BindingModels; +using BarContracts.BusinessLogicsContracts; +using BarContracts.StoragesContracts; +using BarDataModels.Enums; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace BarBusinessLogic.BusinessLogics +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + + private readonly IBackUpInfo _backUpInfo; + + public BackUpLogic(ILogger logger, IBackUpInfo backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + + public void CreateBackUp(BackUpSaveBinidngModel model) + { + if (_backUpInfo == null) + { + return; + } + try + { + _logger.LogDebug("Clear folder"); + var dirInfo = new DirectoryInfo(model.FolderName); + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", nameof(assembly)); + } + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != null) + { + var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); + if (modelType == null) + { + throw new InvalidOperationException($"Не найден класс-модель для {type.Name}"); + } + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + // вызываем метод на выполнение + method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName }); + } + } + _logger.LogDebug("Create zip and remove folder"); + // архивируем + ZipFile.CreateFromDirectory(model.FolderName, fileName); + // удаляем папку + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + + private void SaveToFile(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + return; + } + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} diff --git a/Bar/BarBusinessLogic/MailWorker/AbstractMailWorker.cs b/Bar/BarBusinessLogic/MailWorker/AbstractMailWorker.cs index bd758de..7217f9c 100644 --- a/Bar/BarBusinessLogic/MailWorker/AbstractMailWorker.cs +++ b/Bar/BarBusinessLogic/MailWorker/AbstractMailWorker.cs @@ -73,7 +73,7 @@ namespace BarBusinessLogic.MailWorker foreach (var mail in list) { _messageInfoLogic.Create(mail); - + } } protected abstract Task SendMailAsync(MailSendInfoBindingModel info); diff --git a/Bar/BarContracts/Attributes/ColumnAttribute.cs b/Bar/BarContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..1bb2edf --- /dev/null +++ b/Bar/BarContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public string Title { get; private set; } + + public bool Visible { get; private set; } + + public int Width { get; private set; } + + public GridViewAutoSize GridViewAutoSize { get; private set; } + + public bool IsUseAutoSize { get; private set; } + + public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + } +} diff --git a/Bar/BarContracts/Attributes/GridViewAutoSize.cs b/Bar/BarContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..16667d8 --- /dev/null +++ b/Bar/BarContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + + None = 1, + + ColumnHeader = 2, + + AllCellsExceptHeader = 4, + + AllCells = 6, + + DisplayedCellsExceptHeader = 8, + + DisplayedCells = 10, + + Fill = 16 + } +} diff --git a/Bar/BarContracts/BarContracts.csproj b/Bar/BarContracts/BarContracts.csproj index a6c45ed..40313d6 100644 --- a/Bar/BarContracts/BarContracts.csproj +++ b/Bar/BarContracts/BarContracts.csproj @@ -1,4 +1,4 @@ - + net6.0-windows @@ -13,6 +13,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Bar/BarContracts/BindingModels/BackUpSaveBinidngModel.cs b/Bar/BarContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..5efa223 --- /dev/null +++ b/Bar/BarContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/Bar/BarContracts/BindingModels/MessageInfoBindingModel.cs b/Bar/BarContracts/BindingModels/MessageInfoBindingModel.cs index f76daa6..038d315 100644 --- a/Bar/BarContracts/BindingModels/MessageInfoBindingModel.cs +++ b/Bar/BarContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,7 @@ namespace BarContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; + + public int Id => throw new NotImplementedException(); } } diff --git a/Bar/BarContracts/BusinessLogicsContracts/IBackUpLogic.cs b/Bar/BarContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..d6775c1 --- /dev/null +++ b/Bar/BarContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using BarContracts.BindingModels; + +namespace BarContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/Bar/BarContracts/DI/DependencyManager.cs b/Bar/BarContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..7811824 --- /dev/null +++ b/Bar/BarContracts/DI/DependencyManager.cs @@ -0,0 +1,66 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new ServiceDependencyContainer(); + } + + public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } } + + /// + /// Иницализация библиотек, в которых идут установки зависомстей + /// + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + // регистрируем зависимости + ext.RegisterServices(); + } + + /// + /// Регистрация логгера + /// + /// + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/Bar/BarContracts/DI/IDependencyContainer.cs b/Bar/BarContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..ae44fab --- /dev/null +++ b/Bar/BarContracts/DI/IDependencyContainer.cs @@ -0,0 +1,40 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.DI +{ + public interface IDependencyContainer + { + /// + /// Регистрация логгера + /// + /// + void AddLogging(Action configure); + + /// + /// Добавление зависимости + /// + /// + /// + /// + void RegisterType(bool isSingle) where U : class, T where T : class; + + /// + /// Добавление зависимости + /// + /// + /// + void RegisterType(bool isSingle) where T : class; + + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + T Resolve(); + } +} diff --git a/Bar/BarContracts/DI/IImplementationExtension.cs b/Bar/BarContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..abd79ef --- /dev/null +++ b/Bar/BarContracts/DI/IImplementationExtension.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/Bar/BarContracts/DI/ServiceDependencyContainer.cs b/Bar/BarContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..37ffe79 --- /dev/null +++ b/Bar/BarContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,62 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.DI +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + } +} diff --git a/Bar/BarContracts/DI/ServiceProviderLoader.cs b/Bar/BarContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..558972e --- /dev/null +++ b/Bar/BarContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.DI +{ + public class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/Bar/BarContracts/StoragesContracts/IBackUpInfo.cs b/Bar/BarContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..610d444 --- /dev/null +++ b/Bar/BarContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/Bar/BarContracts/ViewModels/ClientViewModel.cs b/Bar/BarContracts/ViewModels/ClientViewModel.cs index 66360dd..885a7c5 100644 --- a/Bar/BarContracts/ViewModels/ClientViewModel.cs +++ b/Bar/BarContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using BarDataModels.Models; +using BarContracts.Attributes; +using BarDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace BarContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО клиента", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/Bar/BarContracts/ViewModels/CocktailViewModel.cs b/Bar/BarContracts/ViewModels/CocktailViewModel.cs index dacd001..b98f098 100644 --- a/Bar/BarContracts/ViewModels/CocktailViewModel.cs +++ b/Bar/BarContracts/ViewModels/CocktailViewModel.cs @@ -1,4 +1,5 @@ -using BarDataModels.Models; +using BarContracts.Attributes; +using BarDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,14 @@ namespace BarContracts.ViewModels { public class CocktailViewModel : ICocktailModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string CocktailName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary CocktailComponents + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название коктейля", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string CocktailName { get; set; } = string.Empty; + [Column(title: "Цена", width: 70)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary CocktailComponents { get; set; diff --git a/Bar/BarContracts/ViewModels/ComponentViewModel.cs b/Bar/BarContracts/ViewModels/ComponentViewModel.cs index abfb5a5..42e399a 100644 --- a/Bar/BarContracts/ViewModels/ComponentViewModel.cs +++ b/Bar/BarContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ -using BarDataModels.Models; +using BarContracts.Attributes; +using BarDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,11 @@ namespace BarContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название ингридиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column(title: "Цена", width: 150)] + public double Cost { get; set; } } } diff --git a/Bar/BarContracts/ViewModels/ImplementerViewModel.cs b/Bar/BarContracts/ViewModels/ImplementerViewModel.cs index 0d43c40..962db04 100644 --- a/Bar/BarContracts/ViewModels/ImplementerViewModel.cs +++ b/Bar/BarContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using BarDataModels.Models; +using BarContracts.Attributes; +using BarDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace BarContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 100)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column(title: "Стаж работы", width: 60)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column(title: "Квалификация", width: 60)] public int Qualification { get; set; } } } diff --git a/Bar/BarContracts/ViewModels/MessageInfoViewModel.cs b/Bar/BarContracts/ViewModels/MessageInfoViewModel.cs index 436e7bb..6a88f86 100644 --- a/Bar/BarContracts/ViewModels/MessageInfoViewModel.cs +++ b/Bar/BarContracts/ViewModels/MessageInfoViewModel.cs @@ -2,24 +2,25 @@ using System; using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using BarContracts.Attributes; namespace BarContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] + public int Id { get; set; } + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; - + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Имя отправителя")] + [Column(title: "Имя отправителя", width: 150)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата доставки")] + [Column(title: "Дата доставки", width: 120)] public DateTime DateDelivery { get; set; } - [DisplayName("Тема письма")] + [Column(title: "Тема письма", width: 120)] public string Subject { get; set; } = string.Empty; - [DisplayName("Внутренности письма")] + [Column(title: "Внутренности письма", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; } } diff --git a/Bar/BarContracts/ViewModels/OrderViewModel.cs b/Bar/BarContracts/ViewModels/OrderViewModel.cs index 8e0363f..a9f4214 100644 --- a/Bar/BarContracts/ViewModels/OrderViewModel.cs +++ b/Bar/BarContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using BarDataModels.Enums; +using BarContracts.Attributes; +using BarDataModels.Enums; using BarDataModels.Models; using System; using System.Collections.Generic; @@ -11,27 +12,30 @@ namespace BarContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int CocktailId { get; set; } - [DisplayName("Изделие")] - public string CocktailName { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } - public int ClientId { get; set; } + [Column(title: "Номер", width: 90)] + public int Id { get; set; } + [Column(visible: false)] + public int CocktailId { get; set; } + [Column(title: "Коктейль", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string CocktailName { get; set; } = string.Empty; + [Column(title: "Количество", width: 100)] + public int Count { get; set; } + [Column(title: "Сумма", width: 120)] + public double Sum { get; set; } + [Column(title: "Статус", width: 70)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column(title: "Дата создания", width: 120)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column(title: "Дата выполнения", width: 120)] + public DateTime? DateImplement { get; set; } + [Column(visible: false)] + public int ClientId { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Имя клиента", width: 190)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Исполнитель")] + [Column(title: "Исполнитель", width: 150)] public string? ImplementerFIO { get; set; } = null; } } diff --git a/Bar/BarDataModels/Models/IMessageInfoModel.cs b/Bar/BarDataModels/Models/IMessageInfoModel.cs index d75b941..6ec9d1b 100644 --- a/Bar/BarDataModels/Models/IMessageInfoModel.cs +++ b/Bar/BarDataModels/Models/IMessageInfoModel.cs @@ -1,4 +1,5 @@ -using System; +using BarDataModels.Enums; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +7,7 @@ using System.Threading.Tasks; namespace BarDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/Bar/BarDatabaseImplement/BarDatabaseImplement.csproj b/Bar/BarDatabaseImplement/BarDatabaseImplement.csproj index 9d30671..1cf39a1 100644 --- a/Bar/BarDatabaseImplement/BarDatabaseImplement.csproj +++ b/Bar/BarDatabaseImplement/BarDatabaseImplement.csproj @@ -23,4 +23,9 @@ + + + + + diff --git a/Bar/BarDatabaseImplement/ImplementationExtension.cs b/Bar/BarDatabaseImplement/ImplementationExtension.cs new file mode 100644 index 0000000..212bff3 --- /dev/null +++ b/Bar/BarDatabaseImplement/ImplementationExtension.cs @@ -0,0 +1,22 @@ +using BarContracts.DI; +using BarContracts.StoragesContracts; +using BarDatabaseImplement.Implements; + +namespace BarDatabaseImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 3; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/Bar/BarDatabaseImplement/Implements/BackUpInfo.cs b/Bar/BarDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..23762a6 --- /dev/null +++ b/Bar/BarDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,27 @@ +using BarContracts.StoragesContracts; + +namespace BarDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new BarDatabase(); + return context.Set().ToList(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/Bar/BarDatabaseImplement/Implements/MessageInfoStorage.cs b/Bar/BarDatabaseImplement/Implements/MessageInfoStorage.cs index 24ee109..2d9060c 100644 --- a/Bar/BarDatabaseImplement/Implements/MessageInfoStorage.cs +++ b/Bar/BarDatabaseImplement/Implements/MessageInfoStorage.cs @@ -43,12 +43,16 @@ namespace BarDatabaseImplement.Implements public MessageInfoViewModel? Insert(MessageInfoBindingModel model) { - var newMessage = MessageInfo.Create(model); - if (newMessage == null) return null; using var context = new BarDatabase(); - context.Messages.Add(newMessage); + model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id; + var message = MessageInfo.Create(model); + if (message == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId))) + { + return null; + } + context.Messages.Add(message); context.SaveChanges(); - return newMessage.GetViewModel; + return message.GetViewModel; } } diff --git a/Bar/BarDatabaseImplement/Migrations/20240517095734_init.Designer.cs b/Bar/BarDatabaseImplement/Migrations/20240517114824_init.Designer.cs similarity index 99% rename from Bar/BarDatabaseImplement/Migrations/20240517095734_init.Designer.cs rename to Bar/BarDatabaseImplement/Migrations/20240517114824_init.Designer.cs index c6dccb5..c933bca 100644 --- a/Bar/BarDatabaseImplement/Migrations/20240517095734_init.Designer.cs +++ b/Bar/BarDatabaseImplement/Migrations/20240517114824_init.Designer.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace BarDatabaseImplement.Migrations { [DbContext(typeof(BarDatabase))] - [Migration("20240517095734_init")] + [Migration("20240517114824_init")] partial class init { /// diff --git a/Bar/BarDatabaseImplement/Migrations/20240517095734_init.cs b/Bar/BarDatabaseImplement/Migrations/20240517114824_init.cs similarity index 100% rename from Bar/BarDatabaseImplement/Migrations/20240517095734_init.cs rename to Bar/BarDatabaseImplement/Migrations/20240517114824_init.cs diff --git a/Bar/BarDatabaseImplement/Models/Client.cs b/Bar/BarDatabaseImplement/Models/Client.cs index e755219..cee5bd8 100644 --- a/Bar/BarDatabaseImplement/Models/Client.cs +++ b/Bar/BarDatabaseImplement/Models/Client.cs @@ -8,18 +8,26 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace BarDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } - [Required] + [DataMember] + [Required] public string ClientFIO { get; set; } = string.Empty; - [Required] + + [DataMember] + [Required] public string Email { get; set; } = string.Empty; - [Required] + + [DataMember] + [Required] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] diff --git a/Bar/BarDatabaseImplement/Models/Cocktail.cs b/Bar/BarDatabaseImplement/Models/Cocktail.cs index 1a640e4..e7e078e 100644 --- a/Bar/BarDatabaseImplement/Models/Cocktail.cs +++ b/Bar/BarDatabaseImplement/Models/Cocktail.cs @@ -3,18 +3,27 @@ using BarContracts.ViewModels; using BarDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace BarDatabaseImplement.Models { - public class Cocktail : ICocktailModel + [DataContract] + public class Cocktail : ICocktailModel { - public int Id { get; set; } - [Required] + [DataMember] + public int Id { get; set; } + + [DataMember] + [Required] public string CocktailName { get; set; } = string.Empty; - [Required] + + [DataMember] + [Required] public double Price { get; set; } private Dictionary? _cocktailComponents = null; - [NotMapped] + + [DataMember] + [NotMapped] public Dictionary CocktailComponents { get diff --git a/Bar/BarDatabaseImplement/Models/Component.cs b/Bar/BarDatabaseImplement/Models/Component.cs index 96e9017..81ec28d 100644 --- a/Bar/BarDatabaseImplement/Models/Component.cs +++ b/Bar/BarDatabaseImplement/Models/Component.cs @@ -5,15 +5,20 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace BarDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public string ComponentName { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List CocktailComponents { get; set; } = diff --git a/Bar/BarDatabaseImplement/Models/Implementer.cs b/Bar/BarDatabaseImplement/Models/Implementer.cs index c9104ed..5e5efc6 100644 --- a/Bar/BarDatabaseImplement/Models/Implementer.cs +++ b/Bar/BarDatabaseImplement/Models/Implementer.cs @@ -8,22 +8,29 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace BarDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; set; } + [DataMember] [Required] public string ImplementerFIO { get; set; } = string.Empty; + [DataMember] [Required] public string Password { get; set; } = string.Empty; + [DataMember] [Required] public int WorkExperience { get; set; } + [DataMember] [Required] public int Qualification { get; set; } diff --git a/Bar/BarDatabaseImplement/Models/MessageInfo.cs b/Bar/BarDatabaseImplement/Models/MessageInfo.cs index e026b3c..6453888 100644 --- a/Bar/BarDatabaseImplement/Models/MessageInfo.cs +++ b/Bar/BarDatabaseImplement/Models/MessageInfo.cs @@ -4,7 +4,9 @@ using BarDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; @@ -12,15 +14,23 @@ namespace BarDatabaseImplement.Models { public class MessageInfo : IMessageInfoModel { + [NotMapped] + public int Id { get; private set; } + [DataMember] [Key] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } + [DataMember] [Required] public string SenderName { get; private set; } = string.Empty; + [DataMember] [Required] public DateTime DateDelivery { get; private set; } + [DataMember] [Required] public string Subject { get; private set; } = string.Empty; + [DataMember] [Required] public string Body { get; private set; } = string.Empty; public virtual Client? Client { get; private set; } diff --git a/Bar/BarDatabaseImplement/Models/Order.cs b/Bar/BarDatabaseImplement/Models/Order.cs index 5832084..20f93cf 100644 --- a/Bar/BarDatabaseImplement/Models/Order.cs +++ b/Bar/BarDatabaseImplement/Models/Order.cs @@ -9,27 +9,46 @@ using BarDataModels.Models; using BarDataModels.Enums; using System.Xml.Linq; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace BarDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + + [DataMember] + [Required] public int ClientId { get; private set; } + + [DataMember] public int? ImplementerId { get; private set; } + + [DataMember] [Required] public int CocktailId { get; private set; } - [Required] + + [DataMember] + [Required] public int Count { get; private set; } - [Required] + + [DataMember] + [Required] public double Sum { get; private set; } - [Required] + + [DataMember] + [Required] public OrderStatus Status { get; private set; } - [Required] + + [DataMember] + [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + + [DataMember] + public DateTime? DateImplement { get; private set; } public Client Client { get; set; } public Implementer? Implementer { get; set; } public Cocktail Cocktail { get; set; } diff --git a/Bar/BarFileImplement/BarFileImplement.csproj b/Bar/BarFileImplement/BarFileImplement.csproj index 022fc07..642b82c 100644 --- a/Bar/BarFileImplement/BarFileImplement.csproj +++ b/Bar/BarFileImplement/BarFileImplement.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/Bar/BarFileImplement/ImplementationExtension.cs b/Bar/BarFileImplement/ImplementationExtension.cs new file mode 100644 index 0000000..3c1643c --- /dev/null +++ b/Bar/BarFileImplement/ImplementationExtension.cs @@ -0,0 +1,22 @@ +using BarContracts.DI; +using BarContracts.StoragesContracts; +using BarFileImplement.Implements; + +namespace BarFileImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/Bar/BarFileImplement/Implements/BackUpInfo.cs b/Bar/BarFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..9010c81 --- /dev/null +++ b/Bar/BarFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,45 @@ +using BarContracts.BindingModels; +using BarContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace BarFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + private readonly DataFileSingleton source; + private readonly PropertyInfo[] sourceProperties; + + public BackUpInfo() + { + source = DataFileSingleton.GetInstance(); + sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public); + } + + public List? GetList() where T : class, new() + { + var requredType = typeof(T); + return (List?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType) + ?.GetValue(source); + + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/Bar/BarFileImplement/Implements/OrderStorage.cs b/Bar/BarFileImplement/Implements/OrderStorage.cs index df3dbe3..74b03b7 100644 --- a/Bar/BarFileImplement/Implements/OrderStorage.cs +++ b/Bar/BarFileImplement/Implements/OrderStorage.cs @@ -29,27 +29,27 @@ namespace BarFileImplement.Implements return source.Orders.Where(x => x.Id == model.Id) .Select(x => AcessCocktailsStorage(x.GetViewModel)) .ToList(); - if (model.ClientId.HasValue && !model.Id.HasValue) - { - return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); - } + if (model.ClientId.HasValue && !model.Id.HasValue) + { + return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); + } - if (!model.ImplementerId.HasValue && !model.Id.HasValue) - { - return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList(); + if (!model.ImplementerId.HasValue && !model.Id.HasValue) + { + return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList(); - } - else + } + else return source.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList(); } public OrderViewModel? GetElement(OrderSearchModel model) { - if (model.ImplementerId.HasValue) - { - return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; - } - if (!model.Id.HasValue) + if (model.ImplementerId.HasValue) + { + return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; + } + if (!model.Id.HasValue) { return null; } diff --git a/Bar/BarFileImplement/Models/Client.cs b/Bar/BarFileImplement/Models/Client.cs index a49afc6..1675632 100644 --- a/Bar/BarFileImplement/Models/Client.cs +++ b/Bar/BarFileImplement/Models/Client.cs @@ -4,17 +4,26 @@ using BarDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace BarFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; set; } + + [DataMember] public string ClientFIO { get; set; } = string.Empty; + + [DataMember] public string Email { get; set; } = string.Empty; + + [DataMember] public string Password { get; set; } = string.Empty; public static Client? Create(ClientBindingModel? model) { diff --git a/Bar/BarFileImplement/Models/Cocktail.cs b/Bar/BarFileImplement/Models/Cocktail.cs index 6eb7318..fcf73b5 100644 --- a/Bar/BarFileImplement/Models/Cocktail.cs +++ b/Bar/BarFileImplement/Models/Cocktail.cs @@ -2,18 +2,24 @@ using BarContracts.ViewModels; using BarDataModels.Models; using System.Collections.Generic; +using System.Runtime.Serialization; using System.Xml.Linq; namespace BarFileImplement.Models { - public class Cocktail : ICocktailModel + [DataContract] + public class Cocktail : ICocktailModel { - public int Id { get; private set; } - public string CocktailName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string CocktailName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _cocktailComponents = null; - public Dictionary CocktailComponents + [DataMember] + public Dictionary CocktailComponents { get { diff --git a/Bar/BarFileImplement/Models/Component.cs b/Bar/BarFileImplement/Models/Component.cs index d9563fd..7c39439 100644 --- a/Bar/BarFileImplement/Models/Component.cs +++ b/Bar/BarFileImplement/Models/Component.cs @@ -3,15 +3,22 @@ using BarContracts.ViewModels; using BarDataModels.Models; using System; using System.Collections.Generic; +using System.Runtime.Serialization; using System.Xml.Linq; namespace BarFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; private set; } + [DataMember] + public int Id { get; private set; } + + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + + [DataMember] + public double Cost { get; private set; } public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/Bar/BarFileImplement/Models/Implementer.cs b/Bar/BarFileImplement/Models/Implementer.cs index 5f1307f..d3ee042 100644 --- a/Bar/BarFileImplement/Models/Implementer.cs +++ b/Bar/BarFileImplement/Models/Implementer.cs @@ -7,16 +7,23 @@ using System.Threading.Tasks; using System.Xml.Linq; using BarContracts.BindingModels; using BarContracts.ViewModels; +using System.Runtime.Serialization; namespace BarFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; set; } + [DataMember] public string ImplementerFIO { get; set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; + [DataMember] public int WorkExperience { get; set; } + [DataMember] public int Qualification { get; set; } public static Implementer? Create(ImplementerBindingModel? model) { diff --git a/Bar/BarFileImplement/Models/MessageInfo.cs b/Bar/BarFileImplement/Models/MessageInfo.cs index 5278334..27e5f3e 100644 --- a/Bar/BarFileImplement/Models/MessageInfo.cs +++ b/Bar/BarFileImplement/Models/MessageInfo.cs @@ -4,24 +4,35 @@ using BarDataModels.Models; using System; using System.Collections.Generic; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace BarFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + [DataMember] + public int Id { get; private set; } + + [DataMember] public string MessageId { get; set; } = string.Empty; + [DataMember] public int? ClientId { get; set; } + [DataMember] public string SenderName { get; set; } = string.Empty; + [DataMember] public DateTime DateDelivery { get; set; } + [DataMember] public string Subject { get; set; } = string.Empty; + [DataMember] public string Body { get; set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel? model) diff --git a/Bar/BarFileImplement/Models/Order.cs b/Bar/BarFileImplement/Models/Order.cs index 51f527c..3ccef7e 100644 --- a/Bar/BarFileImplement/Models/Order.cs +++ b/Bar/BarFileImplement/Models/Order.cs @@ -8,21 +8,39 @@ using BarContracts.ViewModels; using BarDataModels.Models; using BarDataModels.Enums; using System.Xml.Linq; - +using System.Runtime.Serialization; namespace BarFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int CocktailId { get; private set; } - public int? ImplementerId { get; private set; } - public int ClientId { get; private set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } - public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public int Id { get; private set; } + + [DataMember] + public int CocktailId { get; private set; } + + [DataMember] + public int? ImplementerId { get; private set; } + + [DataMember] + public int ClientId { get; private set; } + + [DataMember] + public int Count { get; private set; } + + [DataMember] + public double Sum { get; private set; } + + [DataMember] + public OrderStatus Status { get; private set; } + + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel model) { diff --git a/Bar/BarListImplement/BarListImplement.csproj b/Bar/BarListImplement/BarListImplement.csproj index 68cd851..c3662f8 100644 --- a/Bar/BarListImplement/BarListImplement.csproj +++ b/Bar/BarListImplement/BarListImplement.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/Bar/BarListImplement/ImplementationExtension.cs b/Bar/BarListImplement/ImplementationExtension.cs new file mode 100644 index 0000000..12ec208 --- /dev/null +++ b/Bar/BarListImplement/ImplementationExtension.cs @@ -0,0 +1,22 @@ +using BarContracts.DI; +using BarContracts.StoragesContracts; +using BarListImplement.Implements; + +namespace BarListImplement +{ + internal class ImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/Bar/BarListImplement/Implements/BackUpInfo.cs b/Bar/BarListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..55908fa --- /dev/null +++ b/Bar/BarListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using BarContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BarListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} diff --git a/Bar/BarListImplement/Implements/OrderStorage.cs b/Bar/BarListImplement/Implements/OrderStorage.cs index d7578a8..2d77164 100644 --- a/Bar/BarListImplement/Implements/OrderStorage.cs +++ b/Bar/BarListImplement/Implements/OrderStorage.cs @@ -31,46 +31,46 @@ namespace BarListImplement.Implements public List GetFilteredList(OrderSearchModel model) { - var result = new List(); - if (!model.Id.HasValue) - { - return result; - } - else if (model.ClientId.HasValue && !model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.ClientId == model.ClientId) - { - result.Add(AccessCocktailStorage(order.GetViewModel)); - } - } - } - else if (model.ImplementerId.HasValue && !model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.ImplementerId == model.ImplementerId) - { - result.Add(AccessCocktailStorage(order.GetViewModel)); - } - } - } - else if (model.Id.HasValue) - { - foreach (var order in _source.Orders) - { - if (order.Id == model.Id) - { - result.Add(AccessCocktailStorage(order.GetViewModel)); - } - else if (model.DateFrom.HasValue && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate) - { - result.Add(AccessCocktailStorage(order.GetViewModel)); - } - } - } - return result; + var result = new List(); + if (!model.Id.HasValue) + { + return result; + } + else if (model.ClientId.HasValue && !model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.ClientId == model.ClientId) + { + result.Add(AccessCocktailStorage(order.GetViewModel)); + } + } + } + else if (model.ImplementerId.HasValue && !model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.ImplementerId == model.ImplementerId) + { + result.Add(AccessCocktailStorage(order.GetViewModel)); + } + } + } + else if (model.Id.HasValue) + { + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AccessCocktailStorage(order.GetViewModel)); + } + else if (model.DateFrom.HasValue && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate) + { + result.Add(AccessCocktailStorage(order.GetViewModel)); + } + } + } + return result; } public OrderViewModel? GetElement(OrderSearchModel model) { diff --git a/Bar/BarListImplement/Models/MessageInfo.cs b/Bar/BarListImplement/Models/MessageInfo.cs index d817708..9bd4ef6 100644 --- a/Bar/BarListImplement/Models/MessageInfo.cs +++ b/Bar/BarListImplement/Models/MessageInfo.cs @@ -23,6 +23,8 @@ namespace BarListImplement.Models public string Body { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public static MessageInfo? Create(MessageInfoBindingModel? model) { if (model == null) diff --git a/Bar/BarView/DataGridViewExtension.cs b/Bar/BarView/DataGridViewExtension.cs new file mode 100644 index 0000000..40905da --- /dev/null +++ b/Bar/BarView/DataGridViewExtension.cs @@ -0,0 +1,46 @@ +using BarContracts.Attributes; + +namespace BarView +{ + internal static class DataGridViewExtension + { + public static void FillAndConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + grid.DataSource = data; + + var type = typeof(T); + var properties = type.GetProperties(); + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } +} diff --git a/Bar/BarView/FormClients.cs b/Bar/BarView/FormClients.cs index 8a585cd..03a837b 100644 --- a/Bar/BarView/FormClients.cs +++ b/Bar/BarView/FormClients.cs @@ -35,13 +35,7 @@ namespace BarView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) diff --git a/Bar/BarView/FormCocktail.Designer.cs b/Bar/BarView/FormCocktail.Designer.cs index fc8f45c..b5e1a37 100644 --- a/Bar/BarView/FormCocktail.Designer.cs +++ b/Bar/BarView/FormCocktail.Designer.cs @@ -40,10 +40,10 @@ buttonDel = new Button(); buttonSave = new Button(); buttonCancel = new Button(); - id = new DataGridViewTextBoxColumn(); - CmponentName = new DataGridViewTextBoxColumn(); - Count = new DataGridViewTextBoxColumn(); - groupBox1.SuspendLayout(); + id = new DataGridViewTextBoxColumn(); + CmponentName = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); + groupBox1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // @@ -163,26 +163,26 @@ buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; - // - // id - // - id.HeaderText = "id"; - id.Name = "id"; - id.Visible = false; - // - // CmponentName - // - CmponentName.HeaderText = "Компонент"; - CmponentName.Name = "CmponentName"; - // - // Count - // - Count.HeaderText = "Количество"; - Count.Name = "Count"; - // - // FormCocktail - // - AutoScaleDimensions = new SizeF(7F, 15F); + // + // id + // + id.HeaderText = "id"; + id.Name = "id"; + id.Visible = false; + // + // CmponentName + // + CmponentName.HeaderText = "Компонент"; + CmponentName.Name = "CmponentName"; + // + // Count + // + Count.HeaderText = "Количество"; + Count.Name = "Count"; + // + // FormCocktail + // + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(577, 412); Controls.Add(buttonCancel); diff --git a/Bar/BarView/FormCocktail.cs b/Bar/BarView/FormCocktail.cs index b8762e0..f09f919 100644 --- a/Bar/BarView/FormCocktail.cs +++ b/Bar/BarView/FormCocktail.cs @@ -2,6 +2,7 @@ using System.Windows.Forms; using BarContracts.BindingModels; using BarContracts.BusinessLogicsContracts; +using BarContracts.DI; using BarContracts.SearchModels; using BarDataModels.Models; using Microsoft.AspNetCore.Components; @@ -14,14 +15,14 @@ namespace BarView private readonly ILogger _logger; private readonly ICocktailLogic _logic; private int? _id; - private Dictionary _computerComponents; + private Dictionary _cocktailComponents; public int Id { set { _id = value; } } public FormCocktail(ILogger logger, ICocktailLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; - _computerComponents = new Dictionary(); + _cocktailComponents = new Dictionary(); } private void FormCocktail_Load(object sender, EventArgs e) { @@ -39,7 +40,7 @@ namespace BarView { textBoxName.Text = view.CocktailName; textBoxPrice.Text = view.Price.ToString(); - _computerComponents = view.CocktailComponents ?? new + _cocktailComponents = view.CocktailComponents ?? new Dictionary(); LoadData(); } @@ -57,10 +58,10 @@ namespace BarView _logger.LogInformation("Загрузка компонент изделия"); try { - if (_computerComponents != null) + if (_cocktailComponents != null) { dataGridView.Rows.Clear(); - foreach (var pc in _computerComponents) + foreach (var pc in _cocktailComponents) { dataGridView.Rows.Add(new object[] { pc.Key, pc.Value.Item1.ComponentName, pc.Value.Item2 }); @@ -76,57 +77,43 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); } } private void ButtonAdd_Click(object sender, EventArgs e) - { - var service = - Program.ServiceProvider?.GetService(typeof(FormCocktailComponent)); - if (service is FormCocktailComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", - form.ComponentModel.ComponentName, form.Count); - if (_computerComponents.ContainsKey(form.Id)) - { - _computerComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _computerComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); - } - } - } + { + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() != DialogResult.OK) + { + return; + } + _logger.LogInformation("Добавление нового ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + if (_cocktailComponents.ContainsKey(form.Id)) + { + _cocktailComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _cocktailComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); + } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormCocktailComponent)); - if (service is FormCocktailComponent form) - { - int id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _computerComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", - form.ComponentModel.ComponentName, form.Count); - _computerComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _cocktailComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + _cocktailComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } } } private void ButtonDel_Click(object sender, EventArgs e) @@ -140,7 +127,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); { _logger.LogInformation("Удаление компонента:{ ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value); - _computerComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); + _cocktailComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); } catch (Exception ex) { @@ -169,7 +156,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); MessageBoxIcon.Error); return; } - if (_computerComponents == null || _computerComponents.Count == 0) + if (_cocktailComponents == null || _cocktailComponents.Count == 0) { MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); @@ -183,7 +170,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); Id = _id ?? 0, CocktailName = textBoxName.Text, Price = Convert.ToDouble(textBoxPrice.Text), - CocktailComponents = _computerComponents + CocktailComponents = _cocktailComponents }; var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model); @@ -211,7 +198,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); private double CalcPrice() { double price = 0; - foreach (var elem in _computerComponents) + foreach (var elem in _cocktailComponents) { price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); } diff --git a/Bar/BarView/FormCocktailComponent.Designer.cs b/Bar/BarView/FormCocktailComponent.Designer.cs index 493a85d..5471d8f 100644 --- a/Bar/BarView/FormCocktailComponent.Designer.cs +++ b/Bar/BarView/FormCocktailComponent.Designer.cs @@ -88,10 +88,10 @@ buttonCancel.Text = "Отмена"; buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; - // - // FormCocktailComponent - // - AutoScaleDimensions = new SizeF(7F, 15F); + // + // FormCocktailComponent + // + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(353, 126); Controls.Add(buttonCancel); @@ -100,9 +100,9 @@ Controls.Add(textBoxCount); Controls.Add(label2); Controls.Add(label1); - Name = "FormCocktailComponent"; - Text = "Компоненты коктейля"; - ResumeLayout(false); + Name = "FormCocktailComponent"; + Text = "Компоненты коктейля"; + ResumeLayout(false); PerformLayout(); } diff --git a/Bar/BarView/FormCocktails.cs b/Bar/BarView/FormCocktails.cs index f4b8ff9..9c0d259 100644 --- a/Bar/BarView/FormCocktails.cs +++ b/Bar/BarView/FormCocktails.cs @@ -1,5 +1,6 @@ using BarContracts.BindingModels; using BarContracts.BusinessLogicsContracts; +using BarContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -33,15 +34,8 @@ namespace BarView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["CocktailName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["CocktailComponents"].Visible = false; - } - _logger.LogInformation("Загрузка коктейля"); + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка коктейля"); } catch (Exception ex) { @@ -52,30 +46,23 @@ namespace BarView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCocktail)); - if (service is FormCocktail form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } private void ButtonUpdate_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormCocktail)); - if (service is FormCocktail form) - { - var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } } diff --git a/Bar/BarView/FormComponents.cs b/Bar/BarView/FormComponents.cs index 773edc1..917f774 100644 --- a/Bar/BarView/FormComponents.cs +++ b/Bar/BarView/FormComponents.cs @@ -2,6 +2,7 @@ using BarContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; using System.Windows.Forms; +using BarContracts.DI; namespace BarView { @@ -42,31 +43,23 @@ namespace BarView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + LoadData(); + } } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - form.Id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } } private void ButtonDel_Click(object sender, EventArgs e) diff --git a/Bar/BarView/FormImplementers.cs b/Bar/BarView/FormImplementers.cs index 1ec4aa5..3a48298 100644 --- a/Bar/BarView/FormImplementers.cs +++ b/Bar/BarView/FormImplementers.cs @@ -29,14 +29,7 @@ namespace BarView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) diff --git a/Bar/BarView/FormMail.cs b/Bar/BarView/FormMail.cs index 27041c3..a6b80b6 100644 --- a/Bar/BarView/FormMail.cs +++ b/Bar/BarView/FormMail.cs @@ -33,14 +33,7 @@ namespace BarView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Loading materials"); } catch (Exception ex) diff --git a/Bar/BarView/FormMain.Designer.cs b/Bar/BarView/FormMain.Designer.cs index 9c996c0..91cc5b5 100644 --- a/Bar/BarView/FormMain.Designer.cs +++ b/Bar/BarView/FormMain.Designer.cs @@ -1,220 +1,225 @@ namespace BarView { - partial class FormMain - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormMain + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - buttonCreateOrder = new Button(); - buttonIssuedOrder = new Button(); - buttonRef = new Button(); - dataGridView = new DataGridView(); - menuStrip = new MenuStrip(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - компонентыToolStripMenuItem1 = new ToolStripMenuItem(); - изделияToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - клиентToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + buttonCreateOrder = new Button(); + buttonIssuedOrder = new Button(); + buttonRef = new Button(); + dataGridView = new DataGridView(); + menuStrip = new MenuStrip(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + компонентыToolStripMenuItem1 = new ToolStripMenuItem(); + изделияToolStripMenuItem = new ToolStripMenuItem(); + клиентToolStripMenuItem = new ToolStripMenuItem(); + исполнителиToolStripMenuItem = new ToolStripMenuItem(); почтовыеПисьмаToolStripMenuItem = new ToolStripMenuItem(); - запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); ComponentsToolStripMenuItem = new ToolStripMenuItem(); - ComponentCocktailToolStripMenuItem = new ToolStripMenuItem(); - OrdersToolStripMenuItem = new ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - menuStrip.SuspendLayout(); - SuspendLayout(); - // - // buttonCreateOrder - // - buttonCreateOrder.Location = new Point(751, 34); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(158, 32); - buttonCreateOrder.TabIndex = 1; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += ButtonCreateOrder_Click; - // - // buttonIssuedOrder - // - buttonIssuedOrder.Location = new Point(751, 148); - buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(158, 32); - buttonIssuedOrder.TabIndex = 4; - buttonIssuedOrder.Text = "Заказ выдан"; - buttonIssuedOrder.UseVisualStyleBackColor = true; - buttonIssuedOrder.Click += ButtonIssuedOrder_Click; - // - // buttonRef - // - buttonRef.Location = new Point(751, 186); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(158, 32); - buttonRef.TabIndex = 5; - buttonRef.Text = "Обновить список"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += ButtonRef_Click; - // - // dataGridView - // - dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(-4, 24); - dataGridView.Name = "dataGridView"; - dataGridView.RowTemplate.Height = 25; - dataGridView.Size = new Size(749, 285); - dataGridView.TabIndex = 6; - // - // menuStrip - // - menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem}); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(921, 24); - menuStrip.TabIndex = 7; - menuStrip.Text = "menuStrip"; - // - // компонентыToolStripMenuItem - // - компонентыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem1, изделияToolStripMenuItem, - клиентToolStripMenuItem, исполнителиToolStripMenuItem, почтовыеПисьмаToolStripMenuItem }); - компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(94, 20); - компонентыToolStripMenuItem.Text = "Справочники"; - // - // компонентыToolStripMenuItem1 - // - компонентыToolStripMenuItem1.Name = "компонентыToolStripMenuItem1"; - компонентыToolStripMenuItem1.Size = new Size(145, 22); - компонентыToolStripMenuItem1.Text = "Компоненты"; - компонентыToolStripMenuItem1.Click += КомпонентыToolStripMenuItem_Click; - // - // изделияToolStripMenuItem - // - изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; - изделияToolStripMenuItem.Size = new Size(145, 22); - изделияToolStripMenuItem.Text = "Изделия"; - изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; - // - // отчетыToolStripMenuItem - // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentCocktailToolStripMenuItem, OrdersToolStripMenuItem}); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); - отчетыToolStripMenuItem.Text = "Отчеты"; - // - // ComponentsToolStripMenuItem - // - ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; - ComponentsToolStripMenuItem.Size = new Size(218, 22); - ComponentsToolStripMenuItem.Text = "Список компонентов"; - ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; - // - // ComponentCocktailToolStripMenuItem - // - ComponentCocktailToolStripMenuItem.Name = "ComponentCocktailToolStripMenuItem"; - ComponentCocktailToolStripMenuItem.Size = new Size(218, 22); - ComponentCocktailToolStripMenuItem.Text = "Компоненты по изделиям"; - ComponentCocktailToolStripMenuItem.Click += ComponentCocktailToolStripMenuItem_Click; + ComponentCocktailToolStripMenuItem = new ToolStripMenuItem(); + OrdersToolStripMenuItem = new ToolStripMenuItem(); + запускРаботToolStripMenuItem = new ToolStripMenuItem(); + создатьБекапToolStripMenuItem = new ToolStripMenuItem(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + menuStrip.SuspendLayout(); + SuspendLayout(); // - // OrdersToolStripMenuItem + // buttonCreateOrder + // + buttonCreateOrder.Location = new Point(1056, 27); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(158, 32); + buttonCreateOrder.TabIndex = 1; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += ButtonCreateOrder_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Location = new Point(1056, 65); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(158, 32); + buttonIssuedOrder.TabIndex = 4; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += ButtonIssuedOrder_Click; + // + // buttonRef + // + buttonRef.Location = new Point(1056, 103); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(158, 32); + buttonRef.TabIndex = 5; + buttonRef.Text = "Обновить список"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += ButtonRef_Click; + // + // dataGridView + // + dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(-4, 24); + dataGridView.Name = "dataGridView"; + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(1054, 285); + dataGridView.TabIndex = 6; + // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, создатьБекапToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1226, 24); + menuStrip.TabIndex = 7; + menuStrip.Text = "menuStrip"; + // + // компонентыToolStripMenuItem + // + компонентыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem1, изделияToolStripMenuItem, клиентToolStripMenuItem, исполнителиToolStripMenuItem, почтовыеПисьмаToolStripMenuItem }); + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(94, 20); + компонентыToolStripMenuItem.Text = "Справочники"; + // + // компонентыToolStripMenuItem1 + // + компонентыToolStripMenuItem1.Name = "компонентыToolStripMenuItem1"; + компонентыToolStripMenuItem1.Size = new Size(173, 22); + компонентыToolStripMenuItem1.Text = "Компоненты"; + компонентыToolStripMenuItem1.Click += КомпонентыToolStripMenuItem_Click; + // + // изделияToolStripMenuItem + // + изделияToolStripMenuItem.Name = "изделияToolStripMenuItem"; + изделияToolStripMenuItem.Size = new Size(173, 22); + изделияToolStripMenuItem.Text = "Изделия"; + изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // - // // клиентToolStripMenuItem // - this.клиентToolStripMenuItem.Name = "клиентToolStripMenuItem"; - this.клиентToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.клиентToolStripMenuItem.Text = "Клиент"; - this.клиентToolStripMenuItem.Click += new System.EventHandler(this.ClientToolStripMenuItem_Click); + клиентToolStripMenuItem.Name = "клиентToolStripMenuItem"; + клиентToolStripMenuItem.Size = new Size(173, 22); + клиентToolStripMenuItem.Text = "Клиент"; + клиентToolStripMenuItem.Click += ClientToolStripMenuItem_Click; // // исполнителиToolStripMenuItem // - this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(149, 22); - this.исполнителиToolStripMenuItem.Text = "Исполнители"; - this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.employersToolStripMenuItem_Click); + исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + исполнителиToolStripMenuItem.Size = new Size(173, 22); + исполнителиToolStripMenuItem.Text = "Исполнители"; + исполнителиToolStripMenuItem.Click += employersToolStripMenuItem_Click; // // почтовыеПисьмаToolStripMenuItem // почтовыеПисьмаToolStripMenuItem.Name = "почтовыеПисьмаToolStripMenuItem"; - почтовыеПисьмаToolStripMenuItem.Size = new Size(149, 22); + почтовыеПисьмаToolStripMenuItem.Size = new Size(173, 22); почтовыеПисьмаToolStripMenuItem.Text = "ПочтовыеПисьма"; почтовыеПисьмаToolStripMenuItem.Click += emailsToolStripMenuItem_Click; // - // + // отчетыToolStripMenuItem + // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentCocktailToolStripMenuItem, OrdersToolStripMenuItem }); + отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + отчетыToolStripMenuItem.Size = new Size(60, 20); + отчетыToolStripMenuItem.Text = "Отчеты"; + // + // ComponentsToolStripMenuItem + // + ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem"; + ComponentsToolStripMenuItem.Size = new Size(218, 22); + ComponentsToolStripMenuItem.Text = "Список компонентов"; + ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; + // + // ComponentCocktailToolStripMenuItem + // + ComponentCocktailToolStripMenuItem.Name = "ComponentCocktailToolStripMenuItem"; + ComponentCocktailToolStripMenuItem.Size = new Size(218, 22); + ComponentCocktailToolStripMenuItem.Text = "Компоненты по изделиям"; + ComponentCocktailToolStripMenuItem.Click += ComponentCocktailToolStripMenuItem_Click; + // + // OrdersToolStripMenuItem + // + OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; + OrdersToolStripMenuItem.Size = new Size(218, 22); + OrdersToolStripMenuItem.Text = "Список заказов"; + OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; + // // запускРаботToolStripMenuItem // - this.запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; - this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(92, 20); - this.запускРаботToolStripMenuItem.Text = "Запуск работ"; - this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.startWorkToolStripMenuItem_Click); + запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem"; + запускРаботToolStripMenuItem.Size = new Size(92, 20); + запускРаботToolStripMenuItem.Text = "Запуск работ"; + запускРаботToolStripMenuItem.Click += startWorkToolStripMenuItem_Click; // - // - OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(218, 22); - OrdersToolStripMenuItem.Text = "Список заказов"; - OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; - // - // FormMain - // - AutoScaleDimensions = new SizeF(7F, 15F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(921, 310); - Controls.Add(dataGridView); - Controls.Add(buttonRef); - Controls.Add(buttonIssuedOrder); - Controls.Add(buttonCreateOrder); - Controls.Add(menuStrip); - MainMenuStrip = menuStrip; - Name = "FormMain"; - Text = "Бар"; - Load += FormMain_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); - ResumeLayout(false); - PerformLayout(); - } + // создатьБекапToolStripMenuItem + // + создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem"; + создатьБекапToolStripMenuItem.Size = new Size(97, 20); + создатьБекапToolStripMenuItem.Text = "Создать Бекап"; + создатьБекапToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1226, 310); + Controls.Add(dataGridView); + Controls.Add(buttonRef); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonCreateOrder); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; + Name = "FormMain"; + Text = "Бар"; + Load += FormMain_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); + ResumeLayout(false); + PerformLayout(); + } - #endregion - private Button buttonCreateOrder; - private Button buttonIssuedOrder; - private Button buttonRef; - private DataGridView dataGridView; - private MenuStrip menuStrip; - private ToolStripMenuItem компонентыToolStripMenuItem; - private ToolStripMenuItem компонентыToolStripMenuItem1; - private ToolStripMenuItem изделияToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem ComponentsToolStripMenuItem; - private ToolStripMenuItem ComponentCocktailToolStripMenuItem; - private ToolStripMenuItem OrdersToolStripMenuItem; + #endregion + private Button buttonCreateOrder; + private Button buttonIssuedOrder; + private Button buttonRef; + private DataGridView dataGridView; + private MenuStrip menuStrip; + private ToolStripMenuItem компонентыToolStripMenuItem; + private ToolStripMenuItem компонентыToolStripMenuItem1; + private ToolStripMenuItem изделияToolStripMenuItem; + private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem ComponentsToolStripMenuItem; + private ToolStripMenuItem ComponentCocktailToolStripMenuItem; + private ToolStripMenuItem OrdersToolStripMenuItem; private ToolStripMenuItem клиентToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem почтовыеПисьмаToolStripMenuItem; + private ToolStripMenuItem создатьБекапToolStripMenuItem; } } \ No newline at end of file diff --git a/Bar/BarView/FormMain.cs b/Bar/BarView/FormMain.cs index 7617056..dc73ca6 100644 --- a/Bar/BarView/FormMain.cs +++ b/Bar/BarView/FormMain.cs @@ -1,180 +1,174 @@ using BarBusinessLogic; using BarContracts.BindingModels; using BarContracts.BusinessLogicsContracts; +using BarContracts.DI; using BarDataModels.Enums; using Microsoft.Extensions.Logging; using System.Windows.Forms; namespace BarView { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - private readonly IReportLogic _reportLogic; + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - _reportLogic = reportLogic; + private readonly IBackUpLogic _backUpLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } - private void LoadData() - { - _logger.LogInformation("Загрузка заказов"); - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["CocktailId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs + e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void ButtonCreateOrder_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + LoadData(); + } + private OrderBindingModel CreateBindingModel(int id, bool isDone = false) + { + return new OrderBindingModel + { + Id = id, + CocktailId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CocktailId"].Value), + Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), + Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), + Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), + DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()), + }; + } + + private void ButtonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = + Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", + id); + try + { + var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id)); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs - e) - { - var service = - Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } - } - private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCocktails)); - if (service is FormCocktails form) - { - form.ShowDialog(); - } - } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + private void ButtonRef_Click(object sender, EventArgs e) + { + LoadData(); + } - private void ButtonCreateOrder_Click(object sender, EventArgs e) - { - var service = - Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } - } - private OrderBindingModel CreateBindingModel(int id, bool isDone = false) - { - return new OrderBindingModel - { - Id = id, - CocktailId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CocktailId"].Value), - Status = Enum.Parse(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()), - Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value), - Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()), - DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()), - }; - } + private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } - private void ButtonIssuedOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = - Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", - id); - try - { - var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id)); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Заказ №{id} выдан", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); - } - } - } - private void ButtonRef_Click(object sender, EventArgs e) - { - LoadData(); - } + private void ComponentCocktailToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName }); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - } - - private void ComponentCocktailToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportCocktailComponents)); - if (service is FormReportCocktailComponents form) - { - form.ShowDialog(); - } - } - - private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } - } + private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void employersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if (service is FormImplementers form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - private void startWorkToolStripMenuItem_Click(object sender, EventArgs e) - { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); - } + private void startWorkToolStripMenuItem_Click(object sender, EventArgs e) + { + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } private void ClientToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void emailsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMail)); - if (service is FormMail form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + private void createBackUpToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка создания бэкапа", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } diff --git a/Bar/BarView/Program.cs b/Bar/BarView/Program.cs index 6f33d33..5802d06 100644 --- a/Bar/BarView/Program.cs +++ b/Bar/BarView/Program.cs @@ -8,6 +8,7 @@ using BarBusinessLogic.OfficePackage.Implements; using BarBusinessLogic.OfficePackage; using BarBusinessLogic.BusinessLogics; using BarBusinessLogic.MailWorker; +using BarContracts.DI; namespace BarView { @@ -24,12 +25,10 @@ namespace BarView // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + InitDependency(); try { - var mailSender = _serviceProvider.GetService(); + var mailSender = DependencyManager.Instance.Resolve(); mailSender?.MailConfig(new() { MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -43,56 +42,53 @@ namespace BarView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé"); } - Application.Run(_serviceProvider.GetRequiredService()); - } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => - { + Application.Run(DependencyManager.Instance.Resolve()); + } + private static void InitDependency() + { + DependencyManager.InitDependency(); + + DependencyManager.Instance.AddLogging(option => + { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file -- 2.25.1