Version 1.1.0

Umstellung auf MVVM Umstellung auf .NET 10 Weniger API-Requests
Refactor StundePage and ViewModels: adjust grid padding, clean up commented code, add SelectEntryCommand, and improve navigation logic.
2025-12-30 13:48:15 +01:00 · 2025-12-30 12:07:01 +01:00 · 2025-12-29 16:18:04 +01:00 · 2025-12-26 17:39:12 +01:00 · 2025-12-26 17:04:52 +01:00 · 2025-12-26 13:54:51 +01:00
14 changed files with 267 additions and 237 deletions
--- a/Stunden/Converter/AnyTrueMultiConverter.cs
+++ b/Stunden/Converter/AnyTrueMultiConverter.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using Microsoft.Maui.Controls;
+
+namespace Jugenddienst_Stunden.Converter;
+
+public class AnyTrueMultiConverter : IMultiValueConverter {
+	public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) {
+		foreach (object value in values) {
+			if (value is bool b && b) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) {
+	throw new NotSupportedException();
+}
+
+}
--- a/Stunden/Infrastructure/ApiClient.cs
+++ b/Stunden/Infrastructure/ApiClient.cs
@@ -13,7 +13,7 @@ internal sealed class ApiClient : IApiClient {
 	private readonly ApiOptions _options;
 	private readonly IAppSettings _settings;

-	public ApiClient(HttpClient http, ApiOptions options, ITokenProvider tokenProvider, IAppSettings settings) {
+	public ApiClient(HttpClient http, ApiOptions options, IAppSettings settings) {
 		_http = http;
 		_options = options;
 		_settings = settings;
--- a/Stunden/Infrastructure/SettingsTokenProvider.cs
+++ b/Stunden/Infrastructure/SettingsTokenProvider.cs
@@ -1,10 +0,0 @@
-using Jugenddienst_Stunden.Interfaces;
-
-namespace Jugenddienst_Stunden.Infrastructure;
-
-internal sealed class SettingsTokenProvider : ITokenProvider {
-	private readonly IAppSettings _settings;
-	public SettingsTokenProvider(IAppSettings settings) => _settings = settings;
-
-	public string GetToken() => _settings.ApiKey;
-}
--- a/Stunden/Interfaces/ITokenProvider.cs
+++ b/Stunden/Interfaces/ITokenProvider.cs
@@ -1,5 +0,0 @@
-namespace Jugenddienst_Stunden.Interfaces;
-
-internal interface ITokenProvider {
-	string? GetToken();
-}
--- a/Stunden/Jugenddienst
+++ b/Stunden/Jugenddienst
@@ -109,8 +109,8 @@
        <SymbolPackageFormat>snupkg</SymbolPackageFormat>
        <PlatformTarget>AnyCPU</PlatformTarget>
        <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
-        <AssemblyVersion>1.0.9</AssemblyVersion>
-        <FileVersion>1.0.9</FileVersion>
+        <AssemblyVersion>1.1.0</AssemblyVersion>
+        <FileVersion>1.1.0</FileVersion>
    </PropertyGroup>

    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0-android|AnyCPU'">
@@ -181,6 +181,26 @@
        <!-- <TargetFrameworks>;net9.0-android35.0</TargetFrameworks> -->
    </PropertyGroup>

+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0-android36.0|AnyCPU'">
+      <ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+      <ApplicationVersion>11</ApplicationVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net10.0-windows10.0.26100.0|AnyCPU'">
+      <ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+      <ApplicationVersion>11</ApplicationVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0-android36.0|AnyCPU'">
+      <ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+      <ApplicationVersion>11</ApplicationVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net10.0-windows10.0.26100.0|AnyCPU'">
+      <ApplicationDisplayVersion>1.1.0</ApplicationDisplayVersion>
+      <ApplicationVersion>11</ApplicationVersion>
+    </PropertyGroup>
+
    <ItemGroup>
        <!-- App Icon -->
        <MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
--- a/Stunden/MauiProgram.cs
+++ b/Stunden/MauiProgram.cs
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
 using ZXing.Net.Maui.Controls;
 using System.Net.Http;
 using Jugenddienst_Stunden.ViewModels;
+using Jugenddienst_Stunden.Views;
 using System.Net;

 namespace Jugenddienst_Stunden;
@@ -27,26 +28,8 @@ public static class MauiProgram {
 				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
 				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
 			})
-			//.UseBarcodeScanning();
 			.UseBarcodeReader();

-		//#if DEBUG
-		//		if (string.IsNullOrWhiteSpace(GlobalVar.ApiKey)) {
-		//			GlobalVar.ApiKey = Preferences.Default.Get("apiKey",
-		//				"MTQxfHNkdFptQkNZTXlPT3ZyMHxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk=");
-		//			GlobalVar.Name = Preferences.Default.Get("name", "Testserver: Isabell");
-		//			GlobalVar.Surname = Preferences.Default.Get("surname", "Biasi");
-		//			GlobalVar.EmployeeId = Preferences.Default.Get("EmployeeId", 141);
-		//			GlobalVar.ApiUrl = Preferences.Default.Get("apiUrl", "https://hours.dauni.mine.nu/appapi");
-		//		}
-
-		//		builder.Logging.AddDebug();
-		//#endif
-
-		// ApiClient registrieren: SocketsHttpHandler als Primary Handler (vermeidet AndroidMessageHandler-Castfehler)
-		//var apiOptions = new Infrastructure.ApiOptions { BaseUrl = GlobalVar.ApiUrl, Timeout = TimeSpan.FromSeconds(15) };
-		//builder.Services.AddApiHttpClient(apiOptions);
-
 		// DI: AlertService für globale Alerts (z. B. leere ApiUrl)
 		builder.Services.AddSingleton<IAlertService, AlertService>();

@@ -59,49 +42,22 @@ public static class MauiProgram {
 			Timeout = TimeSpan.FromSeconds(15)
 		});

-		// Token Provider soll ebenfalls aus Settings/Preferences lesen
-		builder.Services.AddSingleton<ITokenProvider, SettingsTokenProvider>();

-		// HttpClient + ApiClient
-		// Configure HttpClient with SocketsHttpHandler (managed) and RequestLoggingHandler
+		// HttpClient + ApiClient Best Practices:
+		// 1. IHttpClientFactory verwenden (vermeidet Socket Exhaustion & DNS Probleme)
+		// 2. Typed Client für bessere Dependency Injection (AddHttpClient<TInterface, TImplementation>)
+		// 3. DelegatingHandler für Logging/Infrastruktur einbinden
 		builder.Services.AddTransient<RequestLoggingHandler>();
-		builder.Services.AddSingleton<HttpClient>(sp => {
-			var nativeHandler = new SocketsHttpHandler {
+
+		builder.Services.AddHttpClient<IApiClient, ApiClient>()
+			.ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler {
 				AllowAutoRedirect = false,
 				AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
 				PooledConnectionLifetime = TimeSpan.FromMinutes(5),
 				ConnectTimeout = TimeSpan.FromSeconds(10)
-			};
-			var logging = sp.GetRequiredService<RequestLoggingHandler>();
-			logging.InnerHandler = nativeHandler;
-			// HttpClient.Timeout will be adjusted by ApiClient if needed
-			return new HttpClient(logging, disposeHandler: true);
-		});
-
-		builder.Services.AddSingleton<IApiClient>(sp => {
-			var alert = sp.GetRequiredService<IAlertService>();
-			try {
-				return new ApiClient(
-					sp.GetRequiredService<HttpClient>(),
-					sp.GetRequiredService<ApiOptions>(),
-					sp.GetRequiredService<ITokenProvider>(),
-					sp.GetRequiredService<IAppSettings>());
-			} catch (Exception e) {
-				// Alert an UI/VM weiterreichen
-				alert.Raise(e.Message);
-				// Fallback: NullApiClient liefert beim Aufruf aussagekräftige Exception
-				return new NullApiClient(e.Message);
-			}
-		});
-
-		// DI: Infrastruktur
-		//builder.Services.AddSingleton(new ApiOptions { BaseUrl = GlobalVar.ApiUrl, Timeout = TimeSpan.FromSeconds(15) });
-		//builder.Services.AddSingleton<ITokenProvider, GlobalVarTokenProvider>();
-		//builder.Services.AddSingleton<HttpClient>(_ => new HttpClient());
-		//builder.Services.AddSingleton<IApiClient>(sp => new ApiClient(
-		//    sp.GetRequiredService<HttpClient>(),
-		//    sp.GetRequiredService<ApiOptions>(),
-		//    sp.GetRequiredService<ITokenProvider>()));
+			})
+			.AddHttpMessageHandler<RequestLoggingHandler>()
+			.SetHandlerLifetime(TimeSpan.FromMinutes(5));

 		// DI: Validatoren
 		builder.Services.AddSingleton<IHoursValidator, HoursValidator>();
