diff --git a/Jugenddienst Stunden/Models/Hours.cs b/Jugenddienst Stunden/Models/Hours.cs index f78bede..d3dcbd4 100644 --- a/Jugenddienst Stunden/Models/Hours.cs +++ b/Jugenddienst Stunden/Models/Hours.cs @@ -6,15 +6,18 @@ namespace Jugenddienst_Stunden.Models { public class Hours : ObservableObject { public string zeit; public string nominal; - public Dictionary nominal_day_api; - public Dictionary nominal_week_api; + //public Dictionary nominal_day_api; + public List nominal_day_api; + //public Dictionary nominal_week_api; + public List nominal_week_api; //public List time_line; public string zeit_total; //https://stackoverflow.com/questions/29449641/deserialize-json-when-a-value-can-be-an-object-or-an-empty-array/29450279#29450279 - [JsonConverter(typeof(JsonSingleOrEmptyArrayConverter))] - public Dictionary zeit_total_daily; + //[JsonConverter(typeof(JsonSingleOrEmptyArrayConverter))] + //public Dictionary zeit_total_daily; + public List zeit_total_daily_api; //public List wochensumme; public string overtime_month; public string overtime; diff --git a/Jugenddienst Stunden/Models/NominalDay.cs b/Jugenddienst Stunden/Models/NominalDay.cs index c16e1a0..d5cbb19 100644 --- a/Jugenddienst Stunden/Models/NominalDay.cs +++ b/Jugenddienst Stunden/Models/NominalDay.cs @@ -9,5 +9,6 @@ namespace Jugenddienst_Stunden.Models { public int day_number; public int month_number; public decimal hours; + public DateOnly date; } } diff --git a/Jugenddienst Stunden/Models/TimeDay.cs b/Jugenddienst Stunden/Models/TimeDay.cs new file mode 100644 index 0000000..d2da6b0 --- /dev/null +++ b/Jugenddienst Stunden/Models/TimeDay.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 { + public class TimeDay { + public int Day { get; set; } + public decimal Hours { get; set; } + } +} diff --git a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs index 4d410df..789fc8a 100644 --- a/Jugenddienst Stunden/ViewModels/StundenViewModel.cs +++ b/Jugenddienst Stunden/ViewModels/StundenViewModel.cs @@ -6,6 +6,7 @@ using Microsoft.Maui.Networking; using ZXing.Net.Maui; using System.Collections.ObjectModel; using System.ComponentModel; +using Jugenddienst_Stunden.Models; namespace Jugenddienst_Stunden.ViewModels { @@ -37,8 +38,12 @@ namespace Jugenddienst_Stunden.ViewModels { get => _hour.overtime_month; } - public Dictionary ZeitTotalDaily { - get => _hour.zeit_total_daily; + //public Dictionary ZeitTotalDaily { + // get => _hour.zeit_total_daily; + //} + + public List ZeitTotalDaily { + get => _hour.zeit_total_daily_api; } public string Title { get; set; } = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", ""); @@ -46,6 +51,8 @@ namespace Jugenddienst_Stunden.ViewModels { public ObservableCollection Options { get; } public ObservableCollection OptionsProjekt { get; } public ObservableCollection OptionsFreistellung { get; } + public List TimeDay { get; set; } + private string selectedOption; public string SelectedOption { get => selectedOption; @@ -79,7 +86,7 @@ namespace Jugenddienst_Stunden.ViewModels { }; _hour = new Models.Hours(); LoadDataCommand = new AsyncRelayCommand(LoadData); - + } //protected void OnPropertyChanged(string propertyName) { @@ -100,6 +107,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(); RefreshProperties(); } } @@ -113,6 +121,7 @@ namespace Jugenddienst_Stunden.ViewModels { OnPropertyChanged(nameof(Hours)); OnPropertyChanged(nameof(Title)); OnPropertyChanged(nameof(ZeitTotalDaily)); + OnPropertyChanged(nameof(TimeDay)); } diff --git a/Jugenddienst Stunden/Views/StundenPage.xaml b/Jugenddienst Stunden/Views/StundenPage.xaml index 2235b0c..1b7781e 100644 --- a/Jugenddienst Stunden/Views/StundenPage.xaml +++ b/Jugenddienst Stunden/Views/StundenPage.xaml @@ -53,8 +53,9 @@ - - + + +