Sosees04ka/PIbd-22_Kashin_M.I_PrecastConcretePlant
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kashin M.I. Lab work 4 hard #12

Closed
Sosees04ka wants to merge 12 commits from LabWork04_hard into LabWork03_hard
pull from: LabWork04_hard
merge into: Sosees04ka:LabWork03_hard
Conversation 0 Commits 12 Files Changed 56 +4 -10
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5cfafad105 - Show all commits

14
PrecastConcretePlant/PrecastConcretePlantBusinessLogic/BusinessLogic/ReportLogic.cs
View File

@ -112,8 +112,6 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
{
var shops = _shopStorage.GetFullList();
var reinforcedies = _reinforcedStorage.GetFullList();
var list = new List<ReportShopReinforcedViewModel>();
foreach (var shop in shops)
@ -121,18 +119,14 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
var record = new ReportShopReinforcedViewModel
{
ShopName = shop.Name,
Reinforcedies = new List<Tuple<string, int>>(),
Reinforcedies = new(),
TotalCount = 0
};
foreach (var reinforced in reinforcedies)
foreach (var reinforced in shop.ShopReinforcedies)
{
if (shop.ShopReinforcedies.ContainsKey(reinforced.Id))
{
record.Reinforcedies.Add(new(reinforced.ReinforcedName, shop.ShopReinforcedies[reinforced.Id].Item2));
record.TotalCount += shop.ShopReinforcedies[reinforced.Id].Item2;
}
record.Reinforcedies.Add(new(reinforced.Value.Item1.ReinforcedName, reinforced.Value.Item2));
record.TotalCount += reinforced.Value.Item2;
}
record.Workload = record.TotalCount / (double)shop.ReinforcedMaxCount;
list.Add(record);
}