troogs/duempelkas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(usability): preserve reporting year and locate outside-period bookings (U04)

Browse Source
This commit is contained in:
troogs
2026-11-02 06:28:36 +01:00
parent 122d4de809
commit 9c41856b5b
16 changed files with 169 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Duempelkas.App/Components/Accounts/EntryTable.razor
+1 -1
View File
@@ -20,6 +20,6 @@
@if (!Entries.Any())
{
<div class="text-center py-3 text-muted">Keine Buchungen vorhanden.</div>
<div class="text-center py-3 text-muted">@EmptyMessage</div>
}
src/Duempelkas.App/Components/Accounts/EntryTable.razor.cs
+1
View File
@@ -5,6 +5,7 @@ namespace Duempelkas.App.Components.Accounts;
public partial class EntryTable
{
[Parameter] public string EmptyMessage { get; set; } = "Keine Buchungen vorhanden.";
#region Parameters
[Parameter]
src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor
+9 -1
View File
@@ -24,9 +24,17 @@
<input type="number" class="form-control no-spinner" @bind="amount" step="0.01" min="0.01" />
</div>
@if (OutsideYear)
{
<div class="alert alert-warning" role="status">
Datum @date.ToString("dd.MM.yyyy"): Diese Buchung liegt außerhalb von Jahr @ContextYear und wird dort nicht angezeigt.
<label><input type="checkbox" checked="@(confirmDifferentYear && confirmedYear == date.Year)" @onchange="e => { confirmDifferentYear = e.Value is true; confirmedYear = date.Year; }" /> Ich möchte die Buchung im Jahr @date.Year speichern.</label>
</div>
}
<div class="d-flex justify-content-end gap-2">
<button class="btn btn-success" @onclick="Save"
disabled="@(string.IsNullOrWhiteSpace(title) || amount <= 0)">
disabled="@(string.IsNullOrWhiteSpace(title) || amount <= 0 || (OutsideYear && (!confirmDifferentYear || confirmedYear != date.Year)))">
<i class="bi bi-check-lg"></i> @(EditEntry != null ? "Speichern" : "Hinzufügen")
</button>
<button class="btn btn-outline-secondary" @onclick="Cancel"><i class="bi bi-x-lg"></i> Abbrechen</button>
src/Duempelkas.App/Components/Dialogs/AddEntryDialog.razor.cs
+8 -2
View File
@@ -15,13 +15,18 @@ public partial class AddEntryDialog
public EntryDto? EditEntry { get; set; }
[Parameter]
public EventCallback OnSave { get; set; }
public EventCallback<DateTime> OnSave { get; set; }
[Parameter]
public EventCallback OnCancel { get; set; }
#endregion
[Parameter] public int? ContextYear { get; set; }
private bool confirmDifferentYear;
private int? confirmedYear;
private bool OutsideYear => ContextYear.HasValue && date.Year != ContextYear.Value;
#region Fields
private EntryType entryType = EntryType.Income;
@@ -50,6 +55,7 @@ public partial class AddEntryDialog
private async Task Save()
{
if (OutsideYear && (!confirmDifferentYear || confirmedYear != date.Year)) return;
if (EditEntry != null)
{
await EntryService.UpdateEntryAsync(EditEntry.Id, date, title.Trim(), amount);
@@ -59,7 +65,7 @@ public partial class AddEntryDialog
await EntryService.CreateEntryAsync(AccountId, entryType, date, title.Trim(), amount);
}
await OnSave.InvokeAsync();
await OnSave.InvokeAsync(date);
}
private async Task Cancel() => await OnCancel.InvokeAsync();
src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor
+9 -1
View File
@@ -25,9 +25,17 @@
<input type="number" class="form-control no-spinner" @bind="amount" step="0.01" min="0.01" />
</div>
@if (OutsideYear)
{
<div class="alert alert-warning" role="status">
Datum @date.ToString("dd.MM.yyyy"): Diese Buchung liegt außerhalb von Jahr @ContextYear und wird dort nicht angezeigt.
<label><input type="checkbox" checked="@(confirmDifferentYear && confirmedYear == date.Year)" @onchange="e => { confirmDifferentYear = e.Value is true; confirmedYear = date.Year; }" /> Ich möchte die Buchung im Jahr @date.Year speichern.</label>
</div>
}
<div class="d-flex justify-content-end gap-2">
<button class="btn btn-success" @onclick="Save"
disabled="@(!CanSave)"><i class="bi bi-arrow-left-right"></i> @(EditEntry != null ? "Speichern" : "Hinzufügen")</button>
disabled="@(!CanSave || (OutsideYear && (!confirmDifferentYear || confirmedYear != date.Year)))"><i class="bi bi-arrow-left-right"></i> @(EditEntry != null ? "Speichern" : "Hinzufügen")</button>
<button class="btn btn-outline-secondary" @onclick="Cancel"><i class="bi bi-x-lg"></i> Abbrechen</button>
</div>
</div>
src/Duempelkas.App/Components/Dialogs/AddTransferDialog.razor.cs
+8 -2
View File
@@ -14,13 +14,18 @@ public partial class AddTransferDialog
public EntryDto? EditEntry { get; set; }
[Parameter]
public EventCallback OnSave { get; set; }
public EventCallback<DateTime> OnSave { get; set; }
[Parameter]
public EventCallback OnCancel { get; set; }
#endregion
[Parameter] public int? ContextYear { get; set; }
private bool confirmDifferentYear;
private int? confirmedYear;
private bool OutsideYear => ContextYear.HasValue && date.Year != ContextYear.Value;
#region Fields
private List<AccountSummaryDto> accounts = new();
@@ -61,6 +66,7 @@ public partial class AddTransferDialog
private async Task Save()
{
if (OutsideYear && (!confirmDifferentYear || confirmedYear != date.Year)) return;
if (EditEntry != null)
{
await EntryService.UpdateTransferAsync(EditEntry.Id, targetAccountId, date, title.Trim(), amount);
@@ -70,7 +76,7 @@ public partial class AddTransferDialog
await EntryService.CreateTransferAsync(SourceAccountId, targetAccountId, date, title.Trim(), amount);
}
await OnSave.InvokeAsync();
await OnSave.InvokeAsync(date);
}
private async Task Cancel() => await OnCancel.InvokeAsync();