@@ -112,12 +68,12 @@ public static class MauiProgram {
 		builder.Services.AddSingleton<IAuthService, AuthService>();

 		// DI: Views/ViewModels
-		builder.Services.AddTransient<ViewModels.StundenViewModel>();
-		builder.Services.AddTransient<Views.StundenPage>();
-		builder.Services.AddTransient<ViewModels.StundeViewModel>();
-		builder.Services.AddTransient<Views.StundePage>();
-		builder.Services.AddTransient<ViewModels.LoginViewModel>();
-		builder.Services.AddTransient<Views.LoginPage>();
+		builder.Services.AddTransient<StundenViewModel>();
+		builder.Services.AddTransient<StundenPage>();
+		builder.Services.AddTransient<StundeViewModel>();
+		builder.Services.AddTransient<StundePage>();
+		builder.Services.AddTransient<LoginViewModel>();
+		builder.Services.AddTransient<LoginPage>();

 		return builder.Build();
 	}
--- a/Stunden/ViewModels/LoginViewModel.cs
+++ b/Stunden/ViewModels/LoginViewModel.cs
@@ -11,6 +11,7 @@ namespace Jugenddienst_Stunden.ViewModels;
 public partial class LoginViewModel : ObservableObject {
 	private readonly IAuthService _auth;
 	private readonly IAlertService? _alerts;
+	private readonly IAppSettings _settings;
 	private DateTime _lastDetectionTime = DateTime.MinValue;
 	private readonly TimeSpan _detectionInterval = TimeSpan.FromSeconds(5);

@@ -38,7 +39,7 @@ public partial class LoginViewModel : ObservableObject {
 	private string? serverLabel;

 	[ObservableProperty]
-	private string title = Preferences.Default.Get("name", "Nicht") + " " + Preferences.Default.Get("surname", "eingeloggt");
+	private string title = "Nicht eingeloggt";

 	[ObservableProperty]
 	private string? username;
@@ -58,8 +59,9 @@ public partial class LoginViewModel : ObservableObject {
 	// Explizite Command-Property für den QR-Scanner-Event, damit das Binding in XAML zuverlässig greift
 	public IAsyncRelayCommand<object?> QrDetectedCommand { get; }

-	public LoginViewModel(IAuthService auth) {
+	public LoginViewModel(IAuthService auth, IAppSettings settings) {
 		_auth = auth;
+		_settings = settings;

 		// gespeicherte Präferenz für Logintyp laden
 		var lt = Preferences.Default.Get("logintype", "qr");
@@ -68,22 +70,36 @@ public partial class LoginViewModel : ObservableObject {
 		IsDetecting = !isManualMode;

 		// Serveranzeige vorbereiten
-		var apiUrl = Preferences.Default.Get("apiUrl", string.Empty);
-		if (!string.IsNullOrWhiteSpace(apiUrl)) {
-			Server = apiUrl.Replace("/appapi", "").Replace("https://", "").Replace("http://", "");
-			ServerLabel = "Server: " + Server;
-		}
+		RefreshSettings();

 		// Command initialisieren
 		QrDetectedCommand = new AsyncRelayCommand<object?>(QrDetectedAsync);
 	}

 	// DI-Konstruktor: AlertService anbinden und Alerts an VM-Event weiterreichen (analog StundeViewModel)
-	internal LoginViewModel(IAuthService auth, IAlertService alertService) : this(auth) {
+	internal LoginViewModel(IAuthService auth, IAlertService alertService,IAppSettings settings) : this(auth,settings) {
 		_alerts = alertService;
+		_settings = settings;
 		if (alertService is not null) {
 			alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
 		}
+		RefreshSettings();
+	}
+
+	/// <summary>
+	/// Aktualisiert die Serveranzeige aus den aktuellen AppSettings.
+	/// </summary>
+	public void RefreshSettings() {
+		var apiUrl = _settings.ApiUrl;
+		if (!string.IsNullOrWhiteSpace(apiUrl)) {
+			Server = apiUrl.Replace("/appapi", "").Replace("https://", "").Replace("http://", "");
+			ServerLabel = "Server: " + Server;
+		} else {
+			Server = string.Empty;
+			ServerLabel = "Server: Nicht konfiguriert";
+		}
+
+		Title = $"{_settings.Name} {_settings.Surname}";
 	}

 	partial void OnIsManualModeChanged(bool value) {
--- a/Stunden/ViewModels/StundeViewModel.cs
+++ b/Stunden/ViewModels/StundeViewModel.cs
@@ -74,6 +74,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
 	public ICommand SaveCommand { get; private set; }
 	public ICommand DeleteCommand { get; private set; }
 	public ICommand DeleteConfirmCommand { get; private set; }
+	public ICommand SelectEntryCommand { get; }
 	//public ICommand LoadDataCommand { get; private set; }


@@ -83,6 +84,7 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
 		_alertService = alertService;
 		SaveCommand = new AsyncRelayCommand(Save);
 		DeleteConfirmCommand = new Command(async () => await DeleteConfirm());
+		SelectEntryCommand = new AsyncRelayCommand<DayTime>(SelectEntryAsync);

 		_alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
 	}
@@ -136,7 +138,8 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {

 			if (!exceptionOccurred) {
 				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 {
 					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>
 	/// Anwenden der Query-Parameter
 	/// </summary>
@@ -233,6 +249,8 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
 				//die soll aber ignoriert werden, weil beim Neueintrag ist das ja Wurscht
 				//In dem Fall müssen die Settings aber nochmal geholt werden, weil die dann nicht geladen wurden
 				// LoadSettingsAsync();
+				var settings = await _hoursService.GetSettingsAsync();
+				UpdateSettings(settings);
 			} finally {
 				DayTime = new DayTime();
 				DayTime.Day = _date;
--- a/Stunden/ViewModels/StundenViewModel.cs
+++ b/Stunden/ViewModels/StundenViewModel.cs
@@ -51,13 +51,7 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
 	/// </summary>
 	[ObservableProperty] private List<DayTime> dayTimes = new List<DayTime>();

-	/// <summary>
-	/// Der Titel der Stundenübersicht ist der aktuelle Benutzername
-	/// </summary>
-	public string Title { 
-		get => _settings.Name + " " + _settings.Surname; 
-		set; 
-	}
+	public string Title => _settings.Name + " " + _settings.Surname;

 	[ObservableProperty] private Hours hours;

@@ -178,16 +172,6 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
 		RefreshListCommand = new AsyncRelayCommand(RefreshList);
 		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);
-			}
-		});
 	}


@@ -231,7 +215,6 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
 					" installiert)");
 			}

-			//_hour = await HoursBase.LoadData();
 			RefreshProperties();
 		} catch (Exception e) {
 			AlertEvent?.Invoke(this, e.Message);
@@ -339,7 +322,7 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
 	/// <summary>
 	/// Refreshes all properties
 	/// </summary>
-	private void RefreshProperties() {
+	public void RefreshProperties() {
 		OnPropertyChanged(nameof(Hours));
 		OnPropertyChanged(nameof(Title));
 		OnPropertyChanged(nameof(Nominal));
--- a/Stunden/Views/LoginPage.xaml.cs
+++ b/Stunden/Views/LoginPage.xaml.cs
@@ -64,13 +64,21 @@ public partial class LoginPage : ContentPage {
 		base.OnDisappearing();

 		barcodeScannerView.CameraLocation = CameraLocation.Front;
-		// IsDetecting wird via Binding vom ViewModel gesteuert
+		// Scanner deaktivieren, wenn Seite verlassen wird
+		if (BindingContext is LoginViewModel vm) {
+			vm.IsDetecting = false;
+		}
 	}

 	protected override void OnAppearing() {
 		base.OnAppearing();
 		
-		// IsDetecting wird via Binding vom ViewModel gesteuert
+		if (BindingContext is LoginViewModel vm) {
+			vm.RefreshSettings();
+			// Scanner wieder aktivieren, wenn QR-Modus aktiv ist
+			vm.IsDetecting = !vm.IsManualMode;
+		}
+
 		barcodeScannerView.CameraLocation = CameraLocation.Rear;
 	}

--- a/Stunden/Views/StundePage.xaml
+++ b/Stunden/Views/StundePage.xaml
@@ -21,64 +21,81 @@
            StatusBarStyle="LightContent" />
    </ContentPage.Behaviors>

-    <VerticalStackLayout Spacing="10" Margin="10">
+    <Grid Padding="10,0,10,0">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="45"/>
+            <RowDefinition Height="20"/>
+            <RowDefinition Height="40"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>

-        <Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" />

-        <Border>
-            <Border.Padding>
-                <OnPlatform x:TypeArguments="Thickness" Default="0,15,10,0">
-                    <On Platform="Android" Value="0,4,10,8" />
-                    <On Platform="WPF" Value="0,15,10,0" />
-                </OnPlatform>
-            </Border.Padding>

-            <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="SpaceBetween">
-                <HorizontalStackLayout Spacing="10">
-                    <Label Text="Beginn" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
+        <Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" Grid.Row="0" />
+
+        <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" AlignContent="Start" JustifyContent="Start" Grid.Row="1" Margin="0,0,0,10" >
+
+            <Border Margin="0,0,0,10" MinimumHeightRequest="72" FlexLayout.Grow="1">
+                <Border.Padding>
+                    <OnPlatform x:TypeArguments="Thickness" Default="0,15,10,0">
+                        <On Platform="Android" Value="0,4,10,8" />
+                        <On Platform="WPF" Value="0,15,10,0" />
+                    </OnPlatform>
+                </Border.Padding>
+
+                <FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" JustifyContent="Start" AlignContent="Start">
+                    <HorizontalStackLayout Spacing="10">
+                        <Label Text="Beginn" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
                           MinimumWidthRequest="60">
-                    </Label>
-                    <TimePicker x:Name="TimeBegin" HorizontalOptions="Center" Format="HH:mm" MinimumWidthRequest="80"
+                        </Label>
+                        <TimePicker x:Name="TimeBegin" HorizontalOptions="Center" Format="HH:mm" MinimumWidthRequest="80"
                                Time="{Binding DayTime.TimeSpanVon}" />
-                </HorizontalStackLayout>
+                    </HorizontalStackLayout>
+
+                    <HorizontalStackLayout Spacing="10">
+                        <Label Text="Ende" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
+                           MinimumWidthRequest="60">
+                        </Label>
+                        <TimePicker x:Name="TimeEnd" Format="HH:mm" MinimumWidthRequest="80"
+                                Time="{Binding DayTime.TimeSpanBis}" />
+                    </HorizontalStackLayout>
+                </FlexLayout>
+            </Border>
+
+
+            <Border FlexLayout.Grow="1">
+                <Border.Padding>
+                    <OnPlatform x:TypeArguments="Thickness" Default="5">
+                        <On Platform="Android" Value="5,4,5,8" />
+                        <On Platform="WPF" Value="5" />
+                    </OnPlatform>
+                </Border.Padding>

                <HorizontalStackLayout Spacing="10">
-                    <Label Text="Ende" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
-                           MinimumWidthRequest="60">
-                    </Label>
-                    <TimePicker x:Name="TimeEnd" Format="HH:mm" MinimumWidthRequest="80"
-                                Time="{Binding DayTime.TimeSpanBis}" />
-                </HorizontalStackLayout>
-            </FlexLayout>
-        </Border>
-
-        <Border>
-            <Border.Padding>
-                <OnPlatform x:TypeArguments="Thickness" Default="5">
-                    <On Platform="Android" Value="5,4,5,8" />
-                    <On Platform="WPF" Value="5" />
-                </OnPlatform>
-            </Border.Padding>
-            <HorizontalStackLayout>
-                <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}"
+                    <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}"
                        SelectedItem="{Binding DayTime.GemeindeAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
                        IsVisible="{Binding GemeindeAktivSet}">
-                </Picker>
-                <Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}"
+                    </Picker>
+                    <Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}"
                        SelectedItem="{Binding DayTime.ProjektAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
                        IsVisible="{Binding ProjektAktivSet}">
