Refactor Api-Client
Add Exceptionhandler, AlertService JSON-Converter AppSettings via DI Reformat Code
This commit is contained in:
@@ -8,243 +8,257 @@ using static System.Runtime.InteropServices.JavaScript.JSType;
|
||||
using Jugenddienst_Stunden.Interfaces;
|
||||
using Jugenddienst_Stunden.Repositories;
|
||||
using Jugenddienst_Stunden.Services;
|
||||
using Jugenddienst_Stunden.Infrastructure;
|
||||
using Jugenddienst_Stunden.Validators;
|
||||
using System.Net.Http;
|
||||
|
||||
namespace Jugenddienst_Stunden.ViewModels;
|
||||
|
||||
/// <summary>
|
||||
/// Viewmodel für die einzelnen Stundeneinträge / Bearbeitung
|
||||
/// </summary>
|
||||
public partial class StundeViewModel : ObservableObject, IQueryAttributable {
|
||||
private readonly IHoursService _hoursService;
|
||||
private readonly IHoursService _hoursService;
|
||||
|
||||
public int Id { get; set; }
|
||||
public string Title { get; set; } = "Eintrag bearbeiten";
|
||||
public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMMM yyyy");
|
||||
public int Id { get; set; }
|
||||
public string Title { get; set; } = "Eintrag bearbeiten";
|
||||
public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMMM yyyy");
|
||||
|
||||
//private HoursBase HoursBase = new HoursBase();
|
||||
internal Settings Settings = new Settings();
|
||||
//private HoursBase HoursBase = new HoursBase();
|
||||
internal Settings Settings = new Settings();
|
||||
|
||||
public event EventHandler<string> AlertEvent;
|
||||
public event EventHandler<string> InfoEvent;
|
||||
public event Func<string, string, Task<bool>> ConfirmEvent;
|
||||
//public event Func<string, string, string?, string?, Task<bool>> ConfirmEvent;
|
||||
//public event EventHandler<ConfirmEventArgs> ConfirmEvent;
|
||||
public event EventHandler<string> AlertEvent;
|
||||
public event EventHandler<string> InfoEvent;
|
||||
|
||||
/// <summary>
|
||||
/// Gemeinden für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private List<Gemeinde> optionsGemeinde;
|
||||
public event Func<string, string, Task<bool>> ConfirmEvent;
|
||||
//public event Func<string, string, string?, string?, Task<bool>> ConfirmEvent;
|
||||
//public event EventHandler<ConfirmEventArgs> ConfirmEvent;
|
||||
|
||||
/// <summary>
|
||||
/// Projekte für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private List<Projekt> optionsProjekt;
|
||||
/// <summary>
|
||||
/// Gemeinden für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty] private List<Gemeinde> optionsGemeinde;
|
||||
|
||||
/// <summary>
|
||||
/// Freistellungen für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private List<Freistellung> optionsFreistellung;
|
||||
/// <summary>
|
||||
/// Projekte für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty] private List<Projekt> optionsProjekt;
|
||||
|
||||
/// <summary>
|
||||
/// Vorhandene Zeiten anzeigen, wenn neuer Eintrag erstellt wird
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private List<DayTime> dayTimes;
|
||||
/// <summary>
|
||||
/// Freistellungen für die Auswahlliste
|
||||
/// </summary>
|
||||
[ObservableProperty] private List<Freistellung> optionsFreistellung;
|
||||
|
||||
/// <summary>
|
||||
/// Aktueller Stundeneintrag
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private DayTime dayTime;
|
||||
/// <summary>
|
||||
/// Vorhandene Zeiten anzeigen, wenn neuer Eintrag erstellt wird
|
||||
/// </summary>
|
||||
[ObservableProperty] private List<DayTime> dayTimes;
|
||||
|
||||
/// <summary>
|
||||
/// Dürfen Gemeinden verwendet werden?
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private bool gemeindeAktivSet;
|
||||
/// <summary>
|
||||
/// Aktueller Stundeneintrag
|
||||
/// </summary>
|
||||
[ObservableProperty] private DayTime dayTime;
|
||||
|
||||
/// <summary>
|
||||
/// Dürfen Projekte verwendet werden?
|
||||
/// </summary>
|
||||
[ObservableProperty]
|
||||
private bool projektAktivSet;
|
||||
/// <summary>
|
||||
/// Dürfen Gemeinden verwendet werden?
|
||||
/// </summary>
|
||||
[ObservableProperty] private bool gemeindeAktivSet;
|
||||
|
||||
[ObservableProperty]
|
||||
private bool freistellungEnabled;
|
||||
/// <summary>
|
||||
/// Dürfen Projekte verwendet werden?
|
||||
/// </summary>
|
||||
[ObservableProperty] private bool projektAktivSet;
|
||||
|
||||
public ICommand SaveCommand { get; private set; }
|
||||
public ICommand DeleteCommand { get; private set; }
|
||||
public ICommand DeleteConfirmCommand { get; private set; }
|
||||
//public ICommand LoadDataCommand { get; private set; }
|
||||
[ObservableProperty] private bool freistellungEnabled;
|
||||
|
||||
public ICommand SaveCommand { get; private set; }
|
||||
public ICommand DeleteCommand { get; private set; }
|
||||
public ICommand DeleteConfirmCommand { get; private set; }
|
||||
//public ICommand LoadDataCommand { get; private set; }
|
||||
|
||||
|
||||
public StundeViewModel() : this(GetServiceOrCreate()) { }
|
||||
public StundeViewModel() : this(GetServiceOrCreate()) {
|
||||
}
|
||||
|
||||
private static IHoursService GetServiceOrCreate() => new HoursService(new HoursRepository());
|
||||
private static IHoursService GetServiceOrCreate() {
|
||||
// Fallback-Konstruktion, falls DI nicht injiziert wurde (z. B. im Designer)
|
||||
var http = new HttpClient();
|
||||
var options = new Infrastructure.ApiOptions { BaseUrl = GlobalVar.ApiUrl, Timeout = TimeSpan.FromSeconds(15) };
|
||||
var tokenProvider = new GlobalVarTokenProvider();
|
||||
var api = new ApiClient(http, options, tokenProvider, new PreferencesAppSettings());
|
||||
var repo = new HoursRepository(api);
|
||||
var validator = new HoursValidator();
|
||||
return new HoursService(repo, validator);
|
||||
}
|
||||
|
||||
internal StundeViewModel(IHoursService hoursService) {
|
||||
_hoursService = hoursService;
|
||||
SaveCommand = new AsyncRelayCommand(Save);
|
||||
//DeleteCommand = new AsyncRelayCommand(Delete);
|
||||
DeleteConfirmCommand = new Command(async () => await DeleteConfirm());
|
||||
}
|
||||
internal StundeViewModel(IHoursService hoursService) {
|
||||
_hoursService = hoursService;
|
||||
SaveCommand = new AsyncRelayCommand(Save);
|
||||
//DeleteCommand = new AsyncRelayCommand(Delete);
|
||||
DeleteConfirmCommand = new Command(async () => await DeleteConfirm());
|
||||
}
|
||||
|
||||
private async void LoadSettingsAsync() {
|
||||
try {
|
||||
Settings = await _hoursService.GetSettingsAsync();
|
||||
GlobalVar.Settings = Settings;
|
||||
// DI-Konstruktor, der den globalen Alert-Service abonniert und Alerts an das ViewModel weiterreicht.
|
||||
internal StundeViewModel(IHoursService hoursService, IAlertService alertService) : this(hoursService) {
|
||||
if (alertService is not null) {
|
||||
alertService.AlertRaised += (s, msg) => AlertEvent?.Invoke(this, msg);
|
||||
}
|
||||
}
|
||||
|
||||
OptionsGemeinde = Settings.Gemeinden;
|
||||
OptionsProjekt = Settings.Projekte;
|
||||
OptionsFreistellung = Settings.Freistellungen;
|
||||
private async void LoadSettingsAsync() {
|
||||
try {
|
||||
Settings = await _hoursService.GetSettingsAsync();
|
||||
GlobalVar.Settings = Settings;
|
||||
|
||||
GemeindeAktivSet = Settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = Settings.ProjektAktivSet;
|
||||
OptionsGemeinde = Settings.Gemeinden;
|
||||
OptionsProjekt = Settings.Projekte;
|
||||
OptionsFreistellung = Settings.Freistellungen;
|
||||
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
}
|
||||
}
|
||||
GemeindeAktivSet = Settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = Settings.ProjektAktivSet;
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
async Task Save() {
|
||||
bool exceptionOccurred = false;
|
||||
bool proceed = true;
|
||||
if (DayTime.TimeSpanVon == DayTime.TimeSpanBis && DayTime.FreistellungAktiv.Name == null) {
|
||||
proceed = false;
|
||||
AlertEvent?.Invoke(this, "Uhrzeiten sollten unterschiedlich sein");
|
||||
}
|
||||
|
||||
if (proceed) {
|
||||
try {
|
||||
await _hoursService.SaveEntryAsync(DayTime);
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
exceptionOccurred = true;
|
||||
}
|
||||
if (!exceptionOccurred) {
|
||||
if (DayTime.Id != null) {
|
||||
await Shell.Current.GoToAsync($"..?saved={DayTime.Id}");
|
||||
} else {
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
async Task Save() {
|
||||
bool exceptionOccurred = false;
|
||||
bool proceed = true;
|
||||
if (DayTime.TimeSpanVon == DayTime.TimeSpanBis && DayTime.FreistellungAktiv.Name == null) {
|
||||
proceed = false;
|
||||
AlertEvent?.Invoke(this, "Uhrzeiten sollten unterschiedlich sein");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Löschen ohne Bestätigung
|
||||
/// </summary>
|
||||
private async Task Delete() {
|
||||
await _hoursService.DeleteEntryAsync(DayTime);
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
}
|
||||
if (proceed) {
|
||||
try {
|
||||
await _hoursService.SaveEntryAsync(DayTime);
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
exceptionOccurred = true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Löschen mit Bestätigung
|
||||
/// </summary>
|
||||
private async Task DeleteConfirm() {
|
||||
if (ConfirmEvent != null) {
|
||||
bool answer = await ConfirmEvent.Invoke("Achtung", "Löschen kann nicht ungeschehen gemacht werden. Fortfahren?");
|
||||
if (answer) {
|
||||
//Löschen
|
||||
await _hoursService.DeleteEntryAsync(DayTime);
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
} else {
|
||||
//nicht Löschen
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!exceptionOccurred) {
|
||||
if (DayTime.Id != null) {
|
||||
await Shell.Current.GoToAsync($"..?saved={DayTime.Id}");
|
||||
} else {
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Anwenden der Query-Parameter
|
||||
/// </summary>
|
||||
async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
|
||||
//load beinhaltet die ID: Eintrag bearbeiten
|
||||
//date beinhaltet einen Tag: Neuen Eintrag erstellen
|
||||
if (query.ContainsKey("load")) {
|
||||
/// <summary>
|
||||
/// Löschen ohne Bestätigung
|
||||
/// </summary>
|
||||
private async Task Delete() {
|
||||
await _hoursService.DeleteEntryAsync(DayTime);
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
}
|
||||
|
||||
//DateTime heute = DateTime.Now;
|
||||
try {
|
||||
var entry = await _hoursService.GetEntryAsync(Convert.ToInt32(query["load"]));
|
||||
var settings = await _hoursService.GetSettingsAsync();
|
||||
GlobalVar.Settings = settings;
|
||||
GemeindeAktivSet = settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = settings.ProjektAktivSet;
|
||||
/// <summary>
|
||||
/// Löschen mit Bestätigung
|
||||
/// </summary>
|
||||
private async Task DeleteConfirm() {
|
||||
if (ConfirmEvent != null) {
|
||||
bool answer =
|
||||
await ConfirmEvent.Invoke("Achtung", "Löschen kann nicht ungeschehen gemacht werden. Fortfahren?");
|
||||
if (answer) {
|
||||
//Löschen
|
||||
await _hoursService.DeleteEntryAsync(DayTime);
|
||||
await Shell.Current.GoToAsync($"..?date={DayTime.Day.ToString("yyyy-MM-dd")}");
|
||||
} else {
|
||||
//nicht Löschen
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DayTime = entry;
|
||||
DayTime.TimeSpanVon = entry.Begin.ToTimeSpan();
|
||||
DayTime.TimeSpanBis = entry.End.ToTimeSpan();
|
||||
/// <summary>
|
||||
/// Anwenden der Query-Parameter
|
||||
/// </summary>
|
||||
async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
|
||||
//load beinhaltet die ID: Eintrag bearbeiten
|
||||
//date beinhaltet einen Tag: Neuen Eintrag erstellen
|
||||
if (query.ContainsKey("load")) {
|
||||
//DateTime heute = DateTime.Now;
|
||||
try {
|
||||
var entry = await _hoursService.GetEntryAsync(Convert.ToInt32(query["load"]));
|
||||
var settings = await _hoursService.GetSettingsAsync();
|
||||
GlobalVar.Settings = settings;
|
||||
GemeindeAktivSet = settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = settings.ProjektAktivSet;
|
||||
|
||||
OptionsGemeinde = settings.Gemeinden ?? new List<Gemeinde>();
|
||||
OptionsProjekt = settings.Projekte ?? new List<Projekt>();
|
||||
OptionsFreistellung = settings.Freistellungen ?? new List<Freistellung>();
|
||||
DayTime = entry;
|
||||
DayTime.TimeSpanVon = entry.Begin.ToTimeSpan();
|
||||
DayTime.TimeSpanBis = entry.End.ToTimeSpan();
|
||||
|
||||
DayTime.GemeindeAktiv = OptionsGemeinde.FirstOrDefault(Gemeinde => Gemeinde.Id == DayTime.Gemeinde) ?? new Gemeinde();
|
||||
DayTime.ProjektAktiv = OptionsProjekt.FirstOrDefault(Projekt => Projekt.Id == DayTime.Projekt) ?? new Projekt();
|
||||
DayTime.FreistellungAktiv = OptionsFreistellung.FirstOrDefault(Freistellung => Freistellung.Id == DayTime.Free) ?? new Freistellung();
|
||||
OptionsGemeinde = settings.Gemeinden ?? new List<Gemeinde>();
|
||||
OptionsProjekt = settings.Projekte ?? new List<Projekt>();
|
||||
OptionsFreistellung = settings.Freistellungen ?? new List<Freistellung>();
|
||||
|
||||
//Evtl. noch die anderen Zeiten des gleichen Tages holen
|
||||
var day = await _hoursService.GetDayWithSettingsAsync(DayTime.Day);
|
||||
DayTimes = day.dayTimes;
|
||||
OnPropertyChanged(nameof(DayTime));
|
||||
OnPropertyChanged(nameof(DayTimes));
|
||||
DayTime.GemeindeAktiv = OptionsGemeinde.FirstOrDefault(Gemeinde => Gemeinde.Id == DayTime.Gemeinde) ??
|
||||
new Gemeinde();
|
||||
DayTime.ProjektAktiv = OptionsProjekt.FirstOrDefault(Projekt => Projekt.Id == DayTime.Projekt) ??
|
||||
new Projekt();
|
||||
DayTime.FreistellungAktiv =
|
||||
OptionsFreistellung.FirstOrDefault(Freistellung => Freistellung.Id == DayTime.Free) ??
|
||||
new Freistellung();
|
||||
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
} finally {
|
||||
//Evtl. noch die anderen Zeiten des gleichen Tages holen
|
||||
var day = await _hoursService.GetDayWithSettingsAsync(DayTime.Day);
|
||||
DayTimes = day.dayTimes;
|
||||
OnPropertyChanged(nameof(DayTime));
|
||||
OnPropertyChanged(nameof(DayTimes));
|
||||
} catch (Exception e) {
|
||||
AlertEvent?.Invoke(this, e.Message);
|
||||
} finally {
|
||||
}
|
||||
|
||||
}
|
||||
if (System.String.IsNullOrEmpty(DayTime.Description)) {
|
||||
InfoEvent?.Invoke(this, "Eintrag hat keinen Beschreibungstext");
|
||||
}
|
||||
|
||||
if (System.String.IsNullOrEmpty(DayTime.Description)) {
|
||||
InfoEvent?.Invoke(this, "Eintrag hat keinen Beschreibungstext");
|
||||
}
|
||||
SubTitle = DayTime.Day.ToString("dddd, d. MMMM yyyy");
|
||||
OnPropertyChanged(nameof(SubTitle));
|
||||
SubTitle = DayTime.Day.ToString("dddd, d. MMMM yyyy");
|
||||
OnPropertyChanged(nameof(SubTitle));
|
||||
|
||||
FreistellungEnabled = !DayTime.Approved;
|
||||
//OnPropertyChanged(nameof(DayTime));
|
||||
FreistellungEnabled = !DayTime.Approved;
|
||||
//OnPropertyChanged(nameof(DayTime));
|
||||
} else if (query.ContainsKey("date")) {
|
||||
Title = "Neuer Eintrag";
|
||||
OnPropertyChanged(nameof(Title));
|
||||
|
||||
} else if (query.ContainsKey("date")) {
|
||||
Title = "Neuer Eintrag";
|
||||
OnPropertyChanged(nameof(Title));
|
||||
DateTime _date = DateTime.ParseExact((string)query["date"], "yyyy-MM-dd",
|
||||
System.Globalization.CultureInfo.InvariantCulture);
|
||||
//Bei neuem Eintrag die vorhandenen des gleichen Tages anzeigen
|
||||
try {
|
||||
var (list, settings) = await _hoursService.GetDayWithSettingsAsync(_date);
|
||||
GlobalVar.Settings = settings;
|
||||
DayTimes = list;
|
||||
|
||||
DateTime _date = DateTime.ParseExact((string)query["date"], "yyyy-MM-dd", System.Globalization.CultureInfo.InvariantCulture);
|
||||
//Bei neuem Eintrag die vorhandenen des gleichen Tages anzeigen
|
||||
try {
|
||||
var (list, settings) = await _hoursService.GetDayWithSettingsAsync(_date);
|
||||
GlobalVar.Settings = settings;
|
||||
DayTimes = list;
|
||||
OptionsGemeinde = settings.Gemeinden;
|
||||
OptionsProjekt = settings.Projekte;
|
||||
OptionsFreistellung = settings.Freistellungen;
|
||||
|
||||
OptionsGemeinde = settings.Gemeinden;
|
||||
OptionsProjekt = settings.Projekte;
|
||||
OptionsFreistellung = settings.Freistellungen;
|
||||
GemeindeAktivSet = settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = settings.ProjektAktivSet;
|
||||
} catch (Exception) {
|
||||
//Ein Tag ohne Einträge gibt eine Fehlermeldung,
|
||||
//die soll aber ignoriert werden, weil beim Neueintrag ist das ja Wurscht
|
||||
//In dem Fall müssen die Settings aber nochmal geholt werden, weil die dann nicht geladen wurden
|
||||
LoadSettingsAsync();
|
||||
} finally {
|
||||
DayTime = new DayTime();
|
||||
DayTime.Day = _date;
|
||||
DayTime.EmployeeId = GlobalVar.EmployeeId;
|
||||
DayTime.GemeindeAktiv = new Gemeinde();
|
||||
DayTime.ProjektAktiv = new Projekt();
|
||||
DayTime.FreistellungAktiv = new Freistellung();
|
||||
|
||||
GemeindeAktivSet = settings.GemeindeAktivSet;
|
||||
ProjektAktivSet = settings.ProjektAktivSet;
|
||||
SubTitle = _date.ToString("dddd, d. MMMM yyyy");
|
||||
FreistellungEnabled = true;
|
||||
|
||||
} catch (Exception) {
|
||||
//Ein Tag ohne Einträge gibt eine Fehlermeldung,
|
||||
//die soll aber ignoriert werden, weil beim Neueintrag ist das ja Wurscht
|
||||
//In dem Fall müssen die Settings aber nochmal geholt werden, weil die dann nicht geladen wurden
|
||||
LoadSettingsAsync();
|
||||
} finally {
|
||||
DayTime = new DayTime();
|
||||
DayTime.Day = _date;
|
||||
DayTime.EmployeeId = GlobalVar.EmployeeId;
|
||||
DayTime.GemeindeAktiv = new Gemeinde();
|
||||
DayTime.ProjektAktiv = new Projekt();
|
||||
DayTime.FreistellungAktiv = new Freistellung();
|
||||
|
||||
SubTitle = _date.ToString("dddd, d. MMMM yyyy");
|
||||
FreistellungEnabled = true;
|
||||
|
||||
OnPropertyChanged(nameof(SubTitle));
|
||||
//OnPropertyChanged(nameof(DayTime));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
OnPropertyChanged(nameof(SubTitle));
|
||||
//OnPropertyChanged(nameof(DayTime));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user