kaznacheeva/PIbd-22_Kaznacheeva.E.K._SoftwareInstallation
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

правочки

Browse Source
This commit is contained in:
Казначеева Елизавета 2024-05-04 00:29:55 +04:00
parent 8b48ca32e9
commit 33bfee6b85
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SoftwareInstallation/SoftwareInstallationFileImplement/OrderStorage.cs
View File

@ -50,18 +50,16 @@ namespace SoftwareInstallationFileImplement.Implements
return source.Orders.Where(x => ( return source.Orders.Where(x => (
(!model.Id.HasValue || x.Id == model.Id) && (!model.Id.HasValue || x.Id == model.Id) &&
(!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) && (!model.DateFrom.HasValue || x.DateCreate >= model.DateFrom) &&
(!model.DateTo.HasValue || x.DateCreate <= model.DateTo) && (!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
(!model.ClientId.HasValue || x.ClientId == model.ClientId)
) )
) )
.Select(x => GetPackageName(x.GetViewModel)) .Select(x => GetPackageName(x.GetViewModel))
.Select(GetClientName)
.ToList(); .ToList();
} }
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
return source.Orders.Select(x => GetPackageName(x.GetViewModel)).Select(GetClientName).ToList(); return source.Orders.Select(x => GetPackageName(x.GetViewModel)).ToList();
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)

19
SoftwareInstallation/SoftwareInstallationListImplement/OrderStorage.cs
View File

@ -54,14 +54,15 @@ namespace SoftwareInstallationListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{ {
var result = new List<OrderViewModel>(); var result = new List<OrderViewModel>();
foreach (var order in _source.Orders) 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.DateFrom.HasValue || order.DateCreate >= model.DateFrom)
(!model.DateTo.HasValue || order.DateCreate <= model.DateTo) && && (!model.DateTo.HasValue || order.DateCreate <= model.DateTo))
(!model.ClientId.HasValue || order.ClientId == model.ClientId)) ;
{ {
result.Add(GetClientName(GetViewModelName(order.GetViewModel))); result.Add(GetViewModelName(order.GetViewModel));
} }
} }
return result; return result;
@ -72,7 +73,7 @@ namespace SoftwareInstallationListImplement.Implements
var result = new List<OrderViewModel>(); var result = new List<OrderViewModel>();
foreach (var order in _source.Orders) foreach (var order in _source.Orders)
{ {
result.Add(GetClientName(GetViewModelName(order.GetViewModel))); result.Add(GetViewModelName(order.GetViewModel));
} }
return result; return result;
} }
@ -114,17 +115,17 @@ namespace SoftwareInstallationListImplement.Implements
return null; return null;
} }
private OrderViewModel GetViewModelName(OrderViewModel viewModel) private OrderViewModel GetViewModelName(OrderViewModel model)
{ {
foreach (var package in _source.Packages) foreach (var package in _source.Packages)
{ {
if (package.Id == viewModel.PackageId) if (package.Id == model.PackageId)
{ {
viewModel.PackageName = package.PackageName; model.PackageName = package.PackageName;
break; break;
} }
} }
return viewModel; return model;
} }
private OrderViewModel GetClientName(OrderViewModel viewModel) private OrderViewModel GetClientName(OrderViewModel viewModel)