-                </Picker>
-                <Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}"
+                    </Picker>
+                    <Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}"
                        SelectedItem="{Binding DayTime.FreistellungAktiv, Mode=TwoWay}"
                        ItemDisplayBinding="{Binding Name}" IsEnabled="{Binding FreistellungEnabled}">
-                </Picker>
-            </HorizontalStackLayout>
-        </Border>
+                    </Picker>
+                </HorizontalStackLayout>
+            </Border>
+        </FlexLayout>
+

        <Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40"
-                AutoSize="TextChanges" FontSize="18" />
+                AutoSize="TextChanges" FontSize="18" Grid.Row="2" Margin="0,0,0,10" />

-        <Grid ColumnDefinitions="*,*" ColumnSpacing="4">
+        <Grid ColumnDefinitions="*,*" ColumnSpacing="4" Grid.Row="3">
            <Button Grid.Column="1" Text="Speichern"
                    TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
                    Command="{Binding SaveCommand}" />
@@ -91,14 +108,14 @@
        </Grid>


-        <BoxView HeightRequest="1" Margin="3,10" />
+        <BoxView HeightRequest="1" Margin="3,10" Grid.Row="4" />

        <Label Text="Noch keine Einträge vorhanden"
               IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}, ConverterParameter=Invert}"
-               Margin="6,0,0,0" />
+               Margin="6,0,0,0" Grid.Row="5" />

        <StackLayout Margin="6,0,0,0"
