diff --git a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs index b482b0e..bf5698a 100644 --- a/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs +++ b/SewingDresses/SewingDressesDatabaseImplement/Implements/OrderStorage.cs @@ -15,12 +15,15 @@ namespace SewingDressesDatabaseImplement.Implements } public List 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) {