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

Add Save function, Visuals, Stuff

Browse Source
This commit is contained in:
Daniel Pichler
2024-09-25 15:32:58 +02:00
parent a066b9caba
commit 3f2191673e
7 changed files with 250 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

193
Jugenddienst Stunden/ViewModels/StundeViewModel.cs
View File

@@ -15,105 +15,20 @@ namespace Jugenddienst_Stunden.ViewModels {
public int id { get; set; }
public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMM. yyyy");
private DayTime _stunde;
public DayTime Stunde { get => _stunde; }
public int Identifier => (int)_stunde.id;
public event EventHandler<string> AlertEvent;
public ObservableCollection<Gemeinde> OptionsGemeinde { get; private set; }
public ObservableCollection<Projekt> OptionsProjekt { get; private set; }
public ObservableCollection<string> OptionsFreistellung { get; }
//public TimeSpan Von {
// get => _stunde.begin.ToTimeSpan();
// set {
// if (_stunde.begin.ToTimeSpan() != value) {
// _stunde.begin = TimeOnly.FromTimeSpan(value);
// OnPropertyChanged(nameof(Von));
// }
// }
//}
//public TimeSpan Bis {
// get => _stunde.end.ToTimeSpan();
// set {
// if (_stunde.end.ToTimeSpan() != value) {
// _stunde.end = TimeOnly.FromTimeSpan(value);
// OnPropertyChanged(nameof(Bis));
// }
// }
//}
public string SubTitle { get; set; } = DateTime.Today.ToString("dddd, d. MMM. yyyy");
public int Identifier => (int)_stunde.id;
public ICommand SaveCommand { get; private set; }
public ICommand DeleteCommand { get; private set; }
public StundeViewModel() {
_stunde = new DayTime();
//SaveCommand = new AsyncRelayCommand(Save);
//DeleteCommand = new AsyncRelayCommand(Delete);
OptionsFreistellung = new ObservableCollection<string> {
"Urlaub",
"Krankheit",
"Elternzeit"
};
}
public StundeViewModel(DayTime stunde) {
_stunde = stunde;
//SaveCommand = new AsyncRelayCommand(Save);
//DeleteCommand = new AsyncRelayCommand(Delete);
}
//private async Task Save() {
// _stunde.Date = DateTime.Now;
// _stunde.Save();
// await Shell.Current.GoToAsync($"..?saved={_stunde.Filename}");
//}
//private async Task Delete() {
// _stunde.Delete();
// await Shell.Current.GoToAsync($"..?deleted={_stunde.Filename}");
//}
public event EventHandler<string> AlertEvent;
public event EventHandler<string> ErrorEvent;
async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
if (query.ContainsKey("load")) {
//DateTime heute = DateTime.Now;
_stunde = await Models.Stunde.LoadEntry(Convert.ToInt32(query["load"]));
if (String.IsNullOrEmpty(_stunde.description)) {
AlertEvent?.Invoke(this, "Eintrag hat keine Daten zurückgegeben");
}
SubTitle = _stunde.day.ToString("dddd, d. MMM. yyyy");
OptionsProjekt = new ObservableCollection<Projekt>(_stunde.Projekte);
OptionsGemeinde = new ObservableCollection<Gemeinde>(_stunde.Gemeinden);
OnPropertyChanged(nameof(OptionsGemeinde));
OnPropertyChanged(nameof(OptionsProjekt));
//OptionsProjekt.FirstOrDefault(x => x.Id == _stunde.projekt);
SelectedOptionGemeinde = OptionsGemeinde.FirstOrDefault(item => item.Id == _stunde.gemeinde) ?? new Gemeinde();
OnPropertyChanged(nameof(SelectedOptionGemeinde));
SelectedOptionProjekt = OptionsProjekt.FirstOrDefault(Projekt => Projekt.Id == _stunde.projekt) ?? new Projekt();
OnPropertyChanged(nameof(SelectedOptionProjekt));
OnPropertyChanged(nameof(Stunde));
OnPropertyChanged(nameof(SubTitle));
}
}
private Gemeinde _selectedGemeinde;
public Gemeinde SelectedOptionGemeinde {
get => _selectedGemeinde;
@@ -148,5 +63,99 @@ namespace Jugenddienst_Stunden.ViewModels {
}
}
}
//public TimeSpan Von {
// get => _stunde.begin.ToTimeSpan();
// set {
// if (_stunde.begin.ToTimeSpan() != value) {
// _stunde.begin = TimeOnly.FromTimeSpan(value);
// OnPropertyChanged(nameof(Von));
// }
// }
//}
//public TimeSpan Bis {
// get => _stunde.end.ToTimeSpan();
// set {
// if (_stunde.end.ToTimeSpan() != value) {
// _stunde.end = TimeOnly.FromTimeSpan(value);
// OnPropertyChanged(nameof(Bis));
// }
// }
//}
public ICommand SaveCommand { get; private set; }
public ICommand DeleteCommand { get; private set; }
public StundeViewModel() {
_stunde = new DayTime();
SaveCommand = new AsyncRelayCommand(Save);
//DeleteCommand = new AsyncRelayCommand(Delete);
OptionsFreistellung = new ObservableCollection<string> {
"Keine",
"Urlaub",
"Krankheit",
"Elternzeit"
};
}
public StundeViewModel(DayTime stunde) {
_stunde = stunde;
SaveCommand = new AsyncRelayCommand(Save);
//DeleteCommand = new AsyncRelayCommand(Delete);
}
async Task Save() {
//_stunde.day = DateTime.Now;
//_stunde.Save();
await Models.Stunde.SaveEntry(_stunde);
await Shell.Current.GoToAsync($"..?saved={_stunde.id}");
}
//private async Task Delete() {
// _stunde.Delete();
// await Shell.Current.GoToAsync($"..?deleted={_stunde.Filename}");
//}
async void IQueryAttributable.ApplyQueryAttributes(IDictionary<string, object> query) {
if (query.ContainsKey("load")) {
//DateTime heute = DateTime.Now;
_stunde = await Models.Stunde.LoadEntry(Convert.ToInt32(query["load"]));
if (String.IsNullOrEmpty(_stunde.description)) {
AlertEvent?.Invoke(this, "Eintrag hat keine Daten zurückgegeben");
}
SubTitle = _stunde.day.ToString("dddd, d. MMM. yyyy");
OptionsProjekt = new ObservableCollection<Projekt>(_stunde.Projekte);
OptionsGemeinde = new ObservableCollection<Gemeinde>(_stunde.Gemeinden);
OnPropertyChanged(nameof(OptionsGemeinde));
OnPropertyChanged(nameof(OptionsProjekt));
//OptionsProjekt.FirstOrDefault(x => x.Id == _stunde.projekt);
SelectedOptionGemeinde = OptionsGemeinde.FirstOrDefault(item => item.Id == _stunde.gemeinde) ?? new Gemeinde();
OnPropertyChanged(nameof(SelectedOptionGemeinde));
SelectedOptionProjekt = OptionsProjekt.FirstOrDefault(Projekt => Projekt.Id == _stunde.projekt) ?? new Projekt();
OnPropertyChanged(nameof(SelectedOptionProjekt));
OnPropertyChanged(nameof(Stunde));
OnPropertyChanged(nameof(SubTitle));
}
}
}
}

