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

Tsukanova_I.V. LabWork05_hard #13

Closed
Inohara wants to merge 29 commits from LabWork05_hard into LabWork05
pull from: LabWork05_hard
merge into: Inohara:LabWork05
Conversation 0 Commits 29 Files Changed 149 +3 -12
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2536db5691 - 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);
}

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

@ -245,15 +245,6 @@ namespace IceCreamShopDatabaseImplement.Migrations
b.Navigation("IceCream");
});
modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Order", b =>
{
b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", null)
.WithMany("Orders")
.HasForeignKey("IceCreamId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("IceCreamShopDatabaseImplement.Models.Shop", b =>
{
b.HasOne("IceCreamShopDatabaseImplement.Models.IceCream", null)