дон, доделать файлы и список

This commit is contained in:
ValAnn 2024-05-22 13:07:02 +04:00
parent 5cb4a18742
commit d062463466
49 changed files with 1236 additions and 584 deletions

View File

@ -0,0 +1,102 @@
using Microsoft.Extensions.Logging;
using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.StoragesContracts;
using SushiBarDataModels;
using System;
using System.Collections.Generic;
using System.IO.Compression;
using System.Linq;
using System.Reflection;
using System.Runtime.Serialization.Json;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarBusinessLogic
{
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,25 @@
namespace SushiBarContracts.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 SushiBarContracts.Attributes
{
public enum GridViewAutoSize
{
NotSet = 0,
None = 1,
ColumnHeader = 2,
AllCellsExceptHeader = 4,
AllCells = 6,
DisplayedCellsExceptHeader = 8,
DisplayedCells = 10,
Fill = 16
}
}

View File

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

View File

@ -15,5 +15,7 @@ namespace SushiBarContracts.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 DateTime DateDelivery { get; set; } public DateTime DateDelivery { get; set; }
public int Id => throw new NotImplementedException();
} }
} }

View File

@ -0,0 +1,14 @@
using SushiBarContracts.BindingModels;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarContracts.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 SushiBarContracts.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 SushiBarContracts.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 SushiBarContracts.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 SushiBarContracts.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.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarContracts.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 SushiBarContracts.StoragesContracts
{
public interface IBackUpInfo
{
List<T>? GetList<T>() where T : class, new();
Type? GetTypeByModelInterface(string modelInterfaceName);
}
}

View File

