From 2e92bdee5f03ba1084ad40f9953f9e0b3e6b5de2 Mon Sep 17 00:00:00 2001 From: "t.ruspekhofer" Date: Sun, 13 Mar 2022 18:11:15 +0100 Subject: [PATCH] the raid roles now have a fixed order --- Lieb/Pages/Raids/RaidRolesNoSignUp.razor | 2 +- Lieb/Pages/Raids/RaidRolesPlanned.razor | 2 +- Lieb/Pages/Raids/RaidRolesRandom.razor | 2 +- Lieb/Pages/Raids/RaidTemplateDetails.razor | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lieb/Pages/Raids/RaidRolesNoSignUp.razor b/Lieb/Pages/Raids/RaidRolesNoSignUp.razor index 4cf697e..0a37ac0 100644 --- a/Lieb/Pages/Raids/RaidRolesNoSignUp.razor +++ b/Lieb/Pages/Raids/RaidRolesNoSignUp.razor @@ -3,7 +3,7 @@
- @foreach (var role in _raid.Roles) + @foreach (var role in _raid.Roles.OrderBy(r => r.PlannedRaidRoleId)) { Models.GuildWars2.Raid.RaidSignUp[] signUps = _raid.SignUps.Where(s => s.PlannedRaidRoleId == role.PlannedRaidRoleId).ToArray(); int usedSpots = signUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count(); diff --git a/Lieb/Pages/Raids/RaidRolesPlanned.razor b/Lieb/Pages/Raids/RaidRolesPlanned.razor index f5ecf29..8ef65e8 100644 --- a/Lieb/Pages/Raids/RaidRolesPlanned.razor +++ b/Lieb/Pages/Raids/RaidRolesPlanned.razor @@ -9,7 +9,7 @@ RaidSignUp userRole = _raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId).FirstOrDefault(); bool isSignedUp = userRole != null; } - @foreach (var role in _raid.Roles) + @foreach (var role in _raid.Roles.OrderBy(r => r.PlannedRaidRoleId)) { RaidSignUp[] signUps = _raid.SignUps.Where(s => s.PlannedRaidRoleId == role.PlannedRaidRoleId).ToArray(); int usedSpots = signUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count(); diff --git a/Lieb/Pages/Raids/RaidRolesRandom.razor b/Lieb/Pages/Raids/RaidRolesRandom.razor index 1e706d1..507b512 100644 --- a/Lieb/Pages/Raids/RaidRolesRandom.razor +++ b/Lieb/Pages/Raids/RaidRolesRandom.razor @@ -10,7 +10,7 @@ RaidSignUp userRole = _raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId).FirstOrDefault(); bool isSignedUp = userRole != null; } - @foreach (PlannedRaidRole role in _raid.Roles) + @foreach (PlannedRaidRole role in _raid.Roles.OrderBy(r => r.PlannedRaidRoleId)) { RaidSignUp[] signUps = _raid.SignUps.Where(s => s.PlannedRaidRoleId == role.PlannedRaidRoleId).ToArray(); int usedSpots = signUps.Where(s => s.SignUpType == SignUpType.SignedUp).Count(); diff --git a/Lieb/Pages/Raids/RaidTemplateDetails.razor b/Lieb/Pages/Raids/RaidTemplateDetails.razor index f29fe44..6c6c03e 100644 --- a/Lieb/Pages/Raids/RaidTemplateDetails.razor +++ b/Lieb/Pages/Raids/RaidTemplateDetails.razor @@ -47,7 +47,7 @@
- @foreach (var role in _template.Roles) + @foreach (var role in _template.Roles.OrderBy(r => r.PlannedRaidRoleId)) {
@role.Name: @role.Description (@role.Spots)