32
Jugenddienst Stunden/ViewModels/StundenViewModel.cs
View File

@@ -15,7 +15,7 @@ namespace Jugenddienst_Stunden.ViewModels {
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 string LoadOverview => "Zeige Summen für " + DateTime.Today.ToString("MMMM");
public static DateTime GetDay = DateTime.Today;
public string ShowDay => "Zeit an Tag " + GetDay.ToString("ddd d. MMM") + ": ";
@@ -50,9 +50,19 @@ namespace Jugenddienst_Stunden.ViewModels {
public string OvertimeMonth {
get => _hour.overtime_month;
}
public string Holiday {
get => _hour.holiday;
}
public TimeOnly DayTotal { get; set; }
public List<DayTime> DayTimes {
get => _hour.daytime;
set {
if (_hour.daytime != value) {
_hour.daytime = value;
OnPropertyChanged();
}
}
}
public DateTime MinimumDate {
@@ -94,16 +104,14 @@ namespace Jugenddienst_Stunden.ViewModels {
public string Title { get; set; } = Preferences.Default.Get("name", "") + " " + Preferences.Default.Get("surname", "");
public List<TimeDay> TimeDay { get; set; }
public StundenViewModel() {
_hour = new Types.Hours();
LoadDataCommand = new AsyncRelayCommand(LoadData);
@@ -115,6 +123,7 @@ namespace Jugenddienst_Stunden.ViewModels {
}
private async Task NewEntryAsync() {
//Hier muss das Datum übergeben werden
await Shell.Current.GoToAsync(nameof(Views.StundePage));
}
@@ -126,9 +135,10 @@ namespace Jugenddienst_Stunden.ViewModels {
public event EventHandler<string> AlertEvent;
private async Task LoadData() {
try {
_hour = await Models.Stunde.LoadData();
@@ -144,14 +154,21 @@ namespace Jugenddienst_Stunden.ViewModels {
////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();
TimeSpan span = TimeSpan.Zero;
foreach (DayTime dt in _hour.daytime) {
span += dt.end - dt.begin;
}
DayTotal = TimeOnly.FromTimeSpan(span);
OnPropertyChanged(nameof(ShowDay));
OnPropertyChanged(nameof(TimeDay));
OnPropertyChanged(nameof(DayTotal));
OnPropertyChanged(nameof(DayTimes));
////}
} catch (Exception e) {
DayTimes = new List<DayTime>();
AlertEvent?.Invoke(this, e.Message);
}
}
private void RefreshProperties() {
@@ -160,6 +177,7 @@ namespace Jugenddienst_Stunden.ViewModels {
OnPropertyChanged(nameof(OvertimeMonth));
OnPropertyChanged(nameof(ZeitCalculated));
OnPropertyChanged(nameof(ZeitDone));
OnPropertyChanged(nameof(Holiday));
OnPropertyChanged(nameof(Hours));
OnPropertyChanged(nameof(Title));
OnPropertyChanged(nameof(ZeitTotalDaily));