Inohara/PIbd-22_Tsukanova_I.V._IceCreamShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tsukanova_I.V. LabWork06_hard #14

Closed
Inohara wants to merge 21 commits from LabWork06_hard into LabWork05_hard
pull from: LabWork06_hard
merge into: Inohara:LabWork05_hard
Conversation 0 Commits 21 Files Changed 49 +3 -13
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d02a6e71fd - Show all commits

6
IceCreamShop/IceCreamBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -128,10 +128,10 @@ namespace IceCreamBusinessLogic.BusinessLogics
IceCreams = new List<Tuple<string, int>>(),
Count = 0
};
foreach (var docCount in shop.ShopIceCreams.Values)
foreach (var iceCreamCount in shop.ShopIceCreams.Values)
{
record.IceCreams.Add(new Tuple<string, int>(docCount.Item1.IceCreamName, docCount.Item2));
record.Count += docCount.Item2;
record.IceCreams.Add(new Tuple<string, int>(iceCreamCount.Item1.IceCreamName, iceCreamCount.Item2));
record.Count += iceCreamCount.Item2;
}
list.Add(record);
}

10
IceCreamShop/IceCreamShopDatabaseImplement/Migrations/IceCreamShopDatabaseModelSnapshot.cs
View File

@ -282,16 +282,6 @@ namespace IceCreamShopDatabaseImplement.Migrations
b.Navigation("IceCream");
b.Navigation("Implementer");
});
modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Shop", b =>
{
b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", null)
.WithMany("Shops")
.HasForeignKey("IceCreamId");
});
modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.ShopIcecream", b =>
{
b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", "IceCream")