chk
/
KoogleApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chk:1d7139fc1ade06f6f477a7e785ece452844aea7a
Branches Tags
chk:main
chk:fuchsjagd
chk:feature/d2-person-pages
chk:feature/d1-person-state-fluxor
chk:feature/c2-club-pages
..
compare: chk:cd98df5a2365dc242308509166904a803ccef123
Branches Tags
chk:main
chk:fuchsjagd
chk:feature/d2-person-pages
chk:feature/d1-person-state-fluxor
chk:feature/c2-club-pages

No commits in common. "1d7139fc1ade06f6f477a7e785ece452844aea7a" and "cd98df5a2365dc242308509166904a803ccef123" have entirely different histories.
1d7139fc1a ... cd98df5a23

3 changed files with 10 additions and 18 deletions
Show Stats Expand all files Collapse all files

15
src/Koogle.Application/Services/UserService.cs
View File

@ -316,18 +316,13 @@ public class UserService : IUserService
// Update default club if specified // Update default club if specified
if (dto.DefaultClubId.HasValue) if (dto.DefaultClubId.HasValue)
{ {
// First: clear all defaults (to avoid unique index violation) var memberships = await _appDb.UserProfileClubs
foreach (var m in profile.Clubs) .Where(upc => upc.UserProfileId == profile.Id)
{ .ToListAsync(ct);
m.IsDefault = false;
}
await _appDb.SaveChangesAsync(ct);
// Then: set the new default foreach (var m in memberships)
var newDefault = profile.Clubs.FirstOrDefault(m => m.ClubId == dto.DefaultClubId.Value);
if (newDefault != null)
{ {
newDefault.IsDefault = true; m.IsDefault = m.ClubId == dto.DefaultClubId.Value;
} }
} }

2
src/Koogle.Web/Components/Pages/Days/DayEditDialog.razor
View File

@ -39,7 +39,7 @@
} }
else else
{ {
<MudText Typo="Typo.subtitle2" Class="mb-2">Teilnehmer auswählen</MudText> <MudText Typo="Typo.subtitle2" Class="mb-2">Teilnehmer vorauswählen</MudText>
<MudText Typo="Typo.caption" Color="Color.Secondary" Class="mb-2"> <MudText Typo="Typo.caption" Color="Color.Secondary" Class="mb-2">
Mitglieder sind automatisch vorausgewählt. Du kannst Teilnehmer später noch ändern. Mitglieder sind automatisch vorausgewählt. Du kannst Teilnehmer später noch ändern.
</MudText> </MudText>

3
src/Koogle.Web/Components/Pages/Days/Days.razor
View File

@ -50,13 +50,10 @@
Filtern Filtern
</MudButton> </MudButton>
<MudSpacer /> <MudSpacer />
@if (AuthState.Value.IsClubEditor || AuthState.Value.IsClubTreasurer || AuthState.Value.IsClubAdmin || AuthState.Value.IsSuperAdmin)
{
<MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add" <MudButton Variant="Variant.Filled" Color="Color.Primary" StartIcon="@Icons.Material.Filled.Add"
OnClick="OpenCreateDialog"> OnClick="OpenCreateDialog">
Neuer Spieltag Neuer Spieltag
</MudButton> </MudButton>
}
</ToolBarContent> </ToolBarContent>
<HeaderContent> <HeaderContent>
<MudTh><MudTableSortLabel SortBy="new Func<DaySummaryDto, object>(x => x.PostDate)">Datum</MudTableSortLabel></MudTh> <MudTh><MudTableSortLabel SortBy="new Func<DaySummaryDto, object>(x => x.PostDate)">Datum</MudTableSortLabel></MudTh>