-                     IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
+                     IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}" Grid.Row="5">
            <Label>
                <Label.FormattedText>
                    <FormattedString>
@@ -109,48 +126,52 @@
            </Label>
        </StackLayout>

-        <ScrollView IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
-            <CollectionView
+
+        <CollectionView
                ItemsSource="{Binding DayTimes}"
                x:Name="stundeItems" Margin="0"
-                HeightRequest="350"
                SelectionMode="Single"
+            VerticalOptions="Start"
                SelectionChangedCommand="{Binding SelectEntryCommand}"
-                SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}">
+                SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}"
+                IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}"
+            Grid.Row="6">

-                <CollectionView.ItemsLayout>
-                    <LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
-                </CollectionView.ItemsLayout>
+            <CollectionView.ItemsLayout>
+                <LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
+            </CollectionView.ItemsLayout>

-                <CollectionView.ItemTemplate>
-                    <DataTemplate>
-                        <Grid Padding="5,10,5,0">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <HorizontalStackLayout Grid.Row="0" Grid.Column="0">
-                                <Label Grid.Column="0" Text="{Binding Begin}" />
-                                <Label Text="bis" Padding="5,0,5,0" />
-                                <Label Text="{Binding End}" />
-                                <Label Text="{Binding GemeindeAktiv.Name}" Margin="10,0,0,0"
+            <CollectionView.ItemTemplate>
+                <DataTemplate>
+                    <Grid Padding="5,10,5,0">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <HorizontalStackLayout Grid.Row="0" Grid.Column="0">
+                            <Label Grid.Column="0" Text="{Binding Begin}" />
+                            <Label Text="bis" Padding="5,0,5,0" />
+                            <Label Text="{Binding End}" />
+                            <Label Text="{Binding GemeindeAktiv.Name}" Margin="10,0,0,0"
                                       IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.GemeindeAktivSet}" />
