This commit is contained in:
Katanaa Die 2024-05-17 23:32:45 +04:00
parent afd5bd91ce
commit cdce51272a
60 changed files with 1439 additions and 699 deletions

View File

@ -0,0 +1,103 @@
using BarContracts.BindingModels;
using BarContracts.BusinessLogicsContracts;
using BarContracts.StoragesContracts;
using BarDataModels.Enums;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.IO.Compression;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Threading.Tasks;
namespace BarBusinessLogic.BusinessLogics
{
public class BackUpLogic : IBackUpLogic
{
private readonly ILogger _logger;
private readonly IBackUpInfo _backUpInfo;
public BackUpLogic(ILogger<BackUpLogic> 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<T>(string folderName) where T : class, new()
{
var records = _backUpInfo.GetList<T>();
if (records == null)
{
_logger.LogWarning("{type} type get null list", typeof(T).Name);
return;
}
var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
jsonFormatter.WriteObject(fs, records);
}
}
}

View File

@ -0,0 +1,31 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.Attributes
{
[AttributeUsage(AttributeTargets.Property)]
public class ColumnAttribute : Attribute
{
public string Title { get; private set; }
public bool Visible { get; private set; }
public int Width { get; private set; }
public GridViewAutoSize GridViewAutoSize { get; private set; }
public bool IsUseAutoSize { get; private set; }
public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false)
{
Title = title;
Visible = visible;
Width = width;
GridViewAutoSize = gridViewAutoSize;
IsUseAutoSize = isUseAutoSize;
}
}
}

View File

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.Attributes
{
public enum GridViewAutoSize
{
NotSet = 0,
None = 1,
ColumnHeader = 2,
AllCellsExceptHeader = 4,
AllCells = 6,
DisplayedCellsExceptHeader = 8,
DisplayedCells = 10,
Fill = 16
}
}

View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework> <TargetFramework>net6.0-windows</TargetFramework>
@ -13,6 +13,7 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.BindingModels
{
public class BackUpSaveBinidngModel
{
public string FolderName { get; set; } = string.Empty;
}
}

View File

@ -20,5 +20,7 @@ namespace BarContracts.BindingModels
public string Subject { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty;
public string Body { get; set; } = string.Empty; public string Body { get; set; } = string.Empty;
public int Id => throw new NotImplementedException();
} }
} }

View File

@ -0,0 +1,9 @@
using BarContracts.BindingModels;
namespace BarContracts.BusinessLogicsContracts
{
public interface IBackUpLogic
{
void CreateBackUp(BackUpSaveBinidngModel model);
}
}

View File

@ -0,0 +1,66 @@
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.DI
{
public class DependencyManager
{
private readonly IDependencyContainer _dependencyManager;
private static DependencyManager? _manager;
private static readonly object _locjObject = new();
private DependencyManager()
{
_dependencyManager = new ServiceDependencyContainer();
}
public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } }
/// <summary>
/// Иницализация библиотек, в которых идут установки зависомстей
/// </summary>
public static void InitDependency()
{
var ext = ServiceProviderLoader.GetImplementationExtensions();
if (ext == null)
{
throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям");
}
// регистрируем зависимости
ext.RegisterServices();
}
/// <summary>
/// Регистрация логгера
/// </summary>
/// <param name="configure"></param>
public void AddLogging(Action<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
/// <summary>
/// Добавление зависимости
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="U"></typeparam>
public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
/// <summary>
/// Добавление зависимости
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="U"></typeparam>
public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
/// <summary>
/// Получение класса со всеми зависмостями
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
public T Resolve<T>() => _dependencyManager.Resolve<T>();
}
}

View File

@ -0,0 +1,40 @@
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.DI
{
public interface IDependencyContainer
{
/// <summary>
/// Регистрация логгера
/// </summary>
/// <param name="configure"></param>
void AddLogging(Action<ILoggingBuilder> configure);
/// <summary>
/// Добавление зависимости
/// </summary>
/// <typeparam name="T"></typeparam>
/// <typeparam name="U"></typeparam>
/// <param name="isSingle"></param>
void RegisterType<T, U>(bool isSingle) where U : class, T where T : class;
/// <summary>
/// Добавление зависимости
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="isSingle"></param>
void RegisterType<T>(bool isSingle) where T : class;
/// <summary>
/// Получение класса со всеми зависмостями
/// </summary>
/// <typeparam name="T"></typeparam>
/// <returns></returns>
T Resolve<T>();
}
}

View File

@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.DI
{
public interface IImplementationExtension
{
public int Priority { get; }
/// <summary>
/// Регистрация сервисов
/// </summary>
public void RegisterServices();
}
}

View File

@ -0,0 +1,62 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.DI
{
public class ServiceDependencyContainer : IDependencyContainer
{
private ServiceProvider? _serviceProvider;
private readonly ServiceCollection _serviceCollection;
public ServiceDependencyContainer()
{
_serviceCollection = new ServiceCollection();
}
public void AddLogging(Action<ILoggingBuilder> configure)
{
_serviceCollection.AddLogging(configure);
}
public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
{
if (isSingle)
{
_serviceCollection.AddSingleton<T, U>();
}
else
{
_serviceCollection.AddTransient<T, U>();
}
_serviceProvider = null;
}
public void RegisterType<T>(bool isSingle) where T : class
{
if (isSingle)
{
_serviceCollection.AddSingleton<T>();
}
else
{
_serviceCollection.AddTransient<T>();
}
_serviceProvider = null;
}
public T Resolve<T>()
{
if (_serviceProvider == null)
{
_serviceProvider = _serviceCollection.BuildServiceProvider();
}
return _serviceProvider.GetService<T>()!;
}
}
}

View File

@ -0,0 +1,56 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.DI
{
public class ServiceProviderLoader
{
/// <summary>
/// Загрузка всех классов-реализаций IImplementationExtension
/// </summary>
/// <returns></returns>
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";
}
}
}

View File

@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.StoragesContracts
{
public interface IBackUpInfo
{
List<T>? GetList<T>() where T : class, new();
Type? GetTypeByModelInterface(string modelInterfaceName);
}
}

View File

