pgirl1/PIbd-23_Borschevskaya_A.A._FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lab4_base' into lab4_hard

Browse Source
This commit is contained in:
prodigygirl 2023-04-09 13:51:49 +04:00
commit 7c70546980
3 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FurnitureAssembly/FurnitureAssemFileImplement/Implements/OrderStorage.cs
View File

@ -27,12 +27,19 @@ namespace FurnitureAssemFileImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue) if (!model.Id.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue))
{ {
return new(); return new();
} }
if (model.Id.HasValue)
{
return source.Orders return source.Orders
.Where(x => x.Id.Equals(model.Id) || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) .Where(x => x.Id.Equals(model.Id))
.Select(x => GetOrderViewModel(x))
.ToList();
}
return source.Orders
.Where(x => model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Select(x => GetOrderViewModel(x)) .Select(x => GetOrderViewModel(x))
.ToList(); .ToList();
} }

13
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/OrderStorage.cs
View File

@ -29,14 +29,23 @@ namespace FurnitureAssemblyDatabaseImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue) if (!model.Id.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue))
{ {
return new(); return new();
} }
using var context = new FurnitureAssemblyDatabase(); using var context = new FurnitureAssemblyDatabase();
if (model.Id.HasValue)
{
return context.Orders return context.Orders
.Include(x => x.Furniture) .Include(x => x.Furniture)
.Where(x => x.Id == model.Id || model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo) .Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.ToList();
}
return context.Orders
.Include(x => x.Furniture)
.Where(x => model.DateFrom <= x.DateCreate && x.DateCreate <= model.DateTo)
.Select(x => x.GetViewModel) .Select(x => x.GetViewModel)
.ToList(); .ToList();
} }

19
FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs
View File

@ -51,11 +51,26 @@ namespace FurnitureAssemblyListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
if (!model.Id.HasValue && (!model.DateFrom.HasValue || !model.DateTo.HasValue))
{
return new();
}
var result = new List<OrderViewModel>(); var result = new List<OrderViewModel>();
if (model.Id.HasValue)
{
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
if (order.Id.Equals(model.Id) || model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo) if (order.Id.Equals(model.Id))
{
result.Add(GetOrderViewModel(order));
break;
}
}
return result;
}
foreach (var order in _source.Orders)
{
if (model.DateFrom <= order.DateCreate && order.DateCreate <= model.DateTo)
{ {
result.Add(GetOrderViewModel(order)); result.Add(GetOrderViewModel(order));
} }