-                                <Label Text="{Binding ProjektAktiv.Name}" Margin="10,0,0,0"
+                            <Label Text="{Binding ProjektAktiv.Name}" Margin="10,0,0,0"
                                       IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.ProjektAktivSet}" />
-                                <Label Text="{Binding FreistellungAktiv.Name}" Margin="10,0,0,0" />
-                            </HorizontalStackLayout>
+                            <Label Text="{Binding FreistellungAktiv.Name}" Margin="10,0,0,0" />
+                        </HorizontalStackLayout>

-                            <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Description}"
+                        <Label Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Description}"
                                   Padding="0,0,0,15" />
-                        </Grid>
-                    </DataTemplate>
-                </CollectionView.ItemTemplate>
+                    </Grid>
+                </DataTemplate>
+            </CollectionView.ItemTemplate>
+
+        </CollectionView>
+
+
+    </Grid>

-            </CollectionView>
-        </ScrollView>
-    </VerticalStackLayout>
 </ContentPage>
--- a/Stunden/Views/StundePage.xaml.cs
+++ b/Stunden/Views/StundePage.xaml.cs
@@ -40,12 +40,4 @@ public partial class StundePage : ContentPage {
 		});
 	}

-	//private async Task<bool> ShowConfirm(string title, string message, string ok, string not_ok) {
-	//    return await DisplayAlert(title, message, ok, not_ok);
-	//}
-
-	//private async void ShowConfirm(object? sender, ConfirmEventArgs e) {
-	//    bool result = await DisplayAlert(e.Title, e.Message, e.Ok, e.NotOk);
-	//    e.Result = result;
-	//}
 }
