подредактировал fileImplement
This commit is contained in:
parent
0d16f29914
commit
e47a130624
@ -22,7 +22,7 @@ namespace TravelCompanyFileImplement.Implements
|
|||||||
public List<OrderViewModel> GetFullList()
|
public List<OrderViewModel> GetFullList()
|
||||||
{
|
{
|
||||||
return source.Orders
|
return source.Orders
|
||||||
.Select(x => AccessTravelStorage(x.GetViewModel))
|
.Select(x => AccessStorage(x.GetViewModel))
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -36,9 +36,11 @@ model)
|
|||||||
(!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
|
(!model.DateTo.HasValue || x.DateCreate <= model.DateTo)
|
||||||
&&
|
&&
|
||||||
(!model.ClientId.HasValue || x.ClientId == model.ClientId)
|
(!model.ClientId.HasValue || x.ClientId == model.ClientId)
|
||||||
|
&&
|
||||||
|
(!model.Status.HasValue || x.Status == model.Status)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.Select(x => AccessTravelStorage(x.GetViewModel))
|
.Select(x => AccessStorage(x.GetViewModel))
|
||||||
.ToList();
|
.ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -48,8 +50,11 @@ model)
|
|||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
return AccessTravelStorage(source.Orders
|
return AccessStorage(source.Orders
|
||||||
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel);
|
.FirstOrDefault(
|
||||||
|
x => ((model.Id.HasValue && x.Id == model.Id) ||
|
||||||
|
(model.ImplementerId.HasValue && model.Status.HasValue &&
|
||||||
|
x.ImplementerId == model.ImplementerId && x.Status == model.Status)))?.GetViewModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
public OrderViewModel? Insert(OrderBindingModel model)
|
public OrderViewModel? Insert(OrderBindingModel model)
|
||||||
@ -62,7 +67,7 @@ model)
|
|||||||
}
|
}
|
||||||
source.Orders.Add(newOrder);
|
source.Orders.Add(newOrder);
|
||||||
source.SaveOrders();
|
source.SaveOrders();
|
||||||
return AccessTravelStorage(newOrder.GetViewModel);
|
return AccessStorage(newOrder.GetViewModel);
|
||||||
}
|
}
|
||||||
|
|
||||||
public OrderViewModel? Update(OrderBindingModel model)
|
public OrderViewModel? Update(OrderBindingModel model)
|
||||||
@ -74,7 +79,7 @@ model)
|
|||||||
}
|
}
|
||||||
order.Update(model);
|
order.Update(model);
|
||||||
source.SaveOrders();
|
source.SaveOrders();
|
||||||
return AccessTravelStorage(order.GetViewModel);
|
return AccessStorage(order.GetViewModel);
|
||||||
}
|
}
|
||||||
public OrderViewModel? Delete(OrderBindingModel model)
|
public OrderViewModel? Delete(OrderBindingModel model)
|
||||||
{
|
{
|
||||||
@ -84,33 +89,24 @@ model)
|
|||||||
{
|
{
|
||||||
source.Orders.Remove(element);
|
source.Orders.Remove(element);
|
||||||
source.SaveOrders();
|
source.SaveOrders();
|
||||||
return AccessTravelStorage(element.GetViewModel);
|
return AccessStorage(element.GetViewModel);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public OrderViewModel AccessTravelStorage(OrderViewModel model)
|
public OrderViewModel AccessStorage(OrderViewModel model)
|
||||||
{
|
|
||||||
if (model == null)
|
|
||||||
return null;
|
|
||||||
foreach (var Travel in source.Travels)
|
|
||||||
{
|
|
||||||
if (Travel.Id == model.TravelId)
|
|
||||||
{
|
|
||||||
model.TravelName = Travel.TravelName;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return model;
|
|
||||||
}
|
|
||||||
|
|
||||||
public OrderViewModel AccessClientStorage(OrderViewModel model)
|
|
||||||
{
|
{
|
||||||
if (model == null)
|
if (model == null)
|
||||||
return null;
|
return null;
|
||||||
|
var iceCream = source.Travels.FirstOrDefault(x => x.Id == model.Id);
|
||||||
var client = source.Clients.FirstOrDefault(x => x.Id == model.Id);
|
var client = source.Clients.FirstOrDefault(x => x.Id == model.Id);
|
||||||
|
var implementer = source.Implementers.FirstOrDefault(x => x.Id == model.ImplementerId);
|
||||||
|
if (iceCream != null)
|
||||||
|
model.TravelName = iceCream.TravelName;
|
||||||
if (client != null)
|
if (client != null)
|
||||||
model.ClientFIO = client.ClientFIO;
|
model.ClientFIO = client.ClientFIO;
|
||||||
|
if (implementer != null)
|
||||||
|
model.ImplementerFIO = implementer.ImplementerFIO;
|
||||||
return model;
|
return model;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user