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

PIbd-23. Elatomtsev L.K. Lab work 05 #10

Closed
DeerElk wants to merge 9 commits from lab5 into lab4
pull from: lab5
merge into: DeerElk:lab4
Conversation 0 Commits 9 Files Changed 126 +28 -34
2 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c9705c72f1 - Show all commits

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

@ -18,22 +18,19 @@ namespace ConfectioneryFileImplement.Implements
.Select(x => AccessPastryStorage(x.GetViewModel))
.ToList();
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
return source.Orders
.Where(x => (
(!model.Id.HasValue || x.Id == model.Id) &&
(!model.DateFrom.HasValue || x.DateCreate >=
model.DateFrom) && (!model.DateTo.HasValue ||
x.DateCreate <= model.DateTo) &&
(!model.ClientId.HasValue ||
x.ClientId == model.ClientId)
)
)
.Select(x => AccessPastryStorage(x.GetViewModel))
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
return source.Orders
.Where(x => (
(!model.Id.HasValue || x.Id == model.Id) &&
(!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
(!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
)
)
.Select(x => AccessPastryStorage(x.GetViewModel))
.ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{

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

@ -21,24 +21,21 @@ namespace ConfectioneryListImplement.Implements
}
return result;
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
var result = new List<OrderViewModel>();
foreach (var order in _source.Orders)
{
if ((!model.Id.HasValue || order.Id == model.Id) &&
(!model.DateFrom.HasValue || order.DateCreate >=
model.DateFrom) && (!model.DateTo.HasValue ||
order.DateCreate <= model.DateTo) &&
(!model.ClientId.HasValue ||
order.ClientId == model.ClientId))
{
result.Add(AccessPastryStorage(order.GetViewModel));
}
}
return result;
}
public OrderViewModel? GetElement(OrderSearchModel model)
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
var result = new List<OrderViewModel>();
foreach (var order in _source.Orders)
{
if ((!model.Id.HasValue || order.Id == model.Id) &&
(!model.DateFrom.HasValue || order.DateCreate >= model.DateFrom) &&
(!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
{
result.Add(AccessPastryStorage(order.GetViewModel));
}
}
return result;
}
public OrderViewModel? GetElement(OrderSearchModel model)
{
if (!model.Id.HasValue)
{