Vyacheslav/PIbd-23_Ivanov_V.N._Pizzeria
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

отступы

Browse Source
This commit is contained in:
Вячеслав Иванов 2024-03-22 10:07:28 +04:00
parent 876bc18832
commit 3b425b3f6f
8 changed files with 158 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Pizzeria/PizzeriaDataModels/Models/IOrderModel.cs
View File

@ -10,8 +10,8 @@ namespace PizzeriaDataModels.Models
public interface IOrderModel : IId public interface IOrderModel : IId
{ {
int PizzaId { get; } int PizzaId { get; }
int ClientId { get; } int ClientId { get; }
int Count { get; } int Count { get; }
double Sum { get; } double Sum { get; }
OrderStatus Status { get; } OrderStatus Status { get; }
DateTime DateCreate { get; } DateTime DateCreate { get; }

110
Pizzeria/PizzeriaDatabaseImplement/Models/Order.cs
View File

@ -8,71 +8,71 @@ namespace PizzeriaDatabaseImplement.Models
{ {
public class Order : IOrderModel public class Order : IOrderModel
{ {
public int Id { get; private set; } public int Id { get; private set; }
[Required] [Required]
public int ClientId { get; private set; } public int ClientId { get; private set; }
public virtual Client Client { get; private set; } = new(); public virtual Client Client { get; private set; } = new();
[Required] [Required]
public int PizzaId { get; private set; } public int PizzaId { get; private set; }
public virtual Pizza Pizza { get; set; } = new(); public virtual Pizza Pizza { get; set; } = new();
[Required] [Required]
public int Count { get; private set; } public int Count { get; private set; }
[Required] [Required]
public double Sum { get; private set; } public double Sum { get; private set; }
[Required] [Required]
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
[Required] [Required]
public DateTime DateCreate { get; private set; } = DateTime.Now; public DateTime DateCreate { get; private set; } = DateTime.Now;
public DateTime? DateImplement { get; private set; } public DateTime? DateImplement { get; private set; }
public static Order Create(PizzeriaDatabase context, OrderBindingModel model) public static Order Create(PizzeriaDatabase context, OrderBindingModel model)
{ {
return new Order() return new Order()
{ {
Id = model.Id, Id = model.Id,
ClientId = model.ClientId, ClientId = model.ClientId,
Client = context.Clients.First(x => x.Id == model.ClientId), Client = context.Clients.First(x => x.Id == model.ClientId),
PizzaId = model.PizzaId, PizzaId = model.PizzaId,
Pizza = context.Pizzas.First(x => x.Id == model.PizzaId), Pizza = context.Pizzas.First(x => x.Id == model.PizzaId),
Count = model.Count, Count = model.Count,
Sum = model.Sum, Sum = model.Sum,
Status = model.Status, Status = model.Status,
DateCreate = model.DateCreate, DateCreate = model.DateCreate,
DateImplement = model.DateImplement, DateImplement = model.DateImplement,
}; };
} }
public void Update(OrderBindingModel? model) public void Update(OrderBindingModel? model)
{ {
if (model == null) if (model == null)
{ {
return; return;
} }
Status = model.Status; Status = model.Status;
DateImplement = model.DateImplement; DateImplement = model.DateImplement;
} }
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()
{ {
Id = Id, Id = Id,
ClientId = ClientId, ClientId = ClientId,
ClientFIO = Client.ClientFIO, ClientFIO = Client.ClientFIO,
PizzaId = PizzaId, PizzaId = PizzaId,
PizzaName = Pizza.PizzaName, PizzaName = Pizza.PizzaName,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,
Status = Status, Status = Status,
DateCreate = DateCreate, DateCreate = DateCreate,
DateImplement = DateImplement, DateImplement = DateImplement,
}; };
} }
} }

16
Pizzeria/PizzeriaFileImplement/DataFileSingleton.cs
View File

@ -14,13 +14,13 @@ namespace PizzeriaFileImplement
private readonly string ComponentFileName = "Component.xml"; private readonly string ComponentFileName = "Component.xml";
private readonly string OrderFileName = "Order.xml"; private readonly string OrderFileName = "Order.xml";
private readonly string PizzaFileName = "Pizza.xml"; private readonly string PizzaFileName = "Pizza.xml";
private readonly string ClientFileName = "Client.xml"; private readonly string ClientFileName = "Client.xml";
public List<Component> Components { get; private set; } public List<Component> Components { get; private set; }
public List<Order> Orders { get; private set; } public List<Order> Orders { get; private set; }
public List<Pizza> Pizzas { get; private set; } public List<Pizza> Pizzas { get; private set; }
public List<Client> Clients { get; private set; } public List<Client> Clients { get; private set; }
public static DataFileSingleton GetInstance() public static DataFileSingleton GetInstance()
{ {
if (instance == null) if (instance == null)
{ {
@ -32,15 +32,15 @@ namespace PizzeriaFileImplement
public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement); public void SaveComponents() => SaveData(Components, ComponentFileName, "Components", x => x.GetXElement);
public void SavePizzas() => SaveData(Pizzas, PizzaFileName, "Pizzas", x => x.GetXElement); public void SavePizzas() => SaveData(Pizzas, PizzaFileName, "Pizzas", x => x.GetXElement);
public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement); public void SaveOrders() => SaveData(Orders, OrderFileName, "Orders", x => x.GetXElement);
public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement); public void SaveClients() => SaveData(Clients, ClientFileName, "Clients", x => x.GetXElement);
private DataFileSingleton() private DataFileSingleton()
{ {
Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!; Components = LoadData(ComponentFileName, "Component", x => Component.Create(x)!)!;
Pizzas = LoadData(PizzaFileName, "Pizza", x => Pizza.Create(x)!)!; Pizzas = LoadData(PizzaFileName, "Pizza", x => Pizza.Create(x)!)!;
Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!; Orders = LoadData(OrderFileName, "Order", x => Order.Create(x)!)!;
Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!; Clients = LoadData(ClientFileName, "Client", x => Client.Create(x)!)!;
} }
private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction) private static List<T>? LoadData<T>(string filename, string xmlNodeName, Func<XElement, T> selectFunction)
{ {

46
Pizzeria/PizzeriaFileImplement/Implements/OrderStorage.cs
View File

@ -19,23 +19,23 @@ namespace PizzeriaFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (model.DateFrom.HasValue) if (model.DateFrom.HasValue)
{ {
return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo) return source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
.Select(x => GetViewModel(x)).ToList(); .Select(x => GetViewModel(x)).ToList();
} }
if (model.ClientId.HasValue && !model.Id.HasValue) if (model.ClientId.HasValue && !model.Id.HasValue)
{ {
return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList(); return source.Orders.Where(x => x.ClientId == model.ClientId).Select(x => x.GetViewModel).ToList();
} }
if (model.Id.HasValue) if (model.Id.HasValue)
{ {
return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList(); return source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
} }
return new(); return new();
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
@ -46,25 +46,25 @@ namespace PizzeriaFileImplement.Implements
return AttachPizzaName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel); return AttachPizzaName(source.Orders.FirstOrDefault(x => x.Id == model.Id)?.GetViewModel);
} }
private OrderViewModel GetViewModel(Order order) private OrderViewModel GetViewModel(Order order)
{ {
var viewModel = order.GetViewModel; var viewModel = order.GetViewModel;
var pizza = source.Pizzas.FirstOrDefault(x => x.Id == order.PizzaId); var pizza = source.Pizzas.FirstOrDefault(x => x.Id == order.PizzaId);
var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId); var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
if (pizza != null) if (pizza != null)
{ {
viewModel.PizzaName = pizza.PizzaName; viewModel.PizzaName = pizza.PizzaName;
} }
if (client != null) if (client != null)
{ {
viewModel.ClientFIO = client.ClientFIO; viewModel.ClientFIO = client.ClientFIO;
} }
return viewModel; return viewModel;
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
{ {
model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1; model.Id = source.Orders.Count > 0 ? source.Orders.Max(x => x.Id) + 1 : 1;
var newOrder = Order.Create(model); var newOrder = Order.Create(model);

8
Pizzeria/PizzeriaListImplement/DataListSingleton.cs
View File

@ -13,15 +13,15 @@ namespace PizzeriaListImplement
public List<Component> Components { get; set; } public List<Component> Components { get; set; }
public List<Order> Orders { get; set; } public List<Order> Orders { get; set; }
public List<Pizza> Pizzas { get; set; } public List<Pizza> Pizzas { get; set; }
public List<Client> Clients { get; set; } public List<Client> Clients { get; set; }
private DataListSingleton() private DataListSingleton()
{ {
Components = new List<Component>(); Components = new List<Component>();
Orders = new List<Order>(); Orders = new List<Order>();
Pizzas = new List<Pizza>(); Pizzas = new List<Pizza>();
Clients = new List<Client>(); Clients = new List<Client>();
} }
public static DataListSingleton GetInstance() public static DataListSingleton GetInstance()
{ {

106
Pizzeria/PizzeriaListImplement/Implements/OrderStorage.cs
View File

@ -33,62 +33,62 @@ namespace PizzeriaListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
var result = new List<OrderViewModel>(); var result = new List<OrderViewModel>();
if (model.DateFrom.HasValue) if (model.DateFrom.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo) if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
{ {
result.Add(GetViewModel(order)); result.Add(GetViewModel(order));
} }
} }
} }
else if (model.ClientId.HasValue && !model.Id.HasValue) else if (model.ClientId.HasValue && !model.Id.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.ClientId == model.ClientId) if (order.ClientId == model.ClientId)
{ {
result.Add(GetViewModel(order)); result.Add(GetViewModel(order));
} }
} }
} }
else if (model.Id.HasValue) else if (model.Id.HasValue)
{ {
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.Id == model.Id) if (order.Id == model.Id)
{ {
result.Add(GetViewModel(order)); result.Add(GetViewModel(order));
} }
} }
} }
return result; return result;
} }
private OrderViewModel GetViewModel(Order order) private OrderViewModel GetViewModel(Order order)
{ {
var viewModel = order.GetViewModel; var viewModel = order.GetViewModel;
foreach (var package in _source.Pizzas) foreach (var package in _source.Pizzas)
{ {
if (package.Id == order.PizzaId) if (package.Id == order.PizzaId)
{ {
viewModel.PizzaName = package.PizzaName; viewModel.PizzaName = package.PizzaName;
break; break;
} }
} }
foreach (var client in _source.Clients) foreach (var client in _source.Clients)
{ {
if (client.Id == order.ClientId) if (client.Id == order.ClientId)
{ {
viewModel.ClientFIO = client.ClientFIO; viewModel.ClientFIO = client.ClientFIO;
break; break;
} }
} }
return viewModel; return viewModel;
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {
if (!model.Id.HasValue) if (!model.Id.HasValue)
{ {

12
Pizzeria/PizzeriaListImplement/Models/Order.cs
View File

@ -14,8 +14,8 @@ namespace PizzeriaListImplement.Models
{ {
public int Id { get; private set; } public int Id { get; private set; }
public int PizzaId { get; private set; } public int PizzaId { get; private set; }
public int ClientId { get; private set; } public int ClientId { get; private set; }
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
public DateTime DateCreate { get; private set; } = DateTime.Now; public DateTime DateCreate { get; private set; } = DateTime.Now;
@ -31,8 +31,8 @@ namespace PizzeriaListImplement.Models
{ {
Id = model.Id, Id = model.Id,
PizzaId = model.PizzaId, PizzaId = model.PizzaId,
ClientId = model.ClientId, ClientId = model.ClientId,
Count = model.Count, Count = model.Count,
Sum = model.Sum, Sum = model.Sum,
Status = model.Status, Status = model.Status,
DateCreate = model.DateCreate, DateCreate = model.DateCreate,
@ -54,8 +54,8 @@ namespace PizzeriaListImplement.Models
{ {
Id = Id, Id = Id,
PizzaId = PizzaId, PizzaId = PizzaId,
ClientId = ClientId, ClientId = ClientId,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,
Status = Status, Status = Status,
DateCreate = DateCreate, DateCreate = DateCreate,

14
Pizzeria/PizzeriaView/Program.cs
View File

@ -39,14 +39,14 @@ namespace Pizzeria
option.AddNLog("nlog.config"); option.AddNLog("nlog.config");
}); });
services.AddTransient<IClientStorage, ClientStorage>(); services.AddTransient<IClientStorage, ClientStorage>();
services.AddTransient<IComponentStorage, ComponentStorage>(); services.AddTransient<IComponentStorage, ComponentStorage>();
services.AddTransient<IOrderStorage, OrderStorage>(); services.AddTransient<IOrderStorage, OrderStorage>();
services.AddTransient<IPizzaStorage, PizzaStorage>(); services.AddTransient<IPizzaStorage, PizzaStorage>();
services.AddTransient<IComponentLogic, ComponentLogic>(); services.AddTransient<IComponentLogic, ComponentLogic>();
services.AddTransient<IClientLogic, ClientLogic>(); services.AddTransient<IClientLogic, ClientLogic>();
services.AddTransient<IOrderLogic, OrderLogic>(); services.AddTransient<IOrderLogic, OrderLogic>();
services.AddTransient<IPizzaLogic, PizzaLogic>(); services.AddTransient<IPizzaLogic, PizzaLogic>();
services.AddTransient<IReportLogic, ReportLogic>(); services.AddTransient<IReportLogic, ReportLogic>();
@ -63,8 +63,8 @@ namespace Pizzeria
services.AddTransient<FormPizzas>(); services.AddTransient<FormPizzas>();
services.AddTransient<FormReportPizzaComponents>(); services.AddTransient<FormReportPizzaComponents>();
services.AddTransient<FormReportOrders>(); services.AddTransient<FormReportOrders>();
services.AddTransient<FormClients>(); services.AddTransient<FormClients>();
services.AddTransient<EntityFrameworkDesignServicesBuilder>(); services.AddTransient<EntityFrameworkDesignServicesBuilder>();
} }
} }
} }