Huge updates
This commit is contained in:
@@ -1,3 +1,4 @@
|
|||||||
|
@inject IJSRuntime JSRuntime
|
||||||
<div class="nav-container onboarding-nav-menu">
|
<div class="nav-container onboarding-nav-menu">
|
||||||
@* --- Brand / Logo Section --- *@
|
@* --- Brand / Logo Section --- *@
|
||||||
<div class="nav-header">
|
<div class="nav-header">
|
||||||
@@ -50,6 +51,7 @@
|
|||||||
<div class="nav-footer">
|
<div class="nav-footer">
|
||||||
<AuthorizeView>
|
<AuthorizeView>
|
||||||
<Authorized>
|
<Authorized>
|
||||||
|
<NavLink href="/profile" class="user-profile-link">
|
||||||
<div class="user-profile-card">
|
<div class="user-profile-card">
|
||||||
<div class="avatar-container">
|
<div class="avatar-container">
|
||||||
<MudAvatar Class="user-avatar">
|
<MudAvatar Class="user-avatar">
|
||||||
@@ -62,6 +64,7 @@
|
|||||||
<span class="user-status">Online</span>
|
<span class="user-status">Online</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</NavLink>
|
||||||
</Authorized>
|
</Authorized>
|
||||||
</AuthorizeView>
|
</AuthorizeView>
|
||||||
|
|
||||||
@@ -74,8 +77,12 @@
|
|||||||
</Authorized>
|
</Authorized>
|
||||||
</AuthorizeView>
|
</AuthorizeView>
|
||||||
<MudTooltip Text="Changelog anzeigen" Placement="Placement.Right">
|
<MudTooltip Text="Changelog anzeigen" Placement="Placement.Right">
|
||||||
<MudNavLink Href="/changelog" Icon="@Icons.Material.Filled.NewReleases" Class="custom-nav-link version-link">
|
<MudNavLink Href="/changelog" Icon="@Icons.Material.Filled.NewReleases" Class="custom-nav-link version-link" OnClick="ClearBadge">
|
||||||
<span class="version-text">Version 1.4</span>
|
<span class="version-text">Version @timetracker.Client.Components.Pages.Changelog.LatestVersion</span>
|
||||||
|
@if (_showVersionBadge)
|
||||||
|
{
|
||||||
|
<span class="version-badge">1</span>
|
||||||
|
}
|
||||||
</MudNavLink>
|
</MudNavLink>
|
||||||
</MudTooltip>
|
</MudTooltip>
|
||||||
</MudNavMenu>
|
</MudNavMenu>
|
||||||
@@ -85,6 +92,33 @@
|
|||||||
@code {
|
@code {
|
||||||
[Parameter] public EventCallback OnToggleDrawer { get; set; }
|
[Parameter] public EventCallback OnToggleDrawer { get; set; }
|
||||||
|
|
||||||
|
private bool _showVersionBadge;
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var lastSeen = await JSRuntime.InvokeAsync<string>("localStorage.getItem", "lastSeenVersion");
|
||||||
|
var latest = timetracker.Client.Components.Pages.Changelog.LatestVersion;
|
||||||
|
var isHighlighted = timetracker.Client.Components.Pages.Changelog.IsLatestHighlighted;
|
||||||
|
|
||||||
|
_showVersionBadge = isHighlighted && lastSeen != latest;
|
||||||
|
StateHasChanged();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignored in SSR
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ClearBadge()
|
||||||
|
{
|
||||||
|
_showVersionBadge = false;
|
||||||
|
}
|
||||||
|
|
||||||
private string GetInitials(string? name)
|
private string GetInitials(string? name)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(name))
|
if (string.IsNullOrWhiteSpace(name))
|
||||||
|
|||||||
@@ -177,7 +177,19 @@
|
|||||||
background: rgba(15, 23, 42, 0.2);
|
background: rgba(15, 23, 42, 0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* User profile card */
|
/* User profile link */
|
||||||
|
.user-profile-link {
|
||||||
|
text-decoration: none !important;
|
||||||
|
color: inherit !important;
|
||||||
|
display: block;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.user-profile-link:hover .user-profile-card {
|
||||||
|
background-color: rgba(255, 255, 255, 0.05);
|
||||||
|
border-radius: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.user-profile-card {
|
.user-profile-card {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
@@ -248,6 +260,37 @@
|
|||||||
}
|
}
|
||||||
::deep .version-link .mud-nav-link-text {
|
::deep .version-link .mud-nav-link-text {
|
||||||
font-size: 0.75rem !important;
|
font-size: 0.75rem !important;
|
||||||
|
display: flex !important;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
::deep .version-badge {
|
||||||
|
background-color: #EF4444;
|
||||||
|
color: white;
|
||||||
|
font-size: 0.65rem;
|
||||||
|
font-weight: 700;
|
||||||
|
min-width: 16px;
|
||||||
|
height: 16px;
|
||||||
|
border-radius: 50%;
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 0;
|
||||||
|
box-shadow: 0 0 4px rgba(239, 68, 68, 0.4);
|
||||||
|
animation: pulse-badge 2s infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes pulse-badge {
|
||||||
|
0% {
|
||||||
|
box-shadow: 0 0 0 0 rgba(239, 68, 68, 0.7);
|
||||||
|
}
|
||||||
|
70% {
|
||||||
|
box-shadow: 0 0 0 4px rgba(239, 68, 68, 0);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
box-shadow: 0 0 0 0 rgba(239, 68, 68, 0);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* --- COLLAPSED DRAWER (MINI STATE) STYLES --- */
|
/* --- COLLAPSED DRAWER (MINI STATE) STYLES --- */
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
@page "/changelog"
|
@page "/changelog"
|
||||||
@rendermode InteractiveWebAssembly
|
@rendermode InteractiveWebAssembly
|
||||||
@attribute [AllowAnonymous]
|
@attribute [AllowAnonymous]
|
||||||
|
@inject IJSRuntime JSRuntime
|
||||||
|
|
||||||
<PageTitle>Changelog – Timetracker</PageTitle>
|
<PageTitle>Changelog – Timetracker</PageTitle>
|
||||||
|
|
||||||
@@ -18,7 +19,7 @@
|
|||||||
</MudStack>
|
</MudStack>
|
||||||
</MudPaper>
|
</MudPaper>
|
||||||
|
|
||||||
@foreach (var release in _releases)
|
@foreach (var release in Releases)
|
||||||
{
|
{
|
||||||
<MudCard Elevation="2" Class="rounded-xl">
|
<MudCard Elevation="2" Class="rounded-xl">
|
||||||
<MudCardContent>
|
<MudCardContent>
|
||||||
@@ -55,19 +56,17 @@
|
|||||||
</MudStack>
|
</MudStack>
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
private record ChangeEntry(string Tag, string Text);
|
public record ChangeEntry(string Tag, string Text);
|
||||||
private record Release(string Version, string Date, bool IsLatest, List<ChangeEntry> Entries);
|
public record Release(string Version, string Date, bool IsLatest, List<ChangeEntry> Entries, bool Highlighted = false);
|
||||||
|
|
||||||
private static Color GetTagColor(string tag) => tag switch
|
public static readonly List<Release> Releases =
|
||||||
{
|
|
||||||
"Neu" => Color.Success,
|
|
||||||
"Fix" => Color.Error,
|
|
||||||
"Upgrade" => Color.Info,
|
|
||||||
_ => Color.Default
|
|
||||||
};
|
|
||||||
|
|
||||||
private readonly List<Release> _releases =
|
|
||||||
[
|
[
|
||||||
|
new("1.5", "25.06.2026", true,
|
||||||
|
[
|
||||||
|
new("Neu", "Userprofil angelegt"),
|
||||||
|
new("Upgrade", "Früheste Gehenszeit wird angezeigt"),
|
||||||
|
new("Upgrade", "Pausen werden dynamisch berechnet"),
|
||||||
|
], Highlighted = true),
|
||||||
new("1.4", "08.06.2026", true,
|
new("1.4", "08.06.2026", true,
|
||||||
[
|
[
|
||||||
new("Neu", "Timebot implementiert"),
|
new("Neu", "Timebot implementiert"),
|
||||||
@@ -108,4 +107,30 @@
|
|||||||
new("Neu", "Registrierung und Login"),
|
new("Neu", "Registrierung und Login"),
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
public static string LatestVersion => Releases.FirstOrDefault()?.Version ?? "";
|
||||||
|
public static bool IsLatestHighlighted => Releases.FirstOrDefault()?.Highlighted ?? false;
|
||||||
|
|
||||||
|
private static Color GetTagColor(string tag) => tag switch
|
||||||
|
{
|
||||||
|
"Neu" => Color.Success,
|
||||||
|
"Fix" => Color.Error,
|
||||||
|
"Upgrade" => Color.Info,
|
||||||
|
_ => Color.Default
|
||||||
|
};
|
||||||
|
|
||||||
|
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||||
|
{
|
||||||
|
if (firstRender)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await JSRuntime.InvokeVoidAsync("localStorage.setItem", "lastSeenVersion", LatestVersion);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Ignored in SSR
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,13 +178,13 @@ else
|
|||||||
<MudText Color="Color.Secondary" Class="mb-1">−</MudText>
|
<MudText Color="Color.Secondary" Class="mb-1">−</MudText>
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
<MudText Typo="Typo.overline" Color="Color.Secondary">Pausen</MudText>
|
<MudText Typo="Typo.overline" Color="Color.Secondary">Pausen</MudText>
|
||||||
<MudText Typo="Typo.body1">@FormatTs(day.TotalBreakTime)</MudText>
|
<MudText Typo="Typo.body1">@FormatTs(GetEffectiveBreakTime(day))</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
<MudText Color="Color.Secondary" Class="mb-1">=</MudText>
|
<MudText Color="Color.Secondary" Class="mb-1">=</MudText>
|
||||||
<MudStack Spacing="0">
|
<MudStack Spacing="0">
|
||||||
<MudText Typo="Typo.overline" Color="Color.Secondary">Netto</MudText>
|
<MudText Typo="Typo.overline" Color="Color.Secondary">Netto</MudText>
|
||||||
<MudText Typo="Typo.body1" Color="Color.Primary" Style="font-weight:700">
|
<MudText Typo="Typo.body1" Color="Color.Primary" Style="font-weight:700">
|
||||||
@FormatTs(day.NetWork!.Value)
|
@FormatTs(GetEffectiveNetWork(day)!.Value)
|
||||||
</MudText>
|
</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
<MudDivider Vertical="true" FlexItem="true" Style="height:36px" />
|
<MudDivider Vertical="true" FlexItem="true" Style="height:36px" />
|
||||||
@@ -192,6 +192,30 @@ else
|
|||||||
<MudText Typo="Typo.overline" Color="Color.Secondary">Soll</MudText>
|
<MudText Typo="Typo.overline" Color="Color.Secondary">Soll</MudText>
|
||||||
<MudText Typo="Typo.body1">@FormatTs(TimeSpan.FromHours(_settings.DailyTargetHours))</MudText>
|
<MudText Typo="Typo.body1">@FormatTs(TimeSpan.FromHours(_settings.DailyTargetHours))</MudText>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
|
<MudDivider Vertical="true" FlexItem="true" Style="height:36px" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.overline" Color="Color.Secondary">Soll-Ende</MudText>
|
||||||
|
<MudText Typo="Typo.body1">@FormatTimeSpan(CalculateEarliestDeparture(day)) Uhr</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudItem>
|
||||||
|
}
|
||||||
|
else if (day.Start.HasValue)
|
||||||
|
{
|
||||||
|
<MudItem xs="12" md="8">
|
||||||
|
<MudStack Row="true" Spacing="3" AlignItems="AlignItems.Center" Class="h-100 pl-1">
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.overline" Style="color: var(--mud-palette-info);">Früheste Gehenszeit</MudText>
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="1">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.ExitToApp" Color="Color.Info" Size="Size.Small" />
|
||||||
|
<MudText Typo="Typo.body1" Color="Color.Info" Style="font-weight:700">
|
||||||
|
@FormatTimeSpan(CalculateEarliestDeparture(day)) Uhr
|
||||||
|
</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary" Class="ml-2">
|
||||||
|
(Bei Soll: @FormatTs(TimeSpan.FromHours(_settings.DailyTargetHours))h + @((int)GetRequiredBreakForTarget(day).TotalMinutes) Min. Pause)
|
||||||
|
</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
</MudStack>
|
</MudStack>
|
||||||
</MudItem>
|
</MudItem>
|
||||||
}
|
}
|
||||||
@@ -200,7 +224,7 @@ else
|
|||||||
@* ── Fortschrittsbalken ── *@
|
@* ── Fortschrittsbalken ── *@
|
||||||
@if (progressPct >= 0)
|
@if (progressPct >= 0)
|
||||||
{
|
{
|
||||||
<MudTooltip Text="@($"Netto {FormatTs(day.NetWork ?? TimeSpan.Zero)} von {FormatTs(TimeSpan.FromHours(_settings.DailyTargetHours))} Soll")">
|
<MudTooltip Text="@($"Netto {FormatTs(GetEffectiveNetWork(day) ?? TimeSpan.Zero)} von {FormatTs(TimeSpan.FromHours(_settings.DailyTargetHours))} Soll")">
|
||||||
<MudProgressLinear Value="@Math.Min(progressPct, 100)"
|
<MudProgressLinear Value="@Math.Min(progressPct, 100)"
|
||||||
Color="@(progressPct >= 100 ? Color.Success : Color.Primary)"
|
Color="@(progressPct >= 100 ? Color.Success : Color.Primary)"
|
||||||
Rounded="true" Class="mt-3" Style="height:6px" />
|
Rounded="true" Class="mt-3" Style="height:6px" />
|
||||||
@@ -476,21 +500,48 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ── Berechnungen ─────────────────────────────────────────────
|
// ── Berechnungen ─────────────────────────────────────────────
|
||||||
private TimeSpan? GetOvertime(DayVm day) =>
|
private TimeSpan GetEffectiveBreakTime(DayVm day)
|
||||||
day.NetWork.HasValue ? day.NetWork.Value - TimeSpan.FromHours(_settings.DailyTargetHours) : null;
|
{
|
||||||
|
var enteredBreak = day.Breaks
|
||||||
|
.Where(b => b.Duration.HasValue)
|
||||||
|
.Aggregate(TimeSpan.Zero, (s, b) => s + b.Duration!.Value);
|
||||||
|
|
||||||
|
if (!day.Start.HasValue || !day.End.HasValue)
|
||||||
|
return enteredBreak;
|
||||||
|
|
||||||
|
var gross = day.End.Value - day.Start.Value;
|
||||||
|
int minMinutes = gross.TotalHours >= 9.0 ? 45 : 30;
|
||||||
|
int finalMin = Math.Max(minMinutes, _settings.MinimumBreakMinutes);
|
||||||
|
var minBreak = TimeSpan.FromMinutes(finalMin);
|
||||||
|
|
||||||
|
return enteredBreak > minBreak ? enteredBreak : minBreak;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TimeSpan? GetEffectiveNetWork(DayVm day)
|
||||||
|
{
|
||||||
|
if (!day.GrossWork.HasValue) return null;
|
||||||
|
return day.GrossWork.Value - GetEffectiveBreakTime(day);
|
||||||
|
}
|
||||||
|
|
||||||
|
private TimeSpan? GetOvertime(DayVm day)
|
||||||
|
{
|
||||||
|
var net = GetEffectiveNetWork(day);
|
||||||
|
return net.HasValue ? net.Value - TimeSpan.FromHours(_settings.DailyTargetHours) : null;
|
||||||
|
}
|
||||||
|
|
||||||
private int GetProgressPercent(DayVm day)
|
private int GetProgressPercent(DayVm day)
|
||||||
{
|
{
|
||||||
if (!day.NetWork.HasValue || _settings.DailyTargetHours <= 0) return -1;
|
var net = GetEffectiveNetWork(day);
|
||||||
return (int)(day.NetWork.Value.TotalHours / _settings.DailyTargetHours * 100);
|
if (!net.HasValue || _settings.DailyTargetHours <= 0) return -1;
|
||||||
|
return (int)(net.Value.TotalHours / _settings.DailyTargetHours * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetBorderColor(DayVm day, bool isWorkDay, List<string> errors)
|
private string GetBorderColor(DayVm day, bool isWorkDay, List<string> errors)
|
||||||
{
|
{
|
||||||
if (!isWorkDay) return "#CFD8DC";
|
if (!isWorkDay) return "#CFD8DC";
|
||||||
if (errors.Count > 0) return "#EF5350";
|
if (errors.Count > 0) return "#EF5350";
|
||||||
if (!day.Start.HasValue && !day.End.HasValue) return "#B0BEC5";
|
if (!day.Start.HasValue && !day.End.HasValue) return "#B0BEC5";
|
||||||
if (!day.NetWork.HasValue) return "#B0BEC5";
|
if (!GetEffectiveNetWork(day).HasValue) return "#B0BEC5";
|
||||||
return "#4CAF50";
|
return "#4CAF50";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -517,11 +568,17 @@ else
|
|||||||
yield return $"Pause {i + 1} und Pause {j + 1} überschneiden sich.";
|
yield return $"Pause {i + 1} und Pause {j + 1} überschneiden sich.";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var net = GetEffectiveNetWork(day);
|
||||||
|
if (net.HasValue && net.Value.TotalHours > 10.0)
|
||||||
|
{
|
||||||
|
yield return "Die tägliche Arbeitszeit überschreitet das gesetzliche Maximum von 10 Stunden!";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private TimeSpan WeekGross => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (d.GrossWork ?? TimeSpan.Zero));
|
private TimeSpan WeekGross => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (d.GrossWork ?? TimeSpan.Zero));
|
||||||
private TimeSpan WeekBreaks => _days.Aggregate(TimeSpan.Zero, (s, d) => s + d.TotalBreakTime);
|
private TimeSpan WeekBreaks => _days.Aggregate(TimeSpan.Zero, (s, d) => s + GetEffectiveBreakTime(d));
|
||||||
private TimeSpan WeekNet => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (d.NetWork ?? TimeSpan.Zero));
|
private TimeSpan WeekNet => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (GetEffectiveNetWork(d) ?? TimeSpan.Zero));
|
||||||
private TimeSpan WeekOvertime => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (GetOvertime(d) ?? TimeSpan.Zero));
|
private TimeSpan WeekOvertime => _days.Aggregate(TimeSpan.Zero, (s, d) => s + (GetOvertime(d) ?? TimeSpan.Zero));
|
||||||
|
|
||||||
private static string FormatTs(TimeSpan ts, bool sign = false)
|
private static string FormatTs(TimeSpan ts, bool sign = false)
|
||||||
@@ -532,6 +589,34 @@ else
|
|||||||
return $"{prefix}{(int)abs.TotalHours}:{abs.Minutes:D2}";
|
return $"{prefix}{(int)abs.TotalHours}:{abs.Minutes:D2}";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private TimeSpan GetRequiredBreakForTarget(DayVm day)
|
||||||
|
{
|
||||||
|
var targetNet = _settings.DailyTargetHours;
|
||||||
|
var minMinutes = targetNet >= 8.5 ? 45 : 30;
|
||||||
|
var requiredBreak = TimeSpan.FromMinutes(Math.Max(minMinutes, _settings.MinimumBreakMinutes));
|
||||||
|
|
||||||
|
var enteredBreak = day.Breaks
|
||||||
|
.Where(b => b.Duration.HasValue)
|
||||||
|
.Aggregate(TimeSpan.Zero, (s, b) => s + b.Duration!.Value);
|
||||||
|
|
||||||
|
return enteredBreak > requiredBreak ? enteredBreak : requiredBreak;
|
||||||
|
}
|
||||||
|
|
||||||
|
private TimeSpan CalculateEarliestDeparture(DayVm day)
|
||||||
|
{
|
||||||
|
if (!day.Start.HasValue) return TimeSpan.Zero;
|
||||||
|
var target = TimeSpan.FromHours(_settings.DailyTargetHours);
|
||||||
|
var finalBreak = GetRequiredBreakForTarget(day);
|
||||||
|
return day.Start.Value + target + finalBreak;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatTimeSpan(TimeSpan? ts)
|
||||||
|
{
|
||||||
|
if (!ts.HasValue) return "";
|
||||||
|
var hours = ((int)ts.Value.TotalHours) % 24;
|
||||||
|
return $"{hours:D2}:{ts.Value.Minutes:D2}";
|
||||||
|
}
|
||||||
|
|
||||||
// ── ViewModels ────────────────────────────────────────────────
|
// ── ViewModels ────────────────────────────────────────────────
|
||||||
private sealed class DayVm
|
private sealed class DayVm
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -210,7 +210,10 @@ else
|
|||||||
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
||||||
.Aggregate(TimeSpan.Zero, (s, b) =>
|
.Aggregate(TimeSpan.Zero, (s, b) =>
|
||||||
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
||||||
net = gross - breaks;
|
var minMinutes = gross.TotalHours >= 9.0 ? 45 : 30;
|
||||||
|
var minBreak = TimeSpan.FromMinutes(Math.Max(minMinutes, _settings.MinimumBreakMinutes));
|
||||||
|
var finalBreak = breaks > minBreak ? breaks : minBreak;
|
||||||
|
net = gross - finalBreak;
|
||||||
if (net < TimeSpan.Zero) net = null;
|
if (net < TimeSpan.Zero) net = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,281 @@
|
|||||||
|
@page "/profile"
|
||||||
|
@rendermode InteractiveWebAssembly
|
||||||
|
@attribute [Authorize]
|
||||||
|
@using System.Security.Claims
|
||||||
|
@inject IAuthService AuthService
|
||||||
|
@inject ITimetrackerService TrackerService
|
||||||
|
@inject ISnackbar Snackbar
|
||||||
|
@inject AuthenticationStateProvider AuthStateProvider
|
||||||
|
@inject NavigationManager Nav
|
||||||
|
|
||||||
|
<PageTitle>Benutzerprofil – Timetracker</PageTitle>
|
||||||
|
|
||||||
|
@if (_loading)
|
||||||
|
{
|
||||||
|
<MudStack AlignItems="AlignItems.Center" Class="mt-16">
|
||||||
|
<MudProgressCircular Color="Color.Primary" Indeterminate="true" Size="Size.Large" />
|
||||||
|
<MudText Color="Color.Secondary">Lade Profil…</MudText>
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
<MudStack Spacing="4">
|
||||||
|
|
||||||
|
@* ── Header ── *@
|
||||||
|
<MudPaper Elevation="4" Class="pa-5 rounded-xl"
|
||||||
|
Style="background: #1E293B; color:white;">
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="3">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.AccountCircle" Style="color:white; font-size:2.5rem" />
|
||||||
|
<MudStack Spacing="0">
|
||||||
|
<MudText Typo="Typo.h5" Style="color:white; font-weight:700">Mein Profil</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Style="color:rgba(255,255,255,0.72)">
|
||||||
|
Persönliche Details verwalten und Account sichern
|
||||||
|
</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudPaper>
|
||||||
|
|
||||||
|
<MudGrid Spacing="4">
|
||||||
|
|
||||||
|
@* ── Übersicht & Details ── *@
|
||||||
|
<MudItem xs="12" md="4">
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl h-100">
|
||||||
|
<MudCardContent>
|
||||||
|
<MudStack AlignItems="AlignItems.Center" Class="py-6" Spacing="3">
|
||||||
|
<MudAvatar Style="width:96px; height:96px; font-size:2rem; font-weight:700; background: linear-gradient(135deg, #0EA5E9 0%, #0284C7 100%); color: white;">
|
||||||
|
@GetInitials(_username)
|
||||||
|
</MudAvatar>
|
||||||
|
<MudStack AlignItems="AlignItems.Center" Spacing="0">
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight:700">@_username</MudText>
|
||||||
|
<MudText Typo="Typo.caption" Color="Color.Secondary">@(_isAdmin ? "Administrator" : "Standardbenutzer")</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
|
||||||
|
<MudDivider Class="my-3" />
|
||||||
|
|
||||||
|
<MudStack Spacing="2" Class="pa-2">
|
||||||
|
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">Benutzer-ID</MudText>
|
||||||
|
<MudText Typo="Typo.body2"><b>#@_userId</b></MudText>
|
||||||
|
</MudStack>
|
||||||
|
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">Gleitzeit-Saldo</MudText>
|
||||||
|
<MudText Typo="Typo.body2" Color="@(_overtime >= TimeSpan.Zero ? Color.Success : Color.Warning)">
|
||||||
|
<b>@FormatTs(_overtime, sign: true)</b>
|
||||||
|
</MudText>
|
||||||
|
</MudStack>
|
||||||
|
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||||
|
<MudText Typo="Typo.body2" Color="Color.Secondary">Sollstunden / Tag</MudText>
|
||||||
|
<MudText Typo="Typo.body2"><b>@_settings.DailyTargetHours h</b></MudText>
|
||||||
|
</MudStack>
|
||||||
|
</MudStack>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
@* ── Einstellungen verwalten ── *@
|
||||||
|
<MudItem xs="12" md="8">
|
||||||
|
<MudStack Spacing="4">
|
||||||
|
|
||||||
|
@* Benutzername ändern *@
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl">
|
||||||
|
<MudCardHeader>
|
||||||
|
<CardHeaderContent>
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.Badge" Color="Color.Primary" />
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight:600">Benutzername ändern</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</CardHeaderContent>
|
||||||
|
</MudCardHeader>
|
||||||
|
<MudCardContent>
|
||||||
|
<MudForm @ref="_renameForm" @bind-IsValid="_renameIsValid">
|
||||||
|
<MudStack Spacing="3">
|
||||||
|
<MudTextField @bind-Value="_newUsername"
|
||||||
|
Label="Neuer Benutzername"
|
||||||
|
Variant="Variant.Outlined"
|
||||||
|
Required="true"
|
||||||
|
RequiredError="Bitte gib einen Benutzernamen ein."
|
||||||
|
Validation="@(new Func<string, string?>(ValidateUsername))" />
|
||||||
|
<MudButton Variant="Variant.Filled"
|
||||||
|
Color="Color.Primary"
|
||||||
|
OnClick="HandleRename"
|
||||||
|
Disabled="!_renameIsValid || _newUsername == _username"
|
||||||
|
Class="align-self-start rounded-lg py-2 px-4"
|
||||||
|
StartIcon="@Icons.Material.Filled.Save">
|
||||||
|
Speichern
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
</MudForm>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
@* Passwort ändern *@
|
||||||
|
<MudCard Elevation="3" Class="rounded-xl">
|
||||||
|
<MudCardHeader>
|
||||||
|
<CardHeaderContent>
|
||||||
|
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||||
|
<MudIcon Icon="@Icons.Material.Filled.Lock" Color="Color.Primary" />
|
||||||
|
<MudText Typo="Typo.h6" Style="font-weight:600">Passwort ändern</MudText>
|
||||||
|
</MudStack>
|
||||||
|
</CardHeaderContent>
|
||||||
|
</MudCardHeader>
|
||||||
|
<MudCardContent>
|
||||||
|
<MudForm @ref="_passwordForm" @bind-IsValid="_passwordIsValid">
|
||||||
|
<MudStack Spacing="3">
|
||||||
|
<MudTextField @bind-Value="_currentPassword"
|
||||||
|
Label="Aktuelles Passwort"
|
||||||
|
InputType="InputType.Password"
|
||||||
|
Variant="Variant.Outlined"
|
||||||
|
Required="true"
|
||||||
|
RequiredError="Bitte gib dein aktuelles Passwort ein." />
|
||||||
|
<MudTextField @bind-Value="_newPassword"
|
||||||
|
Label="Neues Passwort"
|
||||||
|
InputType="InputType.Password"
|
||||||
|
Variant="Variant.Outlined"
|
||||||
|
Required="true"
|
||||||
|
RequiredError="Bitte gib dein neues Passwort ein."
|
||||||
|
Validation="@(new Func<string, string?>(ValidatePassword))" />
|
||||||
|
<MudTextField @bind-Value="_confirmPassword"
|
||||||
|
Label="Neues Passwort bestätigen"
|
||||||
|
InputType="InputType.Password"
|
||||||
|
Variant="Variant.Outlined"
|
||||||
|
Required="true"
|
||||||
|
RequiredError="Bitte bestätige dein neues Passwort."
|
||||||
|
Validation="@(new Func<string, string?>(ValidateConfirmPassword))" />
|
||||||
|
<MudButton Variant="Variant.Filled"
|
||||||
|
Color="Color.Primary"
|
||||||
|
OnClick="HandleChangePassword"
|
||||||
|
Disabled="!_passwordIsValid"
|
||||||
|
Class="align-self-start rounded-lg py-2 px-4"
|
||||||
|
StartIcon="@Icons.Material.Filled.VpnKey">
|
||||||
|
Passwort ändern
|
||||||
|
</MudButton>
|
||||||
|
</MudStack>
|
||||||
|
</MudForm>
|
||||||
|
</MudCardContent>
|
||||||
|
</MudCard>
|
||||||
|
|
||||||
|
</MudStack>
|
||||||
|
</MudItem>
|
||||||
|
|
||||||
|
</MudGrid>
|
||||||
|
|
||||||
|
</MudStack>
|
||||||
|
}
|
||||||
|
|
||||||
|
@code {
|
||||||
|
private bool _loading = true;
|
||||||
|
private int _userId;
|
||||||
|
private string _username = "";
|
||||||
|
private string _newUsername = "";
|
||||||
|
private bool _isAdmin;
|
||||||
|
private AppSettings _settings = new();
|
||||||
|
private TimeSpan _overtime;
|
||||||
|
|
||||||
|
// Formulare
|
||||||
|
private MudForm? _renameForm;
|
||||||
|
private bool _renameIsValid;
|
||||||
|
private MudForm? _passwordForm;
|
||||||
|
private bool _passwordIsValid;
|
||||||
|
|
||||||
|
// Passwörter
|
||||||
|
private string _currentPassword = "";
|
||||||
|
private string _newPassword = "";
|
||||||
|
private string _confirmPassword = "";
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
|
var authState = await AuthStateProvider.GetAuthenticationStateAsync();
|
||||||
|
var claim = authState.User.FindFirst(ClaimTypes.NameIdentifier);
|
||||||
|
if (claim == null) return;
|
||||||
|
|
||||||
|
_userId = int.Parse(claim.Value);
|
||||||
|
_username = authState.User.Identity?.Name ?? "";
|
||||||
|
_newUsername = _username;
|
||||||
|
_isAdmin = _username.Equals("marc", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
_settings = await TrackerService.GetSettingsAsync(_userId);
|
||||||
|
_overtime = await TrackerService.GetTotalOvertimeAsync(_userId, _settings);
|
||||||
|
_loading = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string GetInitials(string? name)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(name)) return "U";
|
||||||
|
var parts = name.Split(' ', StringSplitOptions.RemoveEmptyEntries);
|
||||||
|
if (parts.Length == 1) return parts[0][..Math.Min(2, parts[0].Length)].ToUpper();
|
||||||
|
return $"{parts[0][0]}{parts[1][0]}".ToUpper();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string FormatTs(TimeSpan ts, bool sign = false)
|
||||||
|
{
|
||||||
|
if (ts == TimeSpan.Zero && sign) return "±0:00";
|
||||||
|
var prefix = sign ? (ts >= TimeSpan.Zero ? "+" : "−") : (ts < TimeSpan.Zero ? "−" : "");
|
||||||
|
var abs = ts.Duration();
|
||||||
|
return $"{prefix}{(int)abs.TotalHours}:{abs.Minutes:D2}";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validierungen
|
||||||
|
private string? ValidateUsername(string val)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(val) || val.Length < 3)
|
||||||
|
return "Benutzername muss mindestens 3 Zeichen lang sein.";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string? ValidatePassword(string val)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(val) || val.Length < 6)
|
||||||
|
return "Passwort muss mindestens 6 Zeichen lang sein.";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string? ValidateConfirmPassword(string val)
|
||||||
|
{
|
||||||
|
if (val != _newPassword)
|
||||||
|
return "Die Passwörter stimmen nicht überein.";
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Aktionen
|
||||||
|
private async Task HandleRename()
|
||||||
|
{
|
||||||
|
if (_renameForm == null) return;
|
||||||
|
await _renameForm.ValidateAsync();
|
||||||
|
if (!_renameForm.IsValid) return;
|
||||||
|
|
||||||
|
var error = await AuthService.RenameUserAsync(_userId, _newUsername);
|
||||||
|
if (error != null)
|
||||||
|
{
|
||||||
|
Snackbar.Add(error, Severity.Error);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Snackbar.Add("Benutzername erfolgreich geändert. Bitte melde dich ggf. neu an, um alle Anzeigen zu aktualisieren.", Severity.Success);
|
||||||
|
_username = _newUsername;
|
||||||
|
// Umleitung zur Startseite, um die neue Identity zu laden
|
||||||
|
Nav.NavigateTo("/", forceLoad: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleChangePassword()
|
||||||
|
{
|
||||||
|
if (_passwordForm == null) return;
|
||||||
|
await _passwordForm.ValidateAsync();
|
||||||
|
if (!_passwordForm.IsValid) return;
|
||||||
|
|
||||||
|
var error = await AuthService.ChangePasswordAsync(_userId, _currentPassword, _newPassword);
|
||||||
|
if (error != null)
|
||||||
|
{
|
||||||
|
Snackbar.Add(error, Severity.Error);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Snackbar.Add("Passwort erfolgreich geändert.", Severity.Success);
|
||||||
|
_currentPassword = "";
|
||||||
|
_newPassword = "";
|
||||||
|
_confirmPassword = "";
|
||||||
|
if (_passwordForm != null) await _passwordForm.ResetAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -317,7 +317,10 @@ else
|
|||||||
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
||||||
.Aggregate(TimeSpan.Zero, (s, b) =>
|
.Aggregate(TimeSpan.Zero, (s, b) =>
|
||||||
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
||||||
worked = (gross - breakTotal).TotalHours;
|
var minMinutes = gross.TotalHours >= 9.0 ? 45 : 30;
|
||||||
|
var minBreak = TimeSpan.FromMinutes(Math.Max(minMinutes, _settings.MinimumBreakMinutes));
|
||||||
|
var finalBreak = breakTotal > minBreak ? breakTotal : minBreak;
|
||||||
|
worked = (gross - finalBreak).TotalHours;
|
||||||
if (worked < 0) worked = 0.0;
|
if (worked < 0) worked = 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -71,4 +71,14 @@ public class ClientAuthService : IAuthService
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<string?> ChangePasswordAsync(int userId, string currentPassword, string newPassword)
|
||||||
|
{
|
||||||
|
var response = await _http.PutAsJsonAsync($"api/users/{userId}/change-password", new { CurrentPassword = currentPassword, NewPassword = newPassword });
|
||||||
|
if (!response.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
return await response.Content.ReadAsStringAsync();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,6 +55,26 @@ public class AuthService(IDbContextFactory<TimetrackerDbContext> factory, UserNo
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task<string?> ChangePasswordAsync(int userId, string currentPassword, string newPassword)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(newPassword) || newPassword.Length < 6)
|
||||||
|
return "Passwort muss mindestens 6 Zeichen lang sein.";
|
||||||
|
|
||||||
|
await using var db = await factory.CreateDbContextAsync();
|
||||||
|
var user = await db.Users.FindAsync(userId);
|
||||||
|
if (user == null) return "Benutzer nicht gefunden.";
|
||||||
|
|
||||||
|
if (!VerifyPassword(currentPassword, user.PasswordHash, user.PasswordSalt))
|
||||||
|
return "Das aktuelle Passwort ist nicht korrekt.";
|
||||||
|
|
||||||
|
var (hash, salt) = HashPassword(newPassword);
|
||||||
|
user.PasswordHash = hash;
|
||||||
|
user.PasswordSalt = salt;
|
||||||
|
|
||||||
|
await db.SaveChangesAsync();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<(User? User, string? Error)> RegisterAsync(string username, string password, string? honeypot = null) {
|
public async Task<(User? User, string? Error)> RegisterAsync(string username, string password, string? honeypot = null) {
|
||||||
if (string.IsNullOrWhiteSpace(username) || username.Length < 3)
|
if (string.IsNullOrWhiteSpace(username) || username.Length < 3)
|
||||||
return (null, "Benutzername muss mindestens 3 Zeichen lang sein.");
|
return (null, "Benutzername muss mindestens 3 Zeichen lang sein.");
|
||||||
|
|||||||
@@ -173,7 +173,10 @@ public class TimetrackerService(IDbContextFactory<TimetrackerDbContext> factory)
|
|||||||
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
.Where(b => b.StartTime.HasValue && b.EndTime.HasValue && b.EndTime > b.StartTime)
|
||||||
.Aggregate(TimeSpan.Zero, (s, b) =>
|
.Aggregate(TimeSpan.Zero, (s, b) =>
|
||||||
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
s + (b.EndTime!.Value.ToTimeSpan() - b.StartTime!.Value.ToTimeSpan()));
|
||||||
actual = (gross - breakTotal).TotalHours;
|
var minMinutes = gross.TotalHours >= 9.0 ? 45 : 30;
|
||||||
|
var minBreak = TimeSpan.FromMinutes(Math.Max(minMinutes, settings.MinimumBreakMinutes));
|
||||||
|
var finalBreak = breakTotal > minBreak ? breakTotal : minBreak;
|
||||||
|
actual = (gross - finalBreak).TotalHours;
|
||||||
if (actual < 0) actual = 0.0;
|
if (actual < 0) actual = 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -243,6 +243,16 @@ usersApi.MapPut("/{userId:int}/rename", async (int userId, [FromBody] RenameRequ
|
|||||||
return Results.Ok();
|
return Results.Ok();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
usersApi.MapPut("/{userId:int}/change-password", async (int userId, [FromBody] ChangePasswordRequest req, IAuthService authService) =>
|
||||||
|
{
|
||||||
|
var error = await authService.ChangePasswordAsync(userId, req.CurrentPassword, req.NewPassword);
|
||||||
|
if (error != null)
|
||||||
|
{
|
||||||
|
return Results.BadRequest(error);
|
||||||
|
}
|
||||||
|
return Results.Ok();
|
||||||
|
});
|
||||||
|
|
||||||
// ── Timetracker-API-Endpoints (Protected) ─────────────────────────────────────
|
// ── Timetracker-API-Endpoints (Protected) ─────────────────────────────────────
|
||||||
var trackerApi = app.MapGroup("/api/tracker").RequireAuthorization();
|
var trackerApi = app.MapGroup("/api/tracker").RequireAuthorization();
|
||||||
|
|
||||||
@@ -362,3 +372,4 @@ app.Run();
|
|||||||
public record LoginRequest(string Username, string Password);
|
public record LoginRequest(string Username, string Password);
|
||||||
public record RegisterRequest(string Username, string Password, string? Honeypot = null);
|
public record RegisterRequest(string Username, string Password, string? Honeypot = null);
|
||||||
public record RenameRequest(string Username);
|
public record RenameRequest(string Username);
|
||||||
|
public record ChangePasswordRequest(string CurrentPassword, string NewPassword);
|
||||||
|
|||||||
@@ -6,5 +6,6 @@ public interface IAuthService
|
|||||||
Task<List<User>> GetAllUsersAsync();
|
Task<List<User>> GetAllUsersAsync();
|
||||||
Task DeleteUserAsync(int userId);
|
Task DeleteUserAsync(int userId);
|
||||||
Task<string?> RenameUserAsync(int userId, string newUsername);
|
Task<string?> RenameUserAsync(int userId, string newUsername);
|
||||||
|
Task<string?> ChangePasswordAsync(int userId, string currentPassword, string newPassword);
|
||||||
Task<(User? User, string? Error)> RegisterAsync(string username, string password, string? honeypot = null);
|
Task<(User? User, string? Error)> RegisterAsync(string username, string password, string? honeypot = null);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user