From acd7cc602c870b8874596cc6a4271c3f5be60cc6 Mon Sep 17 00:00:00 2001
From: DaPi <info@danielpichler.com>
Date: Sun, 25 Aug 2024 00:56:05 +0200
Subject: [PATCH] Reworking Stundenpage

Todo: Summary not showing anymore
---
 Jugenddienst Stunden/Models/Gemeinde.cs       | 17 ++++++
 Jugenddienst Stunden/Models/Projekt.cs        | 12 ++++
 Jugenddienst Stunden/Models/Stunde.cs         | 11 ++--
 .../ViewModels/StundenViewModel.cs            | 37 +++++++++++-
 Jugenddienst Stunden/Views/StundenPage.xaml   | 60 ++++++++++++++-----
 5 files changed, 115 insertions(+), 22 deletions(-)
 create mode 100644 Jugenddienst Stunden/Models/Gemeinde.cs
 create mode 100644 Jugenddienst Stunden/Models/Projekt.cs

diff --git a/Jugenddienst Stunden/Models/Gemeinde.cs b/Jugenddienst Stunden/Models/Gemeinde.cs
new file mode 100644
index 0000000..a94be8f
--- /dev/null
+++ b/Jugenddienst Stunden/Models/Gemeinde.cs	
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Models {
+	internal class Gemeinde {
+		public int Id { get; set; }
+		public string Name { get; set; }
+
+		public Gemeinde(int id, string name) {
+			Id = id;
+			Name = name;
+		}
+	}
+}
diff --git a/Jugenddienst Stunden/Models/Projekt.cs b/Jugenddienst Stunden/Models/Projekt.cs
new file mode 100644
index 0000000..3840b5f
--- /dev/null
+++ b/Jugenddienst Stunden/Models/Projekt.cs	
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jugenddienst_Stunden.Models {
+	internal class Projekt {
+		public int Id { get; set; }
+		public string Name { get; set; }
+	}
+}
diff --git a/Jugenddienst Stunden/Models/Stunde.cs b/Jugenddienst Stunden/Models/Stunde.cs
index 4f00180..e41cae5 100644
--- a/Jugenddienst Stunden/Models/Stunde.cs	
+++ b/Jugenddienst Stunden/Models/Stunde.cs	
@@ -36,10 +36,13 @@ namespace Jugenddienst_Stunden.Models {
 			//apiKey = "MTAyfEJZZnB1L3VwcnhoVms0dDlLZENPZWtUVy85b3xodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk=";
 			//name = "Kathi";
 			//surname = "Wegi";
-			//Preferences.Default.Set("apiKey", apiKey);
-			//Preferences.Default.Set("name", name);
-			//Preferences.Default.Set("surname", surname);
-			
+			apiKey = "MTQzfEFlMVRjQXdZMnI4RmpxZ0FSY3A0VEN2bVZYVXxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk=";
+			name = "Chri";
+			surname = "Fe";
+			Preferences.Default.Set("apiKey", apiKey);
+			Preferences.Default.Set("name", name);
+			Preferences.Default.Set("surname", surname);
+
 
 			Hours hours = new Hours();
 
diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs
index 33b85fc..5f7200c 100644
--- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
+++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs	
@@ -4,6 +4,8 @@ using System.Windows.Input;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Networking;
 using ZXing.Net.Maui;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 
 
 namespace Jugenddienst_Stunden.ViewModels {
@@ -34,16 +36,47 @@ namespace Jugenddienst_Stunden.ViewModels {
 		public string OvertimeMonth {
 			get => _hour.overtime_month;
 		}
-		
+
 		public Dictionary<int, decimal> ZeitTotalDaily {
 			get => _hour.zeit_total_daily;
 		}
 
 		public string Title { get; set; } = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", "");
 
+		public ObservableCollection<string> Options { get; }
+		public ObservableCollection<string> OptionsProjekt { get; }
+		private string selectedOption;
+		public string SelectedOption {
+			get => selectedOption;
+			set {
+				if (selectedOption != value) {
+					selectedOption = value;
+					OnPropertyChanged(nameof(SelectedOption));
+				}
+			}
+		}
+
+
 		public StundenViewModel() {
+
+
+			Options = new ObservableCollection<string> {
+			"Gemeinde 1",
+			"Gemeinde 2",
+			"Gemeinde 3"
+		};
+			OptionsProjekt = new ObservableCollection<string> {
+			"Projekt 1",
+			"Projekt 2",
+			"Projekt 3"
+		};
 			_hour = new Models.Hours();
 			LoadDataCommand = new AsyncRelayCommand(LoadData);
+
+		}
+
+		protected void OnPropertyChanged(string propertyName) {
+			//PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 		}
 
 		//public async Task LoadData() =>
@@ -67,6 +100,6 @@ namespace Jugenddienst_Stunden.ViewModels {
 			OnPropertyChanged(nameof(ZeitTotalDaily));
 		}
 
-		
+
 	}
 }
diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml
index 6b46180..de7074d 100644
--- a/Jugenddienst Stunden/Views/StundenPage.xaml	
+++ b/Jugenddienst Stunden/Views/StundenPage.xaml	
@@ -9,24 +9,52 @@
         <models:StundenViewModel />
     </ContentPage.BindingContext>
 
-    <VerticalStackLayout Spacing="10" Margin="15">
-        <Label Text="{Binding Message}" />
+        <VerticalStackLayout Spacing="10" Margin="15">
+            
+                <Label Text="{Binding Message}" />
 
-        <Button Text="Load data" Command="{Binding LoadDataCommand}" />
+                <Button Text="Lade aktuelle Daten" Command="{Binding LoadDataCommand}" />
 
-        <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="10">
-            <Label Text="Soll:" Grid.Row="0" />
-            <Label Text="Gearbeitet:" Grid.Row="1" />
-            <Label Text="Berechnet:" Grid.Row="2" />
-            <Label Text="Überstunden Monat:" Grid.Row="3" Margin="0,0,15,0" />
-            <Label Text="Überstunden Jahr:" Grid.Row="4" />
+                <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,*" Margin="10">
+                    <Label Text="Soll:" Grid.Row="0" Background="DarkSalmon" />
+                    <Label Text="Gearbeitet:" Grid.Row="1" />
+                    <Label Text="Berechnet:" Grid.Row="2" />
+                    <Label Text="Überstunden Monat:" Grid.Row="3" Margin="0,0,15,0" />
+                    <Label Text="Überstunden Jahr:" Grid.Row="4" />
 
 
-            <Label Grid.Row="0" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Nominal}" />
-            <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}" />
-            <Label Grid.Row="4" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Overtime}" />
-        </Grid>
-    </VerticalStackLayout>
+            <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}" />
+                    <Label Grid.Row="4" Grid.Column="1" HorizontalTextAlignment="End" Padding="0,0,5,0" Text="{Binding Overtime}" />
+                </Grid>
+           
+            
+            <BoxView HeightRequest="1" Color="Red"/>
+
+            <DatePicker MinimumDate="01/01/2024"
+            MaximumDate="12/31/2024"
+            Date="06/21/2024" Format="dddd, d. MMM. yyyy" />
+            
+            <Grid ColumnDefinitions="Auto,Auto">
+                <Picker x:Name="gempick" Title="Wähle die Gemeinde" ItemsSource="{Binding Options}" SelectedItem="{Binding SelectedOption, Mode=TwoWay}" Grid.Column="0" >
+            </Picker>
+            <Picker x:Name="projpick" Title="Wähle das Projekt" ItemsSource="{Binding OptionsProjekt}" SelectedItem="{Binding SelectedOption, Mode=TwoWay}" Grid.Column="1" >
+            </Picker>
+            </Grid>
+            <Entry x:Name="entry" Placeholder="Tätigkeit" />
+            <Grid ColumnDefinitions="2*,Auto,2*,Auto">
+                <Label Text="Beginn" Grid.Column="0" Background="Green" VerticalTextAlignment="Center" HorizontalTextAlignment="End" Padding="0,0,10,0"></Label>
+                <TimePicker HorizontalOptions="Center" Grid.Column="1" Background="Green" />
+                
+                <Label Text="Ende" Grid.Column="2" Background="Red" VerticalTextAlignment="Center" HorizontalTextAlignment="End" Padding="0,0,10,0"></Label>
+                <TimePicker HorizontalOptions="Center" Grid.Column="3" Background="Red" />
+            </Grid>
+            
+            
+            
+            
+        </VerticalStackLayout>
+   
 </ContentPage>
\ No newline at end of file