--- a/Stunden/Views/StundenPage.xaml
+++ b/Stunden/Views/StundenPage.xaml
@@ -13,6 +13,7 @@
    <ContentPage.Resources>
        <ResourceDictionary>
            <conv:SecondsTimeConverter x:Key="secToTime" />
+            <conv:AnyTrueMultiConverter x:Key="AnyTrue"/>
            <FontImageSource x:Key="ToolbarIcon"
                             Glyph="+"
                             Size="22"
@@ -27,7 +28,7 @@
    </ContentPage.Behaviors>

    <ContentPage.ToolbarItems>
-        <!--<ToolbarItem Text="Lade Liste" Command="{Binding RefreshListCommand}"/>-->
+
        <ToolbarItem Text="Neuer Eintrag" IconImageSource="{StaticResource ToolbarIcon}"
                     Command="{Binding NewEntryCommand}" />
    </ContentPage.ToolbarItems>
@@ -35,7 +36,6 @@
    <RefreshView x:Name="MyRefreshView" Command="{Binding RefreshCommand}" IsRefreshing="{Binding IsRefreshing}"
                 Margin="10" Padding="10">
        <Grid RowDefinitions="50,*,Auto,80">
-            <!--<VerticalStackLayout Spacing="10" Margin="10">-->

            <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*" HeightRequest="50" Grid.Row="0">
                <DatePicker Grid.Column="0" MinimumDate="{Binding MinimumDate}"
