diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/MessageInfoBindingModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/MessageInfoBindingModel.cs index 87ec94c..4f4f750 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/MessageInfoBindingModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/BindingModels/MessageInfoBindingModel.cs @@ -9,7 +9,8 @@ namespace AbstractLawFirmContracts.BindingModels { public class MessageInfoBindingModel : IMessageInfoModel { - public string MessageId { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public string MessageId { get; set; } = string.Empty; public int? ClientId { get; set; } diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/DependencyManager.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..6d4aec8 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/DependencyManager.cs @@ -0,0 +1,65 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.DI +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + + private static DependencyManager? _manager; + + private static readonly object _locjObject = new(); + + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + + 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/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IDependencyContainer.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..0f7ff51 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/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 AbstractLawFirmContracts.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/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IImplementationExtension.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..03b9350 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/IImplementationExtension.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceDependencyContainer.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..8b83c1a --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/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 AbstractLawFirmContracts.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/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceProviderLoader.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..0cd6514 --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmContracts.DI +{ + public class ServiceProviderLoader + { + 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/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/UnityDependencyContainer.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..65e9a7e --- /dev/null +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/DI/UnityDependencyContainer.cs @@ -0,0 +1,44 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Unity.Microsoft.Logging; +using Unity; + +namespace AbstractLawFirmContracts.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/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ClientViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ClientViewModel.cs index 3a8dc1c..7022edd 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ClientViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ClientViewModel.cs @@ -5,17 +5,19 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using AbstractLawFirmContracts.Attributes; namespace AbstractLawFirmContracts.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/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs index 0843b72..b75962d 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ using AbstractLawFirmDataModels.Models; +using AbstractLawFirmContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,11 @@ namespace AbstractLawFirmContracts.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("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column("Цена", width: 100)] + public double Cost { get; set; } + } } diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs index 74d0e5f..27286fe 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/DocumentViewModel.cs @@ -1,4 +1,5 @@ -using AbstractLawFirmDataModels.Models; +using AbstractLawFirmContracts.Attributes; +using AbstractLawFirmDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,13 +11,15 @@ namespace AbstractLawFirmContracts.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 DocumentComponents - { + [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 DocumentComponents + { get; set; } = new(); diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ImplementerViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ImplementerViewModel.cs index fea571d..48f66b7 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ImplementerViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using AbstractLawFirmDataModels.Models; +using AbstractLawFirmContracts.Attributes; +using AbstractLawFirmDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace AbstractLawFirmContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } - [DisplayName("ФИО")] - public string ImplementerFIO { get; set; } = string.Empty; + [Column("ФИО", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column("Пароль", width: 110)] + public string Password { get; set; } = string.Empty; - [DisplayName("Трудовой стаж")] - public int WorkExperience { get; set; } + [Column("Трудовой стаж", width: 110)] + public int WorkExperience { get; set; } - [DisplayName("Квалификация")] - public int Qualification { get; set; } + [Column("Квалификация", width: 110)] + public int Qualification { get; set; } } } diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/MessageInfoViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/MessageInfoViewModel.cs index f891e6e..0d8209d 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/MessageInfoViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using AbstractLawFirmDataModels.Models; +using AbstractLawFirmContracts.Attributes; +using AbstractLawFirmDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,16 +11,19 @@ namespace AbstractLawFirmContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { - public string MessageId { get; set; } = string.Empty; - - public int? ClientId { get; set; } - [DisplayName("Отправитель")] - public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] - public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] - public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] - public string Body { get; set; } = string.Empty; - } + [Column(visible: false)] + public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] + public int? ClientId { get; set; } + [Column("Отправитель", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] + public string SenderName { get; set; } = string.Empty; + [Column("Дата письма", width: 100)] + public DateTime DateDelivery { get; set; } + [Column("Заголовок", width: 150)] + public string Subject { get; set; } = string.Empty; + [Column("Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Body { get; set; } = string.Empty; + [Column(visible: false)] + public int Id => throw new NotImplementedException(); + } } diff --git a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs index 0f3d20e..1d40958 100644 --- a/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs +++ b/LawFirm/AbstractLawFirmContracts/AbstractLawFirmContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using AbstractLawFirmDataModels.Enums; +using AbstractLawFirmContracts.Attributes; +using AbstractLawFirmDataModels.Enums; using AbstractLawFirmDataModels.Models; using System; using System.Collections.Generic; @@ -11,26 +12,30 @@ namespace AbstractLawFirmContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int DocumentId { get; set; } - public int ClientId { get; set; } - [DisplayName("Пакет документов")] - public string DocumentName { get; set; } = string.Empty; - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - public int? ImplementerId { get; set; } - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { 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; } - } + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column(visible: false)] + public int DocumentId { get; set; } + [Column("Пакет документов", width: 110)] + public string DocumentName { get; set; } = string.Empty; + [Column(visible: false)] + public int ClientId { get; set; } + + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] + public int? ImplementerId { get; set; } + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public string ImplementerFIO { 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; } + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column("Дата создания", width: 100)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column("Дата выполнения", width: 100)] + public DateTime? DateImplement { get; set; } + } } diff --git a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IMessageInfoModel.cs b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IMessageInfoModel.cs index 729b46b..b160dbd 100644 --- a/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IMessageInfoModel.cs +++ b/LawFirm/AbstractLawFirmDataModels/AbstractLawFirmDataModels/Models/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace AbstractLawFirmDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel: IId { string MessageId { get; } int? ClientId { get; } diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/AbstractLawFirmDataBaseImplement.csproj b/LawFirm/AbstractLawFirmDatabaseImplement/AbstractLawFirmDataBaseImplement.csproj index f14ba72..aba3df7 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/AbstractLawFirmDataBaseImplement.csproj +++ b/LawFirm/AbstractLawFirmDatabaseImplement/AbstractLawFirmDataBaseImplement.csproj @@ -26,4 +26,7 @@ + + + diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/DatabaseImplementationExtension.cs b/LawFirm/AbstractLawFirmDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..2d68ea8 --- /dev/null +++ b/LawFirm/AbstractLawFirmDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,28 @@ +using AbstractLawFirmContracts.DI; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmDatabaseImplement.Implements; +using AbstractLawFirmDataBaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmDataBaseImplement +{ + 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/AbstractLawFirmDatabaseImplement/Implements/BackUpInfo.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..b93a78d --- /dev/null +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using AbstractLawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmDataBaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new AbstractLawFirmDatabase(); + 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/AbstractLawFirmDatabaseImplement/Models/Client.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Client.cs index 171d7ec..d3f5cf0 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Client.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Client.cs @@ -9,21 +9,27 @@ using System.Threading.Tasks; using AbstractLawFirmDatabaseImplement.Models; using AbstractLawFirmContracts.BindingModels; using AbstractLawFirmContracts.ViewModels; +using System.Runtime.Serialization; namespace AbstractLawFirmDataBaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { + [DataMember] public int Id { get; private set; } [Required] - public string ClientFIO { get; private set; } = string.Empty; + [DataMember] + public string ClientFIO { get; private set; } = string.Empty; [Required] - public string Email { get; private set; } = string.Empty; + [DataMember] + public string Email { get; private set; } = string.Empty; [Required] - public string Password { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; [ForeignKey("ClientId")] public virtual List Orders { get; set; } = new(); diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Component.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Component.cs index 8069012..2d14894 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Component.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Component.cs @@ -10,16 +10,21 @@ using System.Text; using System.Threading.Tasks; using AbstractLawFirmDataBaseImplement.Models; using AbstractLawFirmDatabaseImplement.Models; +using System.Runtime.Serialization; namespace AbstractLawFirmDataBaseImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } [Required] - public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public string ComponentName { get; private set; } = string.Empty; [Required] - public double Cost { get; set; } + [DataMember] + public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List DocumentComponents { get; set; } = new(); public static Component? Create(ComponentBindingModel model) diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Document.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Document.cs index d105418..59ed9b3 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Document.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Document.cs @@ -10,19 +10,25 @@ using System.Text; using System.Threading.Tasks; using AbstractLawFirmDataBaseImplement.Models; using AbstractLawFirmDataBaseImplement; +using System.Runtime.Serialization; namespace AbstractLawFirmDatabaseImplement.Models { + [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? _documentComponents = null; [NotMapped] - public Dictionary DocumentComponents + [DataMember] + public Dictionary DocumentComponents { get { diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Implementer.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Implementer.cs index 21696b1..b10fb9d 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Implementer.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Implementer.cs @@ -6,22 +6,25 @@ 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 AbstractLawFirmDataBaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { 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")] public virtual List Orders { get; private set; } = new(); diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/Models/MessageInfo.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/MessageInfo.cs index 5b751b3..358e8bf 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/MessageInfo.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/MessageInfo.cs @@ -5,24 +5,32 @@ 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 AbstractLawFirmDataBaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] - public string MessageId { get; private set; } = string.Empty; - public int? ClientId { get; private set; } + [DataMember] + public string MessageId { get; private set; } = string.Empty; + [DataMember] + public int? ClientId { get; private set; } [Required] - public string SenderName { get; private set; } = string.Empty; + [DataMember] + public string SenderName { get; private set; } = string.Empty; [Required] - public DateTime DateDelivery { get; private set; } + [DataMember] + public DateTime DateDelivery { get; private set; } [Required] - public string Subject { get; private set; } = string.Empty; + [DataMember] + public string Subject { get; private set; } = string.Empty; [Required] - public string Body { get; private set; } = string.Empty; + [DataMember] + public string Body { get; private set; } = string.Empty; public virtual Client? Client { get; private set; } public static MessageInfo? Create(MessageInfoBindingModel model) { @@ -50,5 +58,7 @@ namespace AbstractLawFirmDataBaseImplement.Models DateDelivery = DateDelivery, Subject = Subject, }; - } + + public int Id => throw new NotImplementedException(); + } } diff --git a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs index 2c82507..5954dcc 100644 --- a/LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs +++ b/LawFirm/AbstractLawFirmDatabaseImplement/Models/Order.cs @@ -7,29 +7,39 @@ 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 AbstractLawFirmDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } [Required] - public int DocumentId { get; private set; } + [DataMember] + public int DocumentId { get; private set; } [Required] - public int ClientId { get; private set; } - public int? ImplementerId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] + public int? ImplementerId { get; private set; } [Required] - public int Count { get; private set; } + [DataMember] + public int Count { get; private set; } [Required] - public double Sum { get; private set; } + [DataMember] + public double Sum { get; private set; } [Required] - public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; [Required] - public DateTime DateCreate { get; private set; } = DateTime.Now; - - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } = DateTime.Now; + [DataMember] + public DateTime? DateImplement { get; private set; } public virtual Document Document { get; set; } public virtual Client Client { get; set; } public Implementer? Implementer { get; private set; } diff --git a/LawFirm/AbstractLawFirmFileImpliment/FileImplementationExtension.cs b/LawFirm/AbstractLawFirmFileImpliment/FileImplementationExtension.cs new file mode 100644 index 0000000..43aa9bd --- /dev/null +++ b/LawFirm/AbstractLawFirmFileImpliment/FileImplementationExtension.cs @@ -0,0 +1,26 @@ +using AbstractLawFirmContracts.DI; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmFileImplement +{ + 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(); + } + } +} diff --git a/LawFirm/AbstractLawFirmFileImpliment/Implements/BackUpInfo.cs b/LawFirm/AbstractLawFirmFileImpliment/Implements/BackUpInfo.cs new file mode 100644 index 0000000..b378fcf --- /dev/null +++ b/LawFirm/AbstractLawFirmFileImpliment/Implements/BackUpInfo.cs @@ -0,0 +1,34 @@ +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmFileImpliment; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + 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/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs b/LawFirm/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs index 936b857..dc3828a 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Implements/OrderStorage.cs @@ -27,30 +27,21 @@ namespace AbstractLawFirmFileImplement.Implements { return null; } - return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; - } + if (model.ImplementerId.HasValue && model.Status != null) + return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId && model.Status.Equals(x.Status))?.GetViewModel; + return source.Orders.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } public List GetFilteredList(OrderSearchModel model) { - if (model.ClientId.HasValue) - { - return source.Orders - .Where(x => x.ClientId == model.ClientId) - .Select(x => x.GetViewModel) - .ToList(); - } - if (model.Status != null) - { - return source.Orders - .Where(x => model.Status.Equals(x.Status)) - .Select(x => x.GetViewModel) - .ToList(); - } - return source.Orders - .Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) - .Select(x => x.GetViewModel) - .ToList(); - } + return source.Orders + .Where(x => x.Id == model.Id || + model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || + x.ClientId == model.ClientId || + model.Status.Equals(x.Status)) + .Select(x => x.GetViewModel) + .ToList(); + } public List GetFullList() { @@ -101,7 +92,7 @@ namespace AbstractLawFirmFileImplement.Implements { viewModel.DocumentName = document.DocumentName; } - return viewModel; + return viewModel; } } } \ No newline at end of file diff --git a/LawFirm/AbstractLawFirmFileImpliment/Models/Component.cs b/LawFirm/AbstractLawFirmFileImpliment/Models/Component.cs index 2ff458b..03a0e43 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Models/Component.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Models/Component.cs @@ -4,17 +4,22 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) { if (model == null) diff --git a/LawFirm/AbstractLawFirmFileImpliment/Models/Document.cs b/LawFirm/AbstractLawFirmFileImpliment/Models/Document.cs index 3aacd44..a031b82 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Models/Document.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Models/Document.cs @@ -5,17 +5,22 @@ using AbstractLawFirmFileImpliment; 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 AbstractLawFirmFileImplement.Models { + [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 Components { get; private set; } = new(); private Dictionary? _documentComponents = null; public Dictionary DocumentComponents diff --git a/LawFirm/AbstractLawFirmFileImpliment/Models/Implementer.cs b/LawFirm/AbstractLawFirmFileImpliment/Models/Implementer.cs index d93da70..114b1ea 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Models/Implementer.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Models/Implementer.cs @@ -4,23 +4,26 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [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/AbstractLawFirmFileImpliment/Models/MessageInfo.cs b/LawFirm/AbstractLawFirmFileImpliment/Models/MessageInfo.cs index bf01ab2..f96c381 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Models/MessageInfo.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Models/MessageInfo.cs @@ -4,24 +4,28 @@ using AbstractLawFirmDataModels.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 AbstractLawFirmFileImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { + public int Id => throw new NotImplementedException(); + [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/LawFirm/AbstractLawFirmFileImpliment/Models/Order.cs b/LawFirm/AbstractLawFirmFileImpliment/Models/Order.cs index 4e8fbbe..c23cd68 100644 --- a/LawFirm/AbstractLawFirmFileImpliment/Models/Order.cs +++ b/LawFirm/AbstractLawFirmFileImpliment/Models/Order.cs @@ -7,23 +7,34 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; namespace AbstractLawFirmFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } - public int DocumentId { get; private set; } - public int ClientId { get; private set; } - public int? ImplementerId { get; set; } - 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; } - public DateTime? DateImplement { get; private set; } + [DataMember] + public int DocumentId { get; private set; } + [DataMember] + public int ClientId { get; private set; } + [DataMember] + public int? ImplementerId { get; set; } + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) { if (model == null) diff --git a/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj b/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj index 1451b06..431c379 100644 --- a/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj +++ b/LawFirm/AbstractLawFirmListImplement/AbstractLawFirmListImplement.csproj @@ -17,4 +17,8 @@ + + + + diff --git a/LawFirm/AbstractLawFirmListImplement/Implements/BackUpInfo.cs b/LawFirm/AbstractLawFirmListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..9919e01 --- /dev/null +++ b/LawFirm/AbstractLawFirmListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using AbstractLawFirmContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmListImplement.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/AbstractLawFirmListImplement/Implements/OrderStorage.cs b/LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs index 661f622..46b2503 100644 --- a/LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs +++ b/LawFirm/AbstractLawFirmListImplement/Implements/OrderStorage.cs @@ -85,8 +85,17 @@ namespace AbstractLawFirmListImplement.Implements { return order.GetViewModel; } - } - return null; + else if (model.ImplementerId.HasValue && model.Status != null && order.ImplementerId == model.ImplementerId && model.Status.Equals(order.Status)) + { + return GetViewModel(order); + } + else if (model.ImplementerId.HasValue && model.ImplementerId == order.ImplementerId) + { + return order.GetViewModel; + } + } + + return null; } public OrderViewModel? Insert(OrderBindingModel model) { diff --git a/LawFirm/AbstractLawFirmListImplement/ListImplementationExtension.cs b/LawFirm/AbstractLawFirmListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..cd3c1f4 --- /dev/null +++ b/LawFirm/AbstractLawFirmListImplement/ListImplementationExtension.cs @@ -0,0 +1,26 @@ +using AbstractLawFirmContracts.DI; +using AbstractLawFirmContracts.StoragesContracts; +using AbstractLawFirmListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AbstractLawFirmListImplement +{ + 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(); + } + } +} diff --git a/LawFirm/AbstractLawFirmListImplement/Models/MessageInfo.cs b/LawFirm/AbstractLawFirmListImplement/Models/MessageInfo.cs index f2003a8..041991a 100644 --- a/LawFirm/AbstractLawFirmListImplement/Models/MessageInfo.cs +++ b/LawFirm/AbstractLawFirmListImplement/Models/MessageInfo.cs @@ -11,6 +11,7 @@ namespace AbstractLawFirmListImplement.Models { public class MessageInfo : IMessageInfoModel { + public int Id => throw new NotImplementedException(); public string MessageId { get; set; } = string.Empty; public int? ClientId { get; set; } diff --git a/LawFirm/AbstractLawFirmListImplement/Models/Order.cs b/LawFirm/AbstractLawFirmListImplement/Models/Order.cs index 9d5fc89..749cc13 100644 --- a/LawFirm/AbstractLawFirmListImplement/Models/Order.cs +++ b/LawFirm/AbstractLawFirmListImplement/Models/Order.cs @@ -18,10 +18,10 @@ namespace AbstractLawFirmListImplement.Models public int? ImplementerId { 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; } - public DateTime? DateImplement { get; private set; } - public static Order? Create(OrderBindingModel? model) + public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + public DateTime DateCreate { get; private set; } = DateTime.Now; + public DateTime? DateImplement { get; private set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) { diff --git a/LawFirm/ImplementationExtensions/AbstractLawFirmContracts.dll b/LawFirm/ImplementationExtensions/AbstractLawFirmContracts.dll new file mode 100644 index 0000000..8db224a Binary files /dev/null and b/LawFirm/ImplementationExtensions/AbstractLawFirmContracts.dll differ diff --git a/LawFirm/ImplementationExtensions/AbstractLawFirmDataBaseImplement.dll b/LawFirm/ImplementationExtensions/AbstractLawFirmDataBaseImplement.dll new file mode 100644 index 0000000..c205a62 Binary files /dev/null and b/LawFirm/ImplementationExtensions/AbstractLawFirmDataBaseImplement.dll differ diff --git a/LawFirm/ImplementationExtensions/AbstractLawFirmDataModels.dll b/LawFirm/ImplementationExtensions/AbstractLawFirmDataModels.dll new file mode 100644 index 0000000..d528058 Binary files /dev/null and b/LawFirm/ImplementationExtensions/AbstractLawFirmDataModels.dll differ diff --git a/LawFirm/ImplementationExtensions/AbstractLawFirmFileImplement.dll b/LawFirm/ImplementationExtensions/AbstractLawFirmFileImplement.dll new file mode 100644 index 0000000..e52c51d Binary files /dev/null and b/LawFirm/ImplementationExtensions/AbstractLawFirmFileImplement.dll differ diff --git a/LawFirm/ImplementationExtensions/AbstractLawFirmListImplement.dll b/LawFirm/ImplementationExtensions/AbstractLawFirmListImplement.dll new file mode 100644 index 0000000..234577c Binary files /dev/null and b/LawFirm/ImplementationExtensions/AbstractLawFirmListImplement.dll differ diff --git a/LawFirm/LawFirmView/DataGridViewExtension.cs b/LawFirm/LawFirmView/DataGridViewExtension.cs new file mode 100644 index 0000000..3eddc8c --- /dev/null +++ b/LawFirm/LawFirmView/DataGridViewExtension.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using AbstractLawFirmContracts.Attributes; + +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/FormClients.cs b/LawFirm/LawFirmView/FormClients.cs index 7e59375..0217c18 100644 --- a/LawFirm/LawFirmView/FormClients.cs +++ b/LawFirm/LawFirmView/FormClients.cs @@ -32,14 +32,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/FormComponents.cs b/LawFirm/LawFirmView/FormComponents.cs index b5111e9..19c8389 100644 --- a/LawFirm/LawFirmView/FormComponents.cs +++ b/LawFirm/LawFirmView/FormComponents.cs @@ -1,5 +1,6 @@ using AbstractLawFirmContracts.BindingModels.BindingModels; using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.DI; using Microsoft.Extensions.Logging; using Microsoft.VisualBasic.Logging; using System; @@ -33,16 +34,9 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); + } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки компонентов"); @@ -53,31 +47,26 @@ namespace LawFirmView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - if (form.ShowDialog() == DialogResult.OK) + 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(FormComponent)); - if (service is FormComponent form) - { - form.Id = + 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/FormDocument.cs b/LawFirm/LawFirmView/FormDocument.cs index f73ea35..3e9440c 100644 --- a/LawFirm/LawFirmView/FormDocument.cs +++ b/LawFirm/LawFirmView/FormDocument.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using AbstractLawFirmContracts.DI; namespace LawFirmView { @@ -86,30 +87,27 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); private void buttonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); - if (service is FormDocumentComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); - if (_documentComponents.ContainsKey(form.Id)) - { - _documentComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _documentComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); - } - } + + return; + } + _logger.LogInformation("Добавление нового компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + if (_documentComponents.ContainsKey(form.Id)) + { + _documentComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _documentComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); + } } @@ -117,11 +115,8 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); { if (dataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormDocumentComponent)); - if (service is FormDocumentComponent form) - { - int id = + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); form.Id = id; form.Count = _documentComponents[id].Item2; @@ -136,7 +131,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 }); LoadData(); } } - } + } diff --git a/LawFirm/LawFirmView/FormDocuments.cs b/LawFirm/LawFirmView/FormDocuments.cs index cbbdda6..5d87c73 100644 --- a/LawFirm/LawFirmView/FormDocuments.cs +++ b/LawFirm/LawFirmView/FormDocuments.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using AbstractLawFirmContracts.DI; namespace LawFirmView { @@ -33,17 +34,9 @@ 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["DocumentComponents"].Visible = false; - } - _logger.LogInformation("Загрузка пакетов документов"); - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка пакетов документов"); + } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки пакетов документов"); @@ -54,29 +47,25 @@ 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) + 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); + 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/FormImplementers.cs b/LawFirm/LawFirmView/FormImplementers.cs index 8580c6d..4287216 100644 --- a/LawFirm/LawFirmView/FormImplementers.cs +++ b/LawFirm/LawFirmView/FormImplementers.cs @@ -1,5 +1,6 @@ using AbstractLawFirmContracts.BindingModels; using AbstractLawFirmContracts.BusinessLogicsContracts; +using AbstractLawFirmContracts.DI; using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; @@ -32,15 +33,9 @@ namespace LawFirmView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка исполнителей"); - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка исполнителей"); + } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки исполнителей"); @@ -51,30 +46,25 @@ namespace LawFirmView private void buttonCreate_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) - { - if (form.ShowDialog() == DialogResult.OK) + 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(FormImplementer)); - if (service is FormImplementer form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); if (form.ShowDialog() == DialogResult.OK) { LoadData(); } } - } + } private void buttonDelete_Click(object sender, EventArgs e) diff --git a/LawFirm/LawFirmView/FormMail.cs b/LawFirm/LawFirmView/FormMail.cs index d3ad954..9a468ef 100644 --- a/LawFirm/LawFirmView/FormMail.cs +++ b/LawFirm/LawFirmView/FormMail.cs @@ -31,14 +31,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("Loading materials"); } catch (Exception ex) diff --git a/LawFirm/LawFirmView/FormMain.cs b/LawFirm/LawFirmView/FormMain.cs index 1a207b6..6ea4978 100644 --- a/LawFirm/LawFirmView/FormMain.cs +++ b/LawFirm/LawFirmView/FormMain.cs @@ -4,6 +4,7 @@ using AbstractLawFirmContracts.BusinessLogicsContracts; using AbstractLawFirmDataModels.Enums; using Microsoft.Extensions.Logging; using AbstractLawFirmBusinessLogic.BusinessLogic; +using AbstractLawFirmContracts.DI; namespace LawFirmView { @@ -13,14 +14,16 @@ namespace LawFirmView private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; private readonly IWorkProcess _workProcess; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) + 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) { @@ -31,17 +34,8 @@ namespace LawFirmView _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; - - } - _logger.LogInformation("Загрузка заказов"); - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов");} catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки заказов"); @@ -51,31 +45,24 @@ namespace LawFirmView private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void пакетыДокументовToolStripMenuItem_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 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(); } @@ -192,51 +179,60 @@ namespace LawFirmView private void компонентыПоПакетамДокументовToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportDocumentComponents)); - if (service is FormReportDocumentComponents form) - { - form.ShowDialog(); - } - - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } private void списокЗаказовToolStripMenuItem_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 клиентыToolStripMenuItem_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 исполнителиToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(Исполнители)); - if (service is Исполнители form) - { - form.ShowDialog(); - } - } + var form = DependencyManager.Instance.Resolve<Исполнители>(); + form.ShowDialog(); + } private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e) { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); - }private void почтаToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormMail)); - if (service is FormMail form) - { - form.ShowDialog(); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } + private void почтаToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + + } + + private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Backup created", "Message", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } diff --git a/LawFirm/LawFirmView/Program.cs b/LawFirm/LawFirmView/Program.cs index e6c0f66..4ede973 100644 --- a/LawFirm/LawFirmView/Program.cs +++ b/LawFirm/LawFirmView/Program.cs @@ -11,6 +11,8 @@ using NLog.Extensions.Logging; using System; using AbstractLawFirmDataBaseImplement.Implements; using AbstractLawFirmBusinessLogic.MailWorker; +using AbstractLawFirmContracts.DI; +using DocumentFormat.OpenXml.Spreadsheet; using AbstractLawFirmContracts.BindingModels; namespace LawFirmView @@ -28,13 +30,10 @@ namespace LawFirmView // 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 MailConfigBindingModel { MailLogin = @@ -62,47 +61,46 @@ namespace LawFirmView logger?.LogError(ex, "Error"); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - 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.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(); - services.AddTransient<Исполнители>(); - services.AddTransient(); - services.AddTransient(); + 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(); + 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) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); + + } } \ No newline at end of file