Funktioniert nicht mehr unter Windows ...
This commit is contained in:
2024-10-23 14:32:42 +02:00
parent 88a79d6548
commit 00e37f9edf
6 changed files with 113 additions and 144 deletions

View File

@@ -154,8 +154,6 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
public StundenViewModel() {
_hour = new Hours();
//LoadSettingsAsync();
//HoursBase.tokendata = new TokenData(HoursBase.apiKey);
LoadDataCommand = new AsyncRelayCommand(LoadData);
NewEntryCommand = new AsyncRelayCommand(NewEntryAsync);
SelectEntryCommand = new AsyncRelayCommand<DayTime>(SelectEntryAsync);
@@ -163,27 +161,9 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
RefreshCommand = new Command(async () => await RefreshItemsAsync());
Task task = LoadDay(DateTime.Today);
}
private async Task LoadSettingsAsync() {
try {
Settings = await HoursBase.LoadSettings();
GemeindeAktivSet = Settings.GemeindeAktivSet;
ProjektAktivSet = Settings.ProjektAktivSet;
OnPropertyChanged(nameof(GemeindeAktivSet));
OnPropertyChanged(nameof(ProjektAktivSet));
doContinue = true;
} catch (Exception e) {
doContinue = false;
AlertEvent?.Invoke(this, e.Message);
}
}
/// <summary>
/// Öffnet eine neue Stundeneingabe
/// </summary>
@@ -213,7 +193,9 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
/// </summary>
private async Task LoadData() {
try {
_hour = await HoursBase.LoadData();
BaseResponse dat = await HoursBase.LoadBase("hours");
_hour = dat.hour;
//_hour = await HoursBase.LoadData();
RefreshProperties();
} catch (Exception e) {
AlertEvent?.Invoke(this, e.Message);
@@ -226,11 +208,10 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
/// </summary>
public async Task LoadDay(DateTime date) {
DayTotal = new TimeOnly(0);
//await LoadSettingsAsync();
//if (doContinue) {
try {
//_dayTimes = await HoursBase.LoadDay(date);
BaseResponse dat = await HoursBase.LoadBase("date=" + date.ToString("yyyy-MM-dd"));
_dayTimes = dat.daytimes;
Settings = dat.settings;
GemeindeAktivSet = Settings.GemeindeAktivSet;
@@ -256,6 +237,12 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
}
DayTotal = TimeOnly.FromTimeSpan(span);
//Nach der Tagessumme die anderen Tage anhängen
if (_dayTimes != null) {
BaseResponse dat1 = await HoursBase.LoadBase("date=" + date.ToString("yyyy-MM-dd") + "&tilldate=" + date.AddDays(3).ToString("yyyy-MM-dd"));
if (dat1.daytimes != null)
_dayTimes = dat.daytimes.Concat(dat1.daytimes).ToList();
}
} catch (Exception e) {
_dayTimes = new List<DayTime>();
@@ -266,7 +253,6 @@ internal class StundenViewModel : ObservableObject, IQueryAttributable, INotifyP
OnPropertyChanged(nameof(Sollstunden));
OnPropertyChanged(nameof(DayTimes));
}
//}
}