Serxionaft/PIbd-21_KozyrevSS_SewingDresses_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Lab4-Hard KozyrevSS SewingDresses #18

Closed
Serxionaft wants to merge 12 commits from Lab4-Hard into Lab3-Hard
pull from: Lab4-Hard
merge into: Serxionaft:Lab3-Hard
Conversation 1 Commits 12 Files Changed 51 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b8e808fa9a - Show all commits

7
SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs
View File

@ -15,12 +15,15 @@ namespace SewingDressesDatabaseImplement.Implements
}
public List<OrderViewModel?> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue)
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue)
{
return new();
}
using var context = new SewingDressesDatabase();
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
if (model.Id.HasValue)
return context.Orders.Where(x => x.Id == model.Id).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
else
return context.Orders.Where(x => x.DateCreate >= model.DateFrom).Where(x => x.DateCreate <= model.DateTo).Select(x => AcessDressesStorage(x.GetViewModel, context)).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
{