@@ -53,7 +53,6 @@
            <CollectionView
                ItemsSource="{Binding DayTimes}"
                x:Name="stundeItems" Margin="0,0,0,20"
-
                SelectionMode="Single"
                SelectionChangedCommand="{Binding SelectEntryCommand}"
                SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}"
@@ -61,79 +60,83 @@
                Grid.Row="1">

                <CollectionView.ItemsLayout>
-                    <LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
+                    <LinearItemsLayout Orientation="Vertical" ItemSpacing="10" />
                </CollectionView.ItemsLayout>

                <CollectionView.ItemTemplate>
                    <DataTemplate>
-                        <VerticalStackLayout Padding="5,10,5,0">
+                        <Border Padding="5" StrokeShape="RoundRectangle 0,30,0,30" >
+                            <Border.Triggers>
+                                <DataTrigger TargetType="Border" Binding="{Binding Approved}" Value="True">
+                                    <Setter Property="Background" Value="LightCoral"/>
+                                    <Setter Property="Padding" Value="4"/>
+                                </DataTrigger>
+                            </Border.Triggers>

                            <VisualStateManager.VisualStateGroups>
                                <VisualStateGroup Name="CommonStates">
                                    <VisualState Name="Normal">
                                        <VisualState.Setters>
                                            <Setter Property="BackgroundColor"
-                                                    Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource TransparentColor}}" />
+                                Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource TransparentColor}}" />
                                        </VisualState.Setters>
                                    </VisualState>
                                    <VisualState Name="Selected">
                                        <VisualState.Setters>
                                            <Setter Property="BackgroundColor"
-                                                    Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
+                                Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}" />
                                        </VisualState.Setters>
                                    </VisualState>
                                </VisualStateGroup>
                            </VisualStateManager.VisualStateGroups>

+                            <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="*" >

-                            <HorizontalStackLayout>
-                                <HorizontalStackLayout.Triggers>
-                                    <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding Approved}"
-                                                 Value="True">
-                                        <Setter Property="BackgroundColor" Value="LightCoral" />
-                                        <Setter Property="Padding" Value="4" />
-                                    </DataTrigger>
-                                </HorizontalStackLayout.Triggers>
-                                <Label Text="{Binding Day, StringFormat='{0:dddd, dd. MMMM}'}" />
-                                <Label Text="von" Padding="5,0,5,0" />
-                                <Label Text="{Binding Begin}" />
-                                <Label Text="bis" Padding="5,0,5,0" />
-                                <Label Text="{Binding End}" />
-                            </HorizontalStackLayout>
+                                <HorizontalStackLayout Grid.Row="0" >
+                                    <Label Text="{Binding Day, StringFormat='{0:dddd, dd. MMMM}'}" />
+                                    <Label Text="von" Padding="5,0,5,0" />
+                                    <Label Text="{Binding Begin}" />
+                                    <Label Text="bis" Padding="5,0,5,0" />
+                                    <Label Text="{Binding End}" />
+                                </HorizontalStackLayout>

-                            <HorizontalStackLayout HorizontalOptions="FillAndExpand">
-                                <HorizontalStackLayout.Triggers>
-                                    <DataTrigger TargetType="HorizontalStackLayout" Binding="{Binding Approved}"
-                                                 Value="True">
-                                        <Setter Property="BackgroundColor" Value="LightCoral" />
-                                        <Setter Property="Padding" Value="4" />
-                                    </DataTrigger>
-                                </HorizontalStackLayout.Triggers>
-                                <Label Text="{Binding GemeindeAktiv.Name}" Margin="0,0,10,0"
+                                <HorizontalStackLayout Grid.Row="1" >
+                                    <!--<HorizontalStackLayout.IsVisible>
+                                        <MultiBinding Converter="{StaticResource AnyTrue}">
+                                            <Binding Path="Approved"/>
+                                            <Binding Path="BindingContext.GemeindeAktivSet" Source="{RelativeSource AncestorType={x:Type ContentPage}}"/>
+                                            <Binding Path="BindingContext.ProjektAktivSet" Source="{RelativeSource AncestorType={x:Type ContentPage}}"/>
+                                        </MultiBinding>
+                                    </HorizontalStackLayout.IsVisible>-->
+                                    <Label Text="{Binding GemeindeAktiv.Name}" Padding="0,0,10,0"
                                       IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.GemeindeAktivSet}" />