@ -1,4 +1,5 @@
using BarDataModels.Models; using BarContracts.Attributes;
using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,12 +11,13 @@ namespace BarContracts.ViewModels
{ {
public class ClientViewModel : IClientModel public class ClientViewModel : IClientModel
{ {
public int Id { get; set; } [Column(visible: false)]
[DisplayName("ФИО клиента")] public int Id { get; set; }
public string ClientFIO { get; set; } = string.Empty; [Column(title: "ФИО клиента", width: 150)]
[DisplayName("Логин (эл. почта)")] public string ClientFIO { get; set; } = string.Empty;
public string Email { get; set; } = string.Empty; [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[DisplayName("Пароль")] public string Email { get; set; } = string.Empty;
public string Password { get; set; } = string.Empty; [Column(title: "Пароль", width: 150)]
public string Password { get; set; } = string.Empty;
} }
} }

View File

@ -1,4 +1,5 @@
using BarDataModels.Models; using BarContracts.Attributes;
using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,12 +11,14 @@ namespace BarContracts.ViewModels
{ {
public class CocktailViewModel : ICocktailModel public class CocktailViewModel : ICocktailModel
{ {
public int Id { get; set; } [Column(visible: false)]
[DisplayName("Название изделия")] public int Id { get; set; }
public string CocktailName { get; set; } = string.Empty; [Column(title: "Название коктейля", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[DisplayName("Цена")] public string CocktailName { get; set; } = string.Empty;
public double Price { get; set; } [Column(title: "Цена", width: 70)]
public Dictionary<int, (IComponentModel, int)> CocktailComponents public double Price { get; set; }
[Column(visible: false)]
public Dictionary<int, (IComponentModel, int)> CocktailComponents
{ {
get; get;
set; set;

View File

@ -1,4 +1,5 @@
using BarDataModels.Models; using BarContracts.Attributes;
using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,10 +11,11 @@ namespace BarContracts.ViewModels
{ {
public class ComponentViewModel : IComponentModel public class ComponentViewModel : IComponentModel
{ {
public int Id { get; set; } [Column(visible: false)]
[DisplayName("Название компонента")] public int Id { get; set; }
public string ComponentName { get; set; } = string.Empty; [Column(title: "Название ингридиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[DisplayName("Цена")] public string ComponentName { get; set; } = string.Empty;
public double Cost { get; set; } [Column(title: "Цена", width: 150)]
public double Cost { get; set; }
} }
} }

View File

@ -1,4 +1,5 @@
using BarDataModels.Models; using BarContracts.Attributes;
using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,18 +11,19 @@ namespace BarContracts.ViewModels
{ {
public class ImplementerViewModel : IImplementerModel public class ImplementerViewModel : IImplementerModel
{ {
[Column(visible: false)]
public int Id { get; set; } public int Id { get; set; }
[DisplayName("ФИО исполнителя")] [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ImplementerFIO { get; set; } = string.Empty; public string ImplementerFIO { get; set; } = string.Empty;
[DisplayName("Пароль")] [Column(title: "Пароль", width: 100)]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[DisplayName("Стаж работы")] [Column(title: "Стаж работы", width: 60)]
public int WorkExperience { get; set; } public int WorkExperience { get; set; }
[DisplayName("Квалификация")] [Column(title: "Квалификация", width: 60)]
public int Qualification { get; set; } public int Qualification { get; set; }
} }
} }

View File

@ -2,24 +2,25 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Linq; using BarContracts.Attributes;
using System.Text;
using System.Threading.Tasks;
namespace BarContracts.ViewModels namespace BarContracts.ViewModels
{ {
public class MessageInfoViewModel : IMessageInfoModel public class MessageInfoViewModel : IMessageInfoModel
{ {
[Column(visible: false)]
public int Id { get; set; }
[Column(visible: false)]
public string MessageId { get; set; } = string.Empty; public string MessageId { get; set; } = string.Empty;
[Column(visible: false)]
public int? ClientId { get; set; } public int? ClientId { get; set; }
[DisplayName("Имя отправителя")] [Column(title: "Имя отправителя", width: 150)]
public string SenderName { get; set; } = string.Empty; public string SenderName { get; set; } = string.Empty;
[DisplayName("Дата доставки")] [Column(title: "Дата доставки", width: 120)]
public DateTime DateDelivery { get; set; } public DateTime DateDelivery { get; set; }
[DisplayName("Тема письма")] [Column(title: "Тема письма", width: 120)]
public string Subject { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty;
[DisplayName("Внутренности письма")] [Column(title: "Внутренности письма", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string Body { get; set; } = string.Empty; public string Body { get; set; } = string.Empty;
} }
} }

View File

@ -1,4 +1,5 @@
using BarDataModels.Enums; using BarContracts.Attributes;
using BarDataModels.Enums;
using BarDataModels.Models; using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -11,27 +12,30 @@ namespace BarContracts.ViewModels
{ {
public class OrderViewModel : IOrderModel public class OrderViewModel : IOrderModel
{ {
[DisplayName("Номер")] [Column(title: "Номер", width: 90)]
public int Id { get; set; } public int Id { get; set; }
public int CocktailId { get; set; } [Column(visible: false)]
[DisplayName("Изделие")] public int CocktailId { get; set; }
public string CocktailName { get; set; } = string.Empty; [Column(title: "Коктейль", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[DisplayName("Количество")] public string CocktailName { get; set; } = string.Empty;
public int Count { get; set; } [Column(title: "Количество", width: 100)]
[DisplayName("Сумма")] public int Count { get; set; }
public double Sum { get; set; } [Column(title: "Сумма", width: 120)]
[DisplayName("Статус")] public double Sum { get; set; }
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; [Column(title: "Статус", width: 70)]
[DisplayName("Дата создания")] public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; set; } = DateTime.Now; [Column(title: "Дата создания", width: 120)]
[DisplayName("Дата выполнения")] public DateTime DateCreate { get; set; } = DateTime.Now;
public DateTime? DateImplement { get; set; } [Column(title: "Дата выполнения", width: 120)]
public int ClientId { get; set; } public DateTime? DateImplement { get; set; }
[Column(visible: false)]
public int ClientId { get; set; }
[DisplayName("ФИО клиента")] [Column(title: "Имя клиента", width: 190)]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[Column(visible: false)]
public int? ImplementerId { get; set; } public int? ImplementerId { get; set; }
[DisplayName("Исполнитель")] [Column(title: "Исполнитель", width: 150)]
public string? ImplementerFIO { get; set; } = null; public string? ImplementerFIO { get; set; } = null;
} }
} }

View File

@ -1,4 +1,5 @@
using System; using BarDataModels.Enums;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
@ -6,7 +7,7 @@ using System.Threading.Tasks;
namespace BarDataModels.Models namespace BarDataModels.Models
{ {
public interface IMessageInfoModel public interface IMessageInfoModel : IId
{ {
string MessageId { get; } string MessageId { get; }
int? ClientId { get; } int? ClientId { get; }

View File

@ -23,4 +23,9 @@
<ProjectReference Include="..\BarDataModels\BarDataModels.csproj" /> <ProjectReference Include="..\BarDataModels\BarDataModels.csproj" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project> </Project>

View File

@ -0,0 +1,22 @@
using BarContracts.DI;
using BarContracts.StoragesContracts;
using BarDatabaseImplement.Implements;
namespace BarDatabaseImplement
{
public class ImplementationExtension : IImplementationExtension
{
public int Priority => 3;
public void RegisterServices()
{
DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
DependencyManager.Instance.RegisterType<ICocktailStorage, CocktailStorage>();
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
}
}
}

View File

@ -0,0 +1,27 @@
using BarContracts.StoragesContracts;
namespace BarDatabaseImplement.Implements
{
public class BackUpInfo : IBackUpInfo
{
public List<T>? GetList<T>() where T : class, new()
{
using var context = new BarDatabase();
return context.Set<T>().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;
}
}
}

View File

@ -43,12 +43,16 @@ namespace BarDatabaseImplement.Implements
public MessageInfoViewModel? Insert(MessageInfoBindingModel model) public MessageInfoViewModel? Insert(MessageInfoBindingModel model)
{ {
var newMessage = MessageInfo.Create(model);
if (newMessage == null) return null;
using var context = new BarDatabase(); using var context = new BarDatabase();
context.Messages.Add(newMessage); model.ClientId = context.Clients.FirstOrDefault(x => x.Email.Equals(model.SenderName))?.Id;
var message = MessageInfo.Create(model);
if (message == null || context.Messages.Any(x => x.MessageId.Equals(model.MessageId)))
{
return null;
}
context.Messages.Add(message);
context.SaveChanges(); context.SaveChanges();
return newMessage.GetViewModel; return message.GetViewModel;
} }
} }

View File

@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace BarDatabaseImplement.Migrations namespace BarDatabaseImplement.Migrations
{ {
[DbContext(typeof(BarDatabase))] [DbContext(typeof(BarDatabase))]
[Migration("20240517095734_init")] [Migration("20240517114824_init")]
partial class init partial class init
{ {
/// <inheritdoc /> /// <inheritdoc />

View File

@ -8,18 +8,26 @@ using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Runtime.Serialization;
namespace BarDatabaseImplement.Models namespace BarDatabaseImplement.Models
{ {
public class Client : IClientModel [DataContract]
public class Client : IClientModel
{ {
public int Id { get; private set; } [DataMember]
public int Id { get; private set; }
[Required] [DataMember]
[Required]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[Required]
[DataMember]
[Required]
public string Email { get; set; } = string.Empty; public string Email { get; set; } = string.Empty;
[Required]
[DataMember]
[Required]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[ForeignKey("ClientId")] [ForeignKey("ClientId")]

View File

@ -3,18 +3,27 @@ using BarContracts.ViewModels;
using BarDataModels.Models; using BarDataModels.Models;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization;
namespace BarDatabaseImplement.Models namespace BarDatabaseImplement.Models
{ {
public class Cocktail : ICocktailModel [DataContract]
public class Cocktail : ICocktailModel
{ {
public int Id { get; set; } [DataMember]
[Required] public int Id { get; set; }
[DataMember]
[Required]
public string CocktailName { get; set; } = string.Empty; public string CocktailName { get; set; } = string.Empty;
[Required]
[DataMember]
[Required]
public double Price { get; set; } public double Price { get; set; }
private Dictionary<int, (IComponentModel, int)>? _cocktailComponents = null; private Dictionary<int, (IComponentModel, int)>? _cocktailComponents = null;
[NotMapped]
[DataMember]
[NotMapped]
public Dictionary<int, (IComponentModel, int)> CocktailComponents public Dictionary<int, (IComponentModel, int)> CocktailComponents
{ {
get get

View File

@ -5,15 +5,20 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
namespace BarDatabaseImplement.Models namespace BarDatabaseImplement.Models
{ {
public class Component : IComponentModel [DataContract]
public class Component : IComponentModel
{ {
public int Id { get; private set; } [DataMember]
[Required] public int Id { get; private set; }
[DataMember]
[Required]
public string ComponentName { get; private set; } = string.Empty; public string ComponentName { get; private set; } = string.Empty;
[Required] [DataMember]
[Required]
public double Cost { get; set; } public double Cost { get; set; }
[ForeignKey("ComponentId")] [ForeignKey("ComponentId")]
public virtual List<CocktailComponent> CocktailComponents { get; set; } = public virtual List<CocktailComponent> CocktailComponents { get; set; } =

View File

@ -8,22 +8,29 @@ using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Runtime.Serialization;
namespace BarDatabaseImplement.Models namespace BarDatabaseImplement.Models
{ {
[DataContract]
public class Implementer : IImplementerModel public class Implementer : IImplementerModel
{ {
[DataMember]
public int Id { get; set; } public int Id { get; set; }
[DataMember]
[Required] [Required]
public string ImplementerFIO { get; set; } = string.Empty; public string ImplementerFIO { get; set; } = string.Empty;
[DataMember]
[Required] [Required]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[DataMember]
[Required] [Required]
public int WorkExperience { get; set; } public int WorkExperience { get; set; }
[DataMember]
[Required] [Required]
public int Qualification { get; set; } public int Qualification { get; set; }

View File

@ -4,7 +4,9 @@ using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq; using System.Linq;
using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -12,15 +14,23 @@ namespace BarDatabaseImplement.Models
{ {
public class MessageInfo : IMessageInfoModel public class MessageInfo : IMessageInfoModel
{ {
[NotMapped]
public int Id { get; private set; }
[DataMember]
[Key] [Key]
public string MessageId { get; private set; } = string.Empty; public string MessageId { get; private set; } = string.Empty;
[DataMember]
public int? ClientId { get; private set; } public int? ClientId { get; private set; }
[DataMember]
[Required] [Required]
public string SenderName { get; private set; } = string.Empty; public string SenderName { get; private set; } = string.Empty;
[DataMember]
[Required] [Required]
public DateTime DateDelivery { get; private set; } public DateTime DateDelivery { get; private set; }
[DataMember]
[Required] [Required]
public string Subject { get; private set; } = string.Empty; public string Subject { get; private set; } = string.Empty;
[DataMember]
[Required] [Required]
public string Body { get; private set; } = string.Empty; public string Body { get; private set; } = string.Empty;
public virtual Client? Client { get; private set; } public virtual Client? Client { get; private set; }

View File

@ -9,27 +9,46 @@ using BarDataModels.Models;
using BarDataModels.Enums; using BarDataModels.Enums;
using System.Xml.Linq; using System.Xml.Linq;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
namespace BarDatabaseImplement.Models namespace BarDatabaseImplement.Models
{ {
public class Order : IOrderModel [DataContract]
public class Order : IOrderModel
{ {
public int Id { get; private set; } [DataMember]
[Required] public int Id { get; private set; }
[DataMember]
[Required]
public int ClientId { get; private set; } public int ClientId { get; private set; }
[DataMember]
public int? ImplementerId { get; private set; } public int? ImplementerId { get; private set; }
[DataMember]
[Required] [Required]
public int CocktailId { get; private set; } public int CocktailId { get; private set; }
[Required]
[DataMember]
[Required]
public int Count { get; private set; } public int Count { get; private set; }
[Required]
[DataMember]
[Required]
public double Sum { get; private set; } public double Sum { get; private set; }
[Required]
[DataMember]
[Required]
public OrderStatus Status { get; private set; } public OrderStatus Status { get; private set; }
[Required]
[DataMember]
[Required]
public DateTime DateCreate { get; private set; } = DateTime.Now; public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; }
[DataMember]
public DateTime? DateImplement { get; private set; }
public Client Client { get; set; } public Client Client { get; set; }
public Implementer? Implementer { get; set; } public Implementer? Implementer { get; set; }
public Cocktail Cocktail { get; set; } public Cocktail Cocktail { get; set; }

View File

@ -21,4 +21,8 @@
<ProjectReference Include="..\BarDataModels\BarDataModels.csproj" /> <ProjectReference Include="..\BarDataModels\BarDataModels.csproj" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project> </Project>

View File

@ -0,0 +1,22 @@
using BarContracts.DI;
using BarContracts.StoragesContracts;
using BarFileImplement.Implements;
namespace BarFileImplement
{
public class ImplementationExtension : IImplementationExtension
{
public int Priority => 1;
public void RegisterServices()
{
DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
DependencyManager.Instance.RegisterType<ICocktailStorage, CocktailStorage>();
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
}
}
}

View File

@ -0,0 +1,45 @@
using BarContracts.BindingModels;
using BarContracts.StoragesContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace BarFileImplement.Implements
{
public class BackUpInfo : IBackUpInfo
{
private readonly DataFileSingleton source;
private readonly PropertyInfo[] sourceProperties;
public BackUpInfo()
{
source = DataFileSingleton.GetInstance();
sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
}
public List<T>? GetList<T>() where T : class, new()
{
var requredType = typeof(T);
return (List<T>?)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;
}
}
}

View File

@ -29,27 +29,27 @@ namespace BarFileImplement.Implements
return source.Orders.Where(x => x.Id == model.Id) return source.Orders.Where(x => x.Id == model.Id)
.Select(x => AcessCocktailsStorage(x.GetViewModel)) .Select(x => AcessCocktailsStorage(x.GetViewModel))
.ToList(); .ToList();
if (model.ClientId.HasValue && !model.Id.HasValue) if (model.ClientId.HasValue && !model.Id.HasValue)
{ {
return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
} }
if (!model.ImplementerId.HasValue && !model.Id.HasValue) if (!model.ImplementerId.HasValue && !model.Id.HasValue)
{ {
return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList(); return source.Orders.Where(x => x.ImplementerId == model.ImplementerId).Select(x => x.GetViewModel).ToList();
} }
else else
return source.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList(); return source.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessCocktailsStorage(x.GetViewModel)).ToList();
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
if (model.ImplementerId.HasValue) if (model.ImplementerId.HasValue)
{ {
return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel; return source.Orders.FirstOrDefault(x => x.ImplementerId == model.ImplementerId)?.GetViewModel;
} }
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {
return null; return null;
} }

View File

@ -4,17 +4,26 @@ using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
[DataContract]
public class Client : IClientModel public class Client : IClientModel
{ {
[DataMember]
public int Id { get; set; } public int Id { get; set; }
[DataMember]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[DataMember]
public string Email { get; set; } = string.Empty; public string Email { get; set; } = string.Empty;
[DataMember]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
public static Client? Create(ClientBindingModel? model) public static Client? Create(ClientBindingModel? model)
{ {

View File

@ -2,18 +2,24 @@
using BarContracts.ViewModels; using BarContracts.ViewModels;
using BarDataModels.Models; using BarDataModels.Models;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Xml.Linq; using System.Xml.Linq;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
public class Cocktail : ICocktailModel [DataContract]
public class Cocktail : ICocktailModel
{ {
public int Id { get; private set; } [DataMember]
public string CocktailName { get; private set; } = string.Empty; public int Id { get; private set; }
public double Price { get; private set; } [DataMember]
public string CocktailName { get; private set; } = string.Empty;
[DataMember]
public double Price { get; private set; }
public Dictionary<int, int> Components { get; private set; } = new(); public Dictionary<int, int> Components { get; private set; } = new();
private Dictionary<int, (IComponentModel, int)>? _cocktailComponents = null; private Dictionary<int, (IComponentModel, int)>? _cocktailComponents = null;
public Dictionary<int, (IComponentModel, int)> CocktailComponents [DataMember]
public Dictionary<int, (IComponentModel, int)> CocktailComponents
{ {
get get
{ {

View File

@ -3,15 +3,22 @@ using BarContracts.ViewModels;
using BarDataModels.Models; using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Xml.Linq; using System.Xml.Linq;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
public class Component : IComponentModel [DataContract]
public class Component : IComponentModel
{ {
public int Id { get; private set; } [DataMember]
public string ComponentName { get; private set; } = string.Empty; public int Id { get; private set; }
public double Cost { get; private set; }
[DataMember]
public string ComponentName { get; private set; } = string.Empty;
[DataMember]
public double Cost { get; private set; }
public static Component? Create(ComponentBindingModel model) public static Component? Create(ComponentBindingModel model)
{ {
if (model == null) if (model == null)

View File

@ -7,16 +7,23 @@ using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
using BarContracts.BindingModels; using BarContracts.BindingModels;
using BarContracts.ViewModels; using BarContracts.ViewModels;
using System.Runtime.Serialization;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
[DataContract]
public class Implementer : IImplementerModel public class Implementer : IImplementerModel
{ {
[DataMember]
public int Id { get; set; } public int Id { get; set; }
[DataMember]
public string ImplementerFIO { get; set; } = string.Empty; public string ImplementerFIO { get; set; } = string.Empty;
[DataMember]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[DataMember]
public int WorkExperience { get; set; } public int WorkExperience { get; set; }
[DataMember]
public int Qualification { get; set; } public int Qualification { get; set; }
public static Implementer? Create(ImplementerBindingModel? model) public static Implementer? Create(ImplementerBindingModel? model)
{ {

View File

@ -4,24 +4,35 @@ using BarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Xml.Linq; using System.Xml.Linq;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
[DataContract]
public class MessageInfo : IMessageInfoModel public class MessageInfo : IMessageInfoModel
{ {
[DataMember]
public int Id { get; private set; }
[DataMember]
public string MessageId { get; set; } = string.Empty; public string MessageId { get; set; } = string.Empty;
[DataMember]
public int? ClientId { get; set; } public int? ClientId { get; set; }
[DataMember]
public string SenderName { get; set; } = string.Empty; public string SenderName { get; set; } = string.Empty;
[DataMember]
public DateTime DateDelivery { get; set; } public DateTime DateDelivery { get; set; }
[DataMember]
public string Subject { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty;
[DataMember]
public string Body { get; set; } = string.Empty; public string Body { get; set; } = string.Empty;
public static MessageInfo? Create(MessageInfoBindingModel? model) public static MessageInfo? Create(MessageInfoBindingModel? model)

View File

@ -8,21 +8,39 @@ using BarContracts.ViewModels;
using BarDataModels.Models; using BarDataModels.Models;
using BarDataModels.Enums; using BarDataModels.Enums;
using System.Xml.Linq; using System.Xml.Linq;
using System.Runtime.Serialization;
namespace BarFileImplement.Models namespace BarFileImplement.Models
{ {
public class Order : IOrderModel [DataContract]
public class Order : IOrderModel
{ {
public int Id { get; private set; } [DataMember]
public int CocktailId { get; private set; } public int Id { get; private set; }
public int? ImplementerId { get; private set; }
public int ClientId { get; private set; } [DataMember]
public int Count { get; private set; } public int CocktailId { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } [DataMember]
public DateTime DateCreate { get; private set; } = DateTime.Now; public int? ImplementerId { get; private set; }
public DateTime? DateImplement { get; private set; }
[DataMember]
public int ClientId { get; private set; }
[DataMember]
public int Count { get; private set; }
[DataMember]
public double Sum { get; private set; }
[DataMember]
public OrderStatus Status { get; private set; }
[DataMember]
public DateTime DateCreate { get; private set; } = DateTime.Now;
[DataMember]
public DateTime? DateImplement { get; private set; }
public static Order? Create(OrderBindingModel model) public static Order? Create(OrderBindingModel model)
{ {

View File

@ -21,4 +21,8 @@
<ProjectReference Include="..\BarDataModels\BarDataModels.csproj" /> <ProjectReference Include="..\BarDataModels\BarDataModels.csproj" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="copy /Y &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)ImplementationExtensions\*.dll&quot;" />
</Target>
</Project> </Project>

View File

@ -0,0 +1,22 @@
using BarContracts.DI;
using BarContracts.StoragesContracts;
using BarListImplement.Implements;
namespace BarListImplement
{
internal class ImplementationExtension : IImplementationExtension
{
public int Priority => 0;
public void RegisterServices()
{
DependencyManager.Instance.RegisterType<IClientStorage, ClientStorage>();
DependencyManager.Instance.RegisterType<IComponentStorage, ComponentStorage>();
DependencyManager.Instance.RegisterType<IImplementerStorage, ImplementerStorage>();
DependencyManager.Instance.RegisterType<IMessageInfoStorage, MessageInfoStorage>();
DependencyManager.Instance.RegisterType<IOrderStorage, OrderStorage>();
DependencyManager.Instance.RegisterType<ICocktailStorage, CocktailStorage>();
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
}
}
}

View File

@ -0,0 +1,22 @@
using BarContracts.StoragesContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BarListImplement.Implements
{
public class BackUpInfo : IBackUpInfo
{
public List<T>? GetList<T>() where T : class, new()
{
throw new NotImplementedException();
}
public Type? GetTypeByModelInterface(string modelInterfaceName)
{
throw new NotImplementedException();
}
}
}

View File

@ -31,46 +31,46 @@ namespace BarListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel public List<OrderViewModel> GetFilteredList(OrderSearchModel
model) model)
{ {
var result = new List<OrderViewModel>(); var result = new List<OrderViewModel>();
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {
return result; return result;
} }
else if (model.ClientId.HasValue && !model.Id.HasValue) else if (model.ClientId.HasValue && !model.Id.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.ClientId == model.ClientId) if (order.ClientId == model.ClientId)
{ {
result.Add(AccessCocktailStorage(order.GetViewModel)); result.Add(AccessCocktailStorage(order.GetViewModel));
} }
} }
} }
else if (model.ImplementerId.HasValue && !model.Id.HasValue) else if (model.ImplementerId.HasValue && !model.Id.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.ImplementerId == model.ImplementerId) if (order.ImplementerId == model.ImplementerId)
{ {
result.Add(AccessCocktailStorage(order.GetViewModel)); result.Add(AccessCocktailStorage(order.GetViewModel));
} }
} }
} }
else if (model.Id.HasValue) else if (model.Id.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.Id == model.Id) if (order.Id == model.Id)
{ {
result.Add(AccessCocktailStorage(order.GetViewModel)); result.Add(AccessCocktailStorage(order.GetViewModel));
} }
else if (model.DateFrom.HasValue && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate) else if (model.DateFrom.HasValue && model.DateFrom <= order.DateCreate && model.DateTo >= order.DateCreate)
{ {
result.Add(AccessCocktailStorage(order.GetViewModel)); result.Add(AccessCocktailStorage(order.GetViewModel));
} }
} }
} }
return result; return result;
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {

View File

@ -23,6 +23,8 @@ namespace BarListImplement.Models
public string Body { get; set; } = string.Empty; public string Body { get; set; } = string.Empty;
public int Id => throw new NotImplementedException();
public static MessageInfo? Create(MessageInfoBindingModel? model) public static MessageInfo? Create(MessageInfoBindingModel? model)
{ {
if (model == null) if (model == null)

View File

@ -0,0 +1,46 @@
using BarContracts.Attributes;
namespace BarView
{
internal static class DataGridViewExtension
{
public static void FillAndConfigGrid<T>(this DataGridView grid, List<T>? 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;
}
}
}
}
}
}

View File

@ -35,13 +35,7 @@ namespace BarView
{ {
try try
{ {
var list = _logic.ReadList(null); dataGridView.FillAndConfigGrid(_logic.ReadList(null));
if (list != null)
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка клиентов"); _logger.LogInformation("Загрузка клиентов");
} }
catch (Exception ex) catch (Exception ex)

View File

@ -40,10 +40,10 @@
buttonDel = new Button(); buttonDel = new Button();
buttonSave = new Button(); buttonSave = new Button();
buttonCancel = new Button(); buttonCancel = new Button();
id = new DataGridViewTextBoxColumn(); id = new DataGridViewTextBoxColumn();
CmponentName = new DataGridViewTextBoxColumn(); CmponentName = new DataGridViewTextBoxColumn();
Count = new DataGridViewTextBoxColumn(); Count = new DataGridViewTextBoxColumn();
groupBox1.SuspendLayout(); groupBox1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
SuspendLayout(); SuspendLayout();
// //
@ -163,26 +163,26 @@
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += ButtonCancel_Click; buttonCancel.Click += ButtonCancel_Click;
// //
// id // id
// //
id.HeaderText = "id"; id.HeaderText = "id";
id.Name = "id"; id.Name = "id";
id.Visible = false; id.Visible = false;
// //
// CmponentName // CmponentName
// //
CmponentName.HeaderText = "Компонент"; CmponentName.HeaderText = "Компонент";
CmponentName.Name = "CmponentName"; CmponentName.Name = "CmponentName";
// //
// Count // Count
// //
Count.HeaderText = "Количество"; Count.HeaderText = "Количество";
Count.Name = "Count"; Count.Name = "Count";
// //
// FormCocktail // FormCocktail
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(577, 412); ClientSize = new Size(577, 412);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);

View File

@ -2,6 +2,7 @@
using System.Windows.Forms; using System.Windows.Forms;
using BarContracts.BindingModels; using BarContracts.BindingModels;
using BarContracts.BusinessLogicsContracts; using BarContracts.BusinessLogicsContracts;
using BarContracts.DI;
using BarContracts.SearchModels; using BarContracts.SearchModels;
using BarDataModels.Models; using BarDataModels.Models;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
@ -14,14 +15,14 @@ namespace BarView
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ICocktailLogic _logic; private readonly ICocktailLogic _logic;
private int? _id; private int? _id;
private Dictionary<int, (IComponentModel, int)> _computerComponents; private Dictionary<int, (IComponentModel, int)> _cocktailComponents;
public int Id { set { _id = value; } } public int Id { set { _id = value; } }
public FormCocktail(ILogger<FormCocktail> logger, ICocktailLogic logic) public FormCocktail(ILogger<FormCocktail> logger, ICocktailLogic logic)
{ {
InitializeComponent(); InitializeComponent();
_logger = logger; _logger = logger;
_logic = logic; _logic = logic;
_computerComponents = new Dictionary<int, (IComponentModel, int)>(); _cocktailComponents = new Dictionary<int, (IComponentModel, int)>();
} }
private void FormCocktail_Load(object sender, EventArgs e) private void FormCocktail_Load(object sender, EventArgs e)
{ {
@ -39,7 +40,7 @@ namespace BarView
{ {
textBoxName.Text = view.CocktailName; textBoxName.Text = view.CocktailName;
textBoxPrice.Text = view.Price.ToString(); textBoxPrice.Text = view.Price.ToString();
_computerComponents = view.CocktailComponents ?? new _cocktailComponents = view.CocktailComponents ?? new
Dictionary<int, (IComponentModel, int)>(); Dictionary<int, (IComponentModel, int)>();
LoadData(); LoadData();
} }
@ -57,10 +58,10 @@ namespace BarView
_logger.LogInformation("Загрузка компонент изделия"); _logger.LogInformation("Загрузка компонент изделия");
try try
{ {
if (_computerComponents != null) if (_cocktailComponents != null)
{ {
dataGridView.Rows.Clear(); dataGridView.Rows.Clear();
foreach (var pc in _computerComponents) foreach (var pc in _cocktailComponents)
{ {
dataGridView.Rows.Add(new object[] { pc.Key, dataGridView.Rows.Add(new object[] { pc.Key,
pc.Value.Item1.ComponentName, pc.Value.Item2 }); pc.Value.Item1.ComponentName, pc.Value.Item2 });
@ -76,57 +77,43 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
} }
} }
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormCocktailComponent>();
Program.ServiceProvider?.GetService(typeof(FormCocktailComponent)); if (form.ShowDialog() != DialogResult.OK)
if (service is FormCocktailComponent form) {
{ return;
if (form.ShowDialog() == DialogResult.OK) }
{ _logger.LogInformation("Добавление нового ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
if (form.ComponentModel == null) if (_cocktailComponents.ContainsKey(form.Id))
{ {
return; _cocktailComponents[form.Id] = (form.ComponentModel,
} form.Count);
_logger.LogInformation("Добавление нового компонента:{ ComponentName} - { Count}", }
form.ComponentModel.ComponentName, form.Count); else
if (_computerComponents.ContainsKey(form.Id)) {
{ _cocktailComponents.Add(form.Id, (form.ComponentModel,
_computerComponents[form.Id] = (form.ComponentModel, form.Count));
form.Count); }
} LoadData();
else }
{
_computerComponents.Add(form.Id, (form.ComponentModel,
form.Count));
}
LoadData();
}
}
}
private void ButtonUpd_Click(object sender, EventArgs e) private void ButtonUpd_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormCocktailComponent>();
Program.ServiceProvider?.GetService(typeof(FormCocktailComponent)); int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
if (service is FormCocktailComponent form) form.Id = id;
{ form.Count = _cocktailComponents[id].Item2;
int id = if (form.ShowDialog() == DialogResult.OK)
Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); {
form.Id = id; if (form.ComponentModel == null)
form.Count = _computerComponents[id].Item2; {
if (form.ShowDialog() == DialogResult.OK) return;
{ }
if (form.ComponentModel == null) _logger.LogInformation("Изменение ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
{ _cocktailComponents[form.Id] = (form.ComponentModel, form.Count);
return; LoadData();
} }
_logger.LogInformation("Изменение компонента: { ComponentName} - { Count}",
form.ComponentModel.ComponentName, form.Count);
_computerComponents[form.Id] = (form.ComponentModel, form.Count);
LoadData();
}
}
} }
} }
private void ButtonDel_Click(object sender, EventArgs e) private void ButtonDel_Click(object sender, EventArgs e)
@ -140,7 +127,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
{ {
_logger.LogInformation("Удаление компонента:{ ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value); _logger.LogInformation("Удаление компонента:{ ComponentName} - { Count}", dataGridView.SelectedRows[0].Cells[1].Value);
_computerComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value)); _cocktailComponents?.Remove(Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value));
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -169,7 +156,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
MessageBoxIcon.Error); MessageBoxIcon.Error);
return; return;
} }
if (_computerComponents == null || _computerComponents.Count == 0) if (_cocktailComponents == null || _cocktailComponents.Count == 0)
{ {
MessageBox.Show("Заполните компоненты", "Ошибка", MessageBox.Show("Заполните компоненты", "Ошибка",
MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBoxButtons.OK, MessageBoxIcon.Error);
@ -183,7 +170,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
Id = _id ?? 0, Id = _id ?? 0,
CocktailName = textBoxName.Text, CocktailName = textBoxName.Text,
Price = Convert.ToDouble(textBoxPrice.Text), Price = Convert.ToDouble(textBoxPrice.Text),
CocktailComponents = _computerComponents CocktailComponents = _cocktailComponents
}; };
var operationResult = _id.HasValue ? _logic.Update(model) : var operationResult = _id.HasValue ? _logic.Update(model) :
_logic.Create(model); _logic.Create(model);
@ -211,7 +198,7 @@ pc.Value.Item1.ComponentName, pc.Value.Item2 });
private double CalcPrice() private double CalcPrice()
{ {
double price = 0; double price = 0;
foreach (var elem in _computerComponents) foreach (var elem in _cocktailComponents)
{ {
price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2); price += ((elem.Value.Item1?.Cost ?? 0) * elem.Value.Item2);
} }

View File

@ -88,10 +88,10 @@
buttonCancel.Text = "Отмена"; buttonCancel.Text = "Отмена";
buttonCancel.UseVisualStyleBackColor = true; buttonCancel.UseVisualStyleBackColor = true;
buttonCancel.Click += ButtonCancel_Click; buttonCancel.Click += ButtonCancel_Click;
// //
// FormCocktailComponent // FormCocktailComponent
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(353, 126); ClientSize = new Size(353, 126);
Controls.Add(buttonCancel); Controls.Add(buttonCancel);
@ -100,9 +100,9 @@
Controls.Add(textBoxCount); Controls.Add(textBoxCount);
Controls.Add(label2); Controls.Add(label2);
Controls.Add(label1); Controls.Add(label1);
Name = "FormCocktailComponent"; Name = "FormCocktailComponent";
Text = "Компоненты коктейля"; Text = "Компоненты коктейля";
ResumeLayout(false); ResumeLayout(false);
PerformLayout(); PerformLayout();
} }

View File

@ -1,5 +1,6 @@
using BarContracts.BindingModels; using BarContracts.BindingModels;
using BarContracts.BusinessLogicsContracts; using BarContracts.BusinessLogicsContracts;
using BarContracts.DI;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -33,15 +34,8 @@ namespace BarView
{ {
try try
{ {
var list = _logic.ReadList(null); dataGridView.FillAndConfigGrid(_logic.ReadList(null));
if (list != null) _logger.LogInformation("Загрузка коктейля");
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["CocktailName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
dataGridView.Columns["CocktailComponents"].Visible = false;
}
_logger.LogInformation("Загрузка коктейля");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -52,30 +46,23 @@ namespace BarView
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormCocktail)); var form = DependencyManager.Instance.Resolve<FormCocktail>();
if (service is FormCocktail form) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{ }
LoadData();
}
}
} }
private void ButtonUpdate_Click(object sender, EventArgs e) private void ButtonUpdate_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormCocktail)); var form = DependencyManager.Instance.Resolve<FormCocktail>();
if (service is FormCocktail form) form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ if (form.ShowDialog() == DialogResult.OK)
var tmp = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); {
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); LoadData();
if (form.ShowDialog() == DialogResult.OK) }
{
LoadData();
}
}
} }
} }

View File

@ -2,6 +2,7 @@
using BarContracts.BusinessLogicsContracts; using BarContracts.BusinessLogicsContracts;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Windows.Forms; using System.Windows.Forms;
using BarContracts.DI;
namespace BarView namespace BarView
{ {
@ -42,31 +43,23 @@ namespace BarView
} }
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormComponent>();
Program.ServiceProvider?.GetService(typeof(FormComponent)); if (form.ShowDialog() == DialogResult.OK)
if (service is FormComponent form)
{ {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{ }
LoadData();
}
}
} }
private void ButtonUpd_Click(object sender, EventArgs e) private void ButtonUpd_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormComponent>();
Program.ServiceProvider?.GetService(typeof(FormComponent));
if (service is FormComponent form) form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ if (form.ShowDialog() == DialogResult.OK)
form.Id = {
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); LoadData();
if (form.ShowDialog() == DialogResult.OK) }
{
LoadData();
}
}
} }
} }
private void ButtonDel_Click(object sender, EventArgs e) private void ButtonDel_Click(object sender, EventArgs e)

View File

@ -29,14 +29,7 @@ namespace BarView
{ {
try try
{ {
var list = _logic.ReadList(null); dataGridView.FillAndConfigGrid(_logic.ReadList(null));
if (list != null)
{
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["ImplementerFIO"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка исполнителей"); _logger.LogInformation("Загрузка исполнителей");
} }
catch (Exception ex) catch (Exception ex)

View File

@ -33,14 +33,7 @@ namespace BarView
{ {
try try
{ {
var list = _logic.ReadList(null); dataGridView.FillAndConfigGrid(_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;
}
_logger.LogInformation("Loading materials"); _logger.LogInformation("Loading materials");
} }
catch (Exception ex) catch (Exception ex)

View File

@ -1,220 +1,225 @@
namespace BarView namespace BarView
{ {
partial class FormMain partial class FormMain
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;
/// <summary> /// <summary>
/// Clean up any resources being used. /// Clean up any resources being used.
/// </summary> /// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing) protected override void Dispose(bool disposing)
{ {
if (disposing && (components != null)) if (disposing && (components != null))
{ {
components.Dispose(); components.Dispose();
} }
base.Dispose(disposing); base.Dispose(disposing);
} }
#region Windows Form Designer generated code #region Windows Form Designer generated code
/// <summary> /// <summary>
/// Required method for Designer support - do not modify /// Required method for Designer support - do not modify
/// the contents of this method with the code editor. /// the contents of this method with the code editor.
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
buttonCreateOrder = new Button(); buttonCreateOrder = new Button();
buttonIssuedOrder = new Button(); buttonIssuedOrder = new Button();
buttonRef = new Button(); buttonRef = new Button();
dataGridView = new DataGridView(); dataGridView = new DataGridView();
menuStrip = new MenuStrip(); menuStrip = new MenuStrip();
компонентыToolStripMenuItem = new ToolStripMenuItem(); компонентыToolStripMenuItem = new ToolStripMenuItem();
компонентыToolStripMenuItem1 = new ToolStripMenuItem(); компонентыToolStripMenuItem1 = new ToolStripMenuItem();
изделияToolStripMenuItem = new ToolStripMenuItem(); изделияToolStripMenuItem = new ToolStripMenuItem();
отчетыToolStripMenuItem = new ToolStripMenuItem(); клиентToolStripMenuItem = new ToolStripMenuItem();
клиентToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); исполнителиToolStripMenuItem = new ToolStripMenuItem();
исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
почтовыеПисьмаToolStripMenuItem = new ToolStripMenuItem(); почтовыеПисьмаToolStripMenuItem = new ToolStripMenuItem();
запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem();
ComponentsToolStripMenuItem = new ToolStripMenuItem(); ComponentsToolStripMenuItem = new ToolStripMenuItem();
ComponentCocktailToolStripMenuItem = new ToolStripMenuItem(); ComponentCocktailToolStripMenuItem = new ToolStripMenuItem();
OrdersToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); запускРаботToolStripMenuItem = new ToolStripMenuItem();
menuStrip.SuspendLayout(); создатьБекапToolStripMenuItem = new ToolStripMenuItem();
SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
// menuStrip.SuspendLayout();
// buttonCreateOrder SuspendLayout();
//
buttonCreateOrder.Location = new Point(751, 34);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(158, 32);
buttonCreateOrder.TabIndex = 1;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
buttonCreateOrder.Click += ButtonCreateOrder_Click;
//
// buttonIssuedOrder
//
buttonIssuedOrder.Location = new Point(751, 148);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(158, 32);
buttonIssuedOrder.TabIndex = 4;
buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true;
buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
//
// buttonRef
//
buttonRef.Location = new Point(751, 186);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(158, 32);
buttonRef.TabIndex = 5;
buttonRef.Text = "Обновить список";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += ButtonRef_Click;
//
// dataGridView
//
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(-4, 24);
dataGridView.Name = "dataGridView";
dataGridView.RowTemplate.Height = 25;
dataGridView.Size = new Size(749, 285);
dataGridView.TabIndex = 6;
//
// menuStrip
//
menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem});
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(921, 24);
menuStrip.TabIndex = 7;
menuStrip.Text = "menuStrip";
//
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem1, изделияToolStripMenuItem,
клиентToolStripMenuItem, исполнителиToolStripMenuItem, почтовыеПисьмаToolStripMenuItem });
компонентыToolStripMenuItem.Name = омпонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(94, 20);
компонентыToolStripMenuItem.Text = "Справочники";
//
// компонентыToolStripMenuItem1
//
компонентыToolStripMenuItem1.Name = омпонентыToolStripMenuItem1";
компонентыToolStripMenuItem1.Size = new Size(145, 22);
компонентыToolStripMenuItem1.Text = "Компоненты";
компонентыToolStripMenuItem1.Click += КомпонентыToolStripMenuItem_Click;
//
// изделияToolStripMenuItem
//
изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
изделияToolStripMenuItem.Size = new Size(145, 22);
изделияToolStripMenuItem.Text = "Изделия";
изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
//
// отчетыToolStripMenuItem
//
отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentCocktailToolStripMenuItem, OrdersToolStripMenuItem});
отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
отчетыToolStripMenuItem.Size = new Size(60, 20);
отчетыToolStripMenuItem.Text = "Отчеты";
//
// ComponentsToolStripMenuItem
//
ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
ComponentsToolStripMenuItem.Size = new Size(218, 22);
ComponentsToolStripMenuItem.Text = "Список компонентов";
ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
//
// ComponentCocktailToolStripMenuItem
//
ComponentCocktailToolStripMenuItem.Name = "ComponentCocktailToolStripMenuItem";
ComponentCocktailToolStripMenuItem.Size = new Size(218, 22);
ComponentCocktailToolStripMenuItem.Text = "Компоненты по изделиям";
ComponentCocktailToolStripMenuItem.Click += ComponentCocktailToolStripMenuItem_Click;
// //
// OrdersToolStripMenuItem // buttonCreateOrder
//
buttonCreateOrder.Location = new Point(1056, 27);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(158, 32);
buttonCreateOrder.TabIndex = 1;
buttonCreateOrder.Text = "Создать заказ";
buttonCreateOrder.UseVisualStyleBackColor = true;
buttonCreateOrder.Click += ButtonCreateOrder_Click;
//
// buttonIssuedOrder
//
buttonIssuedOrder.Location = new Point(1056, 65);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(158, 32);
buttonIssuedOrder.TabIndex = 4;
buttonIssuedOrder.Text = "Заказ выдан";
buttonIssuedOrder.UseVisualStyleBackColor = true;
buttonIssuedOrder.Click += ButtonIssuedOrder_Click;
//
// buttonRef
//
buttonRef.Location = new Point(1056, 103);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(158, 32);
buttonRef.TabIndex = 5;
buttonRef.Text = "Обновить список";
buttonRef.UseVisualStyleBackColor = true;
buttonRef.Click += ButtonRef_Click;
//
// dataGridView
//
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
dataGridView.Location = new Point(-4, 24);
dataGridView.Name = "dataGridView";
dataGridView.RowTemplate.Height = 25;
dataGridView.Size = new Size(1054, 285);
dataGridView.TabIndex = 6;
//
// menuStrip
//
menuStrip.Items.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, отчетыToolStripMenuItem, запускРаботToolStripMenuItem, создатьБекапToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
menuStrip.Size = new Size(1226, 24);
menuStrip.TabIndex = 7;
menuStrip.Text = "menuStrip";
//
// компонентыToolStripMenuItem
//
компонентыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem1, изделияToolStripMenuItem, клиентToolStripMenuItem, исполнителиToolStripMenuItem, почтовыеПисьмаToolStripMenuItem });
компонентыToolStripMenuItem.Name = омпонентыToolStripMenuItem";
компонентыToolStripMenuItem.Size = new Size(94, 20);
компонентыToolStripMenuItem.Text = "Справочники";
//
// компонентыToolStripMenuItem1
//
компонентыToolStripMenuItem1.Name = омпонентыToolStripMenuItem1";
компонентыToolStripMenuItem1.Size = new Size(173, 22);
компонентыToolStripMenuItem1.Text = "Компоненты";
компонентыToolStripMenuItem1.Click += КомпонентыToolStripMenuItem_Click;
//
// изделияToolStripMenuItem
//
изделияToolStripMenuItem.Name = "изделияToolStripMenuItem";
изделияToolStripMenuItem.Size = new Size(173, 22);
изделияToolStripMenuItem.Text = "Изделия";
изделияToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click;
// //
//
// клиентToolStripMenuItem // клиентToolStripMenuItem
// //
this.клиентToolStripMenuItem.Name = "клиентToolStripMenuItem"; клиентToolStripMenuItem.Name = "клиентToolStripMenuItem";
this.клиентToolStripMenuItem.Size = new System.Drawing.Size(149, 22); клиентToolStripMenuItem.Size = new Size(173, 22);
this.клиентToolStripMenuItem.Text = "Клиент"; клиентToolStripMenuItem.Text = "Клиент";
this.клиентToolStripMenuItem.Click += new System.EventHandler(this.ClientToolStripMenuItem_Click); клиентToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
// //
// исполнителиToolStripMenuItem // исполнителиToolStripMenuItem
// //
this.исполнителиToolStripMenuItem.Name = сполнителиToolStripMenuItem"; исполнителиToolStripMenuItem.Name = сполнителиToolStripMenuItem";
this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(149, 22); исполнителиToolStripMenuItem.Size = new Size(173, 22);
this.исполнителиToolStripMenuItem.Text = "Исполнители"; исполнителиToolStripMenuItem.Text = "Исполнители";
this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.employersToolStripMenuItem_Click); исполнителиToolStripMenuItem.Click += employersToolStripMenuItem_Click;
// //
// почтовыеПисьмаToolStripMenuItem // почтовыеПисьмаToolStripMenuItem
// //
почтовыеПисьмаToolStripMenuItem.Name = "почтовыеПисьмаToolStripMenuItem"; почтовыеПисьмаToolStripMenuItem.Name = "почтовыеПисьмаToolStripMenuItem";
почтовыеПисьмаToolStripMenuItem.Size = new Size(149, 22); почтовыеПисьмаToolStripMenuItem.Size = new Size(173, 22);
почтовыеПисьмаToolStripMenuItem.Text = "ПочтовыеПисьма"; почтовыеПисьмаToolStripMenuItem.Text = "ПочтовыеПисьма";
почтовыеПисьмаToolStripMenuItem.Click += emailsToolStripMenuItem_Click; почтовыеПисьмаToolStripMenuItem.Click += emailsToolStripMenuItem_Click;
// //
// отчетыToolStripMenuItem
//
отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsToolStripMenuItem, ComponentCocktailToolStripMenuItem, OrdersToolStripMenuItem });
отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
отчетыToolStripMenuItem.Size = new Size(60, 20);
отчетыToolStripMenuItem.Text = "Отчеты";
//
// ComponentsToolStripMenuItem
//
ComponentsToolStripMenuItem.Name = "ComponentsToolStripMenuItem";
ComponentsToolStripMenuItem.Size = new Size(218, 22);
ComponentsToolStripMenuItem.Text = "Список компонентов";
ComponentsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click;
//
// ComponentCocktailToolStripMenuItem
//
ComponentCocktailToolStripMenuItem.Name = "ComponentCocktailToolStripMenuItem";
ComponentCocktailToolStripMenuItem.Size = new Size(218, 22);
ComponentCocktailToolStripMenuItem.Text = "Компоненты по изделиям";
ComponentCocktailToolStripMenuItem.Click += ComponentCocktailToolStripMenuItem_Click;
//
// OrdersToolStripMenuItem
//
OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
OrdersToolStripMenuItem.Size = new Size(218, 22);
OrdersToolStripMenuItem.Text = "Список заказов";
OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
// //
// запускРаботToolStripMenuItem // запускРаботToolStripMenuItem
// //
this.запускРаботToolStripMenuItem.Name = апускРаботToolStripMenuItem"; запускРаботToolStripMenuItem.Name = апускРаботToolStripMenuItem";
this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(92, 20); запускРаботToolStripMenuItem.Size = new Size(92, 20);
this.запускРаботToolStripMenuItem.Text = "Запуск работ"; запускРаботToolStripMenuItem.Text = "Запуск работ";
this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.startWorkToolStripMenuItem_Click); запускРаботToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
// //
// // создатьБекапToolStripMenuItem
OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; //
OrdersToolStripMenuItem.Size = new Size(218, 22); создатьБекапToolStripMenuItem.Name = "создатьБекапToolStripMenuItem";
OrdersToolStripMenuItem.Text = "Список заказов"; создатьБекапToolStripMenuItem.Size = new Size(97, 20);
OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; создатьБекапToolStripMenuItem.Text = "Создать Бекап";
// создатьБекапToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click;
// FormMain //
// // FormMain
AutoScaleDimensions = new SizeF(7F, 15F); //
AutoScaleMode = AutoScaleMode.Font; AutoScaleDimensions = new SizeF(7F, 15F);
ClientSize = new Size(921, 310); AutoScaleMode = AutoScaleMode.Font;
Controls.Add(dataGridView); ClientSize = new Size(1226, 310);
Controls.Add(buttonRef); Controls.Add(dataGridView);
Controls.Add(buttonIssuedOrder); Controls.Add(buttonRef);
Controls.Add(buttonCreateOrder); Controls.Add(buttonIssuedOrder);
Controls.Add(menuStrip); Controls.Add(buttonCreateOrder);
MainMenuStrip = menuStrip; Controls.Add(menuStrip);
Name = "FormMain"; MainMenuStrip = menuStrip;
Text = "Бар"; Name = "FormMain";
Load += FormMain_Load; Text = "Бар";
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); Load += FormMain_Load;
menuStrip.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
menuStrip.PerformLayout(); menuStrip.ResumeLayout(false);
ResumeLayout(false); menuStrip.PerformLayout();
PerformLayout(); ResumeLayout(false);
} PerformLayout();
}
#endregion #endregion
private Button buttonCreateOrder; private Button buttonCreateOrder;
private Button buttonIssuedOrder; private Button buttonIssuedOrder;
private Button buttonRef; private Button buttonRef;
private DataGridView dataGridView; private DataGridView dataGridView;
private MenuStrip menuStrip; private MenuStrip menuStrip;
private ToolStripMenuItem компонентыToolStripMenuItem; private ToolStripMenuItem компонентыToolStripMenuItem;
private ToolStripMenuItem компонентыToolStripMenuItem1; private ToolStripMenuItem компонентыToolStripMenuItem1;
private ToolStripMenuItem изделияToolStripMenuItem; private ToolStripMenuItem изделияToolStripMenuItem;
private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem отчетыToolStripMenuItem;
private ToolStripMenuItem ComponentsToolStripMenuItem; private ToolStripMenuItem ComponentsToolStripMenuItem;
private ToolStripMenuItem ComponentCocktailToolStripMenuItem; private ToolStripMenuItem ComponentCocktailToolStripMenuItem;
private ToolStripMenuItem OrdersToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem;
private ToolStripMenuItem клиентToolStripMenuItem; private ToolStripMenuItem клиентToolStripMenuItem;
private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripMenuItem исполнителиToolStripMenuItem;
private ToolStripMenuItem запускРаботToolStripMenuItem; private ToolStripMenuItem запускРаботToolStripMenuItem;
private ToolStripMenuItem почтовыеПисьмаToolStripMenuItem; private ToolStripMenuItem почтовыеПисьмаToolStripMenuItem;
private ToolStripMenuItem создатьБекапToolStripMenuItem;
} }
} }

View File

@ -1,180 +1,174 @@
using BarBusinessLogic; using BarBusinessLogic;
using BarContracts.BindingModels; using BarContracts.BindingModels;
using BarContracts.BusinessLogicsContracts; using BarContracts.BusinessLogicsContracts;
using BarContracts.DI;
using BarDataModels.Enums; using BarDataModels.Enums;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Windows.Forms; using System.Windows.Forms;
namespace BarView namespace BarView
{ {
public partial class FormMain : Form public partial class FormMain : Form
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly IOrderLogic _orderLogic; private readonly IOrderLogic _orderLogic;
private readonly IReportLogic _reportLogic; private readonly IReportLogic _reportLogic;
private readonly IWorkProcess _workProcess; private readonly IWorkProcess _workProcess;
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) private readonly IBackUpLogic _backUpLogic;
{ public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
InitializeComponent(); {
_logger = logger; InitializeComponent();
_orderLogic = orderLogic; _logger = logger;
_reportLogic = reportLogic; _orderLogic = orderLogic;
_reportLogic = reportLogic;
_workProcess = workProcess; _workProcess = workProcess;
_backUpLogic = backUpLogic;
} }
private void FormMain_Load(object sender, EventArgs e) private void FormMain_Load(object sender, EventArgs e)
{ {
LoadData(); LoadData();
} }
private void LoadData() private void LoadData()
{ {
_logger.LogInformation("Загрузка заказов"); _logger.LogInformation("Загрузка заказов");
try try
{ {
var list = _orderLogic.ReadList(null); dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
if (list != null) _logger.LogInformation("Загрузка заказов");
{ }
dataGridView.DataSource = list; catch (Exception ex)
dataGridView.Columns["CocktailId"].Visible = false; {
dataGridView.Columns["ClientId"].Visible = false; _logger.LogError(ex, "Ошибка загрузки заказов");
dataGridView.Columns["ImplementerId"].Visible = false; MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs
e)
{
var form = DependencyManager.Instance.Resolve<FormComponents>();
form.ShowDialog();
}
private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormCocktails>();
form.ShowDialog();
}
private void ButtonCreateOrder_Click(object sender, EventArgs e)
{
var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
form.ShowDialog();
LoadData();
}
private OrderBindingModel CreateBindingModel(int id, bool isDone = false)
{
return new OrderBindingModel
{
Id = id,
CocktailId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CocktailId"].Value),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
};
}
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
{
if (dataGridView.SelectedRows.Count == 1)
{
int id =
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
id);
try
{
var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id));
if (!operationResult)
{
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
}
_logger.LogInformation("Заказ №{id} выдан", id);
LoadData();
} }
_logger.LogInformation("Загрузка заказов"); catch (Exception ex)
} {
catch (Exception ex) _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
{ MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
_logger.LogError(ex, "Ошибка загрузки заказов"); MessageBoxIcon.Error);
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); }
} }
} }
private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs private void ButtonRef_Click(object sender, EventArgs e)
e) {
{ LoadData();
var service = }
Program.ServiceProvider?.GetService(typeof(FormComponents));
if (service is FormComponents form)
{
form.ShowDialog();
}
}
private void ИзделияToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormCocktails));
if (service is FormCocktails form)
{
form.ShowDialog();
}
}
private void ButtonCreateOrder_Click(object sender, EventArgs e) private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); if (dialog.ShowDialog() == DialogResult.OK)
if (service is FormCreateOrder form) {
{ _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
form.ShowDialog(); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
LoadData(); }
} }
}
private OrderBindingModel CreateBindingModel(int id, bool isDone = false)
{
return new OrderBindingModel
{
Id = id,
CocktailId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["CocktailId"].Value),
Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
};
}
private void ButtonIssuedOrder_Click(object sender, EventArgs e) private void ComponentCocktailToolStripMenuItem_Click(object sender, EventArgs e)
{ {
if (dataGridView.SelectedRows.Count == 1) var form = DependencyManager.Instance.Resolve<FormReportCocktailComponents>();
{ form.ShowDialog();
int id = }
Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'",
id);
try
{
var operationResult = _orderLogic.DeliveryOrder(CreateBindingModel(id));
if (!operationResult)
{
throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
}
_logger.LogInformation("Заказ №{id} выдан", id);
LoadData();
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка отметки о выдачи заказа");
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
}
private void ButtonRef_Click(object sender, EventArgs e)
{
LoadData();
}
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e) private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; var form = DependencyManager.Instance.Resolve<FormReportOrders>();
if (dialog.ShowDialog() == DialogResult.OK) form.ShowDialog();
{ }
_reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
private void ComponentCocktailToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportCocktailComponents));
if (service is FormReportCocktailComponents form)
{
form.ShowDialog();
}
}
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
{
var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
if (service is FormReportOrders form)
{
form.ShowDialog();
}
}
private void employersToolStripMenuItem_Click(object sender, EventArgs e) private void employersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); var form = DependencyManager.Instance.Resolve<FormImplementers>();
if (service is FormImplementers form) form.ShowDialog();
{ }
form.ShowDialog();
}
}
private void startWorkToolStripMenuItem_Click(object sender, EventArgs e) private void startWorkToolStripMenuItem_Click(object sender, EventArgs e)
{ {
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); _workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
private void ClientToolStripMenuItem_Click(object sender, EventArgs e) private void ClientToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormClients)); var form = DependencyManager.Instance.Resolve<FormClients>();
if (service is FormClients form) form.ShowDialog();
{
form.ShowDialog();
}
} }
private void emailsToolStripMenuItem_Click(object sender, EventArgs e) private void emailsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormMail)); var form = DependencyManager.Instance.Resolve<FormMail>();
if (service is FormMail form) 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);
} }
} }
} }

