Compare commits
2 Commits
4d5b093ea0
...
5148280c36
| Author | SHA1 | Date | |
|---|---|---|---|
| 5148280c36 | |||
| e2ffc24131 |
@@ -13,7 +13,7 @@ internal sealed class ApiClient : IApiClient {
|
|||||||
private readonly ApiOptions _options;
|
private readonly ApiOptions _options;
|
||||||
private readonly IAppSettings _settings;
|
private readonly IAppSettings _settings;
|
||||||
|
|
||||||
public ApiClient(HttpClient http, ApiOptions options, ITokenProvider tokenProvider, IAppSettings settings) {
|
public ApiClient(HttpClient http, ApiOptions options, IAppSettings settings) {
|
||||||
_http = http;
|
_http = http;
|
||||||
_options = options;
|
_options = options;
|
||||||
_settings = settings;
|
_settings = settings;
|
||||||
|
|||||||
@@ -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;
|
|
||||||
}
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace Jugenddienst_Stunden.Interfaces;
|
|
||||||
|
|
||||||
internal interface ITokenProvider {
|
|
||||||
string? GetToken();
|
|
||||||
}
|
|
||||||
@@ -9,6 +9,7 @@ using Microsoft.Extensions.Logging;
|
|||||||
using ZXing.Net.Maui.Controls;
|
using ZXing.Net.Maui.Controls;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
using Jugenddienst_Stunden.ViewModels;
|
using Jugenddienst_Stunden.ViewModels;
|
||||||
|
using Jugenddienst_Stunden.Views;
|
||||||
using System.Net;
|
using System.Net;
|
||||||
|
|
||||||
namespace Jugenddienst_Stunden;
|
namespace Jugenddienst_Stunden;
|
||||||
@@ -27,26 +28,8 @@ public static class MauiProgram {
|
|||||||
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
|
fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
|
||||||
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
|
fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
|
||||||
})
|
})
|
||||||
//.UseBarcodeScanning();
|
|
||||||
.UseBarcodeReader();
|
.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)
|
// DI: AlertService für globale Alerts (z. B. leere ApiUrl)
|
||||||
builder.Services.AddSingleton<IAlertService, AlertService>();
|
builder.Services.AddSingleton<IAlertService, AlertService>();
|
||||||
|
|
||||||
@@ -59,49 +42,22 @@ public static class MauiProgram {
|
|||||||
Timeout = TimeSpan.FromSeconds(15)
|
Timeout = TimeSpan.FromSeconds(15)
|
||||||
});
|
});
|
||||||
|
|
||||||
// Token Provider soll ebenfalls aus Settings/Preferences lesen
|
|
||||||
builder.Services.AddSingleton<ITokenProvider, SettingsTokenProvider>();
|
|
||||||
|
|
||||||
// HttpClient + ApiClient
|
// HttpClient + ApiClient Best Practices:
|
||||||
// Configure HttpClient with SocketsHttpHandler (managed) and RequestLoggingHandler
|
// 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.AddTransient<RequestLoggingHandler>();
|
||||||
builder.Services.AddSingleton<HttpClient>(sp => {
|
|
||||||
var nativeHandler = new SocketsHttpHandler {
|
builder.Services.AddHttpClient<IApiClient, ApiClient>()
|
||||||
|
.ConfigurePrimaryHttpMessageHandler(() => new SocketsHttpHandler {
|
||||||
AllowAutoRedirect = false,
|
AllowAutoRedirect = false,
|
||||||
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
|
AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate,
|
||||||
PooledConnectionLifetime = TimeSpan.FromMinutes(5),
|
PooledConnectionLifetime = TimeSpan.FromMinutes(5),
|
||||||
ConnectTimeout = TimeSpan.FromSeconds(10)
|
ConnectTimeout = TimeSpan.FromSeconds(10)
|
||||||
};
|
})
|
||||||
var logging = sp.GetRequiredService<RequestLoggingHandler>();
|
.AddHttpMessageHandler<RequestLoggingHandler>()
|
||||||
logging.InnerHandler = nativeHandler;
|
.SetHandlerLifetime(TimeSpan.FromMinutes(5));
|
||||||
// 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>()));
|
|
||||||
|
|
||||||
// DI: Validatoren
|
// DI: Validatoren
|
||||||
builder.Services.AddSingleton<IHoursValidator, HoursValidator>();
|
builder.Services.AddSingleton<IHoursValidator, HoursValidator>();
|
||||||
@@ -112,12 +68,12 @@ public static class MauiProgram {
|
|||||||
builder.Services.AddSingleton<IAuthService, AuthService>();
|
builder.Services.AddSingleton<IAuthService, AuthService>();
|
||||||
|
|
||||||
// DI: Views/ViewModels
|
// DI: Views/ViewModels
|
||||||
builder.Services.AddTransient<ViewModels.StundenViewModel>();
|
builder.Services.AddTransient<StundenViewModel>();
|
||||||
builder.Services.AddTransient<Views.StundenPage>();
|
builder.Services.AddTransient<StundenPage>();
|
||||||
builder.Services.AddTransient<ViewModels.StundeViewModel>();
|
builder.Services.AddTransient<StundeViewModel>();
|
||||||
builder.Services.AddTransient<Views.StundePage>();
|
builder.Services.AddTransient<StundePage>();
|
||||||
builder.Services.AddTransient<ViewModels.LoginViewModel>();
|
builder.Services.AddTransient<LoginViewModel>();
|
||||||
builder.Services.AddTransient<Views.LoginPage>();
|
builder.Services.AddTransient<LoginPage>();
|
||||||
|
|
||||||
return builder.Build();
|
return builder.Build();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace Jugenddienst_Stunden.ViewModels;
|
|||||||
public partial class LoginViewModel : ObservableObject {
|
public partial class LoginViewModel : ObservableObject {
|
||||||
private readonly IAuthService _auth;
|
private readonly IAuthService _auth;
|
||||||
private readonly IAlertService? _alerts;
|
private readonly IAlertService? _alerts;
|
||||||
|
private readonly IAppSettings _settings;
|
||||||
private DateTime _lastDetectionTime = DateTime.MinValue;
|
private DateTime _lastDetectionTime = DateTime.MinValue;
|
||||||
private readonly TimeSpan _detectionInterval = TimeSpan.FromSeconds(5);
|
private readonly TimeSpan _detectionInterval = TimeSpan.FromSeconds(5);
|
||||||
|
|
||||||
@@ -38,7 +39,7 @@ public partial class LoginViewModel : ObservableObject {
|
|||||||
private string? serverLabel;
|
private string? serverLabel;
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
private string title = Preferences.Default.Get("name", "Nicht") + " " + Preferences.Default.Get("surname", "eingeloggt");
|
private string title = "Nicht eingeloggt";
|
||||||
|
|
||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
private string? username;
|
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
|
// Explizite Command-Property für den QR-Scanner-Event, damit das Binding in XAML zuverlässig greift
|
||||||
public IAsyncRelayCommand<object?> QrDetectedCommand { get; }
|
public IAsyncRelayCommand<object?> QrDetectedCommand { get; }
|
||||||
|
|
||||||
public LoginViewModel(IAuthService auth) {
|
public LoginViewModel(IAuthService auth, IAppSettings settings) {
|
||||||
_auth = auth;
|
_auth = auth;
|
||||||
|
_settings = settings;
|
||||||
|
|
||||||
// gespeicherte Präferenz für Logintyp laden
|
// gespeicherte Präferenz für Logintyp laden
|
||||||
var lt = Preferences.Default.Get("logintype", "qr");
|
var lt = Preferences.Default.Get("logintype", "qr");
|
||||||
@@ -68,22 +70,36 @@ public partial class LoginViewModel : ObservableObject {
|
|||||||
IsDetecting = !isManualMode;
|
IsDetecting = !isManualMode;
|
||||||
|
|
||||||
// Serveranzeige vorbereiten
|
// Serveranzeige vorbereiten
|
||||||
var apiUrl = Preferences.Default.Get("apiUrl", string.Empty);
|
RefreshSettings();
|
||||||
if (!string.IsNullOrWhiteSpace(apiUrl)) {
|
|
||||||
Server = apiUrl.Replace("/appapi", "").Replace("https://", "").Replace("http://", "");
|
|
||||||
ServerLabel = "Server: " + Server;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Command initialisieren
|
// Command initialisieren
|
||||||
QrDetectedCommand = new AsyncRelayCommand<object?>(QrDetectedAsync);
|
QrDetectedCommand = new AsyncRelayCommand<object?>(QrDetectedAsync);
|
||||||
}
|
}
|
||||||
|
|
||||||
// DI-Konstruktor: AlertService anbinden und Alerts an VM-Event weiterreichen (analog StundeViewModel)
|
// 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;
|
_alerts = alertService;
|
||||||
|
_settings = settings;
|
||||||
if (alertService is not null) {
|
if (alertService is not null) {
|
||||||
alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
|
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) {
|
partial void OnIsManualModeChanged(bool value) {
|
||||||
|
|||||||
@@ -233,6 +233,8 @@ public partial class StundeViewModel : ObservableObject, IQueryAttributable {
|
|||||||
//die soll aber ignoriert werden, weil beim Neueintrag ist das ja Wurscht
|
//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
|
//In dem Fall müssen die Settings aber nochmal geholt werden, weil die dann nicht geladen wurden
|
||||||
// LoadSettingsAsync();
|
// LoadSettingsAsync();
|
||||||
|
var settings = await _hoursService.GetSettingsAsync();
|
||||||
|
UpdateSettings(settings);
|
||||||
} finally {
|
} finally {
|
||||||
DayTime = new DayTime();
|
DayTime = new DayTime();
|
||||||
DayTime.Day = _date;
|
DayTime.Day = _date;
|
||||||
|
|||||||
@@ -231,7 +231,6 @@ public partial class StundenViewModel : ObservableObject, IQueryAttributable, IN
|
|||||||
" installiert)");
|
" installiert)");
|
||||||
}
|
}
|
||||||
|
|
||||||
//_hour = await HoursBase.LoadData();
|
|
||||||
RefreshProperties();
|
RefreshProperties();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
AlertEvent?.Invoke(this, e.Message);
|
AlertEvent?.Invoke(this, e.Message);
|
||||||
|
|||||||
@@ -64,13 +64,21 @@ public partial class LoginPage : ContentPage {
|
|||||||
base.OnDisappearing();
|
base.OnDisappearing();
|
||||||
|
|
||||||
barcodeScannerView.CameraLocation = CameraLocation.Front;
|
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() {
|
protected override void OnAppearing() {
|
||||||
base.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;
|
barcodeScannerView.CameraLocation = CameraLocation.Rear;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,64 +21,81 @@
|
|||||||
StatusBarStyle="LightContent" />
|
StatusBarStyle="LightContent" />
|
||||||
</ContentPage.Behaviors>
|
</ContentPage.Behaviors>
|
||||||
|
|
||||||
<VerticalStackLayout Spacing="10" Margin="10">
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<RowDefinition Height="180"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
<RowDefinition Height="50"/>
|
||||||
|
<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">
|
<Label Text="{Binding SubTitle}" FontSize="Medium" FontAttributes="Bold" Margin="4,0,0,0" Grid.Row="0" />
|
||||||
<HorizontalStackLayout Spacing="10">
|
|
||||||
<Label Text="Beginn" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
|
<FlexLayout Direction="Row" AlignItems="Start" Wrap="Wrap" AlignContent="Start" JustifyContent="Start" Grid.Row="1" >
|
||||||
|
|
||||||
|
<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">
|
MinimumWidthRequest="60">
|
||||||
</Label>
|
</Label>
|
||||||
<TimePicker x:Name="TimeBegin" HorizontalOptions="Center" Format="HH:mm" MinimumWidthRequest="80"
|
<TimePicker x:Name="TimeBegin" HorizontalOptions="Center" Format="HH:mm" MinimumWidthRequest="80"
|
||||||
Time="{Binding DayTime.TimeSpanVon}" />
|
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">
|
<HorizontalStackLayout Spacing="10">
|
||||||
<Label Text="Ende" VerticalTextAlignment="Center" HorizontalTextAlignment="End"
|
<Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding OptionsGemeinde}"
|
||||||
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}"
|
|
||||||
SelectedItem="{Binding DayTime.GemeindeAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
|
SelectedItem="{Binding DayTime.GemeindeAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
|
||||||
IsVisible="{Binding GemeindeAktivSet}">
|
IsVisible="{Binding GemeindeAktivSet}">
|
||||||
</Picker>
|
</Picker>
|
||||||
<Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}"
|
<Picker x:Name="pick_projekt" Title="Projekt" ItemsSource="{Binding OptionsProjekt}"
|
||||||
SelectedItem="{Binding DayTime.ProjektAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
|
SelectedItem="{Binding DayTime.ProjektAktiv, Mode=TwoWay}" ItemDisplayBinding="{Binding Name}"
|
||||||
IsVisible="{Binding ProjektAktivSet}">
|
IsVisible="{Binding ProjektAktivSet}">
|
||||||
</Picker>
|
</Picker>
|
||||||
<Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}"
|
<Picker x:Name="pick_freistellung" Title="Freistellung" ItemsSource="{Binding OptionsFreistellung}"
|
||||||
SelectedItem="{Binding DayTime.FreistellungAktiv, Mode=TwoWay}"
|
SelectedItem="{Binding DayTime.FreistellungAktiv, Mode=TwoWay}"
|
||||||
ItemDisplayBinding="{Binding Name}" IsEnabled="{Binding FreistellungEnabled}">
|
ItemDisplayBinding="{Binding Name}" IsEnabled="{Binding FreistellungEnabled}">
|
||||||
</Picker>
|
</Picker>
|
||||||
</HorizontalStackLayout>
|
</HorizontalStackLayout>
|
||||||
</Border>
|
</Border>
|
||||||
|
</FlexLayout>
|
||||||
|
|
||||||
|
|
||||||
<Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40"
|
<Editor Placeholder="Beschreibung" Text="{Binding DayTime.Description}" MinimumHeightRequest="40"
|
||||||
AutoSize="TextChanges" FontSize="18" />
|
AutoSize="TextChanges" FontSize="18" Grid.Row="2" />
|
||||||
|
|
||||||
<Grid ColumnDefinitions="*,*" ColumnSpacing="4">
|
<Grid ColumnDefinitions="*,*" ColumnSpacing="4" Grid.Row="3">
|
||||||
<Button Grid.Column="1" Text="Speichern"
|
<Button Grid.Column="1" Text="Speichern"
|
||||||
TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
|
TextColor="{AppThemeBinding Dark={StaticResource White}, Light={StaticResource White}}"
|
||||||
Command="{Binding SaveCommand}" />
|
Command="{Binding SaveCommand}" />
|
||||||
@@ -91,14 +108,14 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
|
|
||||||
|
|
||||||
<BoxView HeightRequest="1" Margin="3,10" />
|
<BoxView HeightRequest="1" Margin="3,10" Grid.Row="4" />
|
||||||
|
|
||||||
<Label Text="Noch keine Einträge vorhanden"
|
<Label Text="Noch keine Einträge vorhanden"
|
||||||
IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}, ConverterParameter=Invert}"
|
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"
|
<StackLayout Margin="6,0,0,0"
|
||||||
IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
|
IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}" Grid.Row="5">
|
||||||
<Label>
|
<Label>
|
||||||
<Label.FormattedText>
|
<Label.FormattedText>
|
||||||
<FormattedString>
|
<FormattedString>
|
||||||
@@ -109,48 +126,53 @@
|
|||||||
</Label>
|
</Label>
|
||||||
</StackLayout>
|
</StackLayout>
|
||||||
|
|
||||||
<ScrollView IsVisible="{Binding DayTimes, Converter={StaticResource CollectionVisibilityConverter}}">
|
|
||||||
<CollectionView
|
|
||||||
|
<CollectionView
|
||||||
ItemsSource="{Binding DayTimes}"
|
ItemsSource="{Binding DayTimes}"
|
||||||
x:Name="stundeItems" Margin="0"
|
x:Name="stundeItems" Margin="0"
|
||||||
HeightRequest="350"
|
|
||||||
SelectionMode="Single"
|
SelectionMode="Single"
|
||||||
|
VerticalOptions="Start"
|
||||||
SelectionChangedCommand="{Binding SelectEntryCommand}"
|
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>
|
<CollectionView.ItemsLayout>
|
||||||
<LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
|
<LinearItemsLayout Orientation="Vertical" ItemSpacing="0" />
|
||||||
</CollectionView.ItemsLayout>
|
</CollectionView.ItemsLayout>
|
||||||
|
|
||||||
<CollectionView.ItemTemplate>
|
<CollectionView.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid Padding="5,10,5,0">
|
<Grid Padding="5,10,5,0">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<HorizontalStackLayout Grid.Row="0" Grid.Column="0">
|
<HorizontalStackLayout Grid.Row="0" Grid.Column="0">
|
||||||
<Label Grid.Column="0" Text="{Binding Begin}" />
|
<Label Grid.Column="0" Text="{Binding Begin}" />
|
||||||
<Label Text="bis" Padding="5,0,5,0" />
|
<Label Text="bis" Padding="5,0,5,0" />
|
||||||
<Label Text="{Binding End}" />
|
<Label Text="{Binding End}" />
|
||||||
<Label Text="{Binding GemeindeAktiv.Name}" Margin="10,0,0,0"
|
<Label Text="{Binding GemeindeAktiv.Name}" Margin="10,0,0,0"
|
||||||
IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.GemeindeAktivSet}" />
|
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}" />
|
IsVisible="{Binding Source={RelativeSource AncestorType={x:Type ContentPage}}, Path=BindingContext.ProjektAktivSet}" />
|
||||||
<Label Text="{Binding FreistellungAktiv.Name}" Margin="10,0,0,0" />
|
<Label Text="{Binding FreistellungAktiv.Name}" Margin="10,0,0,0" />
|
||||||
</HorizontalStackLayout>
|
</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" />
|
Padding="0,0,0,15" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</CollectionView.ItemTemplate>
|
</CollectionView.ItemTemplate>
|
||||||
|
|
||||||
|
</CollectionView>
|
||||||
|
|
||||||
|
|
||||||
|
</Grid>
|
||||||
|
|
||||||
</CollectionView>
|
|
||||||
</ScrollView>
|
|
||||||
</VerticalStackLayout>
|
|
||||||
</ContentPage>
|
</ContentPage>
|
||||||
@@ -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;
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user