@ -1,16 +1,20 @@
using SushiBarDataModels.Models; using SushiBarDataModels.Models;
using System.ComponentModel; using System.ComponentModel;
using SushiBarContracts.Attributes;
using SushiBarDataModels.Models;
namespace SushiBar.ViewModels namespace SushiBar.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 SushiBarDataModels.Models; using SushiBarContracts.Attributes;
using SushiBarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,12 +11,13 @@ namespace SushiBarContracts.ViewModels
{ {
public class ComponentViewModel : IComponentModel public class ComponentViewModel : IComponentModel
{ {
public int Id { get; set; } [Column(visible: false)]
public int Id { get; set; }
[DisplayName("Название компонента")]
public string ComponentName { get; set; } = string.Empty; [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ComponentName { get; set; } = string.Empty;
[DisplayName("Цена")]
public double Cost { get; set; } [Column(title: "Цена", width: 150)]
public double Cost { get; set; }
} }
} }

View File

@ -1,4 +1,5 @@
using SushiBarDataModels.Models; using SushiBarContracts.Attributes;
using SushiBarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,18 +11,20 @@ namespace SushiBarContracts.ViewModels
{ {
public class ImplementerViewModel : IImplementerModel public class ImplementerViewModel : IImplementerModel
{ {
public int Id { get; set; } [Column(visible: false)]
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

@ -1,4 +1,5 @@
using SushiBarDataModels.Models; using SushiBarContracts.Attributes;
using SushiBarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,20 +11,25 @@ namespace SushiBarContracts.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 SushiBarDataModels.Enums; using SushiBarContracts.Attributes;
using SushiBarDataModels.Enums;
using SushiBarDataModels.Models; using SushiBarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@ -11,34 +12,43 @@ namespace SushiBarContracts.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? ImplementerId { get; set; }
[DisplayName("Исполнитель")]
public string? ImplementerFIO { get; set; } = null;
public int SushiId { get; set; }
public int ClientId { get; set; }
public string ClientEmail { get; set; } = string.Empty;
[DisplayName("ФИО клиента")] [Column(visible: false)]
public string ClientFIO { get; set; } = string.Empty; public int ClientId { get; set; }
[DisplayName("Изделие")] [Column(title: "Имя клиента", width: 190)]
public string SushiName { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[DisplayName("Количество")] [Column(visible: false)]
public int Count { get; set; } public string ClientEmail { get; set; } = string.Empty;
[DisplayName("Сумма")] [Column(visible: false)]
public double Sum { get; set; } public int? ImplementerId { get; set; }
[DisplayName("Статус")] [Column(title: "Исполнитель", width: 150)]
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; public string? ImplementerFIO { get; set; } = null;
[DisplayName("Дата создания")] [Column(visible: false)]
public DateTime DateCreate { get; set; } = DateTime.Now; public int SushiId { get; set; }
[DisplayName("Дата выполнения")] [Column(title: "Суши", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public DateTime? DateImplement { get; set; } public string SushiName { get; set; } = string.Empty;
}
[Column(title: "Количество", width: 100)]
public int Count { get; set; }
[Column(title: "Сумма", width: 120)]
public double Sum { get; set; }
[Column(title: "Статус", width: 70)]
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
[Column(title: "Дата создания", width: 120)]
public DateTime DateCreate { get; set; } = DateTime.Now;
[Column(title: "Дата выполнения", width: 120)]
public DateTime? DateImplement { get; set; }
}
} }

View File

@ -1,4 +1,5 @@
using SushiBarDataModels.Models; using SushiBarContracts.Attributes;
using SushiBarDataModels.Models;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -10,12 +11,14 @@ namespace SushiBarContracts.ViewModels
{ {
public class SushiViewModel : ISushiModel public class SushiViewModel : ISushiModel
{ {
public int Id { get; set; } [Column(visible: false)]
[DisplayName("Название изделия")] public int Id { get; set; }
public string SushiName { get; set; } = string.Empty; [Column(title: "Название сущи", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[DisplayName("Цена")] public string SushiName { get; set; } = string.Empty;
public double Price { get; set; } [Column(title: "Цена", width: 70)]
public Dictionary<int, (IComponentModel, int)> SushiComponents public double Price { get; set; }
[Column(visible: false)]
public Dictionary<int, (IComponentModel, int)> SushiComponents
{ {
get; get;
set; set;

View File

@ -6,8 +6,8 @@ using System.Threading.Tasks;
namespace SushiBarDataModels.Models namespace SushiBarDataModels.Models
{ {
public interface IMessageInfoModel public interface IMessageInfoModel : IId
{ {
string MessageId { get; } string MessageId { get; }
int? ClientId { get; } int? ClientId { get; }
string SenderName { get; } string SenderName { get; }

View File

@ -0,0 +1,28 @@
using SushiBar.StoragesContracts;
using SushiBarContracts.DI;
using SushiBarContracts.StoragesContracts;
using SushiBarDatabaseImplement.Implements;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarDatabaseImplement
{
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<ISushiStorage, SushiStorage>();
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
}
}
}

View File

@ -0,0 +1,32 @@
using SushiBarContracts.StoragesContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarDatabaseImplement.Implements
{
public class BackUpInfo : IBackUpInfo
{
public List<T>? GetList<T>() where T : class, new()
{
using var context = new SushiBarDatabase();
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

@ -12,7 +12,7 @@ using SushiBarDatabaseImplement;
namespace SushiBarDatabaseImplement.Migrations namespace SushiBarDatabaseImplement.Migrations
{ {
[DbContext(typeof(SushiBarDatabase))] [DbContext(typeof(SushiBarDatabase))]
[Migration("20240508104959_InitCreate")] [Migration("20240522080218_InitCreate")]
partial class InitCreate partial class InitCreate
{ {
/// <inheritdoc /> /// <inheritdoc />

View File

@ -9,29 +9,37 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; 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;
namespace SushiBarDatabaseImplement.Models namespace SushiBarDatabaseImplement.Models
{ {
[DataContract]
public class Client : IClientModel public class Client : IClientModel
{ {
[DataMember]
public int Id { get; private set; } public int Id { get; private set; }
[DataMember]
[Required] [Required]
public string ClientFIO { get; set; } = string.Empty; public string ClientFIO { get; set; } = string.Empty;
[DataMember]
[Required] [Required]
public string Email { get; set; } = string.Empty; public string Email { get; set; } = string.Empty;
[DataMember]
[Required] [Required]
public string Password { get; set; } = string.Empty; public string Password { get; set; } = string.Empty;
[ForeignKey("ClientId")] [ForeignKey("ClientId")]
public virtual List<Order> ClientOrders { get; set; } = new(); public virtual List<Order> ClientOrders { get; set; } = new();
[ForeignKey("ClientId")] [ForeignKey("ClientId")]
public virtual List<MessageInfo> ClientMessages { get; set; } = new(); public virtual List<MessageInfo> ClientMessages { get; set; } = new();
public static Client? Create(ClientBindingModel model) public static Client? Create(ClientBindingModel model)
{ {
if (model == null) if (model == null)
{ {
@ -76,4 +84,4 @@ namespace SushiBarDatabaseImplement.Models
Password = Password Password = Password
}; };
} }
} }

View File

@ -8,15 +8,20 @@ using System.Threading.Tasks;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.ViewModels; using SushiBarContracts.ViewModels;
using SushiBarDataModels.Models; using SushiBarDataModels.Models;
using System.Runtime.Serialization;
namespace SushiBarDatabaseImplement.Models namespace SushiBarDatabaseImplement.Models
{ {
public class Component : IComponentModel [DataContract]
public class Component : IComponentModel
{ {
[DataMember]
public int Id { get; private set; } public int Id { get; private set; }
[Required] [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<SushiComponent> SushiComponents { get; set; } = new(); public virtual List<SushiComponent> SushiComponents { get; set; } = new();

View File

@ -8,23 +8,26 @@ using System.Threading.Tasks;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarDatabaseImplement.Models; using SushiBarDatabaseImplement.Models;
using SushiBarContracts.ViewModels; using SushiBarContracts.ViewModels;
using System.Runtime.Serialization;
namespace SushiBarDataModels.Models namespace SushiBarDataModels.Models
{ {
public class Implementer : IImplementerModel [DataContract]
public class Implementer : IImplementerModel
{ {
public int Id { get; set; } [DataMember]
public int Id { get; set; }
[Required] [DataMember]
[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; }
[ForeignKey("ImplementerId")] [ForeignKey("ImplementerId")]

View File

@ -8,57 +8,67 @@ 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 SushiBarDatabaseImplement.Models namespace SushiBarDatabaseImplement.Models
{ {
public class MessageInfo : IMessageInfoModel public class MessageInfo : IMessageInfoModel
{ {
[Key] [NotMapped]
[DatabaseGenerated(DatabaseGeneratedOption.None)] public int Id { get; private set; }
public string MessageId { get; set; } = string.Empty;
public int? ClientId { get; set; } [DataMember]
[Key]
[DatabaseGenerated(DatabaseGeneratedOption.None)]
public string MessageId { get; set; } = string.Empty;
public virtual Client? Client { get; set; } [DataMember]
public int? ClientId { get; set; }
[Required] public virtual Client? Client { get; set; }
public string SenderName { get; set; } = string.Empty;
[Required] [DataMember]
public DateTime DateDelivery { get; set; } [Required]
public string SenderName { get; set; } = string.Empty;
[Required] [DataMember]
public string Subject { get; set; } = string.Empty; [Required]
public DateTime DateDelivery { get; set; }
[Required] [DataMember]
public string Body { get; set; } = string.Empty; [Required]
public string Subject { get; set; } = string.Empty;
public static MessageInfo? Create(MessageInfoBindingModel? model) [DataMember]
{ [Required]
if (model == null) public string Body { get; set; } = string.Empty;
{
return null;
}
return new()
{
MessageId = model.MessageId,
ClientId = model.ClientId,
SenderName = model.SenderName,
DateDelivery = model.DateDelivery,
Subject = model.Subject,
Body = model.Body,
}; public static MessageInfo? Create(MessageInfoBindingModel? model)
} {
if (model == null)
{
return null;
}
return new()
{
MessageId = model.MessageId,
ClientId = model.ClientId,
SenderName = model.SenderName,
DateDelivery = model.DateDelivery,
Subject = model.Subject,
Body = model.Body,
public MessageInfoViewModel GetViewModel => new() };
{ }
MessageId = MessageId,
ClientId = ClientId, public MessageInfoViewModel GetViewModel => new()
SenderName = SenderName, {
DateDelivery = DateDelivery, MessageId = MessageId,
Subject = Subject, ClientId = ClientId,
Body = Body SenderName = SenderName,
}; DateDelivery = DateDelivery,
} Subject = Subject,
Body = Body
};
}
} }

View File

@ -6,37 +6,47 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.Linq; using System.Linq;
using System.Runtime.Serialization;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace SushiBarDatabaseImplement.Models namespace SushiBarDatabaseImplement.Models
{ {
public class Order : IOrderModel [DataContract]
public class Order : IOrderModel
{ {
public int Id { get; private set; } [DataMember]
public int Id { get; private set; }
[Required] [DataMember]
[Required]
public int ClientId { get; private set; } public int ClientId { get; private set; }
public virtual Client Client { get; private set; } = new(); public virtual Client Client { get; private set; } = new();
[Required] [DataMember]
[Required]
public int SushiId { get; private set; } public int SushiId { get; private set; }
public virtual Sushi Sushi { get; set; } = new(); public virtual Sushi Sushi { get; set; } = new();
[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; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
[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 int? ImplementerId { get; private set; } public DateTime? DateImplement { get; private set; }
[DataMember]
public int? ImplementerId { get; private set; }
public virtual Implementer? Implementer { get; set; } = new(); public virtual Implementer? Implementer { get; set; } = new();

View File

@ -8,19 +8,27 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.ViewModels; using SushiBarContracts.ViewModels;
using System.Runtime.Serialization;
namespace SushiBarDatabaseImplement.Models namespace SushiBarDatabaseImplement.Models
{ {
public class Sushi : ISushiModel [DataContract]
public class Sushi : ISushiModel
{ {
public int Id { get; set; } [DataMember]
[Required] public int Id { get; set; }
[DataMember]
[Required]
public string SushiName { get; set; } = string.Empty; public string SushiName { get; set; } = string.Empty;
[Required] [DataMember]
[Required]
public double Price { get; set; } public double Price { get; set; }
private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null; private Dictionary<int, (IComponentModel, int)>? _sushiComponents = null;
[NotMapped] [DataMember]
[NotMapped]
public Dictionary<int, (IComponentModel, int)> SushiComponents public Dictionary<int, (IComponentModel, int)> SushiComponents
{ {
get get

View File

@ -20,5 +20,8 @@
<ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" /> <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
<ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.csproj" /> <ProjectReference Include="..\SushiBarListImplement_\SushiBarListImplement.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,29 @@
using SushiBar.StoragesContracts;
using SushiBarContracts.DI;
using SushiBarContracts.StoragesContracts;
using SushiBarFileImplement.Implements;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarFileImplement
{
public class ImplementationExtension : IImplementationExtension
{
public int Priority => 1;
public void RegisterServices()
{
//TODO 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<ISushiStorage, SushiStorage>();
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
}
}
}

View File

@ -0,0 +1,44 @@
using SushiBarContracts.StoragesContracts;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
namespace SushiBarFileImplement.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

@ -76,5 +76,7 @@ namespace SushiBarFileImplement.Models
new XAttribute("SenderName", SenderName), new XAttribute("SenderName", SenderName),
new XAttribute("DateDelivery", DateDelivery) new XAttribute("DateDelivery", DateDelivery)
); );
}
public int Id => throw new NotImplementedException();
}
} }

View File

@ -17,6 +17,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" /> <ProjectReference Include="..\SushiBarContracts\SushiBarContracts.csproj" />
<ProjectReference Include="..\SushiBarDatabaseImplement\SushiBarDatabaseImplement.csproj" />
<ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" /> <ProjectReference Include="..\SushiBarDataModels\SushiBarDataModels.csproj" />
</ItemGroup> </ItemGroup>

View File

@ -49,5 +49,7 @@ namespace SushiBarListImplement.Models
SenderName = SenderName, SenderName = SenderName,
DateDelivery = DateDelivery, DateDelivery = DateDelivery,
}; };
}
public int Id => throw new NotImplementedException();
}
} }

View File

@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SushiBarContracts.Attributes;
namespace SushiBarView
{
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

@ -37,14 +37,8 @@ namespace SushiBarView
{ {
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["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка клиентов");
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@ -10,6 +10,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using SushiBarContracts.DI;
namespace SushiBarView namespace SushiBarView
{ {
@ -57,31 +58,24 @@ namespace SushiBarView
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); var form = DependencyManager.Instance.Resolve<FormComponent>();
if (service is FormComponent form) if (form.ShowDialog() == DialogResult.OK)
{ {
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

@ -2,6 +2,7 @@
using SushiBar; using SushiBar;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.DI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
@ -30,15 +31,8 @@ namespace SushiBarView
{ {
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["ImplementerFIO"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка исполнителей");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -55,9 +49,9 @@ namespace SushiBarView
private void buttonAdd_Click(object sender, EventArgs e) private void buttonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); var form = DependencyManager.Instance.Resolve<FormImplementer>();
if (service is FormImplementer form) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) if (form.ShowDialog() == DialogResult.OK)
{ {
LoadData(); LoadData();

View File

@ -28,16 +28,8 @@ namespace SushiBarView
{ {
try try
{ {
var list = _logic.ReadList(null); dataGridView.FillAndConfigGrid(_logic.ReadList(null));
if (list != null) _logger.LogInformation("Загрузка почтовых собщений");
{
dataGridView.DataSource = list;
dataGridView.Columns["MessageId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["Body"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка почтовых собщений");
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@ -20,208 +20,216 @@
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();
ButtonOrderReady = new Button(); ButtonOrderReady = new Button();
ButtonRef = new Button(); ButtonRef = new Button();
ButtonIssuedOrder = new Button(); ButtonIssuedOrder = new Button();
ButtonTakeOrderInWork = new Button(); ButtonTakeOrderInWork = new Button();
menuStrip = new MenuStrip(); menuStrip = new MenuStrip();
toolStripMenuItem1 = new ToolStripMenuItem(); toolStripMenuItem1 = new ToolStripMenuItem();
componentsToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem(); componentsToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
sushiToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem(); sushiToolStripMenuItemToolStripMenuItem = new ToolStripMenuItem();
ClientToolStripMenuItem = new ToolStripMenuItem(); ClientToolStripMenuItem = new ToolStripMenuItem();
employersToolStripMenuItem = new ToolStripMenuItem(); employersToolStripMenuItem = new ToolStripMenuItem();
начатьРаботуToolStripMenuItem = new ToolStripMenuItem(); начатьРаботуToolStripMenuItem = new ToolStripMenuItem();
отчётыToolStripMenuItem = new ToolStripMenuItem(); gToolStripMenuItem = new ToolStripMenuItem();
componentsToolStripMenuItem1 = new ToolStripMenuItem(); отчётыToolStripMenuItem = new ToolStripMenuItem();
componentSushiToolStripMenuItem1 = new ToolStripMenuItem(); componentsToolStripMenuItem1 = new ToolStripMenuItem();
ordersToolStripMenuItem = new ToolStripMenuItem(); componentSushiToolStripMenuItem1 = new ToolStripMenuItem();
dataGridView = new DataGridView(); ordersToolStripMenuItem = new ToolStripMenuItem();
gToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView();
menuStrip.SuspendLayout(); создатьБэкапToolStripMenuItem = new ToolStripMenuItem();
((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); menuStrip.SuspendLayout();
SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
// SuspendLayout();
// ButtonCreateOrder //
// // ButtonCreateOrder
ButtonCreateOrder.Location = new Point(676, 37); //
ButtonCreateOrder.Name = "ButtonCreateOrder"; ButtonCreateOrder.Location = new Point(676, 37);
ButtonCreateOrder.Size = new Size(217, 29); ButtonCreateOrder.Name = "ButtonCreateOrder";
ButtonCreateOrder.TabIndex = 0; ButtonCreateOrder.Size = new Size(217, 29);
ButtonCreateOrder.Text = "Создать заказ"; ButtonCreateOrder.TabIndex = 0;
ButtonCreateOrder.UseVisualStyleBackColor = true; ButtonCreateOrder.Text = "Создать заказ";
ButtonCreateOrder.Click += ButtonCreateOrder_Click; ButtonCreateOrder.UseVisualStyleBackColor = true;
// ButtonCreateOrder.Click += ButtonCreateOrder_Click;
// ButtonOrderReady //
// // ButtonOrderReady
ButtonOrderReady.Location = new Point(676, 180); //
ButtonOrderReady.Name = "ButtonOrderReady"; ButtonOrderReady.Location = new Point(676, 180);
ButtonOrderReady.Size = new Size(217, 29); ButtonOrderReady.Name = "ButtonOrderReady";
ButtonOrderReady.TabIndex = 1; ButtonOrderReady.Size = new Size(217, 29);
ButtonOrderReady.Text = "Заказ готов"; ButtonOrderReady.TabIndex = 1;
ButtonOrderReady.UseVisualStyleBackColor = true; ButtonOrderReady.Text = "Заказ готов";
ButtonOrderReady.Click += ButtonOrderReady_Click; ButtonOrderReady.UseVisualStyleBackColor = true;
// ButtonOrderReady.Click += ButtonOrderReady_Click;
// ButtonRef //
// // ButtonRef
ButtonRef.Location = new Point(676, 323); //
ButtonRef.Name = "ButtonRef"; ButtonRef.Location = new Point(676, 323);
ButtonRef.Size = new Size(217, 29); ButtonRef.Name = "ButtonRef";
ButtonRef.TabIndex = 2; ButtonRef.Size = new Size(217, 29);
ButtonRef.Text = "Обновить список"; ButtonRef.TabIndex = 2;
ButtonRef.UseVisualStyleBackColor = true; ButtonRef.Text = "Обновить список";
ButtonRef.Click += ButtonRef_Click; ButtonRef.UseVisualStyleBackColor = true;
// ButtonRef.Click += ButtonRef_Click;
// ButtonIssuedOrder //
// // ButtonIssuedOrder
ButtonIssuedOrder.Location = new Point(676, 256); //
ButtonIssuedOrder.Name = "ButtonIssuedOrder"; ButtonIssuedOrder.Location = new Point(676, 256);
ButtonIssuedOrder.Size = new Size(217, 29); ButtonIssuedOrder.Name = "ButtonIssuedOrder";
ButtonIssuedOrder.TabIndex = 3; ButtonIssuedOrder.Size = new Size(217, 29);
ButtonIssuedOrder.Text = "Заказ выполнен"; ButtonIssuedOrder.TabIndex = 3;
ButtonIssuedOrder.UseVisualStyleBackColor = true; ButtonIssuedOrder.Text = "Заказ выполнен";
ButtonIssuedOrder.Click += ButtonIssuedOrder_Click; ButtonIssuedOrder.UseVisualStyleBackColor = true;
// ButtonIssuedOrder.Click += ButtonIssuedOrder_Click;
// ButtonTakeOrderInWork //
// // ButtonTakeOrderInWork
ButtonTakeOrderInWork.Location = new Point(676, 109); //
ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork"; ButtonTakeOrderInWork.Location = new Point(676, 109);
ButtonTakeOrderInWork.Size = new Size(217, 29); ButtonTakeOrderInWork.Name = "ButtonTakeOrderInWork";
ButtonTakeOrderInWork.TabIndex = 4; ButtonTakeOrderInWork.Size = new Size(217, 29);
ButtonTakeOrderInWork.Text = "Отдать на выполнение"; ButtonTakeOrderInWork.TabIndex = 4;
ButtonTakeOrderInWork.UseVisualStyleBackColor = true; ButtonTakeOrderInWork.Text = "Отдать на выполнение";
ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click; ButtonTakeOrderInWork.UseVisualStyleBackColor = true;
// ButtonTakeOrderInWork.Click += ButtonTakeOrderInWork_Click;
// menuStrip //
// // menuStrip
menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, отчётыToolStripMenuItem }); //
menuStrip.Location = new Point(0, 0); menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem1, отчётыToolStripMenuItem, создатьБэкапToolStripMenuItem });
menuStrip.Name = "menuStrip"; menuStrip.Location = new Point(0, 0);
menuStrip.Size = new Size(922, 24); menuStrip.Name = "menuStrip";
menuStrip.TabIndex = 5; menuStrip.Size = new Size(922, 24);
menuStrip.Text = "menuStrip1"; menuStrip.TabIndex = 5;
// menuStrip.Text = "menuStrip1";
// toolStripMenuItem1 //
// // toolStripMenuItem1
toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem, employersToolStripMenuItem, начатьРаботуToolStripMenuItem, gToolStripMenuItem }); //
toolStripMenuItem1.Name = "toolStripMenuItem1"; toolStripMenuItem1.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItemToolStripMenuItem, sushiToolStripMenuItemToolStripMenuItem, ClientToolStripMenuItem, employersToolStripMenuItem, начатьРаботуToolStripMenuItem, gToolStripMenuItem });
toolStripMenuItem1.Size = new Size(94, 20); toolStripMenuItem1.Name = "toolStripMenuItem1";
toolStripMenuItem1.Text = "Справочники"; toolStripMenuItem1.Size = new Size(94, 20);
// toolStripMenuItem1.Text = "Справочники";
// componentsToolStripMenuItemToolStripMenuItem //
// // componentsToolStripMenuItemToolStripMenuItem
componentsToolStripMenuItemToolStripMenuItem.Name = "componentsToolStripMenuItemToolStripMenuItem"; //
componentsToolStripMenuItemToolStripMenuItem.Size = new Size(180, 22); componentsToolStripMenuItemToolStripMenuItem.Name = "componentsToolStripMenuItemToolStripMenuItem";
componentsToolStripMenuItemToolStripMenuItem.Text = "Компоненты"; componentsToolStripMenuItemToolStripMenuItem.Size = new Size(154, 22);
componentsToolStripMenuItemToolStripMenuItem.Click += componentsToolStripMenuItem_Click; componentsToolStripMenuItemToolStripMenuItem.Text = "Компоненты";
// componentsToolStripMenuItemToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
// sushiToolStripMenuItemToolStripMenuItem //
// // sushiToolStripMenuItemToolStripMenuItem
sushiToolStripMenuItemToolStripMenuItem.Name = "sushiToolStripMenuItemToolStripMenuItem"; //
sushiToolStripMenuItemToolStripMenuItem.Size = new Size(180, 22); sushiToolStripMenuItemToolStripMenuItem.Name = "sushiToolStripMenuItemToolStripMenuItem";
sushiToolStripMenuItemToolStripMenuItem.Text = "Суши"; sushiToolStripMenuItemToolStripMenuItem.Size = new Size(154, 22);
sushiToolStripMenuItemToolStripMenuItem.Click += sushiToolStripMenuItem_Click; sushiToolStripMenuItemToolStripMenuItem.Text = "Суши";
// sushiToolStripMenuItemToolStripMenuItem.Click += sushiToolStripMenuItem_Click;
// ClientToolStripMenuItem //
// // ClientToolStripMenuItem
ClientToolStripMenuItem.Name = "ClientToolStripMenuItem"; //
ClientToolStripMenuItem.Size = new Size(180, 22); ClientToolStripMenuItem.Name = "ClientToolStripMenuItem";
ClientToolStripMenuItem.Text = "Клиенты"; ClientToolStripMenuItem.Size = new Size(154, 22);
ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click; ClientToolStripMenuItem.Text = "Клиенты";
// ClientToolStripMenuItem.Click += ClientToolStripMenuItem_Click;
// employersToolStripMenuItem //
// // employersToolStripMenuItem
employersToolStripMenuItem.Name = "employersToolStripMenuItem"; //
employersToolStripMenuItem.Size = new Size(180, 22); employersToolStripMenuItem.Name = "employersToolStripMenuItem";
employersToolStripMenuItem.Text = "Исполнители"; employersToolStripMenuItem.Size = new Size(154, 22);
employersToolStripMenuItem.Click += employersToolStripMenuItem_Click; employersToolStripMenuItem.Text = "Исполнители";
// employersToolStripMenuItem.Click += employersToolStripMenuItem_Click;
// начатьРаботуToolStripMenuItem //
// // начатьРаботуToolStripMenuItem
начатьРаботуToolStripMenuItem.Name = ачатьРаботуToolStripMenuItem"; //
начатьРаботуToolStripMenuItem.Size = new Size(180, 22); начатьРаботуToolStripMenuItem.Name = ачатьРаботуToolStripMenuItem";
начатьРаботуToolStripMenuItem.Text = "Начать работу"; начатьРаботуToolStripMenuItem.Size = new Size(154, 22);
начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click; начатьРаботуToolStripMenuItem.Text = "Начать работу";
// начатьРаботуToolStripMenuItem.Click += startWorkToolStripMenuItem_Click;
// отчётыToolStripMenuItem //
// // gToolStripMenuItem
отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem1, componentSushiToolStripMenuItem1, ordersToolStripMenuItem }); //
отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; gToolStripMenuItem.Name = "gToolStripMenuItem";
отчётыToolStripMenuItem.Size = new Size(60, 20); gToolStripMenuItem.Size = new Size(154, 22);
отчётыToolStripMenuItem.Text = "Отчёты"; gToolStripMenuItem.Text = "Почта";
// gToolStripMenuItem.Click += mailToolStripMenuItem_Click;
// componentsToolStripMenuItem1 //
// // отчётыToolStripMenuItem
componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1"; //
componentsToolStripMenuItem1.Size = new Size(201, 22); отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem1, componentSushiToolStripMenuItem1, ordersToolStripMenuItem });
componentsToolStripMenuItem1.Text = "Суши"; отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem";
componentsToolStripMenuItem1.Click += ComponentsToolStripMenuItem_Click; отчётыToolStripMenuItem.Size = new Size(60, 20);
// отчётыToolStripMenuItem.Text = "Отчёты";
// componentSushiToolStripMenuItem1 //
// // componentsToolStripMenuItem1
componentSushiToolStripMenuItem1.Name = "componentSushiToolStripMenuItem1"; //
componentSushiToolStripMenuItem1.Size = new Size(201, 22); componentsToolStripMenuItem1.Name = "componentsToolStripMenuItem1";
componentSushiToolStripMenuItem1.Text = "Суши с компонентами"; componentsToolStripMenuItem1.Size = new Size(201, 22);
componentSushiToolStripMenuItem1.Click += ComponentSushiToolStripMenuItem_Click; componentsToolStripMenuItem1.Text = "Суши";
// componentsToolStripMenuItem1.Click += ComponentsToolStripMenuItem_Click;
// ordersToolStripMenuItem //
// // componentSushiToolStripMenuItem1
ordersToolStripMenuItem.Name = "ordersToolStripMenuItem"; //
ordersToolStripMenuItem.Size = new Size(201, 22); componentSushiToolStripMenuItem1.Name = "componentSushiToolStripMenuItem1";
ordersToolStripMenuItem.Text = "Заказы"; componentSushiToolStripMenuItem1.Size = new Size(201, 22);
ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; componentSushiToolStripMenuItem1.Text = "Суши с компонентами";
// componentSushiToolStripMenuItem1.Click += ComponentSushiToolStripMenuItem_Click;
// dataGridView //
// // ordersToolStripMenuItem
dataGridView.BackgroundColor = Color.White; //
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
dataGridView.Location = new Point(12, 27); ordersToolStripMenuItem.Size = new Size(201, 22);
dataGridView.Name = "dataGridView"; ordersToolStripMenuItem.Text = "Заказы";
dataGridView.RowTemplate.Height = 25; ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
dataGridView.Size = new Size(647, 344); //
dataGridView.TabIndex = 6; // dataGridView
// //
// gToolStripMenuItem dataGridView.BackgroundColor = Color.White;
// dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
gToolStripMenuItem.Name = "gToolStripMenuItem"; dataGridView.Location = new Point(12, 27);
gToolStripMenuItem.Size = new Size(180, 22); dataGridView.Name = "dataGridView";
gToolStripMenuItem.Text = "Почта"; dataGridView.RowTemplate.Height = 25;
gToolStripMenuItem.Click += mailToolStripMenuItem_Click; dataGridView.Size = new Size(647, 344);
// dataGridView.TabIndex = 6;
// FormMain //
// // создатьБэкапToolStripMenuItem
AutoScaleDimensions = new SizeF(7F, 15F); //
AutoScaleMode = AutoScaleMode.Font; создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem";
ClientSize = new Size(922, 383); создатьБэкапToolStripMenuItem.Size = new Size(97, 20);
Controls.Add(dataGridView); создатьБэкапToolStripMenuItem.Text = "Создать бэкап";
Controls.Add(ButtonTakeOrderInWork); создатьБэкапToolStripMenuItem.Click += createBackUpToolStripMenuItem_Click;
Controls.Add(ButtonIssuedOrder); //
Controls.Add(ButtonRef); // FormMain
Controls.Add(ButtonOrderReady); //
Controls.Add(ButtonCreateOrder); AutoScaleDimensions = new SizeF(7F, 15F);
Controls.Add(menuStrip); AutoScaleMode = AutoScaleMode.Font;
MainMenuStrip = menuStrip; ClientSize = new Size(922, 383);
Name = "FormMain"; Controls.Add(dataGridView);
Text = "FormMain"; Controls.Add(ButtonTakeOrderInWork);
Load += FormMain_Load; Controls.Add(ButtonIssuedOrder);
menuStrip.ResumeLayout(false); Controls.Add(ButtonRef);
menuStrip.PerformLayout(); Controls.Add(ButtonOrderReady);
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); Controls.Add(ButtonCreateOrder);
ResumeLayout(false); Controls.Add(menuStrip);
PerformLayout(); MainMenuStrip = menuStrip;
} Name = "FormMain";
Text = "FormMain";
Load += FormMain_Load;
menuStrip.ResumeLayout(false);
menuStrip.PerformLayout();
((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
ResumeLayout(false);
PerformLayout();
}
#endregion #endregion
private Button ButtonCreateOrder; private Button ButtonCreateOrder;
private Button ButtonOrderReady; private Button ButtonOrderReady;
private Button ButtonRef; private Button ButtonRef;
private Button ButtonIssuedOrder; private Button ButtonIssuedOrder;
@ -239,5 +247,6 @@
private ToolStripMenuItem employersToolStripMenuItem; private ToolStripMenuItem employersToolStripMenuItem;
private ToolStripMenuItem начатьРаботуToolStripMenuItem; private ToolStripMenuItem начатьРаботуToolStripMenuItem;
private ToolStripMenuItem gToolStripMenuItem; private ToolStripMenuItem gToolStripMenuItem;
} private ToolStripMenuItem создатьБэкапToolStripMenuItem;
}
} }

View File

@ -12,6 +12,8 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using SushiBarView.Reports; using SushiBarView.Reports;
using SushiBarContracts.DI;
using System.Windows.Forms;
namespace SushiBarView namespace SushiBarView
{ {
@ -24,27 +26,25 @@ namespace SushiBarView
private void ButtonCreateOrder_Click(object sender, EventArgs e) private void ButtonCreateOrder_Click(object sender, EventArgs e)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); form.ShowDialog();
if (service is FormCreateOrder form) LoadData();
{ }
form.ShowDialog();
LoadData();
}
}
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(); InitializeComponent();
_logger = logger; _logger = logger;
_orderLogic = orderLogic; _orderLogic = orderLogic;
_reportLogic = reportLogic; _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();
@ -54,16 +54,8 @@ namespace SushiBarView
_logger.LogInformation("Загрузка заказов"); _logger.LogInformation("Загрузка заказов");
try try
{ {
var list = _orderLogic.ReadList(null); dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
if (list != null) _logger.LogInformation("Загрузка заказов");
{
dataGridView.DataSource = list;
dataGridView.Columns["SushiId"].Visible = false;
dataGridView.Columns["ClientId"].Visible = false;
dataGridView.Columns["ClientEmail"].Visible = false;
dataGridView.Columns["ImplementerId"].Visible = false;
}
_logger.LogInformation("Загрузка заказов");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -73,20 +65,14 @@ namespace SushiBarView
} }
private void componentsToolStripMenuItem_Click(object sender, EventArgs e) private void componentsToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); var form = DependencyManager.Instance.Resolve<FormComponents>();
if (service is FormComponents form) form.ShowDialog();
{ }
form.ShowDialog();
}
}
private void sushiToolStripMenuItem_Click(object sender, EventArgs e) private void sushiToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSushis)); var form = DependencyManager.Instance.Resolve<FormSushis>();
if (service is FormSushis form) form.ShowDialog();
{ }
form.ShowDialog();
}
}
private void ButtonTakeOrderInWork_Click(object sender, EventArgs e) private void ButtonTakeOrderInWork_Click(object sender, EventArgs e)
{ {
@ -186,54 +172,63 @@ namespace SushiBarView
private void ComponentSushiToolStripMenuItem_Click(object sender, EventArgs e) private void ComponentSushiToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormReportSushiComponents)); var form = DependencyManager.Instance.Resolve<FormReportSushiComponents>();
if (service is FormReportSushiComponents form) form.ShowDialog();
{
form.ShowDialog();
}
} }
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e) private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
{ {
var service = var form = DependencyManager.Instance.Resolve<FormReportOrders>();
Program.ServiceProvider?.GetService(typeof(FormReportOrders)); form.ShowDialog();
if (service is FormReportOrders form) }
{
form.ShowDialog();
}
}
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 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 mailToolStripMenuItem_Click(object sender, EventArgs e) private void mailToolStripMenuItem_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();
{ }
form.ShowDialog();
} private void createBackUpToolStripMenuItem_Click(object sender, EventArgs e)
} {
} try
{
if (_backUpLogic != null)
{
var fbd = new FolderBrowserDialog();
if (fbd.ShowDialog() == DialogResult.OK)
{
_backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
{
FolderName = fbd.SelectedPath
});
MessageBox.Show("Бекап создан", "Сообщение",
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Ошибка создания бэкапа", MessageBoxButtons.OK,
MessageBoxIcon.Error);
}
}
}
} }

View File

@ -12,6 +12,7 @@ using System.Windows.Forms;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.SearchModels; using SushiBarContracts.SearchModels;
using SushiBarContracts.DI;
namespace SushiBarView namespace SushiBarView
@ -108,54 +109,46 @@ 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 = Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); var form = DependencyManager.Instance.Resolve<FormSushiComponent>();
if (service is FormSushiComponent form) if (form.ShowDialog() != DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) return;
{ }
if (form.ComponentModel == null) _logger.LogInformation("Добавление нового ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
{ if (_sushiComponents.ContainsKey(form.Id))
return; {
} _sushiComponents[form.Id] = (form.ComponentModel,
_logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); form.Count);
if (_sushiComponents.ContainsKey(form.Id)) }
{ else
_sushiComponents[form.Id] = (form.ComponentModel, form.Count); {
} _sushiComponents.Add(form.Id, (form.ComponentModel,
else form.Count));
{ }
_sushiComponents.Add(form.Id, (form.ComponentModel, form.Count)); 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<FormSushiComponent>();
Program.ServiceProvider?.GetService(typeof(FormSushiComponent)); int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
if (service is FormSushiComponent form) form.Id = id;
{ form.Count = _sushiComponents[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 = _sushiComponents[id].Item2; {
if (form.ShowDialog() == DialogResult.OK) return;
{ }
if (form.ComponentModel == null) _logger.LogInformation("Изменение ингридиента:{ ComponentName}-{ Count}", form.ComponentModel.ComponentName, form.Count);
{ _sushiComponents[form.Id] = (form.ComponentModel, form.Count);
return; LoadData();
} }
_logger.LogInformation("Изменение компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count);
_sushiComponents[form.Id] = (form.ComponentModel, form.Count);
LoadData();
}
} }
} }
}
private void ButtonDel_Click(object sender, EventArgs e) private void ButtonDel_Click(object sender, EventArgs e)
{ {

View File

@ -10,6 +10,7 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.BusinessLogicsContracts; using SushiBarContracts.BusinessLogicsContracts;
using SushiBarContracts.DI;
namespace SushiBarView namespace SushiBarView
{ {
@ -22,15 +23,13 @@ namespace SushiBarView
private void ButtonAdd_Click(object sender, EventArgs e) private void ButtonAdd_Click(object sender, EventArgs e)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSushi)); var form = DependencyManager.Instance.Resolve<FormSushi>();
if (service is FormSushi form) if (form.ShowDialog() == DialogResult.OK)
{ {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{
LoadData(); }
} }
}
}
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ISushiLogic _logic; private readonly ISushiLogic _logic;
@ -51,16 +50,9 @@ namespace SushiBarView
{ {
try try
{ {
var list = _logic.ReadList(null);
if (list != null) dataGridView.FillAndConfigGrid(_logic.ReadList(null));
{ _logger.LogInformation("Загрузка суши");
dataGridView.DataSource = list;
dataGridView.Columns["Id"].Visible = false;
dataGridView.Columns["SushiComponents"].Visible = false;
dataGridView.Columns["SushiName"].AutoSizeMode =
DataGridViewAutoSizeColumnMode.Fill;
}
_logger.LogInformation("Загрузка суши");
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -73,15 +65,12 @@ namespace SushiBarView
{ {
if (dataGridView.SelectedRows.Count == 1) if (dataGridView.SelectedRows.Count == 1)
{ {
var service = Program.ServiceProvider?.GetService(typeof(FormSushi)); var form = DependencyManager.Instance.Resolve<FormSushi>();
if (service is FormSushi form) form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
{ if (form.ShowDialog() == DialogResult.OK)
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); {
if (form.ShowDialog() == DialogResult.OK) LoadData();
{ }
LoadData();
}
}
} }
} }

View File

@ -16,6 +16,7 @@ using Microsoft.EntityFrameworkCore.Design;
using SushiBar.BusinessLogicsContracts; using SushiBar.BusinessLogicsContracts;
using SushiBarBusinessLogic.MailWorker; using SushiBarBusinessLogic.MailWorker;
using SushiBarContracts.BindingModels; using SushiBarContracts.BindingModels;
using SushiBarContracts.DI;
namespace SushiBarView namespace SushiBarView
{ {
@ -30,13 +31,11 @@ namespace SushiBarView
static void Main() static void Main()
{ {
ApplicationConfiguration.Initialize(); ApplicationConfiguration.Initialize();
var services = new ServiceCollection(); InitDependency();
ConfigureServices(services); try
_serviceProvider = services.BuildServiceProvider();
try
{ {
var mailSender = _serviceProvider.GetService<AbstractMailWorker>(); var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
mailSender?.MailConfig(new MailConfigBindingModel mailSender?.MailConfig(new MailConfigBindingModel
{ {
MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty, MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty,
@ -50,57 +49,47 @@ namespace SushiBarView
} }
catch (Exception ex) catch (Exception ex)
{ {
var logger = _serviceProvider.GetService<ILogger>(); var logger = DependencyManager.Instance.Resolve<ILogger>();
logger?.LogError(ex, "Mails Problem"); logger?.LogError(ex, "Mails Problem");
} }
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<ISushiStorage, SushiStorage>(); DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
services.AddTransient<IClientStorage, ClientStorage>(); DependencyManager.Instance.RegisterType<ISushiLogic, SushiLogic>();
services.AddTransient<IImplementerStorage, ImplementerStorage>(); DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
services.AddTransient<IMessageInfoStorage, MessageInfoStorage>(); DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
services.AddTransient<IComponentLogic, ComponentLogic>(); DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
services.AddTransient<IOrderLogic, OrderLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
services.AddTransient<ISushiLogic, SushiLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<IClientLogic, ClientLogic>(); DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<IComponentLogic, ComponentLogic>(); DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
services.AddTransient<IImplementerLogic, ImplementerLogic>(); DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
services.AddTransient<IMessageInfoLogic, MessageInfoLogic>(); DependencyManager.Instance.RegisterType<FormMain>();
services.AddTransient<IWorkProcess, WorkModeling>(); DependencyManager.Instance.RegisterType<FormComponent>();
services.AddSingleton<AbstractMailWorker, MailKitWorker>(); DependencyManager.Instance.RegisterType<FormComponents>();
DependencyManager.Instance.RegisterType<FormCreateOrder>();
services.AddTransient<FormMain>(); DependencyManager.Instance.RegisterType<FormSushi>();
services.AddTransient<FormComponent>(); DependencyManager.Instance.RegisterType<FormSushiComponent>();
services.AddTransient<FormComponents>(); DependencyManager.Instance.RegisterType<FormSushis>();
services.AddTransient<FormCreateOrder>(); DependencyManager.Instance.RegisterType<FormReportOrders>();
services.AddTransient<FormSushis>(); DependencyManager.Instance.RegisterType<FormReportSushiComponents>();
services.AddTransient<FormSushiComponent>(); DependencyManager.Instance.RegisterType<FormClients>();
services.AddTransient<FormSushi>(); DependencyManager.Instance.RegisterType<FormImplementers>();
services.AddTransient<FormReportOrders>(); DependencyManager.Instance.RegisterType<FormImplementer>();
services.AddTransient<FormReportSushiComponents>(); DependencyManager.Instance.RegisterType<FormMail>();
services.AddTransient<FormImplementers>(); }
services.AddTransient<FormImplementer>(); private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
services.AddTransient<IReportLogic, ReportLogic>(); }
services.AddTransient<FormClients>();
services.AddTransient<FormMail>();
services.AddTransient<EntityFrameworkDesignServicesBuilder>();
services.AddTransient<AbstractSaveToWord, SaveToWord>();
services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
services.AddTransient<FormMain>();
}
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
}
} }