maxKarme/PIbd-22_Karamushko_M_K_Pizzeria
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Karamushko M.K lab4_base #5

Closed
maxKarme wants to merge 6 commits from lab4_base into lab3_base
pull from: lab4_base
merge into: maxKarme:lab3_base
Conversation 0 Commits 6 Files Changed 42 +9 -2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7630dabb9e - Show all commits

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

@ -39,7 +39,11 @@ namespace PizzeriaListImplement.Implements
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) &&
(!model.DateTo.HasValue || order.DateCreate <= model.DateTo)
)
{
OrderViewModel viewModel = order.GetViewModel;
viewModel.PizzaName = _pizzaStorage.GetElement(new PizzaSearchModel { Id = order.PizzaId }).PizzaName;

5
Pizzeria/PizzeriaShopFileImplement/Implements/OrderStorage.cs
View File

@ -23,7 +23,10 @@ namespace PizzeriaFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
return source.Orders
.Where(x => (model.Id.HasValue && x.Id == model.Id))
.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 => x.GetViewModel)
.ToList();
}