safgerd/PIbd-23_Minhasapov_R.H._AutomobilePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LabWork02_Base: Исправления

Browse Source
This commit is contained in:
Safgerd 2023-03-11 22:36:18 +04:00
parent 886ba20f87
commit 818c4db5d6
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
AutomobilePlant/AutomobilePlantFileImplement/Implements/OrderStorage.cs
View File

@ -26,8 +26,8 @@ namespace AutomobilePlantFileImplement.Implements
{ {
return null; return null;
} }
return source.Orders return GetViewModel(source.Orders
.FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id))?.GetViewModel; .FirstOrDefault(x => (model.Id.HasValue && x.Id == model.Id)));
} }
public List<OrderViewModel> GetFilteredList(OrderSearchModel model) public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
@ -38,13 +38,13 @@ namespace AutomobilePlantFileImplement.Implements
} }
return source.Orders return source.Orders
.Where(x => x.Id == model.Id) .Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel) .Select(x => GetViewModel(x))
.ToList(); .ToList();
} }
public List<OrderViewModel> GetFullList() public List<OrderViewModel> GetFullList()
{ {
return source.Orders.Select(x => x.GetViewModel).ToList(); return source.Orders.Select(x => GetViewModel(x)).ToList();
} }
public OrderViewModel? Insert(OrderBindingModel model) public OrderViewModel? Insert(OrderBindingModel model)
@ -57,7 +57,7 @@ namespace AutomobilePlantFileImplement.Implements
} }
source.Orders.Add(newOrder); source.Orders.Add(newOrder);
source.SaveOrders(); source.SaveOrders();
return newOrder.GetViewModel; return GetViewModel(newOrder);
} }
public OrderViewModel? Update(OrderBindingModel model) public OrderViewModel? Update(OrderBindingModel model)
@ -69,8 +69,9 @@ namespace AutomobilePlantFileImplement.Implements
} }
order.Update(model); order.Update(model);
source.SaveOrders(); source.SaveOrders();
return order.GetViewModel; return GetViewModel(order);
} }
public OrderViewModel? Delete(OrderBindingModel model) public OrderViewModel? Delete(OrderBindingModel model)
{ {
var order = source.Orders.FirstOrDefault(x => x.Id == model.Id); var order = source.Orders.FirstOrDefault(x => x.Id == model.Id);
@ -80,7 +81,18 @@ namespace AutomobilePlantFileImplement.Implements
} }
source.Orders.Remove(order); source.Orders.Remove(order);
source.SaveOrders(); source.SaveOrders();
return order.GetViewModel; return GetViewModel(order);
}
private OrderViewModel GetViewModel(Order order)
{
var viewModel = order.GetViewModel;
var car = source.Cars.FirstOrDefault(x => x.Id == order.CarId);
if (car != null)
{
viewModel.CarName = car.CarName;
}
return viewModel;
} }
} }
} }

6
AutomobilePlant/AutomobilePlantFileImplement/Models/Order.cs
View File

@ -15,8 +15,6 @@ namespace AutomobilePlantFileImplement.Models
{ {
public int CarId { get; private set; } public int CarId { get; private set; }
public string CarName { get; private set; } = string.Empty;
public int Count { get; private set; } public int Count { get; private set; }
public double Sum { get; private set; } public double Sum { get; private set; }
@ -38,7 +36,6 @@ namespace AutomobilePlantFileImplement.Models
return new Order return new Order
{ {
CarId = model.CarId, CarId = model.CarId,
CarName = model.CarName,
Count = model.Count, Count = model.Count,
Sum = model.Sum, Sum = model.Sum,
Status = model.Status, Status = model.Status,
@ -57,7 +54,6 @@ namespace AutomobilePlantFileImplement.Models
return new Order() return new Order()
{ {
Id = Convert.ToInt32(element.Attribute("Id")!.Value), Id = Convert.ToInt32(element.Attribute("Id")!.Value),
CarName = element.Element("CarName")!.Value,
CarId = Convert.ToInt32(element.Element("CarId")!.Value), CarId = Convert.ToInt32(element.Element("CarId")!.Value),
Sum = Convert.ToDouble(element.Element("Sum")!.Value), Sum = Convert.ToDouble(element.Element("Sum")!.Value),
Count = Convert.ToInt32(element.Element("Count")!.Value), Count = Convert.ToInt32(element.Element("Count")!.Value),
@ -80,7 +76,6 @@ namespace AutomobilePlantFileImplement.Models
public OrderViewModel GetViewModel => new() public OrderViewModel GetViewModel => new()
{ {
CarId = CarId, CarId = CarId,
CarName = CarName,
Count = Count, Count = Count,
Sum = Sum, Sum = Sum,
DateCreate = DateCreate, DateCreate = DateCreate,
@ -92,7 +87,6 @@ namespace AutomobilePlantFileImplement.Models
public XElement GetXElement => new( public XElement GetXElement => new(
"Order", "Order",
new XAttribute("Id", Id), new XAttribute("Id", Id),
new XElement("CarName", CarName),
new XElement("CarId", CarId.ToString()), new XElement("CarId", CarId.ToString()),
new XElement("Count", Count.ToString()), new XElement("Count", Count.ToString()),
new XElement("Sum", Sum.ToString()), new XElement("Sum", Sum.ToString()),