fedorenko/PIbd-22_Fedorenko_G.Y._CarpentryWorkshop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'LabWork02Hard' into LabWork03Hard

Browse Source
This commit is contained in:
Галина Федоренко 2024-05-25 16:41:10 +04:00
commit 8e2e38e9b5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CarpentryWorkshop/CarpentryWorkshop/FormShop.cs
View File

@ -63,7 +63,7 @@ namespace CarpentryWorkshopView
DataGridView.Rows.Clear();
foreach (var wood in _shopWoods)
{
DataGridView.Rows.Add(new object[] { wood.Key, wood.Value.Item1.WoodName, wood.Value.Item2 });
DataGridView.Rows.Add(new object[] { wood.Key, wood.Value.Item1.WoodName, wood.Value.Item1.Price,wood.Value.Item2 });
}
}
}

6
CarpentryWorkshop/CarpentryWorkshopFileImplement/Implements/ShopStorage.cs
View File

@ -79,7 +79,11 @@ namespace CarpentryWorkshopFileImplement.Implements
public bool CheckAvailability(int woodId, int count)
{
int minus = source.Shops.Select(x => x.ShopWoods.Select(y => (y.Value.Item1.Id == woodId ? y.Value.Item2 : 0)).Sum()).Sum();
int minus = source.Shops
.SelectMany(shop => shop.ShopWoods
.Where(wood => wood.Value.Item1.Id == woodId)
.Select(wood => wood.Value.Item2))
.Sum();
count -= minus;
return count <= 0;
}