daniel/Jugenddienst-Stunden
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Precision

Browse Source
This commit is contained in:
Daniel Pichler
2025-03-18 00:26:08 +01:00
parent 7f9e3f622a
commit 093679c9bb
7 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Jugenddienst Stunden/Converter/SecondsTimeConverter.cs
View File

@@ -2,13 +2,20 @@
namespace Jugenddienst_Stunden.Converter;
internal class SecondsTimeConverter : IValueConverter {
private int seconds;
/// <summary>
/// Konvertiert eine Sekundenangabe nach Stunden:Minuten, auch bei mehr als 24 Stunden
/// </summary>
public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture) {
if (value is null)
return "0:0";
if (value is int) {
seconds = (int)value;
}
if (value is double) {
seconds = (int)Math.Round((double)value);
} else {
int.TryParse((string?)value, out seconds);
}

47
Jugenddienst Stunden/Types/Hours.cs
View File

@@ -4,33 +4,40 @@ using System.Collections.ObjectModel;
namespace Jugenddienst_Stunden.Types;
internal class Hours : ObservableObject {
public int? Zeit;
public int? Nominal;
internal partial class Hours : ObservableObject {
public double? Zeit;
public double? Nominal;
//public Dictionary<DateOnly,NominalDay> nominal_day_api;
public List<NominalDay>? Nominal_day_api;
//public Dictionary<int,NominalWeek> nominal_week_api;
public List<NominalWeek>? Nominal_week_api;
//public List<string> time_line;
public string? Zeit_total;
//public List<string> time_line;
public double? 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<Hours>))]
//public Dictionary<int,decimal> zeit_total_daily;
//https://stackoverflow.com/questions/29449641/deserialize-json-when-a-value-can-be-an-object-or-an-empty-array/29450279#29450279
//[JsonConverter(typeof(JsonSingleOrEmptyArrayConverter<Hours>))]
//public Dictionary<int,decimal> zeit_total_daily;
public List<TimeDay> zeit_total_daily_api;
public List<TimeDay> zeit_total_daily_api;
public List<DayTime>? daytime;
//public List<string> wochensumme;
public int overtime_month;
public int overtime;
//public List<string> overtime_day;
public int zeitausgleich;
public int zeitausgleich_month;
public int holiday;
public int krankheit;
public int weiterbildung;
public int bereitschaft;
public int bereitschaft_month;
//public List<string> wochensumme;
[ObservableProperty]
public double overtime_month;
[ObservableProperty]
public double overtime;
//public List<string> overtime_day;
[ObservableProperty]
public double zeitausgleich;
public double zeitausgleich_month;
public double holiday;
public double krankheit;
public double weiterbildung;
public double bereitschaft;
public double bereitschaft_month;
//public Operator operator_api;
public DateTime Today;
public DateTime Date;

2
Jugenddienst Stunden/Types/NominalDay.cs
View File

@@ -2,6 +2,6 @@
internal class NominalDay {
public int day_number;
public int month_number;
public int hours;
public double hours;
public DateOnly date;
}

2
Jugenddienst Stunden/Types/NominalWeek.cs
View File

@@ -2,5 +2,5 @@
internal class NominalWeek {
public int Week_number;
public int Hours;
public double Hours;
}

2
Jugenddienst Stunden/Types/Sollstunden.cs
View File

@@ -3,5 +3,5 @@
public class Sollstunden {
public int Timetable { get; set; }
public int Wochentag { get; set; }
public float Zeit { get; set; }
public double Zeit { get; set; }
}

2
Jugenddienst Stunden/Types/TimeDay.cs
View File

@@ -5,5 +5,5 @@
/// </summary>
internal struct TimeDay {
public int Day { get; set; }
public decimal Hours { get; set; }
public double Hours { get; set; }
}

29
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -56,10 +56,9 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
public string Title { get; set; } = GlobalVar.Name + " " + GlobalVar.Surname;
private Hours _hour;
public Hours Hours {
get => _hour;
}
[ObservableProperty]
private Hours hours;
/// <summary>
/// Mindest-Datum für den Datepicker
@@ -94,42 +93,42 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// <summary>
/// Monatsübersicht: Geleistete Stunden
/// </summary>
public string? ZeitCalculated {
public double? ZeitCalculated {
get => Hours.Zeit_total;
}
/// <summary>
/// Monatsübersicht: Sollstunden
/// </summary>
public int? Nominal {
public double? Nominal {
get => Hours.Nominal;
}
/// <summary>
/// Monatsübersicht: Differenz zwischen Soll und geleisteten Stunden
/// </summary>
public int? Overtime {
public double? Overtime {
get => Hours.overtime;
}
/// <summary>
/// Monatsübersicht: Restüberstunden insgesamt
/// </summary>
public int OvertimeMonth {
public double OvertimeMonth {
get => Hours.overtime_month;
}
public int Zeitausgleich {
public double Zeitausgleich {
get => Hours.zeitausgleich;
}
public int ZeitausgleichMonth {
public double ZeitausgleichMonth {
get => Hours.zeitausgleich_month;
}
/// <summary>
/// Monatsübersicht: Resturlaub
/// </summary>
public int Holiday {
public double Holiday {
get => Hours.holiday;
}
@@ -158,7 +157,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// CTOR
/// </summary>
public StundenViewModel() {
_hour = new Hours();
Hours = new Hours();
LoadOverview = "Lade Summen für " + DateToday.ToString("MMMM");
@@ -202,7 +201,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
private async Task LoadData() {
try {
BaseResponse dat = await HoursBase.LoadBase("hours&year=" + DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
_hour = dat.hour;
Hours = dat.hour;
Settings = dat.settings;
if (Settings.Version != AppInfo.Current.VersionString.Substring(0, 5)) {
@@ -295,14 +294,14 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// Refreshes all properties
/// </summary>
private void RefreshProperties() {
OnPropertyChanged(nameof(Hours));
OnPropertyChanged(nameof(Title));
OnPropertyChanged(nameof(Nominal));
OnPropertyChanged(nameof(Overtime));
OnPropertyChanged(nameof(OvertimeMonth));
OnPropertyChanged(nameof(Zeitausgleich));
OnPropertyChanged(nameof(ZeitCalculated));
OnPropertyChanged(nameof(Holiday));
OnPropertyChanged(nameof(Hours));
OnPropertyChanged(nameof(Title));
OnPropertyChanged(nameof(MinimumDate));
OnPropertyChanged(nameof(MaximumDate));
OnPropertyChanged(nameof(LoadOverview));