-                                <Label Text="{Binding ProjektAktiv.Name}" Margin="0,0,10,0"
+                                    <Label Text="{Binding ProjektAktiv.Name}" Padding="0,0,10,0"
                                       IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.ProjektAktivSet}" />
-                                <Label Text="{Binding FreistellungAktiv.Name}" IsVisible="{Binding Approved}" />
-                            </HorizontalStackLayout>
+                                    <Label Text="{Binding FreistellungAktiv.Name}" IsVisible="{Binding Approved}" />
+                                </HorizontalStackLayout>
+                                
+                                <!-- Ensure description row does not paint background -->
+                                <Label Text="{Binding Description}" Grid.Row="2" />
+
+                            </Grid>
+                        </Border>

-                            <Label Text="{Binding Description}" Padding="0,0,0,15" />
-                        </VerticalStackLayout>
                    </DataTemplate>
                </CollectionView.ItemTemplate>

            </CollectionView>

-            <!--<BoxView HeightRequest="1" Grid.Row="2" Margin="0,5,0,15" />-->
+
            <Button Text="{Binding LoadOverview}"
                    Grid.Row="2"
                    Command="{Binding LoadDataCommand}"
                    TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}" />
            <Border Padding="2" Grid.Row="3" Margin="0,10,0,0">
-                <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,*" ColumnDefinitions="Auto,Auto,*,Auto" Margin="10,2">
+                <Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,Auto,*" Margin="10,2">
                    <Label Grid.Row="0" Text="Soll:" />
                    <Label Grid.Row="1" Text="Summe:" />
                    <Label Grid.Row="2" Text="Differenz:" Margin="0,0,15,0" />
-                    <!--<BoxView Grid.Row="3" Grid.ColumnSpan="4" HeightRequest="1" Color="LightGrey" Margin="0,5"/>-->
+
                    <Label Grid.Row="0" Grid.Column="2" Text="Restüberstunden:" Margin="15,0,0,0" />
                    <Label Grid.Row="1" Grid.Column="2" Text="Zeitausgleich:" Margin="15,0,0,0" />
                    <Label Grid.Row="2" Grid.Column="2" Text="Resturlaub:" Margin="15,0,0,0" />
@@ -156,7 +159,7 @@
            </Border>

        </Grid>
-        <!--</VerticalStackLayout>-->
+

    </RefreshView>
 </ContentPage>
--- a/Stunden/Views/StundenPage.xaml.cs
+++ b/Stunden/Views/StundenPage.xaml.cs
@@ -58,6 +58,12 @@ public partial class StundenPage : ContentPage {
 			} catch (Exception ex) {
 				await DisplayAlert("Fehler:", ex.Message, "OK");
 			}
+		} else {
+			// Wenn eingeloggt, sicherstellen dass die Daten aktuell sind (besonders nach dem Login)
+			if (BindingContext is StundenViewModel vm) {
+				vm.RefreshProperties(); // Aktualisiert den Titel (Name/Vorname)
+				await vm.LoadDay(vm.DateToday);
+			}
 		}
 	}
Author	SHA1	Message	Date
Daniel Pichler	7bd0e8767b	Version 1.1.0 Umstellung auf MVVM Umstellung auf .NET 10 Weniger API-Requests	2025-12-30 13:48:15 +01:00
Daniel Pichler	a9467e729d	Refactor StundePage and ViewModels: adjust grid padding, clean up commented code, add SelectEntryCommand, and improve navigation logic.	2025-12-30 12:07:01 +01:00
Daniel Pichler	933ddd9874	Refactor StundePage and StundenPage layouts: adjust grid structure, improve margin handling, and enhance visuals with new binding and triggers.	2025-12-29 16:18:04 +01:00
Daniel Pichler	a4f586d445	Refactor StundenViewModel: simplify `Title` property, make `RefreshProperties` public, and update startup logic in StundenPage to refresh data after login.	2025-12-26 17:39:12 +01:00
Daniel Pichler	5148280c36	Refactor: Remove `ITokenProvider` and `SettingsTokenProvider`; update StundePage layout and optimize dependency injection configuration.	2025-12-26 17:04:52 +01:00
Daniel Pichler	e2ffc24131	Refactor LoginViewModel to use IAppSettings; improve settings management and update dependency injection.	2025-12-26 13:54:51 +01:00