diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index 8ddc37b..179246f 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
@@ -84,7 +84,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
set {
if (dateToday != value) {
dateToday = value;
- LoadOverview = "Lade Summen für " + dateToday.ToString("MMMM");
+ LoadOverview = "Lade Summen für " + dateToday.ToString("MMMM yy");
//OnPropertyChanged();
Task.Run(() => LoadDay(value));
}
@@ -119,6 +119,13 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
get => Hours.overtime_month;
}
+ public int Zeitausgleich {
+ get => Hours.zeitausgleich;
+ }
+ public int ZeitausgleichMonth {
+ get => Hours.zeitausgleich_month;
+ }
+
///
/// Monatsübersicht: Resturlaub
///
@@ -194,7 +201,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
///
private async Task LoadData() {
try {
- BaseResponse dat = await HoursBase.LoadBase("hours&month=" + DateToday.ToString("MM"));
+ BaseResponse dat = await HoursBase.LoadBase("hours&year="+ DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
_hour = dat.hour;
if (dat.settings.Version != AppInfo.Current.VersionString) {
@@ -291,6 +298,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
OnPropertyChanged(nameof(Nominal));
OnPropertyChanged(nameof(Overtime));
OnPropertyChanged(nameof(OvertimeMonth));
+ OnPropertyChanged(nameof(Zeitausgleich));
OnPropertyChanged(nameof(ZeitCalculated));
OnPropertyChanged(nameof(Holiday));
OnPropertyChanged(nameof(Hours));
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index c4b469d..8b363ff 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml
@@ -29,9 +29,10 @@
-
+
+
-
+
@@ -46,11 +47,13 @@
+ SelectionChangedCommandParameter="{Binding Source={RelativeSource Self}, Path=SelectedItem}"
+ VerticalOptions="Start"
+ Grid.Row="1">
@@ -109,28 +112,30 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+
+
+
+
-
-
+
+
+
-
-
+
+
+
\ No newline at end of file
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml.cs b/Jugenddienst Stunden/Views/StundenPage.xaml.cs
index 1234bae..f052358 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml.cs
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml.cs
@@ -25,17 +25,7 @@ public partial class StundenPage : ContentPage {
if (!CheckLogin()) {
NavigateToTargetPage();
}
-#if ANDROID
- heightValue = 280;
-#elif IOS
- heightValue = 280;
-#elif WINDOWS
- heightValue = 320;
-#else
- heightValue = 300;
-#endif
- SizeChanged += OnPageSizeChanged;
}
private void Vm_AlertEvent(object? sender, string e) {
@@ -77,13 +67,4 @@ public partial class StundenPage : ContentPage {
await Navigation.PushAsync(new LoginPage());
}
- private void OnPageSizeChanged(object sender, EventArgs e) {
- double windowHeight = this.Height;
- AdjustLayout(windowHeight);
- }
-
- private void AdjustLayout(double height) {
- // Passen Sie Ihre UI-Elemente basierend auf der Fensterhöhe an
- stundeItems.HeightRequest = height - heightValue; //Datepicker Height 50, Monatssummen Height 125, Titel + Navigation Height xyz
- }
}
\ No newline at end of file