Nastya_Kozlova/PIbd-22_Kozlova_A.A_PrecastConcretePlant
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22. Kozlova A.A. Lab work 02 #2

Closed
Nastya_Kozlova wants to merge 2 commits from lab2_base into lab1_base
pull from: lab2_base
merge into: Nastya_Kozlova:lab1_base
Conversation 1 Commits 2 Files Changed 11 +2 -8
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5606c50ef1 - Show all commits

6
PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/ComponentStorage.cs
View File

@ -39,10 +39,8 @@ namespace PrecastConcretePlantFileImplement.Implements
{
return null;
}
return source.Components
.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
model.ComponentName) ||
(model.Id.HasValue && x.Id == model.Id))
return source.Components.FirstOrDefault(x => (!string.IsNullOrEmpty(model.ComponentName) && x.ComponentName ==
model.ComponentName) || (model.Id.HasValue && x.Id == model.Id))
?.GetViewModel;
}
public ComponentViewModel? Insert(ComponentBindingModel model)

4
PrecastConcretePlant/PrecastConcretePlantFileImplement/Implements/OrderStorage.cs
View File

@ -93,10 +93,6 @@ namespace PrecastConcretePlantFileImplement.Implements
private OrderViewModel AddReinforcedName(OrderViewModel model)
{
var selectedReinforced = source.Reinforceds.FirstOrDefault(x => x.Id == model.ReinforcedId);
if (selectedReinforced != null)
{
model.ReinforcedName = selectedReinforced.ReinforcedName;
}
model.ReinforcedName = selectedReinforced?.ReinforcedName;
return model;
}