DeerElk/PIbd-23_Elatomtsev_L.K._Confectionery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab5 alpha3

Browse Source
This commit is contained in:
DeerElk 2024-05-05 05:50:26 +04:00
parent 35ac0ae1ea
commit c9705c72f1
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Confectionery/ConfectioneryFileImplement/Implements/OrderStorage.cs
View File

@ -23,11 +23,8 @@ namespace ConfectioneryFileImplement.Implements
return source.Orders return source.Orders
.Where(x => ( .Where(x => (
(!model.Id.HasValue || x.Id == model.Id) && (!model.Id.HasValue || x.Id == model.Id) &&
(!model.DateFrom.HasValue || x.DateCreate >= (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
model.DateFrom) && (!model.DateTo.HasValue || (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
x.DateCreate <= model.DateTo) &&
(!model.ClientId.HasValue ||
x.ClientId == model.ClientId)
) )
) )
.Select(x => AccessPastryStorage(x.GetViewModel)) .Select(x => AccessPastryStorage(x.GetViewModel))

7
Confectionery/ConfectioneryListImplement/Implements/OrderStorage.cs
View File

@ -27,11 +27,8 @@ namespace ConfectioneryListImplement.Implements
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if ((!model.Id.HasValue || order.Id == model.Id) && if ((!model.Id.HasValue || order.Id == model.Id) &&
(!model.DateFrom.HasValue || order.DateCreate >= (!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) &&
model.DateFrom) && (!model.DateTo.HasValue || (!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
order.DateCreate <= model.DateTo) &&
(!model.ClientId.HasValue ||
order.ClientId == model.ClientId))
{ {
result.Add(AccessPastryStorage(order.GetViewModel)); result.Add(AccessPastryStorage(order.GetViewModel));
} }