From 335ef3741b813b4d570ce275c924ada59f9267a5 Mon Sep 17 00:00:00 2001 From: DaPi Date: Tue, 27 Aug 2024 18:26:49 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Freistellungen=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jugenddienst Stunden/ViewModels/StundenViewModel.cs | 9 ++++++++- Jugenddienst Stunden/Views/StundenPage.xaml | 8 +++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs index 55e9fe6..1dfbf21 100644 --- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs +++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs @@ -45,6 +45,7 @@ namespace Jugenddienst_Stunden.ViewModels { public ObservableCollection Options { get; } public ObservableCollection OptionsProjekt { get; } + public ObservableCollection OptionsFreistellung { get; } private string selectedOption; public string SelectedOption { get => selectedOption; @@ -63,12 +64,18 @@ namespace Jugenddienst_Stunden.ViewModels { Options = new ObservableCollection { "Gemeinde 1", "Gemeinde 2", - "Gemeinde 3" + "Gemeinde 3", + "Gemeinde 4" }; OptionsProjekt = new ObservableCollection { "Projekt 1", "Projekt 2", "Projekt 3" + }; + OptionsFreistellung = new ObservableCollection { + "Urlaub", + "Krankheit", + "Elternzeit" }; _hour = new Models.Hours(); LoadDataCommand = new AsyncRelayCommand(LoadData); diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml index de7074d..2235b0c 100644 --- a/Jugenddienst Stunden/Views/StundenPage.xaml +++ b/Jugenddienst Stunden/Views/StundenPage.xaml @@ -37,10 +37,12 @@ MaximumDate="12/31/2024" Date="06/21/2024" Format="dddd, d. MMM. yyyy" /> - - + + - + + + From 7493cce345495c1c7f787ae727197f11b9aa195b Mon Sep 17 00:00:00 2001 From: DaPi Date: Tue, 27 Aug 2024 18:27:22 +0200 Subject: [PATCH 2/3] Fehlerbehandlung Debug statt Console https://learn.microsoft.com/en-us/dotnet/maui/data-cloud/rest?view=net-maui-8.0 --- Jugenddienst Stunden/Models/Auth.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jugenddienst Stunden/Models/Auth.cs b/Jugenddienst Stunden/Models/Auth.cs index f464a96..975f0c5 100644 --- a/Jugenddienst Stunden/Models/Auth.cs +++ b/Jugenddienst Stunden/Models/Auth.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using System.Net.Http; using System.Text; using System.Threading.Tasks; @@ -45,7 +46,7 @@ namespace Jugenddienst_Stunden.Models { //return responseData; } catch (HttpRequestException e) { // Fehlerbehandlung - Console.WriteLine($"An error occurred: {e.Message}"); + Debug.WriteLine($"An error occurred: {e.Message}"); return null; } } From e74f08d44f0477cc93aea3b5ff13dd6d9f516cfe Mon Sep 17 00:00:00 2001 From: DaPi Date: Tue, 27 Aug 2024 21:44:20 +0200 Subject: [PATCH 3/3] Add Name --- Jugenddienst Stunden/Models/Stunde.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Jugenddienst Stunden/Models/Stunde.cs b/Jugenddienst Stunden/Models/Stunde.cs index e41cae5..4d43a26 100644 --- a/Jugenddienst Stunden/Models/Stunde.cs +++ b/Jugenddienst Stunden/Models/Stunde.cs @@ -36,9 +36,12 @@ namespace Jugenddienst_Stunden.Models { //apiKey = "MTAyfEJZZnB1L3VwcnhoVms0dDlLZENPZWtUVy85b3xodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk="; //name = "Kathi"; //surname = "Wegi"; - apiKey = "MTQzfEFlMVRjQXdZMnI4RmpxZ0FSY3A0VEN2bVZYVXxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk="; - name = "Chri"; - surname = "Fe"; + //apiKey = "MTQzfEFlMVRjQXdZMnI4RmpxZ0FSY3A0VEN2bVZYVXxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk="; + //name = "Chri"; + //surname = "Fe"; + apiKey = "MTI3fDEyYURVdHVZVWRaZk91eDlNcjZDUFlTdmdkNHxodHRwOi8vaG91cnMuZGF1bmkubWluZS5udTo4MS9hcHBhcGk="; + name = "Ju"; + surname = "Ze"; Preferences.Default.Set("apiKey", apiKey); Preferences.Default.Set("name", name); Preferences.Default.Set("surname", surname);