From 94c6acbe14c7d50adb9cd654b157dd378a42e4ac Mon Sep 17 00:00:00 2001
From: Daniel Pichler <pichler.daniel@gmail.com>
Date: Mon, 9 Sep 2024 21:01:13 +0200
Subject: [PATCH] =?UTF-8?q?Datepicker=20=C3=BCberwachen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

und Arbeitszeit des gewählten Tages ausgeben.
---
 .../ViewModels/StundenViewModel.cs            | 25 ++++++++++++++++---
 Jugenddienst Stunden/Views/StundenPage.xaml   | 12 ++++++---
 .../Views/StundenPage.xaml.cs                 |  4 +++
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index c38819b..5417ee4 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
@@ -18,6 +18,9 @@ namespace Jugenddienst_Stunden.ViewModels {
 		public ICommand LoadDataCommand { get; private set; }
 		public object Stunden { get; }
 
+		public static int GetDay = DateTime.Today.Day;
+		public string ShowDay => "Zeit an Tag " + GetDay + ": ";
+
 
 		/* Nicht gemergte Änderung aus Projekt "Jugenddienst Stunden (net8.0-ios)"
 		Vor:
@@ -53,14 +56,26 @@ namespace Jugenddienst_Stunden.ViewModels {
 			//get => _hour.MinDate;
 			get => DateTime.Today.AddDays(-21);
 		}
+
 		public DateTime MaximumDate {
 			//get => _hour.MaxDate;
 			get => DateTime.Today.AddDays(5);
 		}
+
+		private DateTime dateToday = DateTime.Today;
 		public DateTime DateToday {
-			//get => _hour.Today;
-			get => DateTime.Today;
+			get => dateToday;
+			set {
+				if (dateToday != value) {
+					dateToday = value;
+					GetDay = dateToday.Day;
+					OnPropertyChanged();
+					_ = LoadData(); // Use discard operator to explicitly ignore the returned Task  
+					RefreshProperties();
+				}
+			}
 		}
+
 		public DateTime Date {
 			get => _hour.Date;
 		}
@@ -86,6 +101,7 @@ namespace Jugenddienst_Stunden.ViewModels {
 			set {
 				if (selectedOption != value) {
 					selectedOption = value;
+					//new AsyncRelayCommand(LoadData);
 					OnPropertyChanged(nameof(SelectedOption));
 				}
 			}
@@ -134,7 +150,7 @@ namespace Jugenddienst_Stunden.ViewModels {
 			//Models.Hours Hours = new Models.Hours();
 			//Title = _hour.operator_api.name + " " + _hour.operator_api.surname;
 			if (_hour != null) {
-				TimeDay = _hour.zeit_total_daily_api.Where(p => p.Day == 1).ToList();
+				TimeDay = _hour.zeit_total_daily_api.Where(p => p.Day == GetDay).ToList();
 				RefreshProperties();
 			}
 		}
@@ -151,7 +167,8 @@ namespace Jugenddienst_Stunden.ViewModels {
 			OnPropertyChanged(nameof(TimeDay));
 			OnPropertyChanged(nameof(MinimumDate));
 			OnPropertyChanged(nameof(MaximumDate));
-			OnPropertyChanged(nameof(DateToday));
+			OnPropertyChanged(nameof(ShowDay));
+			//OnPropertyChanged(nameof(DateToday));
 		}
 
 
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index f89119f..b0f3a72 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -23,7 +23,7 @@
                     <Label Text="Überstunden Jahr:" Grid.Row="4" />
 
 
-            <Label Grid.Row="0" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Nominal}" Background="DarkSalmon" />
+                    <Label Grid.Row="0" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Nominal}" Background="DarkSalmon" />
                     <Label Grid.Row="1" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding ZeitDone}" />
                     <Label Grid.Row="2" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding ZeitCalculated}" />
                     <Label Grid.Row="3" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding OvertimeMonth}" />
@@ -33,9 +33,13 @@
             
             <BoxView HeightRequest="1" Color="Red"/>
 
-            <DatePicker MinimumDate="{Binding MinimumDate}"
+        <Grid RowDefinitions="Auto" ColumnDefinitions="Auto,*">
+            <DatePicker Grid.Column="0" MinimumDate="{Binding MinimumDate}"
             MaximumDate="{Binding MaximumDate}"
             Date="{Binding DateToday}" Format="dddd, d. MMM. yyyy" />
+            <Label Grid.Column="1" Text="{Binding TimeDay[0].Hours}" VerticalOptions="Center"></Label>
+        </Grid>
+            
             
             <Grid ColumnDefinitions="Auto,Auto,Auto">
                 <Picker x:Name="pick_gemeinde" Title="Gemeinde" ItemsSource="{Binding Options}" SelectedItem="{Binding SelectedOption, Mode=TwoWay}" Grid.Column="0" >
@@ -54,8 +58,8 @@
             <TimePicker HorizontalOptions="Center" Grid.Column="3" Background="OrangeRed" TextColor="White" />
             </Grid>
 
-        <Label Text="Zeit an Tag 1:"></Label>
-        <Label Text="{Binding TimeDay[0].Hours}"></Label>
+        <Label Text="{Binding ShowDay}"></Label>
+        
             
             
         </VerticalStackLayout>
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml.cs b/Jugenddienst Stunden/Views/StundenPage.xaml.cs
index 60e228b..5298411 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml.cs	
@@ -18,4 +18,8 @@ public partial class StundenPage : ContentPage {
 		base.OnAppearing();
 		Title = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", "");
 	}
+
+	protected void OnDateSelected(object sender, DateChangedEventArgs e) {
+		DateTime selectedDate = e.NewDate;
+	}
 }
\ No newline at end of file