diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ClientLogic.cs b/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ClientLogic.cs new file mode 100644 index 0000000..6e5f66d --- /dev/null +++ b/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/ClientLogic.cs @@ -0,0 +1,125 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.BusinessLogicsContracts; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryBusinessLogic.BusinessLogics +{ + public class ClientLogic : IClientLogic + { + private readonly ILogger _logger; + + private readonly IClientStorage _clientStorage; + + public ClientLogic(ILogger logger, IClientStorage clientStorage) + { + _logger = logger; + _clientStorage = clientStorage; + } + + public List? ReadList(ClientSearchModel? model) + { + _logger.LogInformation("ReadList. Email: {Email}. Id: {Id} ", model?.Email, model?.Id); + var list = (model == null) ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model); + if (list == null) + { + _logger.LogWarning("ReadList return null list"); + return null; + } + _logger.LogInformation("ReadList. Count: {Count}", list.Count); + return list; + } + + public ClientViewModel? ReadElement(ClientSearchModel model) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + _logger.LogInformation("ReadElement. Client email: {Email}. Client id: {Id}", model.Email, model.Id); + var element = _clientStorage.GetElement(model); + if (element == null) + { + _logger.LogWarning("ReadElement element not found"); + return null; + } + _logger.LogInformation("ReadElement find. Id: {Id}", element.Id); + return element; + } + + public bool Create(ClientBindingModel model) + { + CheckModel(model); + if (_clientStorage.Insert(model) == null) + { + _logger.LogWarning("Insert operation failed"); + return false; + } + return true; + } + + public bool Update(ClientBindingModel model) + { + CheckModel(model); + if (_clientStorage.Update(model) == null) + { + _logger.LogWarning("Update operation failed"); + return false; + } + return true; + } + + public bool Delete(ClientBindingModel model) + { + CheckModel(model, false); + _logger.LogInformation("Delete. Id: {Id}", model.Id); + if (_clientStorage.Delete(model) == null) + { + _logger.LogWarning("Delete operation failed"); + return false; + } + return true; + } + + private void CheckModel(ClientBindingModel model, bool withParams = true) + { + if (model == null) + { + throw new ArgumentNullException(nameof(model)); + } + if (!withParams) + { + return; + } + if (string.IsNullOrEmpty(model.ClientFIO)) + { + throw new ArgumentNullException("Нет ФИО клиента", nameof(model.ClientFIO)); + } + if (string.IsNullOrEmpty(model.Email)) + { + throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email)); + } + if (string.IsNullOrEmpty(model.Password)) + { + throw new ArgumentNullException("Нет пароля клиента", nameof(model.Password)); + } + _logger.LogInformation("Client. Id: {id}, FIO: {fio}, email: {email}, password: {password}", model.Id, model.ClientFIO, model.Email, + model.Password); + var element = _clientStorage.GetElement(new ClientSearchModel + { + Email = model.Email + }); + if (element != null && element.Id != model.Id) + { + throw new InvalidOperationException("Клиент с таким логином(почтой) уже есть"); + } + } + } +} diff --git a/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/OrderLogic.cs b/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/OrderLogic.cs index ae14b7b..d85bc13 100644 --- a/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/OrderLogic.cs +++ b/GarmentFactory/GarmentFactoryBusinessLogic/BusinessLogics/OrderLogic.cs @@ -84,6 +84,10 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics { throw new ArgumentNullException("Некорректный идентификатор изделия", nameof(model.TextileId)); } + if (model.ClientId <= 0) + { + throw new ArgumentNullException("Некорректный идентификатор клиента", nameof(model.ClientId)); + } if (model.Count <= 0) { throw new ArgumentNullException("В заказе должно быть хотя бы одно изделие", nameof(model.Count)); @@ -111,10 +115,6 @@ namespace GarmentFactoryBusinessLogic.BusinessLogics newStatus, order.Status); return false; } - model.TextileId = order.TextileId; - model.Count = order.Count; - model.Sum = order.Sum; - model.DateCreate = order.DateCreate; model.Status = newStatus; if (model.Status == OrderStatus.Готов) { diff --git a/GarmentFactory/GarmentFactoryContracts/BindingModels/ClientBindingModel.cs b/GarmentFactory/GarmentFactoryContracts/BindingModels/ClientBindingModel.cs new file mode 100644 index 0000000..b3a09f9 --- /dev/null +++ b/GarmentFactory/GarmentFactoryContracts/BindingModels/ClientBindingModel.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using GarmentFactoryDataModels.Models; + +namespace GarmentFactoryContracts.BindingModels +{ + public class ClientBindingModel : IClientModel + { + public int Id { get; set; } + + public string ClientFIO { get; set; } = string.Empty; + + public string Email { get; set; } = string.Empty; + + public string Password { get; set; } = string.Empty; + } +} diff --git a/GarmentFactory/GarmentFactoryContracts/BindingModels/OrderBindingModel.cs b/GarmentFactory/GarmentFactoryContracts/BindingModels/OrderBindingModel.cs index b0429e9..def73bc 100644 --- a/GarmentFactory/GarmentFactoryContracts/BindingModels/OrderBindingModel.cs +++ b/GarmentFactory/GarmentFactoryContracts/BindingModels/OrderBindingModel.cs @@ -13,6 +13,7 @@ namespace GarmentFactoryContracts.BindingModels { public int Id { get; set; } public int TextileId { get; set; } + public int ClientId { get; set; } public int Count { get; set; } public double Sum { get; set; } public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; diff --git a/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IClientLogic.cs b/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IClientLogic.cs new file mode 100644 index 0000000..a3fb2ba --- /dev/null +++ b/GarmentFactory/GarmentFactoryContracts/BusinessLogicsContracts/IClientLogic.cs @@ -0,0 +1,24 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryContracts.BusinessLogicsContracts +{ + public interface IClientLogic + { + List? ReadList(ClientSearchModel? model); + + ClientViewModel? ReadElement(ClientSearchModel model); + + bool Create(ClientBindingModel model); + + bool Update(ClientBindingModel model); + + bool Delete(ClientBindingModel model); + } +} diff --git a/GarmentFactory/GarmentFactoryContracts/SearchModels/ClientSearchModel.cs b/GarmentFactory/GarmentFactoryContracts/SearchModels/ClientSearchModel.cs new file mode 100644 index 0000000..b980f95 --- /dev/null +++ b/GarmentFactory/GarmentFactoryContracts/SearchModels/ClientSearchModel.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryContracts.SearchModels +{ + public class ClientSearchModel + { + public int? Id { get; set; } + + public string? ClientFIO { get; set; } + + public string? Email { get; set; } + + public string? Password { get; set; } + } +} diff --git a/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs b/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs index 8399b33..433efdd 100644 --- a/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs +++ b/GarmentFactory/GarmentFactoryContracts/SearchModels/OrderSearchModel.cs @@ -9,6 +9,7 @@ namespace GarmentFactoryContracts.SearchModels public class OrderSearchModel { public int? Id { get; set; } + public int? ClientId { get; set; } public DateTime? DateFrom { get; set; } public DateTime? DateTo { get; set; } diff --git a/GarmentFactory/GarmentFactoryContracts/StoragesContracts/IClientStorage.cs b/GarmentFactory/GarmentFactoryContracts/StoragesContracts/IClientStorage.cs new file mode 100644 index 0000000..140f525 --- /dev/null +++ b/GarmentFactory/GarmentFactoryContracts/StoragesContracts/IClientStorage.cs @@ -0,0 +1,26 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryContracts.StoragesContracts +{ + public interface IClientStorage + { + List GetFullList(); + + List GetFilteredList(ClientSearchModel model); + + ClientViewModel? GetElement(ClientSearchModel model); + + ClientViewModel? Insert(ClientBindingModel model); + + ClientViewModel? Update(ClientBindingModel model); + + ClientViewModel? Delete(ClientBindingModel model); + } +} diff --git a/GarmentFactory/GarmentFactoryContracts/ViewModels/ClientViewModel.cs b/GarmentFactory/GarmentFactoryContracts/ViewModels/ClientViewModel.cs new file mode 100644 index 0000000..e4fc123 --- /dev/null +++ b/GarmentFactory/GarmentFactoryContracts/ViewModels/ClientViewModel.cs @@ -0,0 +1,24 @@ +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryContracts.ViewModels +{ + public class ClientViewModel : IClientModel + { + public int Id { get; set; } + + [DisplayName("ФИО клиента")] + public string ClientFIO { get; set; } = string.Empty; + + [DisplayName("Логин (эл. почта)")] + public string Email { get; set; } = string.Empty; + + [DisplayName("Пароль")] + public string Password { get; set; } = string.Empty; + } +} diff --git a/GarmentFactory/GarmentFactoryContracts/ViewModels/OrderViewModel.cs b/GarmentFactory/GarmentFactoryContracts/ViewModels/OrderViewModel.cs index 85911a7..123f9ea 100644 --- a/GarmentFactory/GarmentFactoryContracts/ViewModels/OrderViewModel.cs +++ b/GarmentFactory/GarmentFactoryContracts/ViewModels/OrderViewModel.cs @@ -16,6 +16,10 @@ namespace GarmentFactoryContracts.ViewModels public int TextileId { get; set; } [DisplayName("Изделие")] public string TextileName { get; set; } = string.Empty; + public int ClientId { get; set; } + + [DisplayName("ФИО клиента")] + public string ClientFIO { get; set; } = string.Empty; [DisplayName("Количество")] public int Count { get; set; } [DisplayName("Сумма")] diff --git a/GarmentFactory/GarmentFactoryDataModels/Models/IClientModel.cs b/GarmentFactory/GarmentFactoryDataModels/Models/IClientModel.cs new file mode 100644 index 0000000..d31ed72 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDataModels/Models/IClientModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryDataModels.Models +{ + public interface IClientModel + { + string ClientFIO { get; } + + string Email { get; } + + string Password { get; } + } +} diff --git a/GarmentFactory/GarmentFactoryDataModels/Models/IOrderModel.cs b/GarmentFactory/GarmentFactoryDataModels/Models/IOrderModel.cs index 5f6702b..b3ef9c5 100644 --- a/GarmentFactory/GarmentFactoryDataModels/Models/IOrderModel.cs +++ b/GarmentFactory/GarmentFactoryDataModels/Models/IOrderModel.cs @@ -12,6 +12,7 @@ namespace GarmentFactoryDataModels.Models int TextileId { get; } int Count { get; } double Sum { get; } + int ClientId { get; } OrderStatus Status { get; } DateTime DateCreate { get; } DateTime? DateImplement { get; } diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs index e0e142d..6e95244 100644 --- a/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/GarmentFactoryDatabase.cs @@ -22,5 +22,6 @@ namespace GarmentFactoryDatabaseImplement public virtual DbSet Textiles { set; get; } public virtual DbSet TextileComponents { set; get; } public virtual DbSet Orders { set; get; } + public virtual DbSet Clients { set; get; } } } diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs new file mode 100644 index 0000000..4e4dfdd --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/ClientStorage.cs @@ -0,0 +1,88 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDatabaseImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryDatabaseImplement.Implements +{ + public class ClientStorage : IClientStorage + { + public List GetFullList() + { + using var context = new GarmentFactoryDatabase(); + return context.Clients + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ClientSearchModel model) + { + if (string.IsNullOrEmpty(model.Email)) + { + return new(); + } + using var context = new GarmentFactoryDatabase(); + return context.Clients + .Where(x => x.Email.Contains(model.Email)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ClientViewModel? GetElement(ClientSearchModel model) + { + if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue) + { + return null; + } + using var context = new GarmentFactoryDatabase(); + return context.Clients.FirstOrDefault(x => + (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) + || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public ClientViewModel? Insert(ClientBindingModel model) + { + var newClient = Client.Create(model); + if (newClient == null) + { + return null; + } + using var context = new GarmentFactoryDatabase(); + context.Clients.Add(newClient); + context.SaveChanges(); + return newClient.GetViewModel; + } + + public ClientViewModel? Update(ClientBindingModel model) + { + using var context = new GarmentFactoryDatabase(); + var client = context.Clients.FirstOrDefault(x => x.Id == model.Id); + if (client == null) + { + return null; + } + client.Update(model); + context.SaveChanges(); + return client.GetViewModel; + } + + public ClientViewModel? Delete(ClientBindingModel model) + { + using var context = new GarmentFactoryDatabase(); + var element = context.Clients.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + context.Clients.Remove(element); + context.SaveChanges(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs index bb2b08c..943de97 100644 --- a/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Implements/OrderStorage.cs @@ -14,30 +14,42 @@ namespace GarmentFactoryDatabaseImplement.Implements using var context = new GarmentFactoryDatabase(); return context.Orders .Include(x => x.Textile) + .Include(x => x.Client) .Select(x => x.GetViewModel) .ToList(); } public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.DateFrom.HasValue) - { - return new(); - } using var context = new GarmentFactoryDatabase(); - if (model.DateFrom.HasValue) + if (model.Id.HasValue) { return context.Orders .Include(x => x.Textile) + .Include(x => x.Client) + .Where(x => x.Id == model.Id) + .Select(x => x.GetViewModel) + .ToList(); + } + else if (model.DateFrom != null && model.DateTo != null) + { + return context.Orders + .Include(x => x.Textile) + .Include(x => x.Client) .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) .Select(x => x.GetViewModel) .ToList(); } - return context.Orders + else if (model.ClientId.HasValue) + { + return context.Orders .Include(x => x.Textile) - .Where(x => x.Id == model.Id) + .Include(x => x.Client) + .Where(x => x.ClientId == model.ClientId) .Select(x => x.GetViewModel) .ToList(); + } + return new(); } public OrderViewModel? GetElement(OrderSearchModel model) @@ -49,6 +61,7 @@ namespace GarmentFactoryDatabaseImplement.Implements using var context = new GarmentFactoryDatabase(); return context.Orders .Include(x => x.Textile) + .Include(x => x.Client) .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } @@ -65,6 +78,7 @@ namespace GarmentFactoryDatabaseImplement.Implements context.SaveChanges(); return context.Orders .Include(x => x.Textile) + .Include(x => x.Client) .FirstOrDefault(x => x.Id == newOrder.Id) ?.GetViewModel; } @@ -81,6 +95,7 @@ namespace GarmentFactoryDatabaseImplement.Implements context.SaveChanges(); return context.Orders .Include(x => x.Textile) + .Include(x => x.Client) .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; } @@ -93,6 +108,7 @@ namespace GarmentFactoryDatabaseImplement.Implements { var deletedElement = context.Orders .Include(x => x.Textile) + .Include(x => x.Client) .FirstOrDefault(x => x.Id == model.Id) ?.GetViewModel; context.Orders.Remove(element); diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Client.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Client.cs new file mode 100644 index 0000000..d8c9e09 --- /dev/null +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Client.cs @@ -0,0 +1,64 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.ComponentModel.DataAnnotations; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryDatabaseImplement.Models +{ + public class Client : IClientModel + { + public int Id { get; private set; } + + [Required] + public string ClientFIO { get; private set; } = string.Empty; + + [Required] + public string Email { get; private set; } = string.Empty; + + [Required] + public string Password { get; private set; } = string.Empty; + + [ForeignKey("ClientId")] + public virtual List Orders { get; set; } = new(); + + public static Client? Create(ClientBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + ClientFIO = model.ClientFIO, + Email = model.Email, + Password = model.Password + }; + } + + public void Update(ClientBindingModel model) + { + if (model == null) + { + return; + } + ClientFIO = model.ClientFIO; + Email = model.Email; + Password = model.Password; + } + + public ClientViewModel GetViewModel => new() + { + Id = Id, + ClientFIO = ClientFIO, + Email = Email, + Password = Password + }; + } +} diff --git a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs index 93be327..a81d63a 100644 --- a/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs +++ b/GarmentFactory/GarmentFactoryDatabaseImplement/Models/Order.cs @@ -18,6 +18,9 @@ namespace GarmentFactoryDatabaseImplement.Models [Required] public int TextileId { get; set; } + [Required] + public int ClientId { get; set; } + [Required] public int Count { get; set; } @@ -34,6 +37,8 @@ namespace GarmentFactoryDatabaseImplement.Models public virtual Textile Textile { get; set; } + public virtual Client Client { get; set; } + public static Order? Create(OrderBindingModel? model) { if (model == null) @@ -44,6 +49,7 @@ namespace GarmentFactoryDatabaseImplement.Models { Id = model.Id, TextileId = model.TextileId, + ClientId = model.ClientId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -66,12 +72,14 @@ namespace GarmentFactoryDatabaseImplement.Models { Id = Id, TextileId = TextileId, + ClientId = ClientId, Count = Count, Sum = Sum, Status = Status, DateCreate = DateCreate, DateImplement = DateImplement, - TextileName = Textile.TextileName + TextileName = Textile.TextileName, + ClientFIO = Client.ClientFIO }; } } diff --git a/GarmentFactory/GarmentFactoryFileImplement/DataFileSingleton.cs b/GarmentFactory/GarmentFactoryFileImplement/DataFileSingleton.cs index 1ea67f8..b01f348 100644 --- a/GarmentFactory/GarmentFactoryFileImplement/DataFileSingleton.cs +++ b/GarmentFactory/GarmentFactoryFileImplement/DataFileSingleton.cs @@ -14,9 +14,11 @@ namespace GarmentFactoryFileImplement private readonly string ComponentFileName = "Component.xml"; private readonly string OrderFileName = "Order.xml"; private readonly string TextileFileName = "Textile.xml"; + private readonly string ClientFileName = "Client.xml"; public List Components { get; private set; } public List Orders { get; private set; } public List Textils { get; private set; } + public List Clients { get; private set; } public static DataFileSingleton GetInstance() { if (instance == null) @@ -28,11 +30,13 @@ namespace GarmentFactoryFileImplement public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SaveTextils() => SaveData(Textils, TextileFileName, "Textils", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); + public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); private DataFileSingleton() { Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Textils = LoadData(TextileFileName, "Textile", x => Textile.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; + Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; } private static List? LoadData(string filename, string xmlNodeName, Func selectFunction) diff --git a/GarmentFactory/GarmentFactoryFileImplement/Implements/ClientStorage.cs b/GarmentFactory/GarmentFactoryFileImplement/Implements/ClientStorage.cs new file mode 100644 index 0000000..a1457b7 --- /dev/null +++ b/GarmentFactory/GarmentFactoryFileImplement/Implements/ClientStorage.cs @@ -0,0 +1,91 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryFileImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryFileImplement.Implements +{ + public class ClientStorage : IClientStorage + { + private readonly DataFileSingleton source; + + public ClientStorage() + { + source = DataFileSingleton.GetInstance(); + } + + public List GetFullList() + { + return source.Clients + .Select(x => x.GetViewModel) + .ToList(); + } + + public List GetFilteredList(ClientSearchModel model) + { + if (string.IsNullOrEmpty(model.Email)) + { + return new(); + } + return source.Clients + .Where(x => x.Email.Contains(model.Email)) + .Select(x => x.GetViewModel) + .ToList(); + } + + public ClientViewModel? GetElement(ClientSearchModel model) + { + if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue) + { + return null; + } + return source.Clients + .FirstOrDefault(x => + (!string.IsNullOrEmpty(model.Email) && x.Email == model.Email && !string.IsNullOrEmpty(model.Password) && x.Password == model.Password) + || (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; + } + + public ClientViewModel? Insert(ClientBindingModel model) + { + model.Id = source.Clients.Count > 0 ? source.Clients.Max(x => x.Id) + 1 : 1; + var newClient = Client.Create(model); + if (newClient == null) + { + return null; + } + source.Clients.Add(newClient); + source.SaveClients(); + return newClient.GetViewModel; + } + + public ClientViewModel? Update(ClientBindingModel model) + { + var client = source.Clients.FirstOrDefault(x => x.Id == model.Id); + if (client == null) + { + return null; + } + client.Update(model); + source.SaveClients(); + return client.GetViewModel; + } + + public ClientViewModel? Delete(ClientBindingModel model) + { + var element = source.Clients.FirstOrDefault(x => x.Id == model.Id); + if (element != null) + { + source.Clients.Remove(element); + source.SaveClients(); + return element.GetViewModel; + } + return null; + } + } +} diff --git a/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs index 7ec45ae..59bfb9a 100644 --- a/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryFileImplement/Implements/OrderStorage.cs @@ -23,29 +23,35 @@ namespace GarmentFactoryFileImplement.Implements public List GetFullList() { return source.Orders - .Select(x => AddTextileName(x.GetViewModel)) + .Select(x => AddIntelligence(x.GetViewModel)) .ToList(); } public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue) + if (model.Id.HasValue) { - return new(); + return source.Orders + .Where(x => x.Id == model.Id) + .Select(x => AddIntelligence(x.GetViewModel)) + .ToList(); } - if (model.DateFrom.HasValue) + else if (model.DateFrom.HasValue && model.DateTo.HasValue) { return source.Orders .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) - .Select(x => AddTextileName(x.GetViewModel)) + .Select(x => AddIntelligence(x.GetViewModel)) .ToList(); } - return source.Orders - .Where(x => x.Id == model.Id) - .Select(x => AddTextileName(x.GetViewModel)) - .ToList(); + else if (model.ClientId.HasValue) + { + return source.Orders + .Where(x => x.ClientId == model.ClientId) + .Select(x => AddIntelligence(x.GetViewModel)) + .ToList(); + } + return new(); } - public OrderViewModel? GetElement(OrderSearchModel model) { if (!model.Id.HasValue) @@ -57,7 +63,7 @@ namespace GarmentFactoryFileImplement.Implements { return null; } - return AddTextileName(order.GetViewModel); + return AddIntelligence(order.GetViewModel); } public OrderViewModel? Insert(OrderBindingModel model) @@ -70,7 +76,7 @@ namespace GarmentFactoryFileImplement.Implements } source.Orders.Add(newOrder); source.SaveOrders(); - return AddTextileName(newOrder.GetViewModel); + return AddIntelligence(newOrder.GetViewModel); } public OrderViewModel? Update(OrderBindingModel model) @@ -82,7 +88,7 @@ namespace GarmentFactoryFileImplement.Implements } order.Update(model); source.SaveOrders(); - return AddTextileName(order.GetViewModel); + return AddIntelligence(order.GetViewModel); } public OrderViewModel? Delete(OrderBindingModel model) @@ -92,15 +98,17 @@ namespace GarmentFactoryFileImplement.Implements { source.Orders.Remove(element); source.SaveOrders(); - return AddTextileName(element.GetViewModel); + return AddIntelligence(element.GetViewModel); } return null; } - private OrderViewModel AddTextileName(OrderViewModel model) + private OrderViewModel AddIntelligence(OrderViewModel model) { var selectedTextile = source.Textils.FirstOrDefault(x => x.Id == model.TextileId); - model.TextileName = selectedTextile?.TextileName; + model.TextileName = selectedTextile?.TextileName ?? string.Empty; + var selectedClient = source.Clients.FirstOrDefault(x => x.Id == model.ClientId); + model.ClientFIO = selectedClient?.ClientFIO ?? string.Empty; return model; } } diff --git a/GarmentFactory/GarmentFactoryFileImplement/Models/Client.cs b/GarmentFactory/GarmentFactoryFileImplement/Models/Client.cs new file mode 100644 index 0000000..a2868c1 --- /dev/null +++ b/GarmentFactory/GarmentFactoryFileImplement/Models/Client.cs @@ -0,0 +1,79 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Xml.Linq; + +namespace GarmentFactoryFileImplement.Models +{ + public class Client : IClientModel + { + public int Id { get; private set; } + + public string ClientFIO { get; private set; } = string.Empty; + + public string Email { get; private set; } = string.Empty; + + public string Password { get; private set; } = string.Empty; + + public static Client? Create(ClientBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + ClientFIO = model.ClientFIO, + Email = model.Email, + Password = model.Password + }; + } + + public static Client? Create(XElement element) + { + if (element == null) + { + return null; + } + return new() + { + Id = Convert.ToInt32(element.Attribute("Id")!.Value), + ClientFIO = element.Element("FIO")!.Value, + Email = element.Element("Email")!.Value, + Password = element.Element("Password")!.Value + }; + } + + public void Update(ClientBindingModel model) + { + if (model == null) + { + return; + } + ClientFIO = model.ClientFIO; + Email = model.Email; + Password = model.Password; + } + + public ClientViewModel GetViewModel => new() + { + Id = Id, + ClientFIO = ClientFIO, + Email = Email, + Password = Password, + }; + + public XElement GetXElement => new("Client", + new XAttribute("Id", Id), + new XElement("FIO", ClientFIO), + new XElement("Email", Email), + new XElement("Password", Password) + ); + } +} diff --git a/GarmentFactory/GarmentFactoryFileImplement/Models/Order.cs b/GarmentFactory/GarmentFactoryFileImplement/Models/Order.cs index 0b8bc3d..7342288 100644 --- a/GarmentFactory/GarmentFactoryFileImplement/Models/Order.cs +++ b/GarmentFactory/GarmentFactoryFileImplement/Models/Order.cs @@ -16,6 +16,7 @@ namespace GarmentFactoryFileImplement.Models public int Id { get; private set; } public int TextileId { get; private set; } + public int ClientId { get; private set; } public int Count { get; private set; } @@ -37,6 +38,7 @@ namespace GarmentFactoryFileImplement.Models { Id = model.Id, TextileId = model.TextileId, + ClientId = model.ClientId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -55,6 +57,7 @@ namespace GarmentFactoryFileImplement.Models { Id = Convert.ToInt32(element.Attribute("Id")!.Value), TextileId = Convert.ToInt32(element.Element("TextileId")!.Value), + ClientId = Convert.ToInt32(element.Element("ClientId")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value), Status = (OrderStatus)Enum.Parse(typeof(OrderStatus), element.Element("Status")!.Value), @@ -78,6 +81,7 @@ namespace GarmentFactoryFileImplement.Models { Id = Id, TextileId = TextileId, + ClientId = ClientId, Count = Count, Sum = Sum, Status = Status, @@ -88,6 +92,7 @@ namespace GarmentFactoryFileImplement.Models public XElement GetXElement => new("Order", new XAttribute("Id", Id), new XElement("TextileId", TextileId), + new XElement("ClientId", ClientId), new XElement("Count", Count.ToString()), new XElement("Sum", Sum.ToString()), new XElement("Status", Status.ToString()), diff --git a/GarmentFactory/GarmentFactoryListImplement/DataListSingleton.cs b/GarmentFactory/GarmentFactoryListImplement/DataListSingleton.cs index 2970d16..0ad6ea9 100644 --- a/GarmentFactory/GarmentFactoryListImplement/DataListSingleton.cs +++ b/GarmentFactory/GarmentFactoryListImplement/DataListSingleton.cs @@ -13,11 +13,13 @@ namespace GarmentFactoryListImplement public List Components { get; set; } public List Orders { get; set; } public List Textiles { get; set; } + public List Clients { get; set; } private DataListSingleton() { Components = new List(); Orders = new List(); Textiles = new List(); + Clients = new List(); } public static DataListSingleton GetInstance() { diff --git a/GarmentFactory/GarmentFactoryListImplement/Implements/ClientStorage.cs b/GarmentFactory/GarmentFactoryListImplement/Implements/ClientStorage.cs new file mode 100644 index 0000000..ae4f019 --- /dev/null +++ b/GarmentFactory/GarmentFactoryListImplement/Implements/ClientStorage.cs @@ -0,0 +1,114 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.SearchModels; +using GarmentFactoryContracts.StoragesContracts; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryListImplement.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryListImplement.Implements +{ + public class ClientStorage : IClientStorage + { + private readonly DataListSingleton _source; + + public ClientStorage() + { + _source = DataListSingleton.GetInstance(); + } + + public List GetFullList() + { + var result = new List(); + foreach (var client in _source.Clients) + { + result.Add(client.GetViewModel); + } + return result; + } + + public List GetFilteredList(ClientSearchModel model) + { + var result = new List(); + if (string.IsNullOrEmpty(model.Email)) + { + return result; + } + foreach (var client in _source.Clients) + { + if (client.Email.Contains(model.Email)) + { + result.Add(client.GetViewModel); + } + } + return result; + } + + public ClientViewModel? GetElement(ClientSearchModel model) + { + if (string.IsNullOrEmpty(model.Email) && string.IsNullOrEmpty(model.Password) && !model.Id.HasValue) + { + return null; + } + foreach (var client in _source.Clients) + { + if ((!string.IsNullOrEmpty(model.Email) && client.Email == model.Email + && !string.IsNullOrEmpty(model.Password) && client.Password == model.Password) + || (model.Id.HasValue && client.Id == model.Id)) + { + return client.GetViewModel; + } + } + return null; + } + + public ClientViewModel? Insert(ClientBindingModel model) + { + model.Id = 1; + foreach (var client in _source.Clients) + { + if (model.Id <= client.Id) + { + model.Id = client.Id + 1; + } + } + var newClient = Client.Create(model); + if (newClient == null) + { + return null; + } + _source.Clients.Add(newClient); + return newClient.GetViewModel; + } + + public ClientViewModel? Update(ClientBindingModel model) + { + foreach (var client in _source.Clients) + { + if (client.Id == model.Id) + { + client.Update(model); + return client.GetViewModel; + } + } + return null; + } + + public ClientViewModel? Delete(ClientBindingModel model) + { + for (int i = 0; i < _source.Clients.Count; ++i) + { + if (_source.Clients[i].Id == model.Id) + { + var element = _source.Clients[i]; + _source.Clients.RemoveAt(i); + return element.GetViewModel; + } + } + return null; + } + } +} diff --git a/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs b/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs index 659c5a8..444493a 100644 --- a/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs +++ b/GarmentFactory/GarmentFactoryListImplement/Implements/OrderStorage.cs @@ -25,7 +25,7 @@ namespace GarmentFactoryListImplement.Implements var result = new List(); foreach (var order in _source.Orders) { - result.Add(AddTextileName(order.GetViewModel)); + result.Add(AddIntelligence(order.GetViewModel)); } return result; } @@ -33,26 +33,34 @@ namespace GarmentFactoryListImplement.Implements public List GetFilteredList(OrderSearchModel model) { var result = new List(); - if (!model.Id.HasValue && !model.DateFrom.HasValue) + if (model.Id.HasValue) { - return result; + foreach (var order in _source.Orders) + { + if (order.Id == model.Id) + { + result.Add(AddIntelligence(order.GetViewModel)); + } + } } - if (model.DateFrom.HasValue) + else if(model.DateFrom.HasValue && model.DateTo.HasValue) { foreach (var order in _source.Orders) { if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) - { - result.Add(AddTextileName(order.GetViewModel)); + { + result.Add(AddIntelligence(order.GetViewModel)); } } - return result; } - foreach (var order in _source.Orders) + else if (model.ClientId.HasValue) { - if (order.Id == model.Id) + foreach (var order in _source.Orders) { - result.Add(AddTextileName(order.GetViewModel)); + if (order.ClientId == model.ClientId) + { + result.Add(AddIntelligence(order.GetViewModel)); + } } } return result; @@ -68,7 +76,7 @@ namespace GarmentFactoryListImplement.Implements { if (order.Id == model.Id) { - return AddTextileName(order.GetViewModel); + return AddIntelligence(order.GetViewModel); } } return null; @@ -90,7 +98,7 @@ namespace GarmentFactoryListImplement.Implements return null; } _source.Orders.Add(newOrder); - return AddTextileName(newOrder.GetViewModel); + return AddIntelligence(newOrder.GetViewModel); } public OrderViewModel? Update(OrderBindingModel model) @@ -100,7 +108,7 @@ namespace GarmentFactoryListImplement.Implements if (order.Id == model.Id) { order.Update(model); - return AddTextileName(order.GetViewModel); + return AddIntelligence(order.GetViewModel); } } return null; @@ -114,19 +122,27 @@ namespace GarmentFactoryListImplement.Implements { var element = _source.Orders[i]; _source.Orders.RemoveAt(i); - return AddTextileName(element.GetViewModel); + return AddIntelligence(element.GetViewModel); } } return null; } - private OrderViewModel AddTextileName(OrderViewModel model) + private OrderViewModel AddIntelligence(OrderViewModel model) { var selectedTextile = _source.Textiles.Find(textile => textile.Id == model.TextileId); if (selectedTextile != null) { model.TextileName = selectedTextile.TextileName; } + foreach (var client in _source.Clients) + { + if (client.Id == model.ClientId) + { + model.ClientFIO = client.ClientFIO; + break; + } + } return model; } } diff --git a/GarmentFactory/GarmentFactoryListImplement/Models/Client.cs b/GarmentFactory/GarmentFactoryListImplement/Models/Client.cs new file mode 100644 index 0000000..d23fef4 --- /dev/null +++ b/GarmentFactory/GarmentFactoryListImplement/Models/Client.cs @@ -0,0 +1,56 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.ViewModels; +using GarmentFactoryDataModels.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GarmentFactoryListImplement.Models +{ + public class Client : IClientModel + { + public int Id { get; private set; } + + public string ClientFIO { get; private set; } = string.Empty; + + public string Email { get; private set; } = string.Empty; + + public string Password { get; private set; } = string.Empty; + + public static Client? Create(ClientBindingModel model) + { + if (model == null) + { + return null; + } + return new() + { + Id = model.Id, + ClientFIO = model.ClientFIO, + Email = model.Email, + Password = model.Password + }; + } + + public void Update(ClientBindingModel model) + { + if (model == null) + { + return; + } + ClientFIO = model.ClientFIO; + Email = model.Email; + Password = model.Password; + } + + public ClientViewModel GetViewModel => new() + { + Id = Id, + ClientFIO = ClientFIO, + Email = Email, + Password = Password, + }; + } +} diff --git a/GarmentFactory/GarmentFactoryListImplement/Models/Order.cs b/GarmentFactory/GarmentFactoryListImplement/Models/Order.cs index b2c4857..9cc993e 100644 --- a/GarmentFactory/GarmentFactoryListImplement/Models/Order.cs +++ b/GarmentFactory/GarmentFactoryListImplement/Models/Order.cs @@ -16,6 +16,8 @@ namespace GarmentFactoryListImplement.Models public int TextileId { get; private set; } + public int ClientId { get; private set; } + public int Count { get; private set; } public double Sum { get; private set; } @@ -36,6 +38,7 @@ namespace GarmentFactoryListImplement.Models { Id = model.Id, TextileId = model.TextileId, + ClientId = model.ClientId, Count = model.Count, Sum = model.Sum, Status = model.Status, @@ -58,6 +61,7 @@ namespace GarmentFactoryListImplement.Models { Id = Id, TextileId = TextileId, + ClientId = ClientId, Count = Count, Sum = Sum, Status = Status, diff --git a/GarmentFactory/GarmentFactoryView/FormClients.Designer.cs b/GarmentFactory/GarmentFactoryView/FormClients.Designer.cs new file mode 100644 index 0000000..6aeb408 --- /dev/null +++ b/GarmentFactory/GarmentFactoryView/FormClients.Designer.cs @@ -0,0 +1,98 @@ +namespace GarmentFactoryView +{ + partial class FormClients + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + dataGridView = new DataGridView(); + buttonUpd = new Button(); + buttonDel = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.AllowUserToAddRows = false; + dataGridView.AllowUserToDeleteRows = false; + dataGridView.BackgroundColor = SystemColors.ControlLightLight; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 0); + dataGridView.Margin = new Padding(4, 3, 4, 3); + dataGridView.MultiSelect = false; + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersVisible = false; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(408, 360); + dataGridView.TabIndex = 1; + // + // buttonUpd + // + buttonUpd.Location = new Point(430, 59); + buttonUpd.Margin = new Padding(4, 3, 4, 3); + buttonUpd.Name = "buttonUpd"; + buttonUpd.Size = new Size(88, 27); + buttonUpd.TabIndex = 8; + buttonUpd.Text = "Обновить"; + buttonUpd.UseVisualStyleBackColor = true; + buttonUpd.Click += ButtonUpd_Click; + // + // buttonDel + // + buttonDel.Location = new Point(430, 12); + buttonDel.Margin = new Padding(4, 3, 4, 3); + buttonDel.Name = "buttonDel"; + buttonDel.Size = new Size(88, 27); + buttonDel.TabIndex = 7; + buttonDel.Text = "Удалить"; + buttonDel.UseVisualStyleBackColor = true; + buttonDel.Click += ButtonDel_Click; + // + // FormClients + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(541, 360); + Controls.Add(buttonUpd); + Controls.Add(buttonDel); + Controls.Add(dataGridView); + Name = "FormClients"; + StartPosition = FormStartPosition.CenterScreen; + Text = "Клиенты"; + Load += FormClients_Load; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private Button buttonUpd; + private Button buttonDel; + } +} \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormClients.cs b/GarmentFactory/GarmentFactoryView/FormClients.cs new file mode 100644 index 0000000..15296d4 --- /dev/null +++ b/GarmentFactory/GarmentFactoryView/FormClients.cs @@ -0,0 +1,75 @@ +using GarmentFactoryContracts.BindingModels; +using GarmentFactoryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; + +namespace GarmentFactoryView +{ + public partial class FormClients : Form + { + private readonly ILogger _logger; + + private readonly IClientLogic _logic; + + public FormClients(ILogger logger, IClientLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormClients_Load(object sender, EventArgs e) + { + LoadData(); + } + + private void LoadData() + { + try + { + var list = _logic.ReadList(null); + if (list != null) + { + dataGridView.DataSource = list; + dataGridView.Columns["Id"].Visible = false; + dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + } + _logger.LogInformation("Clients loading"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Clients loading error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void ButtonDel_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + if (MessageBox.Show("Удалить клиента?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Deletion of client"); + try + { + if (!_logic.Delete(new ClientBindingModel { Id = id })) + { + throw new Exception("Ошибка при удалении. Дополнительная информация в логах."); + } + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Client deletion error"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } + + private void ButtonUpd_Click(object sender, EventArgs e) + { + LoadData(); + } + } +} diff --git a/GarmentFactory/GarmentFactoryView/FormClients.resx b/GarmentFactory/GarmentFactoryView/FormClients.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/GarmentFactory/GarmentFactoryView/FormClients.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormCreateOrder.Designer.cs b/GarmentFactory/GarmentFactoryView/FormCreateOrder.Designer.cs index 1f9e5b4..04a20f7 100644 --- a/GarmentFactory/GarmentFactoryView/FormCreateOrder.Designer.cs +++ b/GarmentFactory/GarmentFactoryView/FormCreateOrder.Designer.cs @@ -36,12 +36,14 @@ comboBoxTextile = new ComboBox(); buttonSave = new Button(); buttonCancel = new Button(); + labelClient = new Label(); + comboBoxClient = new ComboBox(); SuspendLayout(); // // labelTextile // labelTextile.AutoSize = true; - labelTextile.Location = new Point(15, 9); + labelTextile.Location = new Point(11, 58); labelTextile.Name = "labelTextile"; labelTextile.Size = new Size(75, 20); labelTextile.TabIndex = 0; @@ -50,7 +52,7 @@ // labelCount // labelCount.AutoSize = true; - labelCount.Location = new Point(15, 51); + labelCount.Location = new Point(11, 100); labelCount.Name = "labelCount"; labelCount.Size = new Size(97, 20); labelCount.TabIndex = 1; @@ -59,7 +61,7 @@ // labelSum // labelSum.AutoSize = true; - labelSum.Location = new Point(15, 92); + labelSum.Location = new Point(11, 141); labelSum.Name = "labelSum"; labelSum.Size = new Size(62, 20); labelSum.TabIndex = 2; @@ -67,7 +69,7 @@ // // textBoxCount // - textBoxCount.Location = new Point(112, 51); + textBoxCount.Location = new Point(108, 100); textBoxCount.Name = "textBoxCount"; textBoxCount.Size = new Size(293, 27); textBoxCount.TabIndex = 4; @@ -76,7 +78,7 @@ // textBoxSum // textBoxSum.BackColor = SystemColors.Control; - textBoxSum.Location = new Point(112, 92); + textBoxSum.Location = new Point(108, 141); textBoxSum.Name = "textBoxSum"; textBoxSum.ReadOnly = true; textBoxSum.Size = new Size(293, 27); @@ -86,7 +88,7 @@ // comboBoxTextile.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxTextile.FormattingEnabled = true; - comboBoxTextile.Location = new Point(112, 9); + comboBoxTextile.Location = new Point(108, 58); comboBoxTextile.Name = "comboBoxTextile"; comboBoxTextile.Size = new Size(293, 28); comboBoxTextile.TabIndex = 6; @@ -94,7 +96,7 @@ // // buttonSave // - buttonSave.Location = new Point(184, 131); + buttonSave.Location = new Point(180, 180); buttonSave.Name = "buttonSave"; buttonSave.Size = new Size(101, 36); buttonSave.TabIndex = 7; @@ -104,7 +106,7 @@ // // buttonCancel // - buttonCancel.Location = new Point(291, 131); + buttonCancel.Location = new Point(287, 180); buttonCancel.Name = "buttonCancel"; buttonCancel.Size = new Size(101, 36); buttonCancel.TabIndex = 8; @@ -112,11 +114,31 @@ buttonCancel.UseVisualStyleBackColor = true; buttonCancel.Click += ButtonCancel_Click; // + // labelClient + // + labelClient.AutoSize = true; + labelClient.Location = new Point(11, 15); + labelClient.Name = "labelClient"; + labelClient.Size = new Size(65, 20); + labelClient.TabIndex = 9; + labelClient.Text = "Клиент :"; + // + // comboBoxClient + // + comboBoxClient.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxClient.FormattingEnabled = true; + comboBoxClient.Location = new Point(108, 15); + comboBoxClient.Name = "comboBoxClient"; + comboBoxClient.Size = new Size(293, 28); + comboBoxClient.TabIndex = 10; + // // FormCreateOrder // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(424, 181); + ClientSize = new Size(424, 227); + Controls.Add(comboBoxClient); + Controls.Add(labelClient); Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(comboBoxTextile); @@ -143,5 +165,7 @@ private ComboBox comboBoxTextile; private Button buttonSave; private Button buttonCancel; + private Label labelClient; + private ComboBox comboBoxClient; } } \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormCreateOrder.cs b/GarmentFactory/GarmentFactoryView/FormCreateOrder.cs index ae897d5..49fc740 100644 --- a/GarmentFactory/GarmentFactoryView/FormCreateOrder.cs +++ b/GarmentFactory/GarmentFactoryView/FormCreateOrder.cs @@ -19,13 +19,15 @@ namespace GarmentFactoryView private readonly ILogger _logger; private readonly ITextileLogic _logicT; private readonly IOrderLogic _logicO; + private readonly IClientLogic _logicC; public FormCreateOrder(ILogger logger, ITextileLogic -logicT, IOrderLogic logicO) +logicT, IOrderLogic logicO, IClientLogic logicC) { InitializeComponent(); _logger = logger; _logicT = logicT; _logicO = logicO; + _logicC = logicC; } private void FormCreateOrder_Load(object sender, EventArgs e) @@ -47,6 +49,23 @@ logicT, IOrderLogic logicO) _logger.LogError(ex, "Ошибка при загрузке изделия для заказаr"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } + _logger.LogInformation("Loading clients for order"); + try + { + var clientList = _logicC.ReadList(null); + if (clientList != null) + { + comboBoxClient.DisplayMember = "ClientFIO"; + comboBoxClient.ValueMember = "Id"; + comboBoxClient.DataSource = clientList; + comboBoxClient.SelectedItem = null; + } + } + catch (Exception ex) + { + _logger.LogError(ex, "Error during loading clients for order"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } private void CalcSum() { @@ -100,12 +119,19 @@ logicT, IOrderLogic logicO) MessageBoxButtons.OK, MessageBoxIcon.Error); return; } + if (comboBoxClient.SelectedValue == null) + { + MessageBox.Show("Выберите клиента", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } _logger.LogInformation("Создание заказа"); try { var operationResult = _logicO.CreateOrder(new OrderBindingModel { + TextileId = Convert.ToInt32(comboBoxTextile.SelectedValue), + ClientId = Convert.ToInt32(comboBoxClient.SelectedValue), Count = Convert.ToInt32(textBoxCount.Text), Sum = Convert.ToDouble(textBoxSum.Text) }); diff --git a/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs b/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs index 1be9e19..95cf9a2 100644 --- a/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs +++ b/GarmentFactory/GarmentFactoryView/FormMain.Designer.cs @@ -34,14 +34,15 @@ изделиеToolStripMenuItem = new ToolStripMenuItem(); отчетыToolStripMenuItem = new ToolStripMenuItem(); списокПродуктаToolStripMenuItem = new ToolStripMenuItem(); + компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); + списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); dataGridView = new DataGridView(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); buttonIssuedOrder = new Button(); buttonUpd = new Button(); - компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + клиентыToolStripMenuItem = new ToolStripMenuItem(); menuStrip.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); @@ -58,7 +59,7 @@ // // справочникиToolStripMenuItem // - справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem }); + справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, изделиеToolStripMenuItem, клиентыToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; @@ -66,14 +67,14 @@ // компонентыToolStripMenuItem // компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(182, 26); + компонентыToolStripMenuItem.Size = new Size(224, 26); компонентыToolStripMenuItem.Text = "Компоненты"; компонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // изделиеToolStripMenuItem // изделиеToolStripMenuItem.Name = "изделиеToolStripMenuItem"; - изделиеToolStripMenuItem.Size = new Size(182, 26); + изделиеToolStripMenuItem.Size = new Size(224, 26); изделиеToolStripMenuItem.Text = "Изделие"; изделиеToolStripMenuItem.Click += ИзделиеToolStripMenuItem_Click; // @@ -91,6 +92,20 @@ списокПродуктаToolStripMenuItem.Text = "Список изделия"; списокПродуктаToolStripMenuItem.Click += СписокИзделияToolStripMenuItem_Click; // + // компонентыПоИзделиямToolStripMenuItem + // + компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; + компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); + компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; + компонентыПоИзделиямToolStripMenuItem.Click += КомпонентыПоИзделиямToolStripMenuItem_Click; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(276, 26); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + списокЗаказовToolStripMenuItem.Click += СписокЗаказовToolStripMenuItem_Click; + // // dataGridView // dataGridView.AllowUserToAddRows = false; @@ -158,19 +173,12 @@ buttonUpd.UseVisualStyleBackColor = true; buttonUpd.Click += ButtonUpd_Click; // - // компонентыПоИзделиямToolStripMenuItem + // клиентыToolStripMenuItem // - компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem"; - компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26); - компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям"; - компонентыПоИзделиямToolStripMenuItem.Click += КомпонентыПоИзделиямToolStripMenuItem_Click; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(276, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += СписокЗаказовToolStripMenuItem_Click; + клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; + клиентыToolStripMenuItem.Size = new Size(224, 26); + клиентыToolStripMenuItem.Text = "Клиенты"; + клиентыToolStripMenuItem.Click += КлиентыToolStripMenuItem_Click; // // FormMain // @@ -212,5 +220,6 @@ private ToolStripMenuItem списокПродуктаToolStripMenuItem; private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem; private ToolStripMenuItem списокЗаказовToolStripMenuItem; + private ToolStripMenuItem клиентыToolStripMenuItem; } } \ No newline at end of file diff --git a/GarmentFactory/GarmentFactoryView/FormMain.cs b/GarmentFactory/GarmentFactoryView/FormMain.cs index b4fee53..fcaa4e1 100644 --- a/GarmentFactory/GarmentFactoryView/FormMain.cs +++ b/GarmentFactory/GarmentFactoryView/FormMain.cs @@ -41,6 +41,8 @@ namespace GarmentFactoryView dataGridView.DataSource = list; dataGridView.Columns["TextileId"].Visible = false; dataGridView.Columns["TextileName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + dataGridView.Columns["ClientId"].Visible = false; + dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; } _logger.LogInformation("Загрузка заказов"); } @@ -185,5 +187,14 @@ namespace GarmentFactoryView form.ShowDialog(); } } + + private void КлиентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + if (service is FormClients form) + { + form.ShowDialog(); + } + } } } diff --git a/GarmentFactory/GarmentFactoryView/Program.cs b/GarmentFactory/GarmentFactoryView/Program.cs index fa90c41..8d30f4c 100644 --- a/GarmentFactory/GarmentFactoryView/Program.cs +++ b/GarmentFactory/GarmentFactoryView/Program.cs @@ -34,10 +34,14 @@ namespace GarmentFactoryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -50,6 +54,7 @@ namespace GarmentFactoryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); } }