Salikh/PIbd-21_Yaruskin_S.A_MotorPlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Yaruskin S.A. LabWork05_Base #9

Closed
Salikh wants to merge 3 commits from laba5 into lab4
pull from: laba5
merge into: Salikh:lab4
Conversation 0 Commits 3 Files Changed 126 +5 -5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f21c618272 - Show all commits

6
MotorPlant/MotorPlantDatabaseImplement/Implements/OrderStorage.cs
View File

@ -82,11 +82,11 @@ namespace MotorPlantDatabaseImplement.Implements
if (model == null)
return null;
using var context = new MotorPlantDatabase();
foreach (var Flower in context.Engines)
foreach (var Engine in context.Engines)
{
if (Flower.Id == model.EngineId)
if (Engine.Id == model.EngineId)
{
model.EngineName = Flower.EngineName;
model.EngineName = Engine.EngineName;
break;
}
}

4
MotorPlant/MotorPlantFileImplement/Implements/OrderStorage.cs
View File

@ -78,9 +78,9 @@ namespace MotorPlantFileImplement.Implements
private OrderViewModel GetViewModel(Order order)
{
var viewModel = order.GetViewModel;
var flower = source.Engines.FirstOrDefault(x => x.Id == order.EngineId);
var engine = source.Engines.FirstOrDefault(x => x.Id == order.EngineId);
var client = source.Clients.FirstOrDefault(x => x.Id == order.ClientId);
viewModel.EngineName = flower?.EngineName;
viewModel.EngineName = engine?.EngineName;
viewModel.ClientFIO = client?.ClientFIO;
return viewModel;
}