diff --git a/.gitignore b/.gitignore index ca1c7a3..72cfb7b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + +/RenovationWork/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..4709478 --- /dev/null +++ b/RenovationWork/RenovationWorkBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,102 @@ +using Microsoft.Extensions.Logging; +using RenovationWorkContracts.BindingModels; +using RenovationWorkContracts.BusinessLogicsContracts; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkDataModels; +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 RenovationWorkBusinessLogic.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/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs b/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..5fbbc5d --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public string Title { get; private set; } + + public bool Visible { get; private set; } + + public int Width { get; private set; } + + public GridViewAutoSize GridViewAutoSize { get; private set; } + + public bool IsUseAutoSize { get; private set; } + + public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + } +} diff --git a/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs b/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..369882f --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + + None = 1, + + ColumnHeader = 2, + + AllCellsExceptHeader = 4, + + AllCells = 6, + + DisplayedCellsExceptHeader = 8, + + DisplayedCells = 10, + + Fill = 16 + } +} diff --git a/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs b/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..8cfacee --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs b/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs index fc45f65..ce4eef8 100644 --- a/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs +++ b/RenovationWork/RenovationWorkContracts/BindingModels/MessageInfoBindingModel.cs @@ -15,5 +15,6 @@ namespace RenovationWorkContracts.BindingModels public string Subject { get; set; } = string.Empty; public string Body { get; set; } = string.Empty; public DateTime DateDelivery { get; set; } + public int Id => throw new NotImplementedException(); } } diff --git a/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..a81a807 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using RenovationWorkContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs b/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..2781ec2 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/DependencyManager.cs @@ -0,0 +1,66 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs b/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..c54710b --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/IDependencyContainer.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs b/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs new file mode 100644 index 0000000..7a5c461 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/IImplementationExtension.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs b/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..a63febc --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace RenovationWorkContracts.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/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs b/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..e0911b7 --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.DI +{ + public class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj b/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj index 96ab30f..94102c2 100644 --- a/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj +++ b/RenovationWork/RenovationWorkContracts/RenovationWorkContracts.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -6,6 +6,10 @@ enable + + + + diff --git a/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs b/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..ac499da --- /dev/null +++ b/RenovationWork/RenovationWorkContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs index f2a40e3..fad740b 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ClientViewModel.cs @@ -5,17 +5,19 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using RenovationWorkContracts.Attributes; namespace RenovationWorkContracts.ViewModels { public class ClientViewModel : IClientModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО клиента")] + [Column(title: "ФИО клиента", width: 150)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] + [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs index 4288c6b..d1be379 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace RenovationWorkContracts.ViewModels { public class ComponentViewModel : IComponentModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название расходного материала")] + [Column(title: "Название расходного материала", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column(title: "Цена", width: 150)] public double Cost { get; set; } } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs index a854d63..5f050fa 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/ImplementerViewModel.cs @@ -4,24 +4,26 @@ using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using RenovationWorkContracts.Attributes; using RenovationWorkDataModels.Models; namespace RenovationWorkContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column(title: "Пароль", width: 100)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column(title: "Стаж работы", width: 60)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column(title: "Квалификация", width: 60)] public int Qualification { get; set; } } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs index 88d60bc..851b584 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,20 +11,23 @@ namespace RenovationWorkContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] + public int Id { get; set; } + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; - + [Column(visible: false)] public int? ClientId { get; set; } - [DisplayName("Отправитель")] + [Column(title: "Отправитель", width: 150)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата")] + [Column(title: "Дата письма", width: 120)] public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] + [Column(title: "Заголовок", width: 120)] public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string Body { get; set; } = string.Empty; } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs index 2860d01..c48f42c 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using RenovationWorkDataModels.Enums; +using RenovationWorkContracts.Attributes; +using RenovationWorkDataModels.Enums; using RenovationWorkDataModels.Models; using System; using System.Collections.Generic; @@ -11,35 +12,38 @@ namespace RenovationWorkContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] + [Column(title: "Номер", width: 90)] public int Id { get; set; } + [Column(visible: false)] public int? ImplementerId { get; set; } - [DisplayName("Исполнитель")] + [Column(title: "Исполнитель", width: 150)] public string? ImplementerFIO { get; set; } = null; + [Column(visible: false)] public int ClientId { get; set; } - [DisplayName("ФИО клиента")] + [Column(title: "Имя клиента", width: 190)] public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public string ClientEmail { get; set; } = string.Empty; - + [Column(visible: false)] public int RepairId { get; set; } - [DisplayName("Ремотная работа")] + [Column(title: "Ремотная работа", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string RepairName { get; set; } = string.Empty; - [DisplayName("Количество")] + [Column(title: "Количество", width: 100)] public int Count { get; set; } - [DisplayName("Сумма")] + [Column(title: "Сумма", width: 120)] public double Sum { get; set; } - [DisplayName("Статус")] + [Column(title: "Статус", width: 70)] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] + [Column(title: "Дата создания", width: 120)] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] + [Column(title: "Дата выполнения", width: 120)] public DateTime? DateImplement { get; set; } } } diff --git a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs index bdb1fbe..4e470b7 100644 --- a/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs +++ b/RenovationWork/RenovationWorkContracts/ViewModels/RepairViewModel.cs @@ -1,4 +1,5 @@ using RenovationWorkDataModels.Models; +using RenovationWorkContracts.Attributes; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,14 +11,15 @@ namespace RenovationWorkContracts.ViewModels { public class RepairViewModel : IRepairModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название ремотной работы")] + [Column(title: "Название ремотной работы", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string RepairName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column(title: "Цена", width: 70)] public double Price { get; set; } - + [Column(visible: false)] public Dictionary RepairComponents { get; set; } = new(); } } diff --git a/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs b/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs index bea1c89..d4e6654 100644 --- a/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs +++ b/RenovationWork/RenovationWorkDataModels/Models/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace RenovationWorkDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs new file mode 100644 index 0000000..1b00891 --- /dev/null +++ b/RenovationWork/RenovationWorkDatabaseImplement/ImplementationExtension.cs @@ -0,0 +1,27 @@ +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkDatabaseImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 3; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..70586bc --- /dev/null +++ b/RenovationWork/RenovationWorkDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,32 @@ +using RenovationWorkContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new RenovationWorkDatabase(); + 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/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs index d0d0cd0..546cb06 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Client.cs @@ -8,17 +8,22 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } - + [DataMember] [Required] public string ClientFIO { get; set; } = string.Empty; + [DataMember] [Required] public string Email { get; set; } = string.Empty; + [DataMember] [Required] public string Password { get; set; } = string.Empty; diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs index bbd2c70..64a4de4 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Component.cs @@ -8,14 +8,19 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using RenovationWorkDataModels.Models; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ComponentName { get; private set; } = string.Empty; + [DataMember] [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs index 7757338..735753f 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Implementer.cs @@ -8,22 +8,25 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] public int Id { get; set; } - + [DataMember] [Required] public string ImplementerFIO { get; set; } = string.Empty; - + [DataMember] [Required] public string Password { get; set; } = string.Empty; - + [DataMember] [Required] public int WorkExperience { get; set; } - + [DataMember] [Required] public int Qualification { get; set; } diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs index 74145b9..5c5a7a8 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/MessageInfo.cs @@ -8,28 +8,32 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { public class MessageInfo : IMessageInfoModel { + [NotMapped] + public int Id { get; private set; } + [DataMember] [Key] [DatabaseGenerated(DatabaseGeneratedOption.None)] public string MessageId { get; set; } = string.Empty; - + [DataMember] public int? ClientId { get; set; } public virtual Client? Client { get; set; } - + [DataMember] [Required] public string SenderName { get; set; } = string.Empty; - + [DataMember] [Required] public DateTime DateDelivery { get; set; } - + [DataMember] [Required] public string Subject { get; set; } = string.Empty; - + [DataMember] [Required] public string Body { get; set; } = string.Empty; diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs index fba033c..17b0bf6 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Order.cs @@ -8,39 +8,42 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } - + [DataMember] [Required] public int ClientId { get; private set; } public virtual Client Client { get; private set; } = new(); - + [DataMember] public int? ImplementerId { get; private set; } public virtual Implementer? Implementer { get; set; } = new(); - + [DataMember] [Required] public int RepairId { get; private set; } public virtual Repair Repair { get; set; } = new(); - + [DataMember] [Required] public int Count { get; private set; } - + [DataMember] [Required] public double Sum { get; private set; } - + [DataMember] [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; - + [DataMember] [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - + [DataMember] public DateTime? DateImplement { get; private set; } public static Order? Create(RenovationWorkDatabase context, OrderBindingModel model) diff --git a/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs b/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs index f54f634..7a3ebfd 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs +++ b/RenovationWork/RenovationWorkDatabaseImplement/Models/Repair.cs @@ -8,18 +8,24 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace RenovationWorkDatabaseImplement.Models { + [DataContract] public class Repair : IRepairModel { + [DataMember] public int Id { get; set; } + [DataMember] [Required] public string RepairName { get; set; } = string.Empty; + [DataMember] [Required] public double Price { get; set; } private Dictionary? _repairComponents = null; + [DataMember] [NotMapped] public Dictionary RepairComponents { diff --git a/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj index c0ccf4c..719ee9c 100644 --- a/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj +++ b/RenovationWork/RenovationWorkDatabaseImplement/RenovationWorkDatabaseImplement.csproj @@ -20,4 +20,8 @@ + + + + diff --git a/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs new file mode 100644 index 0000000..ab83716 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/ImplementationExtension.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using RenovationWorkFileImplement.Implements; + +namespace RenovationWorkFileImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 1; + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..a02daf8 --- /dev/null +++ b/RenovationWork/RenovationWorkFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,44 @@ +using RenovationWorkContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + private readonly DataFileSingleton source; + private readonly PropertyInfo[] sourceProperties; + + public BackUpInfo() + { + source = DataFileSingleton.GetInstance(); + sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public); + } + + public List? GetList() where T : class, new() + { + var requredType = typeof(T); + return (List?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType) + ?.GetValue(source); + + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Client.cs b/RenovationWork/RenovationWorkFileImplement/Models/Client.cs index 1058879..7ffce14 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Client.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Client.cs @@ -7,14 +7,20 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; set; } + [DataMember] public string ClientFIO { get; set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; + [DataMember] public string Email { get; set; } = string.Empty; public static Client? Create(ClientBindingModel? model) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs index ec66307..4ce948a 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Component.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Component.cs @@ -7,13 +7,18 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { + [DataContract] public class Component : IComponentModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ComponentName { get; private set; } = string.Empty; + [DataMember] public double Cost { get; set; } public static Component? Create(ComponentBindingModel model) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs b/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs index 5956127..2f6b9fc 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Implementer.cs @@ -7,19 +7,26 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.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/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs index 4a47b50..435e1bf 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/MessageInfo.cs @@ -7,21 +7,31 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { - public class MessageInfo : IMessageInfoModel + [DataContract] + public class MessageInfo : IMessageInfoModel { + [DataMember] + public int Id { get; private set; } + [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.Now; + [DataMember] public string Subject { get; private set; } = string.Empty; + [DataMember] public string Body { get; private set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel model) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Order.cs b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs index 541fed9..9fc9a3f 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Order.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Order.cs @@ -8,19 +8,30 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; set; } + [DataMember] public int RepairId { get; private 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; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } public static Order? Create(OrderBindingModel? model) diff --git a/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs index d9fa2f4..1fa288f 100644 --- a/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs +++ b/RenovationWork/RenovationWorkFileImplement/Models/Repair.cs @@ -7,16 +7,22 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Xml.Linq; +using System.Runtime.Serialization; namespace RenovationWorkFileImplement.Models { + [DataContract] public class Repair : IRepairModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string RepairName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _repairComponents = null; + [DataMember] public Dictionary RepairComponents { get diff --git a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj index bdc7a83..2859d53 100644 --- a/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj +++ b/RenovationWork/RenovationWorkFileImplement/RenovationWorkFileImplement.csproj @@ -15,4 +15,8 @@ + + + + diff --git a/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs b/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs new file mode 100644 index 0000000..0bb21e0 --- /dev/null +++ b/RenovationWork/RenovationWorkListImplement/ImplementationExtension.cs @@ -0,0 +1,27 @@ +using RenovationWorkContracts.DI; +using RenovationWorkContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RenovationWorkListImplement.Implements; + +namespace RenovationWorkListImplement +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs b/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..7425383 --- /dev/null +++ b/RenovationWork/RenovationWorkListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,22 @@ +using RenovationWorkContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace RenovationWorkListImplement.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/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs b/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs index b0bf095..34e383d 100644 --- a/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs +++ b/RenovationWork/RenovationWorkListImplement/Models/MessageInfo.cs @@ -23,6 +23,8 @@ namespace RenovationWorkListImplement.Models public string Body { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public static MessageInfo? Create(MessageInfoBindingModel model) { if (model == null) diff --git a/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj b/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj index bdc7a83..2452f21 100644 --- a/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj +++ b/RenovationWork/RenovationWorkListImplement/RenovationWorkListImplement.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -15,4 +15,8 @@ + + + + diff --git a/RenovationWork/RenovationWorkView/DataGridViewExtension.cs b/RenovationWork/RenovationWorkView/DataGridViewExtension.cs new file mode 100644 index 0000000..77af62a --- /dev/null +++ b/RenovationWork/RenovationWorkView/DataGridViewExtension.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using RenovationWorkContracts.Attributes; + +namespace RenovationWorkView +{ + internal static class DataGridViewExtension + { + public static void FillAndConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + grid.DataSource = data; + + var type = typeof(T); + var properties = type.GetProperties(); + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } +} diff --git a/RenovationWork/RenovationWorkView/FormClients.cs b/RenovationWork/RenovationWorkView/FormClients.cs index c0cbbfb..df6347d 100644 --- a/RenovationWork/RenovationWorkView/FormClients.cs +++ b/RenovationWork/RenovationWorkView/FormClients.cs @@ -35,13 +35,7 @@ namespace RenovationWorkView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) diff --git a/RenovationWork/RenovationWorkView/FormComponents.cs b/RenovationWork/RenovationWorkView/FormComponents.cs index eae6f7f..cf2c39a 100644 --- a/RenovationWork/RenovationWorkView/FormComponents.cs +++ b/RenovationWork/RenovationWorkView/FormComponents.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -54,13 +55,10 @@ namespace RenovationWorkView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -68,15 +66,11 @@ namespace RenovationWorkView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent 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/RenovationWork/RenovationWorkView/FormImplementers.cs b/RenovationWork/RenovationWorkView/FormImplementers.cs index 75f3b89..1590e8f 100644 --- a/RenovationWork/RenovationWorkView/FormImplementers.cs +++ b/RenovationWork/RenovationWorkView/FormImplementers.cs @@ -29,14 +29,7 @@ namespace RenovationWorkView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) diff --git a/RenovationWork/RenovationWorkView/FormMail.cs b/RenovationWork/RenovationWorkView/FormMail.cs index 0ad4d92..42d4187 100644 --- a/RenovationWork/RenovationWorkView/FormMail.cs +++ b/RenovationWork/RenovationWorkView/FormMail.cs @@ -28,15 +28,7 @@ namespace RenovationWorkView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка почты"); } catch (Exception ex) diff --git a/RenovationWork/RenovationWorkView/FormMain.Designer.cs b/RenovationWork/RenovationWorkView/FormMain.Designer.cs index 6075369..5f26ba1 100644 --- a/RenovationWork/RenovationWorkView/FormMain.Designer.cs +++ b/RenovationWork/RenovationWorkView/FormMain.Designer.cs @@ -46,6 +46,7 @@ this.startingworkToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.implementersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); 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(); @@ -57,7 +58,8 @@ this.bookToolStripMenuItem, this.reportsToolStripMenuItem, this.startingworkToolStripMenuItem, - this.mailToolStripMenuItem}); + this.mailToolStripMenuItem, + this.createBackUpToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(5, 2, 0, 2); @@ -218,6 +220,13 @@ this.mailToolStripMenuItem.Text = "Почта"; this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click); // + // createBackUpToolStripMenuItem + // + 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 // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); @@ -263,5 +272,6 @@ private ToolStripMenuItem implementersToolStripMenuItem; private ToolStripMenuItem startingworkToolStripMenuItem; private ToolStripMenuItem mailToolStripMenuItem; + private ToolStripMenuItem createBackUpToolStripMenuItem; } } \ No newline at end of file diff --git a/RenovationWork/RenovationWorkView/FormMain.cs b/RenovationWork/RenovationWorkView/FormMain.cs index 6c01604..40594af 100644 --- a/RenovationWork/RenovationWorkView/FormMain.cs +++ b/RenovationWork/RenovationWorkView/FormMain.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -20,14 +21,16 @@ namespace RenovationWorkView 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) + 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) @@ -39,17 +42,7 @@ namespace RenovationWorkView { try { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["RepairId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ClientEmail"].Visible = false; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["RepairName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -61,30 +54,22 @@ namespace RenovationWorkView private void СonsumablesToolStripMenuItem_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 RepairsToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairs)); - if (service is FormRepairs 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(); } private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) @@ -183,52 +168,62 @@ namespace RenovationWorkView private void ComponentsRepairToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents)); - if (service is FormReportRepairComponents form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void OrdersToolStripMenuItem_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 ClientToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); - if (service is FormClients form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void ImplementersToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); - if (service is FormImplementers form) - { - form.ShowDialog(); - } + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } private void StartingworkToolStripMenuItem_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 mailToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMail)); - if (service is FormMail form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void createBackUpToolStripMenuItem_Click(object sender, EventArgs e) + { + try { - form.ShowDialog(); + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бэкап создан", "Сообщение", + MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка создания бэкапа", MessageBoxButtons.OK, + MessageBoxIcon.Error); } } } diff --git a/RenovationWork/RenovationWorkView/FormRepair.cs b/RenovationWork/RenovationWorkView/FormRepair.cs index 1c7ce95..f653881 100644 --- a/RenovationWork/RenovationWorkView/FormRepair.cs +++ b/RenovationWork/RenovationWorkView/FormRepair.cs @@ -12,6 +12,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -85,51 +86,43 @@ namespace RenovationWorkView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); - if (service is FormRepairComponent form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового расходного материала:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); - if (_RepairComponents.ContainsKey(form.Id)) - { - _RepairComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _RepairComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); - } + return; } + + _logger.LogInformation("Добавление нового расходника:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + if (_RepairComponents.ContainsKey(form.Id)) + { + _RepairComponents[form.Id] = (form.ComponentModel, + form.Count); + } + else + { + _RepairComponents.Add(form.Id, (form.ComponentModel, + form.Count)); + } + LoadData(); } private void ButtonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepairComponent)); - if (service is FormRepairComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _RepairComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _RepairComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) + if (form.ComponentModel == null) { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение расходного материала:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); - _RepairComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); + return; } + _logger.LogInformation("Изменение расходника:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count); + _RepairComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); } } } diff --git a/RenovationWork/RenovationWorkView/FormRepairs.cs b/RenovationWork/RenovationWorkView/FormRepairs.cs index 8195130..cab53c4 100644 --- a/RenovationWork/RenovationWorkView/FormRepairs.cs +++ b/RenovationWork/RenovationWorkView/FormRepairs.cs @@ -10,6 +10,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -34,15 +35,7 @@ namespace RenovationWorkView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["RepairComponents"].Visible = false; - dataGridView.Columns["RepairName"].AutoSizeMode = - DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillAndConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка ремотной работы"); } catch (Exception ex) @@ -54,13 +47,10 @@ namespace RenovationWorkView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); - if (service is FormRepair form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -68,14 +58,11 @@ namespace RenovationWorkView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormRepair)); - if (service is FormRepair 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/RenovationWork/RenovationWorkView/Program.cs b/RenovationWork/RenovationWorkView/Program.cs index 73e641b..f91782f 100644 --- a/RenovationWork/RenovationWorkView/Program.cs +++ b/RenovationWork/RenovationWorkView/Program.cs @@ -10,6 +10,7 @@ using RenovationWorkBusinessLogic.OfficePackage; using RenovationWorkBusinessLogic.MailWorker; using RenovationWorkContracts.BindingModels; using Microsoft.EntityFrameworkCore.Design; +using RenovationWorkContracts.DI; namespace RenovationWorkView { @@ -26,12 +27,10 @@ namespace RenovationWorkView // 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 = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, @@ -46,56 +45,51 @@ namespace RenovationWorkView } catch (Exception ex) { - var logger = _serviceProvider.GetService(); + var logger = DependencyManager.Instance.Resolve(); logger?.LogError(ex, "Mails Problem"); } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) + private static void InitDependency() { - services.AddLogging(option => + DependencyManager.InitDependency(); + + DependencyManager.Instance.AddLogging(option => { option.SetMinimumLevel(LogLevel.Information); option.AddNLog("nlog.config"); }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); + DependencyManager.Instance.RegisterType(); - 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(); + 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