слияние
This commit is contained in:
commit
3c7fd1b8f0
3
.gitignore
vendored
3
.gitignore
vendored
@ -14,6 +14,9 @@
|
|||||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||||
*.userprefs
|
*.userprefs
|
||||||
|
|
||||||
|
# dll файлы
|
||||||
|
*.dll
|
||||||
|
|
||||||
# Mono auto generated files
|
# Mono auto generated files
|
||||||
mono_crash.*
|
mono_crash.*
|
||||||
|
|
||||||
|
@ -0,0 +1,98 @@
|
|||||||
|
using PlumbingRepairContracts.BindingModels;
|
||||||
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
using PlumbingRepairDataModels;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using System.IO.Compression;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Runtime.Serialization.Json;
|
||||||
|
|
||||||
|
namespace PlumbingRepairBusinessLogic.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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,25 @@
|
|||||||
|
namespace PlumbingRepairContracts.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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,21 @@
|
|||||||
|
namespace PlumbingRepairContracts.Attributes
|
||||||
|
{
|
||||||
|
public enum GridViewAutoSize
|
||||||
|
{
|
||||||
|
NotSet = 0,
|
||||||
|
|
||||||
|
None = 1,
|
||||||
|
|
||||||
|
ColumnHeader = 2,
|
||||||
|
|
||||||
|
AllCellsExceptHeader = 4,
|
||||||
|
|
||||||
|
AllCells = 6,
|
||||||
|
|
||||||
|
DisplayedCellsExceptHeader = 8,
|
||||||
|
|
||||||
|
DisplayedCells = 10,
|
||||||
|
|
||||||
|
Fill = 16
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,7 @@
|
|||||||
|
namespace PlumbingRepairContracts.BindingModels
|
||||||
|
{
|
||||||
|
public class BackUpSaveBinidngModel
|
||||||
|
{
|
||||||
|
public string FolderName { get; set; } = string.Empty;
|
||||||
|
}
|
||||||
|
}
|
@ -14,7 +14,11 @@ namespace PlumbingRepairContracts.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;
|
||||||
|
<<<<<<< HEAD
|
||||||
public bool IsRead { get; set; } = false;
|
public bool IsRead { get; set; } = false;
|
||||||
public string? ReplyText { get; set; } = string.Empty;
|
public string? ReplyText { get; set; } = string.Empty;
|
||||||
|
=======
|
||||||
|
public int Id => throw new NotImplementedException();
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -0,0 +1,9 @@
|
|||||||
|
using PlumbingRepairContracts.BindingModels;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.BusinessLogicsContracts
|
||||||
|
{
|
||||||
|
public interface IBackUpLogic
|
||||||
|
{
|
||||||
|
void CreateBackUp(BackUpSaveBinidngModel model);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,61 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.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>();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,35 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.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>();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,11 @@
|
|||||||
|
namespace PlumbingRepairContracts.DI
|
||||||
|
{
|
||||||
|
public interface IImplementationExtension
|
||||||
|
{
|
||||||
|
public int Priority { get; }
|
||||||
|
/// <summary>
|
||||||
|
/// Регистрация сервисов
|
||||||
|
/// </summary>
|
||||||
|
public void RegisterServices();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,57 @@
|
|||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.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>()!;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,50 @@
|
|||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.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";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,33 @@
|
|||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Unity.Microsoft.Logging;
|
||||||
|
using Unity;
|
||||||
|
|
||||||
|
namespace PlumbingRepairContracts.DI
|
||||||
|
{
|
||||||
|
public class UnityDependencyContainer : IDependencyContainer
|
||||||
|
{
|
||||||
|
private readonly IUnityContainer _container;
|
||||||
|
public UnityDependencyContainer()
|
||||||
|
{
|
||||||
|
_container = new UnityContainer();
|
||||||
|
}
|
||||||
|
public void AddLogging(Action<ILoggingBuilder> configure)
|
||||||
|
{
|
||||||
|
var factory = LoggerFactory.Create(configure);
|
||||||
|
_container.AddExtension(new LoggingExtension(factory));
|
||||||
|
}
|
||||||
|
public void RegisterType<T>(bool isSingle) where T : class
|
||||||
|
{
|
||||||
|
_container.RegisterType<T>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
|
||||||
|
|
||||||
|
}
|
||||||
|
public T Resolve<T>()
|
||||||
|
{
|
||||||
|
return _container.Resolve<T>();
|
||||||
|
}
|
||||||
|
void IDependencyContainer.RegisterType<T, U>(bool isSingle)
|
||||||
|
{
|
||||||
|
_container.RegisterType<T, U>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -6,6 +6,12 @@
|
|||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
|
||||||
|
<PackageReference Include="Unity" Version="5.11.10" />
|
||||||
|
<PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
@ -0,0 +1,9 @@
|
|||||||
|
namespace PlumbingRepairContracts.StoragesContracts
|
||||||
|
{
|
||||||
|
public interface IBackUpInfo
|
||||||
|
{
|
||||||
|
List<T>? GetList<T>() where T : class, new();
|
||||||
|
|
||||||
|
Type? GetTypeByModelInterface(string modelInterfaceName);
|
||||||
|
}
|
||||||
|
}
|
@ -1,19 +1,21 @@
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace PlumbingRepairContracts.ViewModels
|
namespace PlumbingRepairContracts.ViewModels
|
||||||
{
|
{
|
||||||
public class ClientViewModel : IClientModel
|
public class ClientViewModel : IClientModel
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
[Column(visible: false)]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
[DisplayName("ФИО клиента")]
|
[Column(title: "ФИО клиента", width: 150)]
|
||||||
public string ClientFIO { get; set; } = string.Empty;
|
public string ClientFIO { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Логин (эл. почта)")]
|
[Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string Email { get; set; } = string.Empty;
|
public string Email { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Пароль")]
|
[Column(title: "Пароль", width: 150)]
|
||||||
public string Password { get; set; } = string.Empty;
|
public string Password { get; set; } = string.Empty;
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,16 +1,18 @@
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace PlumbingRepairContracts.ViewModels
|
namespace PlumbingRepairContracts.ViewModels
|
||||||
{
|
{
|
||||||
public class ComponentViewModel : IComponentModel
|
public class ComponentViewModel : IComponentModel
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
[Column(visible: false)]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
[DisplayName("Название компонента")]
|
[Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string ComponentName { get; set; } = string.Empty;
|
public string ComponentName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Цена")]
|
[Column(title: "Цена", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public double Cost { get; set; }
|
public double Cost { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,20 +1,22 @@
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace PlumbingRepairContracts.ViewModels
|
namespace PlumbingRepairContracts.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: "Пароль", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string Password { get; set; } = string.Empty;
|
public string Password { get; set; } = string.Empty;
|
||||||
[DisplayName("Стаж работы")]
|
[Column(title: "Стаж работы", width: 150)]
|
||||||
public int WorkExperience { get; set; }
|
public int WorkExperience { get; set; }
|
||||||
[DisplayName("Квалификация")]
|
[Column(title: "Квалификация", width: 150)]
|
||||||
public int Qualification { get; set; }
|
public int Qualification { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,10 +1,12 @@
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace PlumbingRepairContracts.ViewModels
|
namespace PlumbingRepairContracts.ViewModels
|
||||||
{
|
{
|
||||||
public class MessageInfoViewModel : IMessageInfoModel
|
public class MessageInfoViewModel : IMessageInfoModel
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
public string MessageId { get; set; } = string.Empty;
|
public string MessageId { get; set; } = string.Empty;
|
||||||
public int? ClientId { get; set; }
|
public int? ClientId { get; set; }
|
||||||
@ -20,5 +22,21 @@ namespace PlumbingRepairContracts.ViewModels
|
|||||||
public bool IsRead { get; set; } = false;
|
public bool IsRead { get; set; } = false;
|
||||||
[DisplayName("Ответ")]
|
[DisplayName("Ответ")]
|
||||||
public string? ReplyText { get; set; }
|
public string? ReplyText { get; set; }
|
||||||
|
=======
|
||||||
|
[Column(visible: false)]
|
||||||
|
public string MessageId { get; set; } = string.Empty;
|
||||||
|
[Column(visible: false)]
|
||||||
|
public int? ClientId { get; set; }
|
||||||
|
[Column(title: "Отправитель", width: 150)]
|
||||||
|
public string SenderName { get; set; } = string.Empty;
|
||||||
|
[Column(title: "Дата отправления", width: 150)]
|
||||||
|
public DateTime DateDelivery { get; set; }
|
||||||
|
[Column(title: "Заголовок", width: 150)]
|
||||||
|
public string Subject { get; set; } = string.Empty;
|
||||||
|
[Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
|
public string Body { get; set; } = string.Empty;
|
||||||
|
[Column(visible: false)]
|
||||||
|
public int Id => throw new NotImplementedException();
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,4 +1,5 @@
|
|||||||
using PlumbingRepairDataModels.Enums;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Enums;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
@ -6,39 +7,39 @@ namespace PlumbingRepairContracts.ViewModels
|
|||||||
{
|
{
|
||||||
public class OrderViewModel : IOrderModel
|
public class OrderViewModel : IOrderModel
|
||||||
{
|
{
|
||||||
[DisplayName("Номер")]
|
[Column(title: "Номер", width: 100)]
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
[DisplayName("Номер работы")]
|
[Column(visible: false)]
|
||||||
public int WorkId { get; set; }
|
public int WorkId { get; set; }
|
||||||
|
|
||||||
[DisplayName("Клиент")]
|
[Column(visible: false)]
|
||||||
public int ClientId { get; set; }
|
public int ClientId { get; set; }
|
||||||
[DisplayName("ФИО клиента")]
|
[Column(title: "ФИО клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string ClientFIO { get; set; } = string.Empty;
|
public string ClientFIO { get; set; } = string.Empty;
|
||||||
[DisplayName("Почта клиента")]
|
[Column(title: "Почта клиента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string ClientEmail { get; set; } = string.Empty;
|
public string ClientEmail { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Исполнитель")]
|
[Column(visible: false)]
|
||||||
public int? ImplementerId { get; set; }
|
public int? ImplementerId { 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: "Работа", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string WorkName { get; set; } = string.Empty;
|
public string WorkName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Количество")]
|
[Column(title: "Количество", width: 150)]
|
||||||
public int Count { get; set; }
|
public int Count { get; set; }
|
||||||
|
|
||||||
[DisplayName("Сумма")]
|
[Column(title: "Сумма", width: 150)]
|
||||||
public double Sum { get; set; }
|
public double Sum { get; set; }
|
||||||
|
|
||||||
[DisplayName("Статус")]
|
[Column(title: "Статус", width: 150)]
|
||||||
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
|
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
|
||||||
|
|
||||||
[DisplayName("Дата создания")]
|
[Column(title: "Дата создания", width: 150)]
|
||||||
public DateTime DateCreate { get; set; } = DateTime.Now;
|
public DateTime DateCreate { get; set; } = DateTime.Now;
|
||||||
|
|
||||||
[DisplayName("Дата выполнения")]
|
[Column(title: "Дата выполнения", width: 150)]
|
||||||
public DateTime? DateImplement { get; set; }
|
public DateTime? DateImplement { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,18 +1,20 @@
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
|
|
||||||
namespace PlumbingRepairContracts.ViewModels
|
namespace PlumbingRepairContracts.ViewModels
|
||||||
{
|
{
|
||||||
public class WorkViewModel : IWorkModel
|
public class WorkViewModel : IWorkModel
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
[Column(visible: false)]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
[DisplayName("Название работ")]
|
[Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
|
||||||
public string WorkName { get; set; } = string.Empty;
|
public string WorkName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[DisplayName("Цена")]
|
[Column(title: "Цена", width: 150)]
|
||||||
public double Price { get; set; }
|
public double Price { get; set; }
|
||||||
[DisplayName("Компоненты")]
|
[Column(visible: false)]
|
||||||
public Dictionary<int, (IComponentModel, int)> WorkComponents { get; set; } = new();
|
public Dictionary<int, (IComponentModel, int)> WorkComponents { get; set; } = new();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
namespace PlumbingRepairDataModels.Models
|
namespace PlumbingRepairDataModels.Models
|
||||||
{
|
{
|
||||||
public interface IMessageInfoModel
|
public interface IMessageInfoModel : IId
|
||||||
{
|
{
|
||||||
string MessageId { get; }
|
string MessageId { get; }
|
||||||
int? ClientId { get; }
|
int? ClientId { get; }
|
||||||
@ -9,7 +9,12 @@ namespace PlumbingRepairDataModels.Models
|
|||||||
DateTime DateDelivery { get; }
|
DateTime DateDelivery { get; }
|
||||||
string Subject { get; }
|
string Subject { get; }
|
||||||
string Body { get; }
|
string Body { get; }
|
||||||
|
<<<<<<< HEAD
|
||||||
bool IsRead { get; }
|
bool IsRead { get; }
|
||||||
string? ReplyText { get; }
|
string? ReplyText { get; }
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
|
||||||
|
}
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,21 @@
|
|||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
using PlumbingRepairDatabaseImplement.Implements;
|
||||||
|
|
||||||
|
namespace PlumbingRepairDatabaseImplement
|
||||||
|
{
|
||||||
|
public class DatabaseImplementationExtension : IImplementationExtension
|
||||||
|
{
|
||||||
|
public int Priority => 2;
|
||||||
|
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<IWorkStorage, WorkStorage>();
|
||||||
|
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,27 @@
|
|||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
|
||||||
|
namespace PlumbingRepairDatabaseImplement.Implements
|
||||||
|
{
|
||||||
|
public class BackUpInfo : IBackUpInfo
|
||||||
|
{
|
||||||
|
public List<T>? GetList<T>() where T : class, new()
|
||||||
|
{
|
||||||
|
using var context = new PlumbingRepairDatabase();
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -3,23 +3,31 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class Client : IClientModel
|
[DataContract]
|
||||||
|
public class Client : IClientModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string ClientFIO { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ClientFIO { get; private set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
public string Email { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Email { get; private set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
public string Password { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
|
||||||
|
|
||||||
[ForeignKey("ClientId")]
|
[ForeignKey("ClientId")]
|
||||||
public virtual List<Order> Orders{ get; set; } = new();
|
public virtual List<Order> Orders{ get; set; } = new();
|
||||||
|
[ForeignKey("ClientId")]
|
||||||
|
public virtual List<MessageInfo> Messages { get; set; } = new();
|
||||||
|
|
||||||
public static Client? Create(ClientBindingModel model)
|
public static Client? Create(ClientBindingModel model)
|
||||||
{
|
{
|
||||||
|
@ -3,18 +3,23 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class Component : IComponentModel
|
[DataContract]
|
||||||
|
public class Component : IComponentModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string ComponentName { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ComponentName { get; private set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public double Cost { get; set; }
|
[DataMember]
|
||||||
|
public double Cost { get; set; }
|
||||||
|
|
||||||
[ForeignKey("ComponentId")]
|
[ForeignKey("ComponentId")]
|
||||||
public virtual List<WorkComponent> WorkComponents { get; set; } = new();
|
public virtual List<WorkComponent> WorkComponents { get; set; } = new();
|
||||||
|
@ -3,23 +3,30 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class Implementer : IImplementerModel
|
[DataContract]
|
||||||
|
public class Implementer : IImplementerModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string ImplementerFIO { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ImplementerFIO { get; private set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
public string Password { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public int WorkExperience { get; private set; }
|
[DataMember]
|
||||||
|
public int WorkExperience { get; private set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public int Qualification { get; private set; }
|
[DataMember]
|
||||||
|
public int Qualification { get; private set; }
|
||||||
|
|
||||||
[ForeignKey("ImplementerId")]
|
[ForeignKey("ImplementerId")]
|
||||||
public virtual List<Order> Orders{ get; set; } = new();
|
public virtual List<Order> Orders{ get; set; } = new();
|
||||||
|
@ -3,25 +3,38 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class MessageInfo : IMessageInfoModel
|
[DataContract]
|
||||||
|
public class MessageInfo : IMessageInfoModel
|
||||||
{
|
{
|
||||||
[Key]
|
[Key]
|
||||||
public string MessageId { get; set; } = string.Empty;
|
[DataMember]
|
||||||
public int? ClientId { get; set; }
|
public string MessageId { get; set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public int? ClientId { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public string SenderName { get; set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string SenderName { get; set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
public DateTime DateDelivery { get; set; } = DateTime.Now;
|
[DataMember]
|
||||||
|
public DateTime DateDelivery { get; set; } = DateTime.Now;
|
||||||
[Required]
|
[Required]
|
||||||
public string Subject { get; set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Subject { get; set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
|
<<<<<<< HEAD
|
||||||
public string Body { get; set; } = string.Empty;
|
public string Body { get; set; } = string.Empty;
|
||||||
[Required]
|
[Required]
|
||||||
public bool IsRead { get; private set; } = false;
|
public bool IsRead { get; private set; } = false;
|
||||||
public string? ReplyText { get; private set; }
|
public string? ReplyText { get; private set; }
|
||||||
|
=======
|
||||||
|
[DataMember]
|
||||||
|
public string Body { get; set; } = string.Empty;
|
||||||
|
public virtual Client? Client { get; set; }
|
||||||
|
>>>>>>> lab_8
|
||||||
|
|
||||||
public static MessageInfo? Create(MessageInfoBindingModel model)
|
public static MessageInfo? Create(MessageInfoBindingModel model)
|
||||||
{
|
{
|
||||||
@ -52,8 +65,14 @@ namespace PlumbingRepairDatabaseImplement.Models
|
|||||||
MessageId = MessageId,
|
MessageId = MessageId,
|
||||||
SenderName = SenderName,
|
SenderName = SenderName,
|
||||||
DateDelivery = DateDelivery,
|
DateDelivery = DateDelivery,
|
||||||
|
<<<<<<< HEAD
|
||||||
IsRead = IsRead,
|
IsRead = IsRead,
|
||||||
ReplyText = ReplyText
|
ReplyText = ReplyText
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
};
|
||||||
|
public int Id => throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
@ -3,28 +3,36 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Enums;
|
using PlumbingRepairDataModels.Enums;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
public class Order : IOrderModel
|
[DataContract]
|
||||||
|
public class Order : IOrderModel
|
||||||
{
|
{
|
||||||
[Required]
|
[Required]
|
||||||
public int WorkId { get; set; }
|
[DataMember]
|
||||||
|
public int WorkId { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public int ClientId { get; set; }
|
[DataMember]
|
||||||
public int? ImplementerId { get; set; }
|
public int ClientId { get; set; }
|
||||||
|
[DataMember]
|
||||||
|
public int? ImplementerId { get; set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public int Count { get; set; }
|
[DataMember]
|
||||||
|
public int Count { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public double Sum { get; set; }
|
[DataMember]
|
||||||
|
public double Sum { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public OrderStatus Status { get; set; }
|
[DataMember]
|
||||||
|
public OrderStatus Status { get; set; }
|
||||||
[Required]
|
[Required]
|
||||||
public DateTime DateCreate { get; set; }
|
[DataMember]
|
||||||
|
public DateTime DateCreate { get; set; }
|
||||||
public DateTime? DateImplement { get; set; }
|
[DataMember]
|
||||||
|
public DateTime? DateImplement { get; set; }
|
||||||
|
|
||||||
public int Id { get; set; }
|
public int Id { get; set; }
|
||||||
|
|
||||||
@ -69,8 +77,7 @@ namespace PlumbingRepairDatabaseImplement.Models
|
|||||||
ImplementerId= ImplementerId,
|
ImplementerId= ImplementerId,
|
||||||
ImplementerFIO = Implementer == null ? null : Implementer.ImplementerFIO,
|
ImplementerFIO = Implementer == null ? null : Implementer.ImplementerFIO,
|
||||||
Count = Count,
|
Count = Count,
|
||||||
ClientEmail = Client.Email,
|
Sum = Sum,
|
||||||
Sum = Sum,
|
|
||||||
DateCreate = DateCreate,
|
DateCreate = DateCreate,
|
||||||
DateImplement = DateImplement,
|
DateImplement = DateImplement,
|
||||||
Id = Id,
|
Id = Id,
|
||||||
|
@ -3,18 +3,23 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.ComponentModel.DataAnnotations;
|
using System.ComponentModel.DataAnnotations;
|
||||||
using System.ComponentModel.DataAnnotations.Schema;
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairDatabaseImplement.Models
|
namespace PlumbingRepairDatabaseImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
public class Work : IWorkModel
|
public class Work : IWorkModel
|
||||||
{
|
{
|
||||||
public int Id { get; set; }
|
[DataMember]
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public string WorkName { get; set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string WorkName { get; set; } = string.Empty;
|
||||||
|
|
||||||
[Required]
|
[Required]
|
||||||
public double Price { get; set; }
|
[DataMember]
|
||||||
|
public double Price { get; set; }
|
||||||
|
|
||||||
private Dictionary<int, (IComponentModel, int)>? _workComponents = null;
|
private Dictionary<int, (IComponentModel, int)>? _workComponents = null;
|
||||||
|
|
||||||
|
@ -24,4 +24,8 @@
|
|||||||
<Folder Include="Migrations\" />
|
<Folder Include="Migrations\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="copy /Y "$(TargetDir)*.dll" "$(SolutionDir)ImplementationExtensions\*.dll"" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -0,0 +1,21 @@
|
|||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
using PlumbingRepairFileImplement.Implements;
|
||||||
|
|
||||||
|
namespace BlacksmithWorkshopFileImplement
|
||||||
|
{
|
||||||
|
public class FileImplementationExtension : 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<IWorkStorage, WorkStorage>();
|
||||||
|
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
|
||||||
|
namespace PlumbingRepairFileImplement.Implements
|
||||||
|
{
|
||||||
|
public class BackUpInfo : IBackUpInfo
|
||||||
|
{
|
||||||
|
public List<T>? GetList<T>() where T : class, new()
|
||||||
|
{
|
||||||
|
// Получаем значения из singleton-объекта универсального свойства содержащее тип T
|
||||||
|
var source = DataFileSingleton.GetInstance();
|
||||||
|
return (List<T>?)source.GetType().GetProperties()
|
||||||
|
.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == typeof(T))
|
||||||
|
?.GetValue(source);
|
||||||
|
}
|
||||||
|
public Type? GetTypeByModelInterface(string modelInterfaceName)
|
||||||
|
{
|
||||||
|
var assembly = typeof(BackUpInfo).Assembly;
|
||||||
|
var types = assembly.GetTypes();
|
||||||
|
foreach (var type in types)
|
||||||
|
{
|
||||||
|
if (type.IsClass && type.GetInterface(modelInterfaceName) != null)
|
||||||
|
{
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,18 +1,22 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
internal class Client : IClientModel
|
[DataContract]
|
||||||
|
internal class Client : IClientModel
|
||||||
{
|
{
|
||||||
|
[DataMember]
|
||||||
public int Id { get; private set; }
|
public int Id { get; private set; }
|
||||||
public string ClientFIO { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ClientFIO { get; private set; } = string.Empty;
|
||||||
public string Email { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Email { get; private set; } = string.Empty;
|
||||||
public string Password { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
|
||||||
public static Client? Create(ClientBindingModel model)
|
public static Client? Create(ClientBindingModel model)
|
||||||
{
|
{
|
||||||
|
@ -1,17 +1,20 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class Component : IComponentModel
|
internal class Component : IComponentModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string ComponentName { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ComponentName { get; private set; } = string.Empty;
|
||||||
public double Cost { get; set; }
|
[DataMember]
|
||||||
|
public double Cost { get; set; }
|
||||||
|
|
||||||
public static Component? Create(ComponentBindingModel model)
|
public static Component? Create(ComponentBindingModel model)
|
||||||
{
|
{
|
||||||
|
@ -1,18 +1,24 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class Implementer : IImplementerModel
|
internal class Implementer : IImplementerModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
public string ImplementerFIO { get; private set; } = string.Empty;
|
public int Id { get; private set; }
|
||||||
|
[DataMember]
|
||||||
public string Password { get; private set; } = string.Empty;
|
public string ImplementerFIO { get; private set; } = string.Empty;
|
||||||
public int Qualification { get; private set; }
|
[DataMember]
|
||||||
public int WorkExperience { get; private set; }
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public int Qualification { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public int WorkExperience { get; private set; }
|
||||||
|
|
||||||
public static Implementer? Create(ImplementerBindingModel model)
|
public static Implementer? Create(ImplementerBindingModel model)
|
||||||
{
|
{
|
||||||
|
@ -1,12 +1,15 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class MessageInfo : IMessageInfoModel
|
internal class MessageInfo : IMessageInfoModel
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
public string MessageId { get; private set; } = string.Empty;
|
public string MessageId { get; private set; } = string.Empty;
|
||||||
|
|
||||||
public int? ClientId { get; private set; }
|
public int? ClientId { get; private set; }
|
||||||
@ -20,6 +23,20 @@ namespace PlumbingRepairFileImplement.Models
|
|||||||
public string Body { get; private set; } = string.Empty;
|
public string Body { get; private set; } = string.Empty;
|
||||||
public bool IsRead { get; private set; } = false;
|
public bool IsRead { get; private set; } = false;
|
||||||
public string? ReplyText { get; private set; }
|
public string? ReplyText { get; private set; }
|
||||||
|
=======
|
||||||
|
[DataMember]
|
||||||
|
public string MessageId { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public int? ClientId { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public string SenderName { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public DateTime DateDelivery { get; private set; } = DateTime.Now;
|
||||||
|
[DataMember]
|
||||||
|
public string Subject { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public string Body { get; private set; } = string.Empty;
|
||||||
|
>>>>>>> lab_8
|
||||||
|
|
||||||
public static MessageInfo? Create(MessageInfoBindingModel model)
|
public static MessageInfo? Create(MessageInfoBindingModel model)
|
||||||
{
|
{
|
||||||
@ -83,5 +100,6 @@ namespace PlumbingRepairFileImplement.Models
|
|||||||
new XElement("IsRead", IsRead),
|
new XElement("IsRead", IsRead),
|
||||||
new XElement("ReplyText", ReplyText)
|
new XElement("ReplyText", ReplyText)
|
||||||
);
|
);
|
||||||
}
|
public int Id => throw new NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
@ -3,27 +3,32 @@ using PlumbingRepairContracts.ViewModels;
|
|||||||
using PlumbingRepairDataModels.Enums;
|
using PlumbingRepairDataModels.Enums;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class Order : IOrderModel
|
internal class Order : IOrderModel
|
||||||
{
|
{
|
||||||
public int WorkId { get; private set; }
|
[DataMember]
|
||||||
public int ClientId { get; private set; }
|
public int WorkId { get; private set; }
|
||||||
public int? ImplementerId { get; private set; }
|
[DataMember]
|
||||||
|
public int ClientId { get; private set; }
|
||||||
public int Count { get; private set; }
|
[DataMember]
|
||||||
|
public int? ImplementerId { get; private set; }
|
||||||
public double Sum { get; private set; }
|
[DataMember]
|
||||||
|
public int Count { get; private set; }
|
||||||
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
|
[DataMember]
|
||||||
|
public double Sum { get; private set; }
|
||||||
public DateTime DateCreate { get; private set; } = DateTime.Now;
|
[DataMember]
|
||||||
|
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
|
||||||
public DateTime? DateImplement { get; private set; }
|
[DataMember]
|
||||||
|
public DateTime DateCreate { get; private set; } = DateTime.Now;
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public DateTime? DateImplement { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
public static Order? Create(OrderBindingModel? model)
|
public static Order? Create(OrderBindingModel? model)
|
||||||
{
|
{
|
||||||
|
@ -1,17 +1,20 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
using System.Xml.Linq;
|
using System.Xml.Linq;
|
||||||
|
|
||||||
namespace PlumbingRepairFileImplement.Models
|
namespace PlumbingRepairFileImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class Work : IWorkModel
|
internal class Work : IWorkModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string WorkName { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string WorkName { get; private set; } = string.Empty;
|
||||||
public double Price { get; private set; }
|
[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();
|
||||||
|
|
||||||
|
@ -11,4 +11,8 @@
|
|||||||
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="copy /Y "$(TargetDir)*.dll" "$(SolutionDir)ImplementationExtensions\*.dll"" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
|
||||||
|
namespace PlumbingRepairListImplement.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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
|
using PlumbingRepairListImplement.Implements;
|
||||||
|
|
||||||
|
namespace PlumbingRepairListImplement
|
||||||
|
{
|
||||||
|
public class ListImplementationExtension : 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<IWorkStorage, WorkStorage>();
|
||||||
|
DependencyManager.Instance.RegisterType<IBackUpInfo, BackUpInfo>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,16 +1,21 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
internal class Client : IClientModel
|
[DataContract]
|
||||||
|
internal class Client : IClientModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string ClientFIO { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
public string Email { get; private set; } = string.Empty;
|
public string ClientFIO { get; private set; } = string.Empty;
|
||||||
public string Password { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string Email { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
|
||||||
public static Client? Create(ClientBindingModel? model)
|
public static Client? Create(ClientBindingModel? model)
|
||||||
{
|
{
|
||||||
|
@ -1,16 +1,19 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
|
[DataContract]
|
||||||
internal class Component : IComponentModel
|
internal class Component : IComponentModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string ComponentName { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string ComponentName { get; private set; } = string.Empty;
|
||||||
public double Cost { get; set; }
|
[DataMember]
|
||||||
|
public double Cost { get; set; }
|
||||||
|
|
||||||
public static Component? Create(ComponentBindingModel? model)
|
public static Component? Create(ComponentBindingModel? model)
|
||||||
{
|
{
|
||||||
|
@ -1,17 +1,23 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
internal class Implementer : IImplementerModel
|
[DataContract]
|
||||||
|
internal class Implementer : IImplementerModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string ImplementerFIO { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
public string Password { get; private set; } = string.Empty;
|
public string ImplementerFIO { get; private set; } = string.Empty;
|
||||||
public int Qualification { get; private set; }
|
[DataMember]
|
||||||
public int WorkExperience { get; private set; }
|
public string Password { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public int Qualification { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public int WorkExperience { get; private set; }
|
||||||
public static Implementer? Create(ImplementerBindingModel? model)
|
public static Implementer? Create(ImplementerBindingModel? model)
|
||||||
{
|
{
|
||||||
if (model == null)
|
if (model == null)
|
||||||
|
@ -1,12 +1,16 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
public class MessageInfo : IMessageInfoModel
|
[DataContract]
|
||||||
|
public class MessageInfo : IMessageInfoModel
|
||||||
{
|
{
|
||||||
|
[DataMember]
|
||||||
public string MessageId { get; private set; } = string.Empty;
|
public string MessageId { get; private set; } = string.Empty;
|
||||||
|
<<<<<<< HEAD
|
||||||
|
|
||||||
public int? ClientId { get; private set; }
|
public int? ClientId { get; private set; }
|
||||||
|
|
||||||
@ -19,6 +23,18 @@ namespace PlumbingRepairListImplement.Models
|
|||||||
public string Body { get; private set; } = string.Empty;
|
public string Body { get; private set; } = string.Empty;
|
||||||
public bool IsRead { get; private set; } = false;
|
public bool IsRead { get; private set; } = false;
|
||||||
public string? ReplyText { get; private set; }
|
public string? ReplyText { get; private set; }
|
||||||
|
=======
|
||||||
|
[DataMember]
|
||||||
|
public int? ClientId { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public string SenderName { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public DateTime DateDelivery { get; private set; } = DateTime.Now;
|
||||||
|
[DataMember]
|
||||||
|
public string Subject { get; private set; } = string.Empty;
|
||||||
|
[DataMember]
|
||||||
|
public string Body { get; private set; } = string.Empty;
|
||||||
|
>>>>>>> lab_8
|
||||||
|
|
||||||
public static MessageInfo? Create(MessageInfoBindingModel model)
|
public static MessageInfo? Create(MessageInfoBindingModel model)
|
||||||
{
|
{
|
||||||
@ -50,8 +66,14 @@ namespace PlumbingRepairListImplement.Models
|
|||||||
MessageId = MessageId,
|
MessageId = MessageId,
|
||||||
SenderName = SenderName,
|
SenderName = SenderName,
|
||||||
DateDelivery = DateDelivery,
|
DateDelivery = DateDelivery,
|
||||||
|
<<<<<<< HEAD
|
||||||
IsRead = IsRead,
|
IsRead = IsRead,
|
||||||
ReplyText = ReplyText
|
ReplyText = ReplyText
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
=======
|
||||||
|
};
|
||||||
|
public int Id => throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
@ -2,26 +2,31 @@
|
|||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Enums;
|
using PlumbingRepairDataModels.Enums;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
internal class Order : IOrderModel
|
[DataContract]
|
||||||
|
internal class Order : IOrderModel
|
||||||
{
|
{
|
||||||
public int WorkId { get; private set; }
|
[DataMember]
|
||||||
public int ClientId { get; private set; }
|
public int WorkId { get; private set; }
|
||||||
public int? ImplementerId { get; private set; }
|
[DataMember]
|
||||||
|
public int ClientId { get; private set; }
|
||||||
public int Count { get; private set; }
|
[DataMember]
|
||||||
|
public int? ImplementerId { get; private set; }
|
||||||
public double Sum { get; private set; }
|
[DataMember]
|
||||||
|
public int Count { get; private set; }
|
||||||
public OrderStatus Status { get; private set; }
|
[DataMember]
|
||||||
|
public double Sum { get; private set; }
|
||||||
public DateTime DateCreate { get; private set; }
|
[DataMember]
|
||||||
|
public OrderStatus Status { get; private set; }
|
||||||
public DateTime? DateImplement { get; private set; }
|
[DataMember]
|
||||||
|
public DateTime DateCreate { get; private set; }
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public DateTime? DateImplement { get; private set; }
|
||||||
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
|
|
||||||
public static Order? Create(OrderBindingModel? model)
|
public static Order? Create(OrderBindingModel? model)
|
||||||
{
|
{
|
||||||
|
@ -1,16 +1,19 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.ViewModels;
|
using PlumbingRepairContracts.ViewModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
|
||||||
namespace PlumbingRepairListImplement.Models
|
namespace PlumbingRepairListImplement.Models
|
||||||
{
|
{
|
||||||
internal class Work : IWorkModel
|
[DataContract]
|
||||||
|
internal class Work : IWorkModel
|
||||||
{
|
{
|
||||||
public int Id { get; private set; }
|
[DataMember]
|
||||||
|
public int Id { get; private set; }
|
||||||
public string WorkName { get; private set; } = string.Empty;
|
[DataMember]
|
||||||
|
public string WorkName { get; private set; } = string.Empty;
|
||||||
public double Price { get; private set; }
|
[DataMember]
|
||||||
|
public double Price { get; private set; }
|
||||||
|
|
||||||
public Dictionary<int, (IComponentModel, int)> WorkComponents { get; private set; } = new Dictionary<int, (IComponentModel, int)>();
|
public Dictionary<int, (IComponentModel, int)> WorkComponents { get; private set; } = new Dictionary<int, (IComponentModel, int)>();
|
||||||
|
|
||||||
|
@ -11,4 +11,8 @@
|
|||||||
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
<ProjectReference Include="..\PlumbingRepairDataModels\PlumbingRepairDataModels.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="copy /Y "$(TargetDir)*.dll" "$(SolutionDir)ImplementationExtensions\*.dll"" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
46
PlumbingRepair/PlumbingRepairView/DataGridViewExtension.cs
Normal file
46
PlumbingRepair/PlumbingRepairView/DataGridViewExtension.cs
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
using PlumbingRepairContracts.Attributes;
|
||||||
|
|
||||||
|
namespace PlumbingRepairView
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -28,14 +28,8 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
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)
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.BusinessLogicsContracts;
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
@ -26,14 +27,8 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
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["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
|
||||||
}
|
|
||||||
_logger.LogInformation("Загрузка компонентов");
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -44,13 +39,10 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
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();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,8 +50,8 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
if (dataGridView.SelectedRows.Count == 1)
|
if (dataGridView.SelectedRows.Count == 1)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
|
var service = DependencyManager.Instance.Resolve<FormComponent>();
|
||||||
if (service is FormComponent form)
|
if (service is FormComponent form)
|
||||||
{
|
{
|
||||||
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
|
||||||
if (form.ShowDialog() == DialogResult.OK)
|
if (form.ShowDialog() == DialogResult.OK)
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.BusinessLogicsContracts;
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
@ -25,14 +26,8 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
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)
|
||||||
{
|
{
|
||||||
@ -43,28 +38,22 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
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)
|
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 = Program.ServiceProvider?.GetService(typeof(FormImplementer));
|
var form = DependencyManager.Instance.Resolve<FormImplementer>();
|
||||||
if (service is FormImplementer 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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,6 +23,7 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
var list = _logic.ReadList(new() { Page = page, PageSize = pageSize });
|
var list = _logic.ReadList(new() { Page = page, PageSize = pageSize });
|
||||||
if (list != null)
|
if (list != null)
|
||||||
{
|
{
|
||||||
@ -32,6 +33,10 @@ namespace PlumbingRepairView
|
|||||||
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
|
||||||
}
|
}
|
||||||
_logger.LogInformation("Загрузка сообщений");
|
_logger.LogInformation("Загрузка сообщений");
|
||||||
|
=======
|
||||||
|
dataGridView.FillAndConfigGrid(_logic.ReadList(null));
|
||||||
|
_logger.LogInformation("Loading mails");
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
@ -50,7 +50,11 @@
|
|||||||
this.выполнениеРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.выполнениеРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.списокВсехЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
<<<<<<< HEAD
|
||||||
this.письмаToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
this.письмаToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
=======
|
||||||
|
this.созданиеБэкапаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
|
||||||
|
>>>>>>> lab_8
|
||||||
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
|
((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
|
||||||
this.menuStrip1.SuspendLayout();
|
this.menuStrip1.SuspendLayout();
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
@ -118,7 +122,12 @@
|
|||||||
this.справочникиToolStripMenuItem,
|
this.справочникиToolStripMenuItem,
|
||||||
this.отчетыToolStripMenuItem,
|
this.отчетыToolStripMenuItem,
|
||||||
this.выполнениеРаботToolStripMenuItem,
|
this.выполнениеРаботToolStripMenuItem,
|
||||||
|
<<<<<<< HEAD
|
||||||
this.письмаToolStripMenuItem1});
|
this.письмаToolStripMenuItem1});
|
||||||
|
=======
|
||||||
|
this.письмаToolStripMenuItem,
|
||||||
|
this.созданиеБэкапаToolStripMenuItem});
|
||||||
|
>>>>>>> lab_8
|
||||||
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
|
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
|
||||||
this.menuStrip1.Name = "menuStrip1";
|
this.menuStrip1.Name = "menuStrip1";
|
||||||
this.menuStrip1.Size = new System.Drawing.Size(1377, 33);
|
this.menuStrip1.Size = new System.Drawing.Size(1377, 33);
|
||||||
@ -142,14 +151,22 @@
|
|||||||
// компонентыToolStripMenuItem
|
// компонентыToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
|
this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
|
||||||
|
<<<<<<< HEAD
|
||||||
this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
||||||
|
=======
|
||||||
|
this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
|
||||||
|
>>>>>>> lab_8
|
||||||
this.компонентыToolStripMenuItem.Text = "Компоненты";
|
this.компонентыToolStripMenuItem.Text = "Компоненты";
|
||||||
this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
|
this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.КомпонентыToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// РаботыToolStripMenuItem
|
// РаботыToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.РаботыToolStripMenuItem.Name = "РаботыToolStripMenuItem";
|
this.РаботыToolStripMenuItem.Name = "РаботыToolStripMenuItem";
|
||||||
|
<<<<<<< HEAD
|
||||||
this.РаботыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
this.РаботыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
||||||
|
=======
|
||||||
|
this.РаботыToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
|
||||||
|
>>>>>>> lab_8
|
||||||
this.РаботыToolStripMenuItem.Text = "Работы";
|
this.РаботыToolStripMenuItem.Text = "Работы";
|
||||||
this.РаботыToolStripMenuItem.Click += new System.EventHandler(this.РаботыToolStripMenuItem_Click);
|
this.РаботыToolStripMenuItem.Click += new System.EventHandler(this.РаботыToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
@ -177,14 +194,22 @@
|
|||||||
// клиентыToolStripMenuItem
|
// клиентыToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
|
this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
|
||||||
|
<<<<<<< HEAD
|
||||||
this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
||||||
|
=======
|
||||||
|
this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
|
||||||
|
>>>>>>> lab_8
|
||||||
this.клиентыToolStripMenuItem.Text = "Клиенты";
|
this.клиентыToolStripMenuItem.Text = "Клиенты";
|
||||||
this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
|
this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
// исполнителиToolStripMenuItem
|
// исполнителиToolStripMenuItem
|
||||||
//
|
//
|
||||||
this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
|
this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
|
||||||
|
<<<<<<< HEAD
|
||||||
this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(296, 34);
|
||||||
|
=======
|
||||||
|
this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(220, 34);
|
||||||
|
>>>>>>> lab_8
|
||||||
this.исполнителиToolStripMenuItem.Text = "Исполнители";
|
this.исполнителиToolStripMenuItem.Text = "Исполнители";
|
||||||
this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click);
|
this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
@ -256,12 +281,21 @@
|
|||||||
this.письмаToolStripMenuItem.Text = "Письма";
|
this.письмаToolStripMenuItem.Text = "Письма";
|
||||||
this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
|
this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
|
||||||
//
|
//
|
||||||
|
<<<<<<< HEAD
|
||||||
// письмаToolStripMenuItem1
|
// письмаToolStripMenuItem1
|
||||||
//
|
//
|
||||||
this.письмаToolStripMenuItem1.Name = "письмаToolStripMenuItem1";
|
this.письмаToolStripMenuItem1.Name = "письмаToolStripMenuItem1";
|
||||||
this.письмаToolStripMenuItem1.Size = new System.Drawing.Size(90, 29);
|
this.письмаToolStripMenuItem1.Size = new System.Drawing.Size(90, 29);
|
||||||
this.письмаToolStripMenuItem1.Text = "Письма";
|
this.письмаToolStripMenuItem1.Text = "Письма";
|
||||||
this.письмаToolStripMenuItem1.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
|
this.письмаToolStripMenuItem1.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
|
||||||
|
=======
|
||||||
|
// созданиеБэкапаToolStripMenuItem
|
||||||
|
//
|
||||||
|
this.созданиеБэкапаToolStripMenuItem.Name = "созданиеБэкапаToolStripMenuItem";
|
||||||
|
this.созданиеБэкапаToolStripMenuItem.Size = new System.Drawing.Size(166, 29);
|
||||||
|
this.созданиеБэкапаToolStripMenuItem.Text = "Создание бэкапа";
|
||||||
|
this.созданиеБэкапаToolStripMenuItem.Click += new System.EventHandler(this.backupToolStripMenuItem_Click);
|
||||||
|
>>>>>>> lab_8
|
||||||
//
|
//
|
||||||
// FormMain
|
// FormMain
|
||||||
//
|
//
|
||||||
@ -309,6 +343,10 @@
|
|||||||
private ToolStripMenuItem выполнениеРаботToolStripMenuItem;
|
private ToolStripMenuItem выполнениеРаботToolStripMenuItem;
|
||||||
private ToolStripMenuItem исполнителиToolStripMenuItem;
|
private ToolStripMenuItem исполнителиToolStripMenuItem;
|
||||||
private ToolStripMenuItem письмаToolStripMenuItem;
|
private ToolStripMenuItem письмаToolStripMenuItem;
|
||||||
|
<<<<<<< HEAD
|
||||||
private ToolStripMenuItem письмаToolStripMenuItem1;
|
private ToolStripMenuItem письмаToolStripMenuItem1;
|
||||||
|
=======
|
||||||
|
private ToolStripMenuItem созданиеБэкапаToolStripMenuItem;
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -2,6 +2,8 @@
|
|||||||
using PlumbingRepairBusinessLogic.BusinessLogics;
|
using PlumbingRepairBusinessLogic.BusinessLogics;
|
||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.BusinessLogicsContracts;
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
using System.Windows.Forms;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
@ -12,13 +14,19 @@ namespace PlumbingRepairView
|
|||||||
private readonly IOrderLogic _orderLogic;
|
private readonly IOrderLogic _orderLogic;
|
||||||
private readonly IReportLogic _reportLogic;
|
private readonly IReportLogic _reportLogic;
|
||||||
private readonly IWorkProcess _workProcess;
|
private readonly IWorkProcess _workProcess;
|
||||||
|
<<<<<<< HEAD
|
||||||
public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, 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)
|
||||||
|
>>>>>>> lab_8
|
||||||
{
|
{
|
||||||
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)
|
||||||
@ -30,6 +38,7 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
var list = _orderLogic.ReadList(null);
|
var list = _orderLogic.ReadList(null);
|
||||||
if (list != null)
|
if (list != null)
|
||||||
{
|
{
|
||||||
@ -38,6 +47,10 @@ namespace PlumbingRepairView
|
|||||||
dataGridView.Columns["ImplementerId"].Visible = false;
|
dataGridView.Columns["ImplementerId"].Visible = false;
|
||||||
}
|
}
|
||||||
_logger.LogInformation("Загрузка заказов");
|
_logger.LogInformation("Загрузка заказов");
|
||||||
|
=======
|
||||||
|
dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
|
||||||
|
_logger.LogInformation("Загрузка заказов");
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -48,16 +61,14 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
private void КомпонентыToolStripMenuItem_Click(object sender, EventArgs e)
|
private void КомпонентыToolStripMenuItem_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 РаботыToolStripMenuItem_Click(object sender, EventArgs e)
|
private void РаботыToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormWorks));
|
var service = Program.ServiceProvider?.GetService(typeof(FormWorks));
|
||||||
if (service is FormWorks form)
|
if (service is FormWorks form)
|
||||||
{
|
{
|
||||||
@ -135,6 +146,13 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
}
|
}
|
||||||
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
|
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
=======
|
||||||
|
var form = DependencyManager.Instance.Resolve<FormWorks>();
|
||||||
|
form.ShowDialog();
|
||||||
|
}
|
||||||
|
private void ComponentsToolStripMenuItem_Click(object sender, EventArgs
|
||||||
|
e)
|
||||||
|
>>>>>>> lab_8
|
||||||
{
|
{
|
||||||
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
|
||||||
if (dialog.ShowDialog() == DialogResult.OK)
|
if (dialog.ShowDialog() == DialogResult.OK)
|
||||||
@ -150,15 +168,12 @@ namespace PlumbingRepairView
|
|||||||
private void ComponentWorksToolStripMenuItem_Click(object sender,
|
private void ComponentWorksToolStripMenuItem_Click(object sender,
|
||||||
EventArgs e)
|
EventArgs e)
|
||||||
{
|
{
|
||||||
var service =
|
var form = DependencyManager.Instance.Resolve<FormReportWorkComponents>();
|
||||||
Program.ServiceProvider?.GetService(typeof(FormReportWorkComponents));
|
form.ShowDialog();
|
||||||
if (service is FormReportWorkComponents form)
|
}
|
||||||
{
|
|
||||||
form.ShowDialog();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
var service =
|
var service =
|
||||||
Program.ServiceProvider?.GetService(typeof(FormReportOrders));
|
Program.ServiceProvider?.GetService(typeof(FormReportOrders));
|
||||||
if (service is FormReportOrders form)
|
if (service is FormReportOrders form)
|
||||||
@ -190,6 +205,21 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
private void OrdersByDateToolStripMenuItem_Click(object sender, EventArgs e)
|
private void OrdersByDateToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
=======
|
||||||
|
var form = DependencyManager.Instance.Resolve<FormReportOrders>();
|
||||||
|
form.ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void ButtonCreateOrder_Click(object sender, EventArgs e)
|
||||||
|
{
|
||||||
|
var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
|
||||||
|
form.ShowDialog();
|
||||||
|
LoadData();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ButtonIssuedOrder_Click(object sender, EventArgs e)
|
||||||
|
>>>>>>> lab_8
|
||||||
{
|
{
|
||||||
var service =
|
var service =
|
||||||
Program.ServiceProvider?.GetService(typeof(FormReportOrdersByDate));
|
Program.ServiceProvider?.GetService(typeof(FormReportOrdersByDate));
|
||||||
@ -201,6 +231,7 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
|
private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
var service =
|
var service =
|
||||||
Program.ServiceProvider?.GetService(typeof(FormClients));
|
Program.ServiceProvider?.GetService(typeof(FormClients));
|
||||||
if (service is FormClients form)
|
if (service is FormClients form)
|
||||||
@ -210,8 +241,22 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void выполнениеРаботToolStripMenuItem_Click(object sender, EventArgs e)
|
private void выполнениеРаботToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
=======
|
||||||
|
var form = DependencyManager.Instance.Resolve<FormClients>();
|
||||||
|
form.ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
_workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
|
var form = DependencyManager.Instance.Resolve<FormImplementers>();
|
||||||
|
form.ShowDialog();
|
||||||
|
|
||||||
|
}
|
||||||
|
private void ЗапускРаботToolStripMenuItem_Click(object sender, EventArgs
|
||||||
|
e)
|
||||||
|
>>>>>>> lab_8
|
||||||
|
{
|
||||||
|
_workProcess.DoWork((DependencyManager.Instance.Resolve<IImplementerLogic>() as IImplementerLogic)!, _orderLogic);
|
||||||
MessageBox.Show("Процесс обработки запущен", "Сообщение",
|
MessageBox.Show("Процесс обработки запущен", "Сообщение",
|
||||||
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||||
}
|
}
|
||||||
@ -227,10 +272,32 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
|
private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormMails));
|
var form = DependencyManager.Instance.Resolve<FormMails>();
|
||||||
if (service is FormMails form)
|
form.ShowDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void backupToolStripMenuItem_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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -3,6 +3,7 @@ using PlumbingRepairContracts.BusinessLogicsContracts;
|
|||||||
using PlumbingRepairContracts.SearchModels;
|
using PlumbingRepairContracts.SearchModels;
|
||||||
using PlumbingRepairDataModels.Models;
|
using PlumbingRepairDataModels.Models;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
@ -30,7 +31,7 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
if (_id.HasValue)
|
if (_id.HasValue)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Загрузка работы");
|
_logger.LogInformation("Загрузка изделия");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var view = _logic.ReadElement(new WorkSearchModel { Id = _id.Value });
|
var view = _logic.ReadElement(new WorkSearchModel { Id = _id.Value });
|
||||||
@ -44,7 +45,7 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Ошибка загрузки работы");
|
_logger.LogError(ex, "Ошибка загрузки изделия");
|
||||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -52,7 +53,7 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
private void LoadData()
|
private void LoadData()
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Загрузка компонент работы");
|
_logger.LogInformation("Загрузка компонент изделия");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (_workComponents != null)
|
if (_workComponents != null)
|
||||||
@ -67,57 +68,53 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Ошибка загрузки компонент работы");
|
_logger.LogError(ex, "Ошибка загрузки компонент изделия");
|
||||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonAdd_Click(object sender, EventArgs e)
|
private void ButtonAdd_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormWorkComponent));
|
var form = DependencyManager.Instance.Resolve<FormWorkComponent>();
|
||||||
if (service is FormWorkComponent form)
|
if (form.ShowDialog() == DialogResult.OK)
|
||||||
{
|
{
|
||||||
if (form.ShowDialog() == DialogResult.OK)
|
if (form.ComponentModel == null)
|
||||||
{
|
{
|
||||||
if (form.ComponentModel == null)
|
return;
|
||||||
{
|
}
|
||||||
return;
|
_logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count);
|
||||||
}
|
if (_workComponents.ContainsKey(form.Id))
|
||||||
_logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count);
|
{
|
||||||
if (_workComponents.ContainsKey(form.Id))
|
_workComponents[form.Id] = (form.ComponentModel, form.Count);
|
||||||
{
|
}
|
||||||
_workComponents[form.Id] = (form.ComponentModel, form.Count);
|
else
|
||||||
}
|
{
|
||||||
else
|
_workComponents.Add(form.Id, (form.ComponentModel, form.Count));
|
||||||
{
|
}
|
||||||
_workComponents.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 = Program.ServiceProvider?.GetService(typeof(FormWorkComponent));
|
var form = DependencyManager.Instance.Resolve<FormWorkComponent>();
|
||||||
if (service is FormWorkComponent form)
|
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
|
||||||
{
|
form.Id = id;
|
||||||
int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
|
form.Count = _workComponents[id].Item2;
|
||||||
form.Id = id;
|
if (form.ShowDialog() == DialogResult.OK)
|
||||||
form.Count = _workComponents[id].Item2;
|
{
|
||||||
if (form.ShowDialog() == DialogResult.OK)
|
if (form.ComponentModel == null)
|
||||||
{
|
{
|
||||||
if (form.ComponentModel == null)
|
return;
|
||||||
{
|
}
|
||||||
return;
|
_logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count);
|
||||||
}
|
_workComponents[form.Id] = (form.ComponentModel, form.Count);
|
||||||
_logger.LogInformation("Изменение компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count);
|
LoadData();
|
||||||
_workComponents[form.Id] = (form.ComponentModel, form.Count);
|
|
||||||
LoadData();
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -163,7 +160,7 @@ namespace PlumbingRepairView
|
|||||||
MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show("Заполните компоненты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
_logger.LogInformation("Сохранение работы");
|
_logger.LogInformation("Сохранение изделия");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var model = new WorkBindingModel
|
var model = new WorkBindingModel
|
||||||
@ -184,7 +181,7 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Ошибка сохранения работы");
|
_logger.LogError(ex, "Ошибка сохранения изделия");
|
||||||
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
using PlumbingRepairContracts.BusinessLogicsContracts;
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
@ -26,16 +27,8 @@ namespace PlumbingRepairView
|
|||||||
{
|
{
|
||||||
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["WorkComponents"].Visible = false;
|
|
||||||
dataGridView.Columns["WorkName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
|
|
||||||
|
|
||||||
}
|
|
||||||
_logger.LogInformation("Загрузка Работ");
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@ -46,29 +39,23 @@ namespace PlumbingRepairView
|
|||||||
|
|
||||||
private void ButtonAdd_Click(object sender, EventArgs e)
|
private void ButtonAdd_Click(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
var service = Program.ServiceProvider?.GetService(typeof(FormWork));
|
var form = DependencyManager.Instance.Resolve<FormWork>();
|
||||||
if (service is FormWork 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 = Program.ServiceProvider?.GetService(typeof(FormWork));
|
var form = DependencyManager.Instance.Resolve<FormWork>();
|
||||||
if (service is FormWork 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,18 +4,17 @@ using NLog.Extensions.Logging;
|
|||||||
using PlumbingRepairBusinessLogic.BusinessLogics;
|
using PlumbingRepairBusinessLogic.BusinessLogics;
|
||||||
using PlumbingRepairContracts.BusinessLogicsContracts;
|
using PlumbingRepairContracts.BusinessLogicsContracts;
|
||||||
using PlumbingRepairContracts.StoragesContracts;
|
using PlumbingRepairContracts.StoragesContracts;
|
||||||
using PlumbingRepairDatabaseImplement.Implements;
|
using PlumbingRepairFileImplement.Implements;
|
||||||
using PlumbingRepairBusinessLogic.OfficePackage;
|
using PlumbingRepairBusinessLogic.OfficePackage;
|
||||||
using PlumbingRepairBusinessLogic.OfficePackage.Implements;
|
using PlumbingRepairBusinessLogic.OfficePackage.Implements;
|
||||||
using PlumbingRepairBusinessLogic.MailWorker;
|
using PlumbingRepairBusinessLogic.MailWorker;
|
||||||
using PlumbingRepairContracts.BindingModels;
|
using PlumbingRepairContracts.BindingModels;
|
||||||
|
using PlumbingRepairContracts.DI;
|
||||||
|
|
||||||
namespace PlumbingRepairView
|
namespace PlumbingRepairView
|
||||||
{
|
{
|
||||||
internal static class Program
|
internal static class Program
|
||||||
{
|
{
|
||||||
private static ServiceProvider? _serviceProvider;
|
|
||||||
public static ServiceProvider? ServiceProvider => _serviceProvider;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The main entry point for the application.
|
/// The main entry point for the application.
|
||||||
@ -26,12 +25,10 @@ namespace PlumbingRepairView
|
|||||||
// 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 MailConfigBindingModel
|
mailSender?.MailConfig(new MailConfigBindingModel
|
||||||
{
|
{
|
||||||
MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
|
MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty,
|
||||||
@ -46,9 +43,10 @@ namespace PlumbingRepairView
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
var logger = _serviceProvider.GetService<ILogger>();
|
var logger = DependencyManager.Instance.Resolve<ILogger>();
|
||||||
logger?.LogError(ex, "Error during work with mail");
|
logger?.LogError(ex, "Îøèáêà ðàáîòû ñ ïî÷òîé");
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
Application.Run(_serviceProvider.GetRequiredService<FormMain>());
|
Application.Run(_serviceProvider.GetRequiredService<FormMain>());
|
||||||
}
|
}
|
||||||
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
|
private static void MailCheck(object obj) => ServiceProvider?.GetService<AbstractMailWorker>()?.MailCheck();
|
||||||
@ -106,6 +104,50 @@ namespace PlumbingRepairView
|
|||||||
services.AddTransient<FormImplementers>();
|
services.AddTransient<FormImplementers>();
|
||||||
services.AddTransient<FormMails>();
|
services.AddTransient<FormMails>();
|
||||||
services.AddTransient<FormMail>();
|
services.AddTransient<FormMail>();
|
||||||
|
=======
|
||||||
|
Application.Run(DependencyManager.Instance.Resolve<FormMain>());
|
||||||
|
>>>>>>> lab_8
|
||||||
}
|
}
|
||||||
}
|
private static void InitDependency()
|
||||||
|
{
|
||||||
|
DependencyManager.InitDependency();
|
||||||
|
|
||||||
|
DependencyManager.Instance.AddLogging(option =>
|
||||||
|
{
|
||||||
|
option.SetMinimumLevel(LogLevel.Information);
|
||||||
|
option.AddNLog("nlog.config");
|
||||||
|
});
|
||||||
|
|
||||||
|
DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IWorkLogic, WorkLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
|
||||||
|
DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
|
||||||
|
|
||||||
|
DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
|
||||||
|
DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
|
||||||
|
DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
|
||||||
|
DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
|
||||||
|
DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
|
||||||
|
DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
|
||||||
|
|
||||||
|
DependencyManager.Instance.RegisterType<FormMain>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormComponent>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormComponents>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormCreateOrder>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormWork>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormWorks>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormWorkComponent>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormReportWorkComponents>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormReportOrders>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormClients>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormImplementers>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormImplementer>();
|
||||||
|
DependencyManager.Instance.RegisterType<FormMails>();
|
||||||
|
}
|
||||||
|
private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user