frog24/PIbd-21_Barsukov_P.O._ComputersShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

все из-за табуляции сломалось(жесть)

Browse Source
This commit is contained in:
frog24 2024-05-18 18:09:12 +04:00
parent b365a146d3
commit f25de886e9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ComputersShop/ComputerShopFileImplements/Implements/OrderStorage.cs
View File

@ -29,12 +29,12 @@ namespace ComputersShopFileImplements.Implements
return new(); return new();
} }
return source.Orders return source.Orders
.Where(x => x.Id == model.Id || .Where(x => x.Id == model.Id ||
model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo ||
x.ClientId == model.ClientId || x.ClientId == model.ClientId ||
model.Status.Equals(x.Status)) model.Status.Equals(x.Status))
.Select(x => GetViewModel(x)) .Select(x => GetViewModel(x))
.ToList(); .ToList();
} }
public OrderViewModel? GetElement(OrderSearchModel model) public OrderViewModel? GetElement(OrderSearchModel model)
{ {

16
ComputersShop/ComputersShopDatabaseImplements/Implements/OrderStorage.cs
View File

@ -22,14 +22,14 @@ namespace ComputersShopDatabaseImplements.Implements
} }
using var context = new ComputersShopDatabase(); using var context = new ComputersShopDatabase();
return context.Orders return context.Orders
.Include(x => x.Computer) .Include(x => x.Computer)
.Include(x => x.Client) .Include(x => x.Client)
.Include(x => x.Implementer) .Include(x => x.Implementer)
.FirstOrDefault(x => .FirstOrDefault(x =>
(model.Status == null || model.Status != null && model.Status.Equals(x.Status)) && (model.Status == null || model.Status != null && model.Status.Equals(x.Status)) &&
(model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) || (model.ImplementerId.HasValue && x.ImplementerId == model.ImplementerId) ||
(model.Id.HasValue && x.Id == model.Id))? (model.Id.HasValue && x.Id == model.Id))?
.GetViewModel; .GetViewModel;
} }
public List<OrderViewModel> GetFiltredList(OrderSearchModel model) public List<OrderViewModel> GetFiltredList(OrderSearchModel model)
{ {