diff --git a/.gitignore b/.gitignore index ca1c7a3..60a46ce 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,11 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll + +/SoftwareInstallation/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/BackUpLogic.cs b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/BackUpLogic.cs new file mode 100644 index 0000000..df0dc3e --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationBusinessLogic/BusinessLogics/BackUpLogic.cs @@ -0,0 +1,99 @@ +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.BindingModels; +using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationDataModels; +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 SoftwareInstallationBusinessLogic.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/SoftwareInstallation/SoftwareInstallationContracts/Attributes/ColumnAttribute.cs b/SoftwareInstallation/SoftwareInstallationContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..360e565 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.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/SoftwareInstallation/SoftwareInstallationContracts/Attributes/GridViewAutoSize.cs b/SoftwareInstallation/SoftwareInstallationContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..1514c5b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/BackUpSaveBinidngModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/BackUpSaveBinidngModel.cs new file mode 100644 index 0000000..adaea29 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/BackUpSaveBinidngModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.BindingModels +{ + public class BackUpSaveBinidngModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs index 9f6ddb5..21e18c2 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/BindingModels/MessageInfoBindingModel.cs @@ -9,6 +9,7 @@ namespace SoftwareInstallationContracts.BindingModels { public class MessageInfoBindingModel : IMessageInfoModel { + public int Id => throw new NotImplementedException(); public string MessageId { get; set; } = string.Empty; public int? ClientId { get; set; } public string SenderName { get; set; } = string.Empty; diff --git a/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicsContracts/IBackUpLogic.cs b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..fd13048 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,14 @@ +using SoftwareInstallationContracts.BindingModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBinidngModel model); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/DI/DependencyManager.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/DependencyManager.cs new file mode 100644 index 0000000..a1781be --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/DI/DependencyManager.cs @@ -0,0 +1,70 @@ +using Microsoft.Extensions.Logging; +using SofrwareInstallationContracts.DI; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.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/SoftwareInstallation/SoftwareInstallationContracts/DI/IDependencyContainer.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/IDependencyContainer.cs new file mode 100644 index 0000000..16aed2b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/DI/IDependencyContainer.cs @@ -0,0 +1,41 @@ +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.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/SoftwareInstallation/SoftwareInstallationContracts/DI/IImplementationException.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/IImplementationException.cs new file mode 100644 index 0000000..f34b7d7 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/DI/IImplementationException.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.DI +{ + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceDependencyContainer.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceDependencyContainer.cs new file mode 100644 index 0000000..f47a726 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceDependencyContainer.cs @@ -0,0 +1,60 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using SoftwareInstallationContracts.DI; + +namespace SofrwareInstallationContracts.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/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceProviderLoader.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceProviderLoader.cs new file mode 100644 index 0000000..9a32a20 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/DI/ServiceProviderLoader.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.DI +{ + public static partial class ServiceProviderLoader + { + /// + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + var files = + Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && + typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = + (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = + (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > + source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + private static string TryGetImplementationExtensionsFolder() + { + var 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/SoftwareInstallation/SoftwareInstallationContracts/DI/UnityDependencyContainer.cs b/SoftwareInstallation/SoftwareInstallationContracts/DI/UnityDependencyContainer.cs new file mode 100644 index 0000000..3c8272a --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/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; +using Unity.Lifetime; +using Unity.Microsoft.Logging; + +namespace SoftwareInstallationContracts.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/SoftwareInstallation/SoftwareInstallationContracts/SoftwareInstallationContracts.csproj b/SoftwareInstallation/SoftwareInstallationContracts/SoftwareInstallationContracts.csproj index 00a4658..6bd1caa 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/SoftwareInstallationContracts.csproj +++ b/SoftwareInstallation/SoftwareInstallationContracts/SoftwareInstallationContracts.csproj @@ -7,6 +7,7 @@ + diff --git a/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IBackUpInfo.cs b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..2507ca9 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ClientViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ClientViewModel.cs index 4367ac1..c809336 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ClientViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ClientViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,12 +11,13 @@ namespace SoftwareInstallationContracts.ViewModels { public class ClientViewModel : IClientModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО клиента")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] + [Column("Логин (эл. почта)", width: 150)] public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; } } diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ComponentViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ComponentViewModel.cs index ce038ee..4ce5ca5 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ComponentViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ComponentViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels.Models; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,10 +11,13 @@ namespace SoftwareInstallationContracts.ViewModels { public class ComponentViewModel : IComponentModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название компонента")] + + [Column("Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] + + [Column("Цена", width: 80)] public double Cost { get; set; } } } diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ImplementerViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ImplementerViewModel.cs index accc4e9..fb6e334 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ImplementerViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/ImplementerViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,18 +11,19 @@ namespace SoftwareInstallationContracts.ViewModels { public class ImplementerViewModel : IImplementerModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("ФИО исполнителя")] + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - [DisplayName("Пароль")] + [Column("Пароль", width: 150)] public string Password { get; set; } = string.Empty; - [DisplayName("Стаж работы")] + [Column("Стаж работы", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int WorkExperience { get; set; } - [DisplayName("Квалификация")] + [Column("Квалификация", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Qualification { get; set; } } } diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs index a879232..55bf1df 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/MessageInfoViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels.Models; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,20 +11,21 @@ namespace SoftwareInstallationContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { + [Column(visible: false)] public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] public int? ClientId { get; set; } - - [DisplayName("Имя отправителя")] + [Column("Имя отправителя", gridViewAutoSize: GridViewAutoSize.DisplayedCells, isUseAutoSize: true)] public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата отправления")] + [Column("Дата отправления", width: 100)] public DateTime DateDelivery { get; set; } - - [DisplayName("Тема")] + [Column("Тема", width: 150)] public string Subject { get; set; } = string.Empty; - - [DisplayName("Содержание")] + [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/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/OrderViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/OrderViewModel.cs index 24f3284..caa4588 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/OrderViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels.Enums; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels.Enums; using SoftwareInstallationDataModels.Models; using System; using System.Collections.Generic; @@ -11,35 +12,31 @@ namespace SoftwareInstallationContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Номер")] - public int Id { get; set; } - public int? ImplementerId { get; set; } - [DisplayName("Изделие")] + [Column(visible: false)] public int PackageId { get; set; } - [DisplayName("Клиент")] + [Column(visible: false)] public int ClientId { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - - [DisplayName("ФИО исполнителя")] + [Column(visible: false)] + public int? ImplementerId { get; set; } + [Column("Номер", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] + public int Id { get; set; } + [Column("ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string ImplementerFIO { get; set; } = string.Empty; - - [DisplayName("Изделия")] + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public string PackageName { get; set; } = string.Empty; - - [DisplayName("Количество")] + [Column("ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ClientFIO { get; set; } = string.Empty; + [Column("Количество", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public int Count { get; set; } - - [DisplayName("Сумма")] + [Column("Сумма", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public double Sum { get; set; } - - [DisplayName("Статус")] + [Column("Статус", gridViewAutoSize: GridViewAutoSize.AllCells, isUseAutoSize: true)] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] + [Column("Дата создания", width: 100)] public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] + [Column("Дата выполнения", width: 100)] public DateTime? DateImplement { get; set; } } } diff --git a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/PackageViewModel.cs b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/PackageViewModel.cs index c2b7fd0..b6ad71a 100644 --- a/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/PackageViewModel.cs +++ b/SoftwareInstallation/SoftwareInstallationContracts/ViewModels/PackageViewModel.cs @@ -1,4 +1,5 @@ -using SoftwareInstallationDataModels.Models; +using SoftwareInstallationContracts.Attributes; +using SoftwareInstallationDataModels.Models; using System; using System.Collections.Generic; using System.ComponentModel; @@ -10,15 +11,14 @@ namespace SoftwareInstallationContracts.ViewModels { public class PackageViewModel : IPackageModel { + [Column(visible: false)] public int Id { get; set; } - [DisplayName("Название изделия")] + [Column("Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] public string PackageName { get; set; } = string.Empty; - [DisplayName("Цена")] + [Column("Цена", width: 100)] public double Price { get; set; } - public Dictionary PackageComponents - { - get; - set; - } = new(); + + [Column(visible: false)] + public Dictionary PackageComponents { get; set; } = new(); } } diff --git a/SoftwareInstallation/SoftwareInstallationDataModels/IMessageInfoModel.cs b/SoftwareInstallation/SoftwareInstallationDataModels/IMessageInfoModel.cs index 4770eba..3763df8 100644 --- a/SoftwareInstallation/SoftwareInstallationDataModels/IMessageInfoModel.cs +++ b/SoftwareInstallation/SoftwareInstallationDataModels/IMessageInfoModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace SoftwareInstallationDataModels.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/BackUpInfo.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/BackUpInfo.cs new file mode 100644 index 0000000..f16332e --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/BackUpInfo.cs @@ -0,0 +1,32 @@ +using SoftwareInstallationContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationDatabaseImplement +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new SoftwareInstallationDatabase(); + 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/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Client.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Client.cs index c48cf9d..6d4a093 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Client.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Client.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; @@ -14,16 +15,19 @@ namespace SoftwareInstallationDatabaseImplement.Models { public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] [Required] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Email { get; set; } = string.Empty; + [DataMember] [Required] public string Password { get; set; } = string.Empty; [ForeignKey("ClientId")] - public virtual List Orders { get; set; } = - new(); + public virtual List Orders { get; set; } = new(); [ForeignKey("ClientId")] public virtual List Messages { get; set; } = new(); public static Client? Create(ClientBindingModel model) diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Component.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Component.cs index 577412a..ec8871d 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Component.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Component.cs @@ -8,14 +8,18 @@ using System.Text; using System.Threading.Tasks; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.ViewModels; +using System.Runtime.Serialization; namespace SoftwareInstallationDatabaseImplement.Models { 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/SoftwareInstallation/SoftwareInstallationDatabaseImplement/DatabaseImplementationExtension.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/DatabaseImplementationExtension.cs new file mode 100644 index 0000000..d028ca1 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/DatabaseImplementationExtension.cs @@ -0,0 +1,27 @@ +using SoftwareInstallationContracts.DI; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationDatabaseImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationDatabaseImplement +{ + 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/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implementer.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implementer.cs index a084649..6ca47a7 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implementer.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Implementer.cs @@ -8,22 +8,29 @@ using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.Runtime.Serialization; namespace SoftwareInstallationDatabaseImplement { + [DataContract] public class Implementer : IImplementerModel { + [DataMember] [Required] public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] [Required] public string Password { get; private set; } = string.Empty; + [DataMember] [Required] public int WorkExperience { get; private set; } + [DataMember] [Required] public int Qualification { get; private set; } + [DataMember] public int Id { get; private set; } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/MessageInfo.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/MessageInfo.cs index 42e849b..d63035d 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/MessageInfo.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/MessageInfo.cs @@ -5,21 +5,28 @@ 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 SoftwareInstallationDatabaseImplement.Models { + [DataContract] public class MessageInfo : IMessageInfoModel { [Key] + [DataMember] public string MessageId { get; private set; } = string.Empty; + [DataMember] public int? ClientId { get; private set; } [Required] + [DataMember] public string SenderName { get; private set; } = string.Empty; [Required] + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; [Required] + [DataMember] public string Subject { get; private set; } = string.Empty; [Required] public string Body { get; private set; } = string.Empty; @@ -51,5 +58,7 @@ namespace SoftwareInstallationDatabaseImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; + + public int Id => throw new NotImplementedException(); } } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs index 6c3fe13..dd4f644 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Order.cs @@ -7,33 +7,38 @@ 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 SoftwareInstallationDatabaseImplement { + [DataContract] public class Order : IOrderModel { + [DataMember] public int Id { get; private set; } - - public int PackageId { get; private set; } - + [DataMember] [Required] + public int PackageId { get; private set; } + [Required] + [DataMember] public int ClientId { get; private set; } + [DataMember] public int? ImplementerId { get; private set; } - + [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 virtual Package Package { get; set; } diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Package.cs b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Package.cs index 936b624..613a6d5 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Package.cs +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/Package.cs @@ -8,22 +8,25 @@ using System.Text; using System.Threading.Tasks; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.ViewModels; +using System.Runtime.Serialization; namespace SoftwareInstallationDatabaseImplement.Models { + [DataContract] public class Package : IPackageModel { public int Id { get; set; } - + [DataMember] [Required] public string PackageName { get; set; } = string.Empty; - + [DataMember] [Required] public double Price { get; set; } private Dictionary? _packageComponents = null; [NotMapped] + [DataMember] public Dictionary PackageComponents { get diff --git a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabaseImplement.csproj b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabaseImplement.csproj index e70e6b9..ee296e5 100644 --- a/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabaseImplement.csproj +++ b/SoftwareInstallation/SoftwareInstallationDatabaseImplement/SoftwareInstallationDatabaseImplement.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/BackUpInfo.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/BackUpInfo.cs new file mode 100644 index 0000000..248cf42 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/BackUpInfo.cs @@ -0,0 +1,37 @@ +using SoftwareInstallationContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationFileImplement.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/SoftwareInstallation/SoftwareInstallationFileImplement/Client.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Client.cs index 023d674..c5343ae 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Client.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Client.cs @@ -5,17 +5,23 @@ using SoftwareInstallationDataModels.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 SoftwareInstallationFileImplement.Models { + [DataContract] public class Client : IClientModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string ClientFIO { get; private set; } = string.Empty; + [DataMember] public string Email { get; set; } = string.Empty; + [DataMember] public string Password { get; set; } = string.Empty; public static Client? Create(ClientBindingModel model) { diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/ClientStorage.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/ClientStorage.cs index 7fad79b..4003a20 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/ClientStorage.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/ClientStorage.cs @@ -20,36 +20,39 @@ namespace SoftwareInstallationFileImplement.Implements } public List GetFullList() { - return source.Clients - .Select(x => x.GetViewModel) - .ToList(); + return source.Clients.Select(x => x.GetViewModel).ToList(); } - public List GetFilteredList(ClientSearchModel - model) + public List GetFilteredList(ClientSearchModel model) { - if (string.IsNullOrEmpty(model.ClientFIO) && string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password)) + if (string.IsNullOrEmpty(model.ClientFIO)) { return new(); } return source.Clients - .Where(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO.Contains(model.ClientFIO) && - string.IsNullOrEmpty(model.Email) || x.ClientFIO.Contains(model.Email) && - string.IsNullOrEmpty(model.Password) || x.ClientFIO.Contains(model.Password))) - .Select(x => x.GetViewModel) - .ToList(); + .Where(x => x.ClientFIO.Contains(model.ClientFIO)) + .Select(x => x.GetViewModel) + .ToList(); } public ClientViewModel? GetElement(ClientSearchModel model) { - return source.Clients - .FirstOrDefault(x => (string.IsNullOrEmpty(model.ClientFIO) || x.ClientFIO == model.ClientFIO) && - (!model.Id.HasValue || x.Id == model.Id) && (string.IsNullOrEmpty(model.Email) || x.Email == model.Email) && - (string.IsNullOrEmpty(model.Password) || x.Password == model.Password)) - ?.GetViewModel; + if (model.Id.HasValue) + return source.Clients + .FirstOrDefault(x => x.Id == model.Id)? + .GetViewModel; + if (!string.IsNullOrEmpty(model.Email) && !string.IsNullOrEmpty(model.Password)) + return source.Clients + .FirstOrDefault(x => x.Email + .Equals(model.Email) && x.Password + .Equals(model.Password))? + .GetViewModel; + if (!string.IsNullOrEmpty(model.Email)) + return source.Clients + .FirstOrDefault(x => x.Email.Equals(model.Email))?.GetViewModel; + return null; } public ClientViewModel? Insert(ClientBindingModel model) { - model.Id = source.Clients.Count > 0 ? source.Clients.Max(x => - x.Id) + 1 : 1; + model.Id = source.Clients.Count > 0 ? source.Clients.Max(x => x.Id) + 1 : 1; var newClient = Client.Create(model); if (newClient == null) { @@ -61,18 +64,18 @@ namespace SoftwareInstallationFileImplement.Implements } public ClientViewModel? Update(ClientBindingModel model) { - var client = source.Clients.FirstOrDefault(x => x.Id == model.Id); - if (client == null) + var ingredient = source.Clients.FirstOrDefault(x => x.Id == model.Id); + if (ingredient == null) { return null; } - client.Update(model); + ingredient.Update(model); source.SaveClients(); - return client.GetViewModel; + return ingredient.GetViewModel; } public ClientViewModel? Delete(ClientBindingModel model) { - var element = source.Clients.FirstOrDefault(rec => rec.Id == model.Id); + var element = source.Clients.FirstOrDefault(x => x.Id == model.Id); if (element != null) { source.Clients.Remove(element); diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Component.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Component.cs index 94e703d..5cd9c46 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Component.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Component.cs @@ -1,14 +1,19 @@ -using System.Xml.Linq; +using System.Runtime.Serialization; +using System.Xml.Linq; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.ViewModels; using SoftwareInstallationDataModels.Models; namespace SoftwareInstallationFileImplement { + [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/SoftwareInstallation/SoftwareInstallationFileImplement/FileImplementationExtension.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/FileImplementationExtension.cs new file mode 100644 index 0000000..365a877 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/FileImplementationExtension.cs @@ -0,0 +1,27 @@ +using SoftwareInstallationContracts.DI; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationFileImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationFileImplement +{ + public class FileImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Implementer.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Implementer.cs index 65f43b0..67857c3 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Implementer.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Implementer.cs @@ -5,22 +5,25 @@ using SoftwareInstallationDataModels.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 SoftwareInstallationFileImplement.Models { + [DataContract] public class Implementer : IImplementerModel { + [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; } - + [DataMember] public int Id { get; private set; } public static Implementer? Create(XElement element) diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/MessageInfo.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/MessageInfo.cs index 2a29482..926ed4a 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/MessageInfo.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/MessageInfo.cs @@ -1,28 +1,34 @@ using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.ViewModels; +using SoftwareInstallationDataModels.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 SoftwareInstallationFileImplement { - public class MessageInfo + [DataContract] + public class MessageInfo : IMessageInfoModel { + [DataMember] public string MessageId { get; private set; } = string.Empty; - + [DataMember] public int? ClientId { get; private set; } - + [DataMember] public string SenderName { get; private set; } = string.Empty; - + [DataMember] public DateTime DateDelivery { get; private set; } = DateTime.Now; - + [DataMember] public string Subject { get; private set; } = string.Empty; - + [DataMember] 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/SoftwareInstallation/SoftwareInstallationFileImplement/Order.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Order.cs index 86ac055..561c4aa 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Order.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Order.cs @@ -5,22 +5,33 @@ using SoftwareInstallationDataModels.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 SoftwareInstallationFileImplement { + [DataContract] public class Order : IOrderModel { + [DataMember] public int ClientId { get; private set; } + [DataMember] public int PackageId { 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; } = DateTime.Now; + [DataMember] public DateTime? DateImplement { get; private set; } + [DataMember] public int Id { get; private set; } public static Order? Create(OrderBindingModel model) { diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/Package.cs b/SoftwareInstallation/SoftwareInstallationFileImplement/Package.cs index da345e7..3919858 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/Package.cs +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/Package.cs @@ -4,19 +4,25 @@ using SoftwareInstallationDataModels.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 SoftwareInstallationFileImplement { + [DataContract] public class Package : IPackageModel { + [DataMember] public int Id { get; private set; } + [DataMember] public string PackageName { get; private set; } = string.Empty; + [DataMember] public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _PackageComponents = null; + [DataMember] public Dictionary PackageComponents { get diff --git a/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj b/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj index d544409..ff61787 100644 --- a/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj +++ b/SoftwareInstallation/SoftwareInstallationFileImplement/SoftwareInstallationFileImplement.csproj @@ -11,4 +11,8 @@ + + + + diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/BackUpInfo.cs b/SoftwareInstallation/SoftwareInstallationListImplement/BackUpInfo.cs new file mode 100644 index 0000000..c71e556 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/BackUpInfo.cs @@ -0,0 +1,22 @@ +using SoftwareInstallationContracts.StoragesContracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationListImplement +{ + 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/SoftwareInstallation/SoftwareInstallationListImplement/ListImplementationExtension.cs b/SoftwareInstallation/SoftwareInstallationListImplement/ListImplementationExtension.cs new file mode 100644 index 0000000..62d357b --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationListImplement/ListImplementationExtension.cs @@ -0,0 +1,28 @@ +using SoftwareInstallationContracts.DI; +using SoftwareInstallationContracts.StoragesContracts; +using SoftwareInstallationListImplement.Implements; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationListImplement +{ + public class ListImplementationExtension : IImplementationExtension + { + public int Priority => 0; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + + } +} diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/MessageInfo.cs b/SoftwareInstallation/SoftwareInstallationListImplement/MessageInfo.cs index 96e42b7..5d1cff6 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/MessageInfo.cs +++ b/SoftwareInstallation/SoftwareInstallationListImplement/MessageInfo.cs @@ -11,6 +11,7 @@ namespace SoftwareInstallationListImplement.Models { public class MessageInfo : IMessageInfoModel { + public int Id => throw new NotImplementedException(); public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } diff --git a/SoftwareInstallation/SoftwareInstallationListImplement/SoftwareInstallationListImplement.csproj b/SoftwareInstallation/SoftwareInstallationListImplement/SoftwareInstallationListImplement.csproj index 1b6acc3..e524c28 100644 --- a/SoftwareInstallation/SoftwareInstallationListImplement/SoftwareInstallationListImplement.csproj +++ b/SoftwareInstallation/SoftwareInstallationListImplement/SoftwareInstallationListImplement.csproj @@ -16,4 +16,8 @@ + + + + diff --git a/SoftwareInstallation/SoftwareInstallationView/DataGridViewExtension.cs b/SoftwareInstallation/SoftwareInstallationView/DataGridViewExtension.cs new file mode 100644 index 0000000..f044c97 --- /dev/null +++ b/SoftwareInstallation/SoftwareInstallationView/DataGridViewExtension.cs @@ -0,0 +1,55 @@ +using SoftwareInstallationContracts.Attributes; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SoftwareInstallationView +{ + 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/SoftwareInstallation/SoftwareInstallationView/FormClients.cs b/SoftwareInstallation/SoftwareInstallationView/FormClients.cs index d391513..b9108cc 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormClients.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormClients.cs @@ -62,13 +62,7 @@ namespace SoftwareInstallationView { 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/SoftwareInstallation/SoftwareInstallationView/FormComponents.cs b/SoftwareInstallation/SoftwareInstallationView/FormComponents.cs index 60e55c7..dbee6ab 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormComponents.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormComponents.cs @@ -2,6 +2,7 @@ using SoftwareInstallation; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; using System; using System.Collections.Generic; using System.ComponentModel; @@ -33,13 +34,7 @@ namespace SoftwareInstallationView { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) @@ -51,13 +46,10 @@ namespace SoftwareInstallationView } 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(); } } @@ -65,14 +57,11 @@ namespace SoftwareInstallationView { 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/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs index 24567dd..665de45 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormImplementers.cs @@ -2,6 +2,7 @@ using SoftwareInstallation; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; using System; using System.Collections.Generic; using System.ComponentModel; @@ -27,14 +28,11 @@ namespace SoftwareInstallationView private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormImplementer form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -42,14 +40,12 @@ namespace SoftwareInstallationView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } @@ -97,16 +93,8 @@ namespace SoftwareInstallationView { 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("Implementers loading"); } catch (Exception ex) diff --git a/SoftwareInstallation/SoftwareInstallationView/FormMails.cs b/SoftwareInstallation/SoftwareInstallationView/FormMails.cs index 57706d1..98e3ba8 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormMails.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormMails.cs @@ -29,14 +29,7 @@ namespace SoftwareInstallationView { try { - var list = _logic.ReadList(null); - if (list != null) - { - DataGridView.DataSource = list; - DataGridView.Columns["ClientId"].Visible = false; - DataGridView.Columns["MessageId"].Visible = false; - DataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + DataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка писем"); } catch (Exception ex) diff --git a/SoftwareInstallation/SoftwareInstallationView/FormMain.Designer.cs b/SoftwareInstallation/SoftwareInstallationView/FormMain.Designer.cs index e5a983e..d12f5b2 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormMain.Designer.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormMain.Designer.cs @@ -39,18 +39,19 @@ компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); запускРаботToolStripMenuItem = new ToolStripMenuItem(); + почтаToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonIssuedOrder = new Button(); buttonRefresh = new Button(); - почтаToolStripMenuItem = new ToolStripMenuItem(); + создатьБекапToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // // menuStrip // - menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, почтаToolStripMenuItem, создатьБекапToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(1180, 24); @@ -127,6 +128,13 @@ запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Click += запускРаботToolStripMenuItem_Click; // + // почтаToolStripMenuItem + // + почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; + почтаToolStripMenuItem.Size = new Size(53, 20); + почтаToolStripMenuItem.Text = "Почта"; + почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + // // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -165,12 +173,12 @@ buttonRefresh.UseVisualStyleBackColor = true; buttonRefresh.Click += buttonRefresh_Click; // - // почтаToolStripMenuItem + // создатьБекапToolStripMenuItem // - почтаToolStripMenuItem.Name = "почтаToolStripMenuItem"; - почтаToolStripMenuItem.Size = new Size(53, 20); - почтаToolStripMenuItem.Text = "Почта"; - почтаToolStripMenuItem.Click += почтаToolStripMenuItem_Click; + создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem"; + создатьБекапToolStripMenuItem.Size = new Size(97, 20); + создатьБекапToolStripMenuItem.Text = "Создать бекап"; + создатьБекапToolStripMenuItem.Click += создатьБекапToolStripMenuItem_Click; // // FormMain // @@ -211,5 +219,6 @@ private ToolStripMenuItem клиентыToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem почтаToolStripMenuItem; + private ToolStripMenuItem создатьБекапToolStripMenuItem; } } \ No newline at end of file diff --git a/SoftwareInstallation/SoftwareInstallationView/FormMain.cs b/SoftwareInstallation/SoftwareInstallationView/FormMain.cs index d05cb84..0fa745f 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormMain.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormMain.cs @@ -3,6 +3,7 @@ using SoftwareInstallation; using SoftwareInstallationBusinessLogic.BusinessLogics; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; using System; using System.Collections.Generic; using System.ComponentModel; @@ -21,13 +22,15 @@ namespace SoftwareInstallationView 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) { @@ -39,20 +42,7 @@ namespace SoftwareInstallationView try { - var list = _orderLogic.ReadList(null); - - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["PackageName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["PackageId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - - } - + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); _logger.LogInformation("Загрузка заказов"); } catch (Exception ex) @@ -64,38 +54,25 @@ namespace SoftwareInstallationView 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(FormPackages)); - - if (service is FormPackages 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 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(); } @@ -143,52 +120,62 @@ namespace SoftwareInstallationView private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormReportPackageComponents)); - if (service is FormReportPackageComponents 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_1(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(FormImplementers)); - if (service is FormImplementers 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); + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); } private void почтаToolStripMenuItem_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + + private void создатьБекапToolStripMenuItem_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/SoftwareInstallation/SoftwareInstallationView/FormPackage.cs b/SoftwareInstallation/SoftwareInstallationView/FormPackage.cs index 660f561..0f2beda 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormPackage.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormPackage.cs @@ -2,6 +2,7 @@ using SoftwareInstallation; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; using SoftwareInstallationContracts.SearchModels; using SoftwareInstallationDataModels.Models; using System; @@ -83,29 +84,27 @@ namespace SoftwareInstallationView private void buttonAdd_Click(object sender, EventArgs e) { - var service = - Program.ServiceProvider?.GetService(typeof(FormPackageComponent)); - if (service is FormPackageComponent 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 (_PackageComponents.ContainsKey(form.Id)) - { - _PackageComponents[form.Id] = (form.ComponentModel, - form.Count); - } - else - { - _PackageComponents.Add(form.Id, (form.ComponentModel, - form.Count)); - } - LoadData(); + return; } + + _logger.LogInformation("Добавление нового компонента: { ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count); + + if (_PackageComponents.ContainsKey(form.Id)) + { + _PackageComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _PackageComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + + LoadData(); } } @@ -113,25 +112,23 @@ namespace SoftwareInstallationView { if (componentsDataGridView.SelectedRows.Count == 1) { - var service = - Program.ServiceProvider?.GetService(typeof(FormPackageComponent)); - if (service is FormPackageComponent form) + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(componentsDataGridView.SelectedRows[0].Cells[0].Value); + + form.Id = id; + form.Count = _PackageComponents[id].Item2; + + if (form.ShowDialog() == DialogResult.OK) { - int id = - Convert.ToInt32(componentsDataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _PackageComponents[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); - _PackageComponents[form.Id] = (form.ComponentModel, - form.Count); - LoadData(); + return; } + + _logger.LogInformation("Изменение компонента: {ComponentName} - {Count} ", form.ComponentModel.ComponentName, form.Count); + _PackageComponents[id] = (form.ComponentModel, form.Count); + + LoadData(); } } } diff --git a/SoftwareInstallation/SoftwareInstallationView/FormPackages.cs b/SoftwareInstallation/SoftwareInstallationView/FormPackages.cs index 88ae4b8..8e8ae45 100644 --- a/SoftwareInstallation/SoftwareInstallationView/FormPackages.cs +++ b/SoftwareInstallation/SoftwareInstallationView/FormPackages.cs @@ -2,6 +2,7 @@ using SoftwareInstallation; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; using System; using System.Collections.Generic; using System.ComponentModel; @@ -36,16 +37,7 @@ namespace SoftwareInstallationView { try { - var list = _logic.ReadList(null); - - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["PackageName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["PackageComponents"].Visible = false; - } - + dataGridView.FillandConfigGrid(_logic.ReadList(null)); _logger.LogInformation("Загрузка изделий"); } @@ -58,30 +50,24 @@ namespace SoftwareInstallationView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormPackage)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormPackage form) + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } private void ButtonUpdate_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormPackage)); + var form = DependencyManager.Instance.Resolve(); - if (service is FormPackage form) + 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/SoftwareInstallation/SoftwareInstallationView/Program.cs b/SoftwareInstallation/SoftwareInstallationView/Program.cs index 1ebdc71..78c649d 100644 --- a/SoftwareInstallation/SoftwareInstallationView/Program.cs +++ b/SoftwareInstallation/SoftwareInstallationView/Program.cs @@ -2,23 +2,19 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using SoftwareInstallationBusinessLogic.BusinessLogics; -using SoftwareInstallationBusinessLogic.OfficePackage.Implements; -using SoftwareInstallationBusinessLogic.OfficePackage; -using SoftwareInstallationContracts.BusinessLogicsContracts; -using SoftwareInstallationContracts.StoragesContracts; -using SoftwareInstallationDatabaseImplement; -using SoftwareInstallationView; -using SoftwareInstallationDatabaseImplement.Implements; using SoftwareInstallationBusinessLogic.MailWorker; +using SoftwareInstallationBusinessLogic.OfficePackage; +using SoftwareInstallationBusinessLogic.OfficePackage.Implements; using SoftwareInstallationContracts.BindingModels; using SoftwareInstallationContracts.BusinessLogicContracts; +using SoftwareInstallationContracts.BusinessLogicsContracts; +using SoftwareInstallationContracts.DI; +using SoftwareInstallationView; namespace SoftwareInstallation { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -27,13 +23,13 @@ namespace SoftwareInstallation { // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); + 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, @@ -43,58 +39,65 @@ namespace SoftwareInstallation PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) }); - + // var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); } catch (Exception ex) { - var logger = _serviceProvider.GetService(); - logger?.LogError(ex, "Mails Problem"); + var logger = DependencyManager.Instance.Resolve(); + logger?.LogError(ex, " "); } - 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(); - 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(); - + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(true); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } + } \ No newline at end of file