Optimierung Stundenseite

Grid statt StackLayout
Monatssummen beachten jetzt auch das Jahr
This commit is contained in:
2025-02-22 17:44:50 +01:00
parent 6d6eaf836b
commit c4fdc266b5
3 changed files with 33 additions and 39 deletions

View File

@@ -84,7 +84,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
set {
if (dateToday != value) {
dateToday = value;
LoadOverview = "Lade Summen für " + dateToday.ToString("MMMM");
LoadOverview = "Lade Summen für " + dateToday.ToString("MMMM yy");
//OnPropertyChanged();
Task.Run(() => LoadDay(value));
}
@@ -119,6 +119,13 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
get => Hours.overtime_month;
}
public int Zeitausgleich {
get => Hours.zeitausgleich;
}
public int ZeitausgleichMonth {
get => Hours.zeitausgleich_month;
}
/// <summary>
/// Monatsübersicht: Resturlaub
/// </summary>
@@ -194,7 +201,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
/// </summary>
private async Task LoadData() {
try {
BaseResponse dat = await HoursBase.LoadBase("hours&month=" + DateToday.ToString("MM"));
BaseResponse dat = await HoursBase.LoadBase("hours&year="+ DateToday.ToString("yyyy") + "&month=" + DateToday.ToString("MM"));
_hour = dat.hour;
if (dat.settings.Version != AppInfo.Current.VersionString) {
@@ -291,6 +298,7 @@ internal partial class StundenViewModel : ObservableObject, IQueryAttributable,
OnPropertyChanged(nameof(Nominal));
OnPropertyChanged(nameof(Overtime));
OnPropertyChanged(nameof(OvertimeMonth));
OnPropertyChanged(nameof(Zeitausgleich));
OnPropertyChanged(nameof(ZeitCalculated));
OnPropertyChanged(nameof(Holiday));
OnPropertyChanged(nameof(Hours));