From 383b544952bd8d0d5284a8473dc7772e28572933 Mon Sep 17 00:00:00 2001 From: Danil Markov Date: Tue, 2 May 2023 20:17:55 +0400 Subject: [PATCH] lab8 --- .gitignore | 1 + .../BusinessLogics/BackUpLogic.cs | 103 ++++++++++++++ .../Attributes/ColumnAttribute.cs | 28 ++++ .../Attributes/GridViewAutoSize.cs | 20 +++ .../BindingModels/BackUpSaveBindingModel.cs | 13 ++ .../BindingModels/MessageInfoBindingModel.cs | 2 + .../BusinessLogicsContracts/IBackUpLogic.cs | 14 ++ .../LawFirmContracts/DI/DependencyManager.cs | 70 ++++++++++ .../DI/IDependencyContainer.cs | 38 ++++++ .../DI/IImplementationExtension.cs | 18 +++ .../DI/ServiceDependencyContainer.cs | 62 +++++++++ .../DI/ServiceProviderLoader.cs | 62 +++++++++ .../DI/UnityDependencyContainer.cs | 43 ++++++ .../LawFirmContracts/LawFirmContracts.csproj | 4 +- .../StoragesContracts/IBackUpInfo.cs | 14 ++ .../ViewModels/BlankViewModel.cs | 14 +- .../ViewModels/ClientViewModel.cs | 18 +-- .../ViewModels/DocumentViewModel.cs | 17 ++- .../ViewModels/ImplementerViewModel.cs | 12 +- .../ViewModels/MessageInfoViewModel.cs | 17 ++- .../ViewModels/OrderViewModel.cs | 43 +++--- .../Models/IMessageInfoModel.cs | 5 +- .../DatabaseImplementationExtension.cs | 28 ++++ .../Implements/BackUpInfo.cs | 32 +++++ .../LawFirmDatabaseImplement/Models/Blank.cs | 13 +- .../LawFirmDatabaseImplement/Models/Client.cs | 16 ++- .../Models/Document.cs | 16 ++- .../Models/Implementer.cs | 11 +- .../Models/Message.cs | 4 + .../LawFirmDatabaseImplement/Models/Order.cs | 26 ++-- .../FileImplementationExtension.cs | 28 ++++ .../Implements/BackUpInfo.cs | 34 +++++ LawFirm/LawFirmFileImplement/Models/Blank.cs | 13 +- LawFirm/LawFirmFileImplement/Models/Client.cs | 19 +-- .../LawFirmFileImplement/Models/Document.cs | 16 ++- .../Models/Implementer.cs | 11 +- .../LawFirmFileImplement/Models/Message.cs | 15 +- LawFirm/LawFirmFileImplement/Models/Order.cs | 26 +++- .../Implements/BacUpInfo.cs | 22 +++ .../ListImplementationExtension.cs | 32 +++++ .../LawFirmListImplement/Models/Message.cs | 2 +- LawFirm/LawFirmView/DataGridViewExtension.cs | 55 ++++++++ LawFirm/LawFirmView/FormBlanks.cs | 41 ++---- LawFirm/LawFirmView/FormDocument.cs | 26 ++-- LawFirm/LawFirmView/FormDocuments.cs | 36 ++--- LawFirm/LawFirmView/FormMain.Designer.cs | 35 +++-- LawFirm/LawFirmView/FormMain.cs | 128 ++++++++---------- LawFirm/LawFirmView/FormViewClients.cs | 10 +- LawFirm/LawFirmView/FormViewImplementers.cs | 28 ++-- LawFirm/LawFirmView/FormViewMail.cs | 9 +- LawFirm/LawFirmView/Program.cs | 106 ++++++++------- 51 files changed, 1112 insertions(+), 344 deletions(-) create mode 100644 LawFirm/LawFirmBusinessLogic/BusinessLogics/BackUpLogic.cs create mode 100644 LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs create mode 100644 LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs create mode 100644 LawFirm/LawFirmContracts/BindingModels/BackUpSaveBindingModel.cs create mode 100644 LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 LawFirm/LawFirmContracts/DI/DependencyManager.cs create mode 100644 LawFirm/LawFirmContracts/DI/IDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/DI/IImplementationExtension.cs create mode 100644 LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs create mode 100644 LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs create mode 100644 LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs create mode 100644 LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs create mode 100644 LawFirm/LawFirmFileImplement/FileImplementationExtension.cs create mode 100644 LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs create mode 100644 LawFirm/LawFirmListImplement/Implements/BacUpInfo.cs create mode 100644 LawFirm/LawFirmListImplement/ListImplementationExtension.cs create mode 100644 LawFirm/LawFirmView/DataGridViewExtension.cs diff --git a/.gitignore b/.gitignore index ca1c7a3..ae28e95 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +*.dll # Mono auto generated files mono_crash.* diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/BackUpLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..decb58b --- /dev/null +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,103 @@ +using LawFirmContracts.BindingModels; +using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.StoragesContracts; +using LawFirmDataModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.IO.Compression; +using System.Linq; +using System.Reflection; +using System.Runtime.Serialization.Json; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmBusinessLogic.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/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs b/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..bee0ebd --- /dev/null +++ b/LawFirm/LawFirmContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + 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; + } + 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; } + } +} diff --git a/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs b/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..5d42c6b --- /dev/null +++ b/LawFirm/LawFirmContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..d0e193b --- /dev/null +++ b/LawFirm/LawFirmContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs index be16f94..b92a7b4 100644 --- a/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs +++ b/LawFirm/LawFirmContracts/BindingModels/MessageInfoBindingModel.cs @@ -20,5 +20,7 @@ namespace LawFirmContracts.BindingModels public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs b/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..0b1925e --- /dev/null +++ b/LawFirm/LawFirmContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using LawFirmContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/LawFirm/LawFirmContracts/DI/DependencyManager.cs b/LawFirm/LawFirmContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..ef6b202 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/DependencyManager.cs @@ -0,0 +1,70 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.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/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..5fc4c34 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/IDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.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/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs b/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..076dcbd --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/IImplementationExtension.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } + +} diff --git a/LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..b7868ca --- /dev/null +++ b/LawFirm/LawFirmContracts/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 LawFirmContracts.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/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..9d08a84 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.DI +{ + public static partial 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 localAppDataFolder = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData); + var implementationExtensionsFolder = Path.Combine(localAppDataFolder, "ImplementationExtensions"); + + if (!Directory.Exists(implementationExtensionsFolder)) + { + Directory.CreateDirectory(implementationExtensionsFolder); + } + + return implementationExtensionsFolder; + } +} diff --git a/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs b/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..eb55862 --- /dev/null +++ b/LawFirm/LawFirmContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,43 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Unity; +using Unity.Microsoft.Logging; + +namespace LawFirmContracts.DI +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + + } + + public T Resolve() + { + return _container.Resolve(); + } + + void IDependencyContainer.RegisterType(bool isSingle) + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + } +} diff --git a/LawFirm/LawFirmContracts/LawFirmContracts.csproj b/LawFirm/LawFirmContracts/LawFirmContracts.csproj index c2d790f..1d70450 100644 --- a/LawFirm/LawFirmContracts/LawFirmContracts.csproj +++ b/LawFirm/LawFirmContracts/LawFirmContracts.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -8,6 +8,8 @@ + + diff --git a/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs b/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..a027e7f --- /dev/null +++ b/LawFirm/LawFirmContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/LawFirm/LawFirmContracts/ViewModels/BlankViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/BlankViewModel.cs index 3ab7f80..da29950 100644 --- a/LawFirm/LawFirmContracts/ViewModels/BlankViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/BlankViewModel.cs @@ -1,14 +1,16 @@ -using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; +using LawFirmDataModels.Models; using System.ComponentModel; namespace LawFirmContracts.ViewModels { public class BlankViewModel : IBlankModel { - public int Id { get; set; } - [DisplayName("Название бланка")] - public string BlankName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column("Название бланка", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string BlankName { get; set; } = string.Empty; + [Column("Цена", width: 80)] + public double Price { get; set; } } } diff --git a/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs index 2790bdb..3d1b645 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using LawFirmDataModel.Models; +using LawFirmContracts.Attributes; +using LawFirmDataModel.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,13 +11,14 @@ namespace LawFirmContracts.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("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column("Логин (эл. почта)", width: 150)] + public string Email { get; set; } = string.Empty; + [Column("Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs index 4626821..1014e4d 100644 --- a/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/DocumentViewModel.cs @@ -1,16 +1,19 @@ -using LawFirmDataModels.Models; +using LawFirmContracts.Attributes; +using LawFirmDataModels.Models; using System.ComponentModel; namespace LawFirmContracts.ViewModels { public class DocumentViewModel : IDocumentModel { - public int Id { get; set; } - [DisplayName("Название документа")] - public string DocumentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary DocumentBlanks{ + [Column(visible: false)] + public int Id { get; set; } + [Column("Название документа", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string DocumentName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary DocumentBlanks{ get; set; } = new (); diff --git a/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs index 1f1289b..a46f497 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using LawFirmDataModel.Models; +using LawFirmContracts.Attributes; +using LawFirmDataModel.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace LawFirmContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } } } diff --git a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs index d01bb02..bc993a0 100644 --- a/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using LawFirmDataModel.Models; +using LawFirmContracts.Attributes; +using LawFirmDataModel.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,20 +11,24 @@ namespace LawFirmContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; - + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Отправитель")] + [Column("Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] + [Column("Дата письма", width: 100)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + [Column("Заголовок", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column("Текст", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; + [Column(visible: false)] + + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs index 5291bd3..09d42b1 100644 --- a/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using LawFirmDataModels.Enums; +using LawFirmContracts.Attributes; +using LawFirmDataModels.Enums; using LawFirmDataModels.Models; using System.ComponentModel; @@ -6,27 +7,29 @@ namespace LawFirmContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int DocumentId { get; set; } + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int DocumentId { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Документ")] - public int ClientId { get; set; } - [DisplayName("Данные клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Фамилия исполнителя")] + [Column(visible: false)] + public int ClientId { get; set; } + [Column("Данные клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column("Данные исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Документ")] - public string DocumentName { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] + [Column("Изделие", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string DocumentName { get; set; } = string.Empty; + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Count { get; set; } + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + [Column("Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } } } diff --git a/LawFirm/LawFirmDataModel/Models/IMessageInfoModel.cs b/LawFirm/LawFirmDataModel/Models/IMessageInfoModel.cs index dd2924c..ad97af7 100644 --- a/LawFirm/LawFirmDataModel/Models/IMessageInfoModel.cs +++ b/LawFirm/LawFirmDataModel/Models/IMessageInfoModel.cs @@ -1,4 +1,5 @@ -using System; +using LawFirmDataModels; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,7 +7,7 @@ using System.Threading.Tasks; namespace LawFirmDataModel.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs b/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..5cfa917 --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,28 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmDatabaseImplement +{ + public class DatabaseImplementationExtension : IImplementationExtension + { + public int Priority => 2; + + 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/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs b/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..b0f0d1c --- /dev/null +++ b/LawFirm/LawFirmDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new LawFirmDatabase(); + 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/LawFirm/LawFirmDatabaseImplement/Models/Blank.cs b/LawFirm/LawFirmDatabaseImplement/Models/Blank.cs index 69c6f5b..9a697fa 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Blank.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Blank.cs @@ -3,16 +3,21 @@ using LawFirmContracts.ViewModels; using LawFirmDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Blank : IBlankModel + [DataContract] + public class Blank : IBlankModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public string BlankName { get; private set; } = string.Empty; + [DataMember] + public string BlankName { get; private set; } = string.Empty; [Required] - public double Price { get; set; } + [DataMember] + public double Price { get; set; } [ForeignKey("BlankId")] public virtual List DocumentBlanks { get; set; } = new(); public static Blank? Create(BlankBindingModel model) diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Client.cs b/LawFirm/LawFirmDatabaseImplement/Models/Client.cs index f8e9d39..d51aa8a 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Client.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Client.cs @@ -6,23 +6,29 @@ 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; namespace LawFirmDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string ClientFIO { get; set; } = string.Empty; + [DataMember] + public string ClientFIO { get; set; } = string.Empty; [Required] - public string Email { get; set; } = string.Empty; + [DataMember] + public string Email { get; set; } = string.Empty; [Required] - public string Password { get; set; } = string.Empty; + [DataMember] + public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); [ForeignKey("ClientId")] diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs index 166110d..84efa3c 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Document.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Document.cs @@ -3,19 +3,25 @@ using LawFirmContracts.ViewModels; using LawFirmDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Document : IDocumentModel + [DataContract] + public class Document : IDocumentModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } [Required] - public string DocumentName { get; set; } = string.Empty; + [DataMember] + public string DocumentName { get; set; } = string.Empty; [Required] - public double Price { get; set; } + [DataMember] + public double Price { get; set; } private Dictionary? _documentBlanks = null; [NotMapped] - public Dictionary DocumentBlanks + [DataMember] + public Dictionary DocumentBlanks { get { diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs b/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs index 06dad64..fe888c0 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Implementer.cs @@ -5,21 +5,24 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace LawFirmDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } - + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; - + [DataMember] public string Password { get; private set; } = string.Empty; - + [DataMember] public int WorkExperience { get; private set; } - + [DataMember] public int Qualification { get; private set; } [ForeignKey("ImplementerId")] diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Message.cs b/LawFirm/LawFirmDatabaseImplement/Models/Message.cs index 8ec883b..8aee151 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Message.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Message.cs @@ -5,14 +5,17 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; namespace LawFirmDatabaseImplement.Models { + [DataContract] public class Message : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } @@ -53,5 +56,6 @@ namespace LawFirmDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs index 8e47289..b9b5d40 100644 --- a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs +++ b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs @@ -4,24 +4,34 @@ using LawFirmDataModels.Enums; using LawFirmDataModels.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace LawFirmDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { [Required] - public int DocumentId { get; set; } - [Required] - public int ClientId { get; private set; } + [DataMember] + public int DocumentId { get; set; } [Required] - public int Count { get; set; } + [DataMember] + public int ClientId { get; private set; } [Required] - public double Sum { get; set; } + [DataMember] + public int Count { get; set; } [Required] - public OrderStatus Status { get; set; } + [DataMember] + public double Sum { get; set; } [Required] - public DateTime DateCreate { get; set; } + [DataMember] + public OrderStatus Status { get; set; } + [Required] + [DataMember] + public DateTime DateCreate { get; set; } + [DataMember] public int? ImplementerId { get; private set; } + [DataMember] public DateTime? DateImplement { get; set; } public virtual Document Document { get; set; } public virtual Client Client { get; set; } diff --git a/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs b/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..7945262 --- /dev/null +++ b/LawFirm/LawFirmFileImplement/FileImplementationExtension.cs @@ -0,0 +1,28 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmFileImplement +{ + public class FileImplementationExtension : 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/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs b/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..8486e7e --- /dev/null +++ b/LawFirm/LawFirmFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,34 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + // Получаем значения из singleton-объекта универсального свойства содержащее тип T + var source = DataFileSingleton.GetInstance(); + return (List?)source.GetType().GetProperties() + .FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T)) + ?.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/LawFirm/LawFirmFileImplement/Models/Blank.cs b/LawFirm/LawFirmFileImplement/Models/Blank.cs index dc42372..7cd847e 100644 --- a/LawFirm/LawFirmFileImplement/Models/Blank.cs +++ b/LawFirm/LawFirmFileImplement/Models/Blank.cs @@ -1,15 +1,20 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.ViewModels; using LawFirmDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Blank : IBlankModel + [DataContract] + public class Blank : IBlankModel { - public int Id { get; private set; } - public string BlankName { get; private set; } = string.Empty; - public double Price { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string BlankName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; set; } public static Blank? Create(BlankBindingModel model) { if (model == null) diff --git a/LawFirm/LawFirmFileImplement/Models/Client.cs b/LawFirm/LawFirmFileImplement/Models/Client.cs index 6faa488..b6e1f90 100644 --- a/LawFirm/LawFirmFileImplement/Models/Client.cs +++ b/LawFirm/LawFirmFileImplement/Models/Client.cs @@ -4,21 +4,24 @@ using LawFirmDataModel.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 LawFirmFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public string ClientFIO { get; private set; } = string.Empty; - - public string Email { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int Id { get; private set; } + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; + [DataMember] + public int Id { get; private set; } public static Client? Create(ClientBindingModel model) { diff --git a/LawFirm/LawFirmFileImplement/Models/Document.cs b/LawFirm/LawFirmFileImplement/Models/Document.cs index 83afe20..8f07b41 100644 --- a/LawFirm/LawFirmFileImplement/Models/Document.cs +++ b/LawFirm/LawFirmFileImplement/Models/Document.cs @@ -1,19 +1,25 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.ViewModels; using LawFirmDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Document : IDocumentModel + [DataContract] + public class Document : IDocumentModel { - public int Id { get; private set; } - public string DocumentName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string DocumentName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Blanks { get; private set; } = new(); private Dictionary? _documentBlanks = null; - public Dictionary DocumentBlanks + [DataMember] + public Dictionary DocumentBlanks { get { diff --git a/LawFirm/LawFirmFileImplement/Models/Implementer.cs b/LawFirm/LawFirmFileImplement/Models/Implementer.cs index adce266..0a161c3 100644 --- a/LawFirm/LawFirmFileImplement/Models/Implementer.cs +++ b/LawFirm/LawFirmFileImplement/Models/Implementer.cs @@ -4,22 +4,25 @@ using LawFirmDataModel.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 LawFirmFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } - + [DataMember] public string ImplementerFIO { get; private set; } = string.Empty; - + [DataMember] public string Password { get; private set; } = string.Empty; - + [DataMember] public int WorkExperience { get; private set; } - + [DataMember] public int Qualification { get; private set; } public static Implementer? Create(XElement element) diff --git a/LawFirm/LawFirmFileImplement/Models/Message.cs b/LawFirm/LawFirmFileImplement/Models/Message.cs index c377edd..299faa1 100644 --- a/LawFirm/LawFirmFileImplement/Models/Message.cs +++ b/LawFirm/LawFirmFileImplement/Models/Message.cs @@ -4,24 +4,27 @@ using LawFirmDataModel.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 LawFirmFileImplement.Models { + [DataContract] public class Message : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; - + [DataMember] public int? ClientId { get; private set; } - + [DataMember] public string SenderName { get; private set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); - + [DataMember] public string Subject { get; private set; } = string.Empty; - + [DataMember] public string Body { get; private set; } = string.Empty; public static Message? Create(MessageInfoBindingModel model) @@ -76,5 +79,7 @@ namespace LawFirmFileImplement.Models new XAttribute("SenderName", SenderName), new XAttribute("DateDelivery", DateDelivery) ); + + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmFileImplement/Models/Order.cs b/LawFirm/LawFirmFileImplement/Models/Order.cs index d236e79..2888dcb 100644 --- a/LawFirm/LawFirmFileImplement/Models/Order.cs +++ b/LawFirm/LawFirmFileImplement/Models/Order.cs @@ -2,21 +2,33 @@ using LawFirmContracts.ViewModels; using LawFirmDataModels.Enums; using LawFirmDataModels.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace LawFirmFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int DocumentId { get; private set; } - public int ClientId { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int DocumentId { get; private set; } + [DataMember] + public int ClientId { get; set; } + [DataMember] public int? ImplementerId { get; set; } + [DataMember] public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Utc); + [DataMember] public DateTime? DateImplement { get; private set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) diff --git a/LawFirm/LawFirmListImplement/Implements/BacUpInfo.cs b/LawFirm/LawFirmListImplement/Implements/BacUpInfo.cs new file mode 100644 index 0000000..ce88908 --- /dev/null +++ b/LawFirm/LawFirmListImplement/Implements/BacUpInfo.cs @@ -0,0 +1,22 @@ +using LawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmListImplement.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/LawFirm/LawFirmListImplement/ListImplementationExtension.cs b/LawFirm/LawFirmListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..e9906b9 --- /dev/null +++ b/LawFirm/LawFirmListImplement/ListImplementationExtension.cs @@ -0,0 +1,32 @@ +using LawFirmContracts.DI; +using LawFirmContracts.StoragesContracts; +using LawFirmListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmListImplement +{ + public class ListImplementationExtension : 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/LawFirm/LawFirmListImplement/Models/Message.cs b/LawFirm/LawFirmListImplement/Models/Message.cs index b58a05c..a2b81fb 100644 --- a/LawFirm/LawFirmListImplement/Models/Message.cs +++ b/LawFirm/LawFirmListImplement/Models/Message.cs @@ -49,6 +49,6 @@ namespace LawFirmListImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; - + public int Id => throw new NotImplementedException(); } } diff --git a/LawFirm/LawFirmView/DataGridViewExtension.cs b/LawFirm/LawFirmView/DataGridViewExtension.cs new file mode 100644 index 0000000..75d8b74 --- /dev/null +++ b/LawFirm/LawFirmView/DataGridViewExtension.cs @@ -0,0 +1,55 @@ +using LawFirmContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace LawFirmView +{ + public 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/LawFirm/LawFirmView/FormBlanks.cs b/LawFirm/LawFirmView/FormBlanks.cs index 3c3bce6..60b81ed 100644 --- a/LawFirm/LawFirmView/FormBlanks.cs +++ b/LawFirm/LawFirmView/FormBlanks.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using Microsoft.Extensions.Logging; namespace LawFirmView @@ -22,14 +23,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["BlankName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка бланков"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка бланков"); } catch (Exception ex) { @@ -40,28 +35,22 @@ namespace LawFirmView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormBlank)); - if (service is FormBlank form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormBlank)); - if (service is FormBlank 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/LawFirm/LawFirmView/FormDocument.cs b/LawFirm/LawFirmView/FormDocument.cs index c44eb56..2367847 100644 --- a/LawFirm/LawFirmView/FormDocument.cs +++ b/LawFirm/LawFirmView/FormDocument.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using LawFirmContracts.SearchModels; using LawFirmDataModels.Models; using Microsoft.Extensions.Logging; @@ -72,11 +73,10 @@ namespace LawFirmView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormDocumentBlank)); - if (service is FormDocumentBlank form) - { - if (form.ShowDialog() == DialogResult.OK) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + if (form.BlankModel == null) { if (form.BlankModel == null) { @@ -102,14 +102,14 @@ namespace LawFirmView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocumentBlank)); - if (service is FormDocumentBlank form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _documentBlanks[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _documentBlanks[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.BlankModel == null) + { if (form.BlankModel == null) { return; diff --git a/LawFirm/LawFirmView/FormDocuments.cs b/LawFirm/LawFirmView/FormDocuments.cs index 77542b9..69db182 100644 --- a/LawFirm/LawFirmView/FormDocuments.cs +++ b/LawFirm/LawFirmView/FormDocuments.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using Microsoft.Extensions.Logging; namespace LawFirmView @@ -22,15 +23,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["DocumentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["DocumentBlanks"].Visible = false; - } - _logger.LogInformation("Загрузка документов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка документов"); } catch (Exception ex) { @@ -41,27 +35,21 @@ namespace LawFirmView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocument)); - if (service is FormDocument form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); } } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocument)); - if (service is FormDocument 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(); } } } diff --git a/LawFirm/LawFirmView/FormMain.Designer.cs b/LawFirm/LawFirmView/FormMain.Designer.cs index bdad6de..4721f9f 100644 --- a/LawFirm/LawFirmView/FormMain.Designer.cs +++ b/LawFirm/LawFirmView/FormMain.Designer.cs @@ -39,13 +39,14 @@ this.компонентыПоИзделиямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.startWorksToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataGridView = new System.Windows.Forms.DataGridView(); this.buttonCreateOrder = new System.Windows.Forms.Button(); this.buttonTakeOrderInWork = new System.Windows.Forms.Button(); this.buttonOrderReady = new System.Windows.Forms.Button(); this.buttonIssuedOrder = new System.Windows.Forms.Button(); this.buttonUpdate = new System.Windows.Forms.Button(); - this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.createBackupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit(); this.SuspendLayout(); @@ -56,7 +57,8 @@ this.справочникиToolStripMenuItem, this.отчетыToolStripMenuItem, this.startWorksToolStripMenuItem, - this.mailToolStripMenuItem}); + this.mailToolStripMenuItem, + this.createBackupToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Size = new System.Drawing.Size(800, 24); @@ -117,7 +119,7 @@ this.списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; this.списокКомпонентовToolStripMenuItem.Size = new System.Drawing.Size(218, 22); this.списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; - this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.BlanksReportToolStripMenuItem_Click); + this.списокКомпонентовToolStripMenuItem.Click += new System.EventHandler(this.DocumentsReportToolStripMenuItem_Click); // // компонентыПоИзделиямToolStripMenuItem // @@ -140,6 +142,13 @@ this.startWorksToolStripMenuItem.Text = "Запуск работ"; this.startWorksToolStripMenuItem.Click += new System.EventHandler(this.StartWorksToolStripMenuItem_Click); // + // mailToolStripMenuItem + // + this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; + this.mailToolStripMenuItem.Size = new System.Drawing.Size(62, 20); + this.mailToolStripMenuItem.Text = "Письма"; + this.mailToolStripMenuItem.Click += new System.EventHandler(this.MailToolStripMenuItem_Click); + // // dataGridView // this.dataGridView.AllowUserToAddRows = false; @@ -203,12 +212,12 @@ this.buttonUpdate.UseVisualStyleBackColor = true; this.buttonUpdate.Click += new System.EventHandler(this.ButtonRef_Click); // - // mailToolStripMenuItem + // createBackupToolStripMenuItem // - this.mailToolStripMenuItem.Name = "mailToolStripMenuItem"; - this.mailToolStripMenuItem.Size = new System.Drawing.Size(62, 20); - this.mailToolStripMenuItem.Text = "Письма"; - this.mailToolStripMenuItem.Click += new System.EventHandler(this.MailToolStripMenuItem_Click); + this.createBackupToolStripMenuItem.Name = "createBackupToolStripMenuItem"; + this.createBackupToolStripMenuItem.Size = new System.Drawing.Size(97, 20); + this.createBackupToolStripMenuItem.Text = "Создать бекап"; + this.createBackupToolStripMenuItem.Click += new System.EventHandler(this.createBackupToolStripMenuItem_Click); // // FormMain // @@ -234,9 +243,14 @@ } - #endregion + private void BlanksReportToolStripMenuItem_Click(object sender, EventArgs e) + { + throw new NotImplementedException(); + } - private MenuStrip menuStrip1; + #endregion + + private MenuStrip menuStrip1; private ToolStripMenuItem справочникиToolStripMenuItem; private DataGridView dataGridView; private Button buttonCreateOrder; @@ -254,5 +268,6 @@ private ToolStripMenuItem startWorksToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem mailToolStripMenuItem; + private ToolStripMenuItem createBackupToolStripMenuItem; } } \ No newline at end of file diff --git a/LawFirm/LawFirmView/FormMain.cs b/LawFirm/LawFirmView/FormMain.cs index e307f5f..178cebe 100644 --- a/LawFirm/LawFirmView/FormMain.cs +++ b/LawFirm/LawFirmView/FormMain.cs @@ -1,6 +1,7 @@ using LawFirmBusinessLogic.BusinessLogics; using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using LawFirmDataModels.Enums; using Microsoft.Extensions.Logging; using System.Windows.Forms; @@ -13,17 +14,20 @@ namespace LawFirmView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; + private readonly IBackUpLogic _backUpLogic; public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, - IWorkProcess workProcess) + IWorkProcess workProcess, + IBackUpLogic backUpLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; } private void FormMain_Load(object sender, EventArgs e) { @@ -32,16 +36,10 @@ namespace LawFirmView private void LoadData() { _logger.LogInformation("Загрузка заказов"); + try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["DocumentId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - } + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка прошла успешно"); } catch (Exception ex) @@ -52,13 +50,10 @@ namespace LawFirmView } private void ButtonCreateOrder_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + LoadData(); + } private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) @@ -69,11 +64,6 @@ namespace LawFirmView { var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel{ Id = id, - DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].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()) }); if (!operationResult) { @@ -100,11 +90,6 @@ namespace LawFirmView var operationResult = _orderLogic.FinishOrder(new OrderBindingModel { Id = id, - DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].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()) }); if (!operationResult) { @@ -132,11 +117,6 @@ namespace LawFirmView OrderBindingModel { Id = id, - DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].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()) }); if (!operationResult) { @@ -159,20 +139,14 @@ namespace LawFirmView } private void BlanksToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormBlanks)); - if (service is FormBlanks form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void DocumentsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormDocuments)); - if (service is FormDocuments form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void DocumentsReportToolStripMenuItem_Click(object sender, EventArgs e) @@ -190,53 +164,65 @@ e) } private void DocumentBlanksReportToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportDocumentBlanks)); - if (service is FormReportDocumentBlanks form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void OrdersReportToolStripMenuItem_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void ClientsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormViewClients)); - if (service is FormViewClients form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void StartWorksToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); + _workProcess.DoWork( + DependencyManager.Instance.Resolve(), + _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormViewImplementers)); - if (service is FormViewImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void MailToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormViewMail)); - if (service is FormViewMail 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/LawFirm/LawFirmView/FormViewClients.cs b/LawFirm/LawFirmView/FormViewClients.cs index f283b45..55c0995 100644 --- a/LawFirm/LawFirmView/FormViewClients.cs +++ b/LawFirm/LawFirmView/FormViewClients.cs @@ -22,14 +22,8 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/LawFirm/LawFirmView/FormViewImplementers.cs b/LawFirm/LawFirmView/FormViewImplementers.cs index 2700220..c6683dd 100644 --- a/LawFirm/LawFirmView/FormViewImplementers.cs +++ b/LawFirm/LawFirmView/FormViewImplementers.cs @@ -1,5 +1,6 @@ using LawFirmContracts.BindingModels; using LawFirmContracts.BusinessLogicsContracts; +using LawFirmContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -31,12 +32,7 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) @@ -48,27 +44,21 @@ namespace LawFirmView } private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer 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(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/LawFirm/LawFirmView/FormViewMail.cs b/LawFirm/LawFirmView/FormViewMail.cs index a92a138..ae5bd06 100644 --- a/LawFirm/LawFirmView/FormViewMail.cs +++ b/LawFirm/LawFirmView/FormViewMail.cs @@ -29,14 +29,7 @@ namespace LawFirmView { 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("Загрузка списка писем"); } catch (Exception ex) diff --git a/LawFirm/LawFirmView/Program.cs b/LawFirm/LawFirmView/Program.cs index aa030dd..fa3b5b5 100644 --- a/LawFirm/LawFirmView/Program.cs +++ b/LawFirm/LawFirmView/Program.cs @@ -9,6 +9,7 @@ using NLog.Extensions.Logging; using LawFirmDatabaseImplement.Implements; using LawFirmBusinessLogic.MailWorker; using LawFirmContracts.BindingModels; +using LawFirmContracts.DI; namespace LawFirmView { @@ -26,12 +27,11 @@ namespace LawFirmView // 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 MailConfigBindingModel { MailLogin = @@ -56,56 +56,62 @@ namespace LawFirmView } 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 => - { - option.SetMinimumLevel(LogLevel.Information); - option.AddNLog("nlog.config"); - }); - 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(); - services.AddTransient(); - - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); - - 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(); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void MailCheck(object obj) => ServiceProvider? - .GetService()?.MailCheck(); + private static void InitDependency() + { + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); + 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(true); + 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(); + DependencyManager.Instance.RegisterType(); + } + + private static void MailCheck(object obj) => + DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file