Sarah/Lieb-Website
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

reworked collapsing all roles

Browse source
This commit is contained in:
t.ruspekhofer 2022-03-18 17:48:26 +01:00
parent 0fe8e4e7e3
commit e626ca2b65
3 changed files with 33 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lieb/Pages/Raids/RaidDetails.razor
View file

@ -17,7 +17,7 @@
@if (_user != null && _isRaidSignUpAllowed) @if (_user != null && _isRaidSignUpAllowed)
{ {
<div class="signUpStatusTooltip"> <div class="signUpStatusTooltip">
@if(_raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId).Any()) @if(_raid.SignUps.Where(s => s.LiebUserId == _user.LiebUserId && s.SignUpType != SignUpType.SignedOff).Any())
{ {
<span class="oi oi-badge" style="color:green"></span> <span class="oi oi-badge" style="color:green"></span>
<span class="tooltiptext">You are signed up</span> <span class="tooltiptext">You are signed up</span>
@ -70,7 +70,7 @@
</span> </span>
<RaidRoles _raid=@_raid _user=@_user _isRaidSignUpAllowed=@_isRaidSignUpAllowed/> <RaidRoles _Parent=@this _raid=@_raid _user=@_user _isRaidSignUpAllowed=@_isRaidSignUpAllowed/>
<div> <div>
<AuthorizeView> <AuthorizeView>
@ -129,4 +129,10 @@
await RaidRandomizerService.RandomizeRaid(_raid.RaidId); await RaidRandomizerService.RandomizeRaid(_raid.RaidId);
_raid = RaidService.GetRaid(_raid.RaidId); _raid = RaidService.GetRaid(_raid.RaidId);
} }
public void HasChanged()
{
_raid = RaidService.GetRaid(_raid.RaidId);
this.StateHasChanged();
}
} }

32
Lieb/Pages/Raids/RaidRoles.razor
View file

@ -9,15 +9,15 @@
bool flexExists = _raid.SignUps.Where(s => s.SignUpType == SignUpType.Flex).Any(); bool flexExists = _raid.SignUps.Where(s => s.SignUpType == SignUpType.Flex).Any();
} }
<thead> <thead>
<tr @onclick="() => ExpandAll()"> <tr @onclick="() => ToggleAll()">
<th> <th>
@if(@_expandableRoles.FirstOrDefault().IsRowExpanded) @if(_allExpanded)
{ {
<span class="oi oi-chevron-top" style="margin-right:7px"> </span> <span class="oi oi-collapse-up" style="margin-right:7px"> </span>
} }
else else
{ {
<span class="oi oi-chevron-bottom" style="margin-right:7px"> </span> <span class="oi oi-expand-down" style="margin-right:7px"> </span>
} }
Role Role
</th> </th>
@ -37,7 +37,7 @@
{ {
<tr> <tr>
@{ @{
<td class="tdRole" @onclick="() => role.IsRowExpanded = !role.IsRowExpanded"> <td class="tdRole" @onclick="() => ToggleRow(role)">
@if(@role.IsRowExpanded) @if(@role.IsRowExpanded)
{ {
<span class="oi oi-chevron-top" style="margin-right:7px"> </span> <span class="oi oi-chevron-top" style="margin-right:7px"> </span>
@ -56,7 +56,7 @@
<td class="tdSignUp"> <td class="tdSignUp">
@{List<SignUpType> signUpTypes =new List<SignUpType>(){SignUpType.SignedUp, SignUpType.Maybe, SignUpType.Backup};} @{List<SignUpType> signUpTypes =new List<SignUpType>(){SignUpType.SignedUp, SignUpType.Maybe, SignUpType.Backup};}
<CascadingValue Value="this"> <CascadingValue Value="this">
<SignedUpUsers _raid=@_raid _usableAccounts=@_usableAccounts _liebUserId=@_liebUserId _currentRoleId=@role.Role.PlannedRaidRoleId _signUpTypes=@signUpTypes _showToolTip=@true></SignedUpUsers> <SignedUpUsers _raid=@_raid _usableAccounts=@_usableAccounts _liebUserId=@_liebUserId _currentRoleId=@role.Role.PlannedRaidRoleId _signUpTypes=@signUpTypes _showToolTip=@true _showUserColor=@true></SignedUpUsers>
</CascadingValue> </CascadingValue>
</td> </td>
@if (flexExists) @if (flexExists)
@ -87,6 +87,8 @@
@code { @code {
[Parameter]
public RaidDetails _Parent { get; set; }
[Parameter] [Parameter]
public Raid _raid { get; set; } public Raid _raid { get; set; }
@ -103,6 +105,8 @@
private List<ExpandableRole> _expandableRoles; private List<ExpandableRole> _expandableRoles;
private bool _allExpanded = false;
private class ExpandableRole private class ExpandableRole
{ {
public PlannedRaidRole Role; public PlannedRaidRole Role;
@ -143,7 +147,7 @@
{ {
await RaidService.SignUp(_raid.RaidId, _liebUserId, _usableAccounts.FirstOrDefault().GuildWars2AccountId, role.PlannedRaidRoleId, signUpType); await RaidService.SignUp(_raid.RaidId, _liebUserId, _usableAccounts.FirstOrDefault().GuildWars2AccountId, role.PlannedRaidRoleId, signUpType);
} }
_raid = RaidService.GetRaid(_raid.RaidId); _Parent.HasChanged();
} }
public async Task ChangeAccount(ChangeEventArgs e) public async Task ChangeAccount(ChangeEventArgs e)
@ -154,12 +158,18 @@
this.StateHasChanged(); this.StateHasChanged();
} }
public async Task ExpandAll() private async Task ToggleRow(ExpandableRole role)
{
role.IsRowExpanded = !role.IsRowExpanded;
_allExpanded = !_expandableRoles.Where(r => !r.IsRowExpanded).Any();
}
private async Task ToggleAll()
{ {
bool newStatus = !_expandableRoles.FirstOrDefault().IsRowExpanded;
foreach(ExpandableRole role in _expandableRoles) foreach(ExpandableRole role in _expandableRoles)
{ {
role.IsRowExpanded = newStatus; role.IsRowExpanded = !_allExpanded;
} }
_allExpanded = !_allExpanded;
} }
} }

5
Lieb/Pages/Raids/SignedUpUsers.razor
View file

@ -29,7 +29,7 @@
</select> @signUpStatus </select> @signUpStatus
</td> </td>
} }
else if(isUser) else if(isUser && _showUserColor)
{ {
<td class="nametooltip username"> <td class="nametooltip username">
@signUp.GuildWars2Account.AccountName @signUpStatus @signUp.GuildWars2Account.AccountName @signUpStatus
@ -74,4 +74,7 @@
[Parameter] [Parameter]
public bool _showToolTip { get; set; } = false; public bool _showToolTip { get; set; } = false;
[Parameter]
public bool _showUserColor { get; set; } = false;
} }