safiulova.k/PIbd-22_Safiulova_K.N._AircraftPlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22. Safiulova K.N. LabWork_05_base #9

Closed
safiulova.k wants to merge 16 commits from LabWork_05 into LabWork_04
pull from: LabWork_05
merge into: safiulova.k:LabWork_04
Conversation 1 Commits 16 Files Changed 127 +3 -33
2 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e30c3bed2e - Show all commits

20
AircraftPlant/AbstractShopListImplement/OrderStorage.cs
View File

@ -49,7 +49,7 @@ namespace AircraftPlantListImplement.Implements
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
var result = new List<OrderViewModel>();
if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue || !model.ClientId.HasValue)
if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue)
{
return result;
}
@ -66,14 +66,6 @@ namespace AircraftPlantListImplement.Implements
return result;
}
if (model.ClientId.HasValue && !model.Id.HasValue)
{
foreach (var order in _source.Orders)
{
result.Add(GetViewModel(order));
}
}
foreach (var order in _source.Orders)
{
if (order.Id == model.Id)
@ -180,16 +172,6 @@ namespace AircraftPlantListImplement.Implements
break;
}
}
foreach (var client in _source.Clients)
{
if (client.Id == order.ClientId)
{
viewModel.ClientFIO = client.ClientFIO;
break;
}
}
return viewModel;
}
}

16
AircraftPlant/AircraftPlantFileImplement/OrderStorage.cs
View File

@ -24,11 +24,10 @@ namespace AircraftPlantFileImplement.Implements
}
public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
{
if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue || !model.ClientId.HasValue)
if (!model.Id.HasValue || !model.DateFrom.HasValue || !model.DateTo.HasValue)
{
return new();
}
if (model.DateFrom.HasValue)
{
return _source.Orders
@ -36,15 +35,6 @@ namespace AircraftPlantFileImplement.Implements
.Select(x => GetViewModel(x))
.ToList();
}
if (model.ClientId.HasValue && !model.Id.HasValue)
{
return _source.Orders
.Where(x => x.ClientId == model.ClientId)
.Select(x => x.GetViewModel)
.ToList();
}
return _source.Orders.Where(x => x.Id.Equals(model.Id)).Select(x => GetViewModel(x)).ToList();
}
public OrderViewModel? GetElement(OrderSearchModel model)
@ -94,9 +84,7 @@ namespace AircraftPlantFileImplement.Implements
{
var viewModel = order.GetViewModel;
var plane = _source.Planes.FirstOrDefault(x => x.Id == order.PlaneId);
viewModel.PlaneName = plane?.PlaneName ?? string.Empty;
var client = _source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
viewModel.ClientFIO = client?.ClientFIO ?? string.Empty;
viewModel.PlaneName = plane?.PlaneName;
return viewModel;
}
}