daniel/Jugenddienst-Stunden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Refactor StundePage and ViewModels: adjust grid padding, clean up commented code, add SelectEntryCommand, and improve navigation logic.

Browse Source
This commit is contained in:
Daniel Pichler
2025-12-30 12:07:01 +01:00
parent 933ddd9874
commit a9467e729d
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Jugenddienst Stunden/ViewModels/StundeViewModel.cs
View File

@@ -74,6 +74,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
public ICommand SaveCommand { get; private set; } public ICommand SaveCommand { get; private set; }
public ICommand DeleteCommand { get; private set; } public ICommand DeleteCommand { get; private set; }
public ICommand DeleteConfirmCommand { get; private set; } public ICommand DeleteConfirmCommand { get; private set; }
public ICommand SelectEntryCommand { get; }
//public ICommand LoadDataCommand { get; private set; } //public ICommand LoadDataCommand { get; private set; }
@@ -83,6 +84,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
_alertService = alertService; _alertService = alertService;
SaveCommand = new AsyncRelayCommand(Save); SaveCommand = new AsyncRelayCommand(Save);
DeleteConfirmCommand = new Command(async () => await DeleteConfirm()); DeleteConfirmCommand = new Command(async () => await DeleteConfirm());
SelectEntryCommand = new AsyncRelayCommand<DayTime>(SelectEntryAsync);
_alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg); _alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
} }
@@ -136,7 +138,8 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
if (!exceptionOccurred) { if (!exceptionOccurred) {
if (DayTime.Id != null) { if (DayTime.Id != null) {
await Shell.Current.GoToAsync($"..?saved={DayTime.Id}"); //await Shell.Current.GoToAsync($"..?saved={DayTime.Id}");
await Shell.Current.GoToAsync($"//StundenPage?saved={DayTime.Id}");
} else { } else {
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}"); await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
} }
@@ -173,6 +176,19 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
} }
} }
/// <summary>
/// Öffnet eine bestehende Stundeneingabe
/// </summary>
private async Task SelectEntryAsync(DayTime entry) {
if (entry != null && entry.Id != null) {
//var navigationParameters = new Dictionary<string, object> { { "load", entry.id } };
//await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}", navigationParameters);
await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}?load={entry.Id}");
} else AlertEvent?.Invoke(this, "Auswahl enthält keine Daten");
}
/// <summary> /// <summary>
/// Anwenden der Query-Parameter /// Anwenden der Query-Parameter
/// </summary> /// </summary>

10
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -172,16 +172,6 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
RefreshListCommand = new AsyncRelayCommand(RefreshList); RefreshListCommand = new AsyncRelayCommand(RefreshList);
RefreshCommand = new Command(async () => await RefreshItemsAsync()); RefreshCommand = new Command(async () => await RefreshItemsAsync());
// Task task = LoadDay(DateTime.Today);
// Beim Startup NICHT direkt im CTOR laden (kann Startup/Navigation blockieren)
// Stattdessen via Dispatcher "nach" dem Aufbau starten:
// MainThread.BeginInvokeOnMainThread(async () => {
// try {
// await LoadDay(DateTime.Today);
// } catch (Exception ex) {
// AlertEvent?.Invoke(this, ex.Message);
// }
// });
} }

2
Jugenddienst Stunden/Views/StundePage.xaml
View File

@@ -21,7 +21,7 @@
StatusBarStyle="LightContent" /> StatusBarStyle="LightContent" />
</ContentPage.Behaviors> </ContentPage.Behaviors>
<Grid> <Grid Padding="10,0,10,0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="50"/> <RowDefinition Height="50"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>