Services: Make FillInputs synchronous
This commit is contained in:
@ -144,12 +144,12 @@ namespace Elwig.Windows {
|
||||
}
|
||||
}
|
||||
|
||||
private async Task RefreshInputs(bool validate = false) {
|
||||
private void RefreshInputs(bool validate = false) {
|
||||
ClearInputStates();
|
||||
if (ViewModel.SelectedDeliveryAncmt is DeliveryAncmt a) {
|
||||
EditDeliveryAncmtButton.IsEnabled = true;
|
||||
DeleteDeliveryAncmtButton.IsEnabled = true;
|
||||
await FillInputs(a);
|
||||
FillInputs(a);
|
||||
} else {
|
||||
EditDeliveryAncmtButton.IsEnabled = false;
|
||||
DeleteDeliveryAncmtButton.IsEnabled = false;
|
||||
@ -185,8 +185,8 @@ namespace Elwig.Windows {
|
||||
await RefreshList();
|
||||
}
|
||||
|
||||
private async void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
await RefreshInputs();
|
||||
private void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
RefreshInputs();
|
||||
}
|
||||
|
||||
private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
|
||||
@ -361,7 +361,7 @@ namespace Elwig.Windows {
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
FinishInputFilling();
|
||||
await RefreshList();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
ViewModel.SearchQuery = "";
|
||||
ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
|
||||
if (sortid != null)
|
||||
@ -374,9 +374,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();
|
||||
@ -401,15 +401,15 @@ namespace Elwig.Windows {
|
||||
|
||||
HideSaveResetCancelButtons();
|
||||
ShowNewEditDeleteButtons();
|
||||
await RefreshInputs();
|
||||
RefreshInputs();
|
||||
LockInputs();
|
||||
ViewModel.EnableSearchInputs = true;
|
||||
}
|
||||
|
||||
private async Task FillInputs(DeliveryAncmt a) {
|
||||
private void FillInputs(DeliveryAncmt a) {
|
||||
ClearOriginalValues();
|
||||
ClearDefaultValues();
|
||||
await ViewModel.FillInputs(a);
|
||||
ViewModel.FillInputs(a);
|
||||
FinishInputFilling();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user