winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Services: Make FillInputs synchronous

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-21 21:46:12 +02:00
parent 9fa9d9fbec
commit 648c406ad2
6 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
View File

@ -72,12 +72,12 @@ namespace Elwig.Windows {
DeliveryScheduleList.ScrollIntoView(DeliveryScheduleList.SelectedItem);
}
private async Task RefreshInputs(bool validate = false) {
private void RefreshInputs(bool validate = false) {
ClearInputStates();
if (ViewModel.SelectedDeliverySchedule is DeliverySchedule s) {
EditDeliveryScheduleButton.IsEnabled = true;
DeleteDeliveryScheduleButton.IsEnabled = true;
await FillInputs(s);
FillInputs(s);
} else {
EditDeliveryScheduleButton.IsEnabled = false;
DeleteDeliveryScheduleButton.IsEnabled = false;
@ -113,8 +113,8 @@ namespace Elwig.Windows {
await RefreshList();
}
private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
await RefreshInputs();
private void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
RefreshInputs();
}
private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
@ -218,7 +218,7 @@ namespace Elwig.Windows {
ViewModel.EnableSearchInputs = true;
FinishInputFilling();
await RefreshList();
await RefreshInputs();
RefreshInputs();
ViewModel.SearchQuery = "";
}
@ -228,9 +228,9 @@ namespace Elwig.Windows {
ResetButton_Click(null, null);
}
private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
if (IsEditing) {
await RefreshInputs();
RefreshInputs();
} else if (IsCreating) {
ClearInputs();
InitInputs();
@ -238,21 +238,21 @@ namespace Elwig.Windows {
UpdateButtons();
}
private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
private void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
IsEditing = false;
IsCreating = false;
DeliveryScheduleList.IsEnabled = true;
HideSaveResetCancelButtons();
ShowNewEditDeleteButtons();
await RefreshInputs();
RefreshInputs();
LockInputs();
ViewModel.EnableSearchInputs = true;
}
private async Task FillInputs(DeliverySchedule s) {
private void FillInputs(DeliverySchedule s) {
ClearOriginalValues();
ClearDefaultValues();
await ViewModel.FillInputs(s);
ViewModel.FillInputs(s);
FinishInputFilling();
}