1.0.4
This commit is contained in:
@@ -1,89 +1,72 @@
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using System.Windows.Input;
|
||||
using Microsoft.Maui.Controls;
|
||||
using Microsoft.Maui.Networking;
|
||||
using ZXing.Net.Maui;
|
||||
using Jugenddienst_Stunden.Types;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.ComponentModel;
|
||||
using Jugenddienst_Stunden.Types;
|
||||
using System.Globalization;
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Windows.Input;
|
||||
|
||||
|
||||
namespace Jugenddienst_Stunden.ViewModels;
|
||||
internal class StundenViewModel : ObservableObject, IQueryAttributable {
|
||||
internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyPropertyChanged {
|
||||
public string Name => AppInfo.Name;
|
||||
public string Surname => AppInfo.VersionString;
|
||||
public string MoreInfoUrl => "https://aka.ms/maui";
|
||||
public string Message => "Hier werden deine geleisteten Arbeitsstunden aufgelistet";
|
||||
public string LoadOverview => "Lade Summen für " + DateTime.Today.ToString("MMMM");
|
||||
public static DateTime GetDay = DateTime.Today;
|
||||
public string ShowDay => "Zeit an Tag " + GetDay.ToString("ddd d. MMM") + ": ";
|
||||
//public string ShowDay => "Zeit an Tag " + GetDay.ToString("ddd d. MMM") + ": ";
|
||||
|
||||
public int id { get; set; }
|
||||
public ICommand NewEntryCommand { get; }
|
||||
public ICommand SelectEntryCommand { get; }
|
||||
|
||||
public ICommand LoadDataCommand { get; private set; }
|
||||
|
||||
public event EventHandler<string> AlertEvent;
|
||||
public event EventHandler<string> InfoEvent;
|
||||
|
||||
|
||||
public object Stunden { get; }
|
||||
|
||||
|
||||
private List<DayTime> _stunde;
|
||||
public List<DayTime> Stunde {
|
||||
get => _stunde;
|
||||
private string _title = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", "");
|
||||
public string Title {
|
||||
get => _title;
|
||||
set => SetProperty(ref _title, value);
|
||||
}
|
||||
|
||||
private Hours _hour;
|
||||
public Hours Hours {
|
||||
get => _hour;
|
||||
}
|
||||
public string ZeitDone {
|
||||
get => _hour.zeit;
|
||||
}
|
||||
public string ZeitCalculated {
|
||||
get => _hour.zeit_total;
|
||||
}
|
||||
public string Nominal {
|
||||
get => _hour.nominal;
|
||||
}
|
||||
public string Overtime {
|
||||
get => _hour.overtime;
|
||||
}
|
||||
public string OvertimeMonth {
|
||||
get => _hour.overtime_month;
|
||||
}
|
||||
public string Holiday {
|
||||
get => _hour.holiday;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gesamtstunden an einem Tag
|
||||
/// </summary>
|
||||
public TimeOnly DayTotal { get; set; }
|
||||
|
||||
public List<DayTime> DayTimes {
|
||||
get => _hour.daytime;
|
||||
set {
|
||||
if (_hour.daytime != value) {
|
||||
_hour.daytime = value;
|
||||
OnPropertyChanged();
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// Liste der Tageszeiten
|
||||
/// </summary>
|
||||
private ObservableCollection<DayTime> _dayTimes = new ObservableCollection<DayTime>();
|
||||
public ObservableCollection<DayTime> DayTimes {
|
||||
get => _dayTimes;
|
||||
set => SetProperty(ref _dayTimes, value);
|
||||
}
|
||||
|
||||
public DateTime MinimumDate {
|
||||
//get => _hour.MinDate;
|
||||
//get => DateTime.Today.AddDays(-21);
|
||||
/// <summary>
|
||||
/// Mindest-Datum für den Datepicker
|
||||
/// </summary>
|
||||
public static DateTime MinimumDate {
|
||||
get => DateTime.Today.AddDays(-365);
|
||||
}
|
||||
|
||||
public DateTime MaximumDate {
|
||||
//get => _hour.MaxDate;
|
||||
/// <summary>
|
||||
/// Höchst-Datum für den Datepicker
|
||||
/// </summary>
|
||||
public static DateTime MaximumDate {
|
||||
get => DateTime.Today.AddDays(60);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Heutiges Datum, wenn das Datum geändert wird, wird auch der Tag geladen
|
||||
/// </summary>
|
||||
private DateTime dateToday = DateTime.Today;
|
||||
public DateTime DateToday {
|
||||
get => dateToday;
|
||||
@@ -91,62 +74,96 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable {
|
||||
if (dateToday != value) {
|
||||
dateToday = value;
|
||||
GetDay = value;
|
||||
OnPropertyChanged();
|
||||
_ = LoadDay(value); // Use discard operator to explicitly ignore the returned Task
|
||||
//RefreshProperties();
|
||||
OnPropertyChanged(nameof(TimeDay));
|
||||
OnPropertyChanged(nameof(ShowDay));
|
||||
OnPropertyChanged(nameof(DayTimes));
|
||||
//OnPropertyChanged();
|
||||
_ = LoadDay(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public DateTime Date {
|
||||
get => _hour.Date;
|
||||
/// <summary>
|
||||
/// Monatsübersicht: Geleistete Stunden
|
||||
/// </summary>
|
||||
public string? ZeitCalculated {
|
||||
get => _hour.zeit_total;
|
||||
}
|
||||
|
||||
|
||||
public List<TimeDay> ZeitTotalDaily {
|
||||
get => _hour.zeit_total_daily_api;
|
||||
/// <summary>
|
||||
/// Monatsübersicht: Sollstunden
|
||||
/// </summary>
|
||||
public string? Nominal {
|
||||
get => _hour.nominal;
|
||||
}
|
||||
|
||||
public string Title { get; set; } = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", "");
|
||||
/// <summary>
|
||||
/// Monatsübersicht: Differenz zwischen Soll und geleisteten Stunden
|
||||
/// </summary>
|
||||
public string? Overtime {
|
||||
get => _hour.overtime;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Monatsübersicht: Restüberstunden insgesamt
|
||||
/// </summary>
|
||||
public string OvertimeMonth {
|
||||
get => _hour.overtime_month;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Monatsübersicht: Resturlaub
|
||||
/// </summary>
|
||||
public string Holiday {
|
||||
get => _hour.holiday;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
public List<TimeDay> TimeDay { get; set; }
|
||||
|
||||
|
||||
|
||||
public static string apiKey = Preferences.Default.Get("apiKey", "");
|
||||
|
||||
/// <summary>
|
||||
/// CTOR
|
||||
/// </summary>
|
||||
public StundenViewModel() {
|
||||
|
||||
|
||||
_hour = new Types.Hours();
|
||||
LoadDataCommand = new AsyncRelayCommand(LoadData);
|
||||
|
||||
NewEntryCommand = new AsyncRelayCommand(NewEntryAsync);
|
||||
SelectEntryCommand = new AsyncRelayCommand<DayTime>(SelectEntryAsync);
|
||||
|
||||
_ = LoadDay(DateTime.Today);
|
||||
OnPropertyChanged(nameof(DayTimes));
|
||||
Task task = LoadDay(DateTime.Today);
|
||||
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Öffnet eine neue Stundeneingabe
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private async Task NewEntryAsync() {
|
||||
//Hier muss das Datum übergeben werden
|
||||
//await Shell.Current.GoToAsync(nameof(Views.StundePage));
|
||||
await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}?date={dateToday.ToString("yyyy-MM-dd")}");
|
||||
await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}?date={dateToday:yyyy-MM-dd}");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Öffnet eine bestehende Stundeneingabe
|
||||
/// </summary>
|
||||
/// <param name="entry"></param>
|
||||
/// <returns></returns>
|
||||
private async Task SelectEntryAsync(DayTime entry) {
|
||||
if (entry != null && entry.id != null) {
|
||||
var navigationParameters = new Dictionary<string, object> {{ "load", entry.id }};
|
||||
var navigationParameters = new Dictionary<string, object> { { "load", entry.id } };
|
||||
//await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}?load={entry.id}");
|
||||
await Shell.Current.GoToAsync($"{nameof(Views.StundePage)}", navigationParameters);
|
||||
} else AlertEvent?.Invoke(this, "Auswahl enthält keine Daten");
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Lädt die Monatssummen für die Übersicht
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private async Task LoadData() {
|
||||
try {
|
||||
_hour = await Models.Stunde.LoadData();
|
||||
@@ -156,54 +173,67 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable {
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Lädt die Arbeitszeiten für einen Tag
|
||||
/// </summary>
|
||||
/// <param name="date"></param>
|
||||
/// <returns></returns>
|
||||
public async Task LoadDay(DateTime date) {
|
||||
try {
|
||||
_hour.daytime = await Models.Stunde.LoadDay(date);
|
||||
////if (_hour.zeit_total_daily_api != null) {
|
||||
////TimeDay = _hour.zeit_total_daily_api.Where(static p => p.Day == GetDay.Day).ToList() ?? new List<TimeDay> { new TimeDay { Day = GetDay.Day, Hours = 0 } };
|
||||
//RefreshProperties();
|
||||
DayTotal = new TimeOnly(0);
|
||||
|
||||
try {
|
||||
DayTimes = await Models.Stunde.LoadDay(date);
|
||||
|
||||
//TODO: Hier muss noch die Berechnung der Stunden erfolgen
|
||||
//Hier werden im Moment noch nur die eingetragenen Stunden gezählt
|
||||
//Auf der Website bekommt der Benutzer die berechneten Stunden angezeigt (Nachstunden außerhalb des Stundenplanes zählen mehr ...)
|
||||
|
||||
TimeSpan span = TimeSpan.Zero;
|
||||
foreach (DayTime dt in _hour.daytime) {
|
||||
foreach (DayTime dt in DayTimes) {
|
||||
span += dt.end - dt.begin;
|
||||
}
|
||||
DayTotal = TimeOnly.FromTimeSpan(span);
|
||||
OnPropertyChanged(nameof(ShowDay));
|
||||
OnPropertyChanged(nameof(TimeDay));
|
||||
|
||||
} catch (Exception e) {
|
||||
DayTimes = new ObservableCollection<DayTime>();
|
||||
//TODO: hier könnte auch ein Fehler kommen, dann wäre InfoEvent falsch.
|
||||
InfoEvent?.Invoke(this, e.Message);
|
||||
} finally {
|
||||
OnPropertyChanged(nameof(DayTotal));
|
||||
OnPropertyChanged(nameof(DayTimes));
|
||||
////}
|
||||
} catch (Exception e) {
|
||||
DayTimes = new List<DayTime>();
|
||||
DayTotal = new TimeOnly(0);
|
||||
OnPropertyChanged(nameof(DayTotal));
|
||||
InfoEvent?.Invoke(this, e.Message);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
|
||||
if (query.ContainsKey("date")) {
|
||||
await LoadDay(Convert.ToDateTime(query["date"]));
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Refreshes all properties
|
||||
/// </summary>
|
||||
private void RefreshProperties() {
|
||||
OnPropertyChanged(nameof(Nominal));
|
||||
OnPropertyChanged(nameof(Overtime));
|
||||
OnPropertyChanged(nameof(OvertimeMonth));
|
||||
OnPropertyChanged(nameof(ZeitCalculated));
|
||||
OnPropertyChanged(nameof(ZeitDone));
|
||||
OnPropertyChanged(nameof(Holiday));
|
||||
OnPropertyChanged(nameof(Hours));
|
||||
OnPropertyChanged(nameof(Title));
|
||||
OnPropertyChanged(nameof(ZeitTotalDaily));
|
||||
OnPropertyChanged(nameof(TimeDay));
|
||||
OnPropertyChanged(nameof(MinimumDate));
|
||||
OnPropertyChanged(nameof(MaximumDate));
|
||||
OnPropertyChanged(nameof(ShowDay));
|
||||
//OnPropertyChanged(nameof(DateToday));
|
||||
}
|
||||
|
||||
protected void OnPropertyChanged([CallerMemberName] string propertyName = null) {
|
||||
try {
|
||||
base.OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
|
||||
} catch (Exception ex) {
|
||||
AlertEvent?.Invoke(this, ex.Message);
|
||||
//Console.WriteLine($"Fehler bei OnPropertyChanged: {ex.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user