TenchinZero/Lieb-Website
1
0
Fork 0
forked from Sarah/Lieb-Website
Code Pull requests Activity

Random Messages don't show empty roles

Browse source 
No Flex Button in random raids
Reworked random sign up to keep roles after signing off
This commit is contained in:
Sarah Faey 2022-12-10 19:51:05 +01:00
parent 0c319a0a8a
commit 2288e48308
7 changed files with 161 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lieb/Pages/Raids/RaidOverview/RaidRoles.razor
View file

@ -36,7 +36,10 @@
}
@foreach (ExpandableRole role in _expandableRoles.OrderBy(r => r.Role.RaidRoleId))
{
<tr>
//leere random Rolle verstecken, wenn sie nicht dem angemeldeten Benutzer gehört
bool roleHidden = _raid.RaidType != RaidType.Planned && !role.Role.IsRandomSignUpRole
&& !_raid.SignUps.Where(s => s.RaidRoleId == role.Role.RaidRoleId && (s.SignUpType != SignUpType.SignedOff || s.LiebUserId == _liebUserId)).Any();
<tr hidden="@roleHidden">
@{
<td class="tdRole" @onclick="() => ToggleRow(role)">
@if(@role.IsRowExpanded)
@ -135,7 +138,7 @@
{
if(_raid.SignUps.Where(s => s.LiebUserId == _liebUserId).Any() && signUpType != SignUpType.Flex)
{
await RaidService.ChangeSignUpType(_raid.RaidId, _liebUserId, role.RaidRoleId, signUpType);
await RaidService.ChangeSignUpType(_raid.RaidId, _liebUserId, role.RaidRoleId, signUpType, _raid.RaidType);
}
else
{