Zakharov_Rostislav/PIbd-23_ZakharovR.A._BlacksmithWorkshop
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ПИбд-23 Захаров Ростислав Андреевич Лабораторная работа №6 усложненная #19

Closed
Zakharov_Rostislav wants to merge 16 commits from lab-6-hard into lab-5-hard
pull from: lab-6-hard
merge into: Zakharov_Rostislav:lab-5-hard
Conversation 0 Commits 16 Files Changed 44 +6 -6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b0de7b41d - Show all commits

6
BlacksmithWorkshop/BlackcmithWorkshopFileImplement/Implements/OrderStorage.cs
View File

@ -88,11 +88,11 @@ namespace BlacksmithWorkshopFileImplement.Implements
}
public OrderViewModel? AccessStorage(OrderViewModel model)
{
var iceCream = source.Manufactures.FirstOrDefault(x => x.Id == model.Id);
var manufacture = source.Manufactures.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.ManufactureName = iceCream.ManufactureName;
if (manufacture != null)
model.ManufactureName = manufacture.ManufactureName;
if (client != null)
model.ClientFIO = client.ClientFIO;
if (implementer != null)

6
BlacksmithWorkshop/BlacksmithWorkshopListImplement/Implements/OrderStorage.cs
View File

@ -108,11 +108,11 @@ namespace BlacksmithWorkshopListImplement.Implements
{
if (model == null)
return null;
var iceCream = _source.Manufactures.FirstOrDefault(x => x.Id == model.Id);
var manufacture = _source.Manufactures.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.ManufactureName = iceCream.ManufactureName;
if (manufacture != null)
model.ManufactureName = manufacture.ManufactureName;
if (client != null)
model.ClientFIO = client.ClientFIO;
if (implementer != null)