View File

@ -8,6 +8,7 @@ using BarBusinessLogic.OfficePackage.Implements;
using BarBusinessLogic.OfficePackage; using BarBusinessLogic.OfficePackage;
using BarBusinessLogic.BusinessLogics; using BarBusinessLogic.BusinessLogics;
using BarBusinessLogic.MailWorker; using BarBusinessLogic.MailWorker;
using BarContracts.DI;
namespace BarView namespace BarView
{ {
@ -24,12 +25,10 @@ namespace BarView
// To customize application configuration such as set high DPI settings or default font, // To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration. // see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize(); ApplicationConfiguration.Initialize();
var services = new ServiceCollection(); InitDependency();
ConfigureServices(services);
_serviceProvider = services.BuildServiceProvider();
try try
{ {
var mailSender = _serviceProvider.GetService<AbstractMailWorker>(); var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
mailSender?.MailConfig(new() mailSender?.MailConfig(new()
{ {
MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
@ -43,56 +42,53 @@ namespace BarView
} }
catch (Exception ex) catch (Exception ex)
{ {
var logger = _serviceProvider.GetService<ILogger>(); var logger = DependencyManager.Instance.Resolve<ILogger>();
logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé"); logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
} }
Application.Run(_serviceProvider.GetRequiredService<FormMain>()); Application.Run(DependencyManager.Instance.Resolve<FormMain>());
} }
private static void ConfigureServices(ServiceCollection services) private static void InitDependency()
{ {
services.AddLogging(option => DependencyManager.InitDependency();
{
DependencyManager.Instance.AddLogging(option =>
{
option.SetMinimumLevel(LogLevel.Information); option.SetMinimumLevel(LogLevel.Information);
option.AddNLog("nlog.config"); option.AddNLog("nlog.config");
}); });
services.AddTransient<IComponentStorage, ComponentStorage>(); DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
services.AddTransient<IOrderStorage, OrderStorage>(); DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
services.AddTransient<ICocktailStorage, CocktailStorage>(); DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
services.AddTransient<IClientStorage, ClientStorage>(); DependencyManager.Instance.RegisterType<ICocktailLogic, CocktailLogic>();
services.AddTransient<IImplementerStorage, ImplementerStorage>(); DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
services.AddTransient<IMessageInfoStorage, MessageInfoStorage>(); DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
services.AddTransient<IComponentLogic, ComponentLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
services.AddTransient<IOrderLogic, OrderLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<IClientLogic, ClientLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<ICocktailLogic, CocktailLogic>(); DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
services.AddTransient<IReportLogic, ReportLogic>();
services.AddTransient<IComponentLogic, ComponentLogic>();
services.AddTransient<IImplementerLogic, ImplementerLogic>();
services.AddTransient<IWorkProcess, WorkModeling>();
services.AddSingleton<AbstractMailWorker, MailKitWorker>();
services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
services.AddTransient<AbstractSaveToWord, SaveToWord>(); DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<FormMain>(); DependencyManager.Instance.RegisterType<FormMain>();
services.AddTransient<FormComponent>(); DependencyManager.Instance.RegisterType<FormComponent>();
services.AddTransient<FormComponents>(); DependencyManager.Instance.RegisterType<FormComponents>();
services.AddTransient<FormCreateOrder>(); DependencyManager.Instance.RegisterType<FormCreateOrder>();
services.AddTransient<FormCocktail>(); DependencyManager.Instance.RegisterType<FormCocktail>();
services.AddTransient<FormCocktailComponent>(); DependencyManager.Instance.RegisterType<FormCocktailComponent>();
services.AddTransient<FormCocktails>(); DependencyManager.Instance.RegisterType<FormCocktails>();
services.AddTransient<FormReportCocktailComponents>(); DependencyManager.Instance.RegisterType<FormReportCocktailComponents>();
services.AddTransient<FormReportOrders>(); DependencyManager.Instance.RegisterType<FormReportOrders>();
services.AddTransient<FormImplementers>(); DependencyManager.Instance.RegisterType<FormImplementers>();
services.AddTransient<FormImplementer>(); DependencyManager.Instance.RegisterType<FormImplementer>();
services.AddTransient<FormClients>();
services.AddTransient<FormMail>(); DependencyManager.Instance.RegisterType<FormClients>();
DependencyManager.Instance.RegisterType<FormMail>();
} }
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck(); private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
} }
} }