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

20
Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
View File

@ -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();
}

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();
}

20
Elwig/Windows/MemberAdminWindow.xaml.cs
View File

@ -155,12 +155,12 @@ namespace Elwig.Windows {
ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
}
private async Task RefreshInputs(bool validate = false) {
private void RefreshInputs(bool validate = false) {
ClearInputStates();
if (ViewModel.SelectedMember is Member m) {
EditMemberButton.IsEnabled = true;
DeleteMemberButton.IsEnabled = true;
await FillInputs(m);
FillInputs(m);
} else {
EditMemberButton.IsEnabled = false;
DeleteMemberButton.IsEnabled = false;
@ -283,8 +283,8 @@ namespace Elwig.Windows {
inputs.Address.Visibility = vis;
}
private async void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
await RefreshInputs();
private void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
RefreshInputs();
if (MemberList.SelectedItem is Member m) {
Menu_Export_ExportSelected.IsEnabled = !IsEditing && !IsCreating;
Menu_Export_UploadSelected.IsEnabled = !IsEditing && !IsCreating && App.Config.SyncUrl != null;
@ -409,7 +409,7 @@ namespace Elwig.Windows {
ViewModel.EnableSearchInputs = true;
FinishInputFilling();
await RefreshList();
await RefreshInputs();
RefreshInputs();
ViewModel.SearchQuery = "";
if (mgnr is int m)
FocusMember(m);
@ -425,7 +425,7 @@ namespace Elwig.Windows {
ViewModel.TransferPredecessorAreaComs = null;
ViewModel.CancelAreaComs = null;
if (IsEditing) {
await RefreshInputs();
RefreshInputs();
} else if (IsCreating) {
ClearInputs();
await InitInputs();
@ -433,7 +433,7 @@ 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;
MemberList.IsEnabled = true;
@ -441,7 +441,7 @@ namespace Elwig.Windows {
ViewModel.CancelAreaComs = null;
HideSaveResetCancelButtons();
ShowNewEditDeleteButtons();
await RefreshInputs();
RefreshInputs();
LockInputs();
UpdateContactInfoVisibility();
ViewModel.EnableSearchInputs = true;
@ -686,10 +686,10 @@ namespace Elwig.Windows {
}
}
private async Task FillInputs(Member m) {
private void FillInputs(Member m) {
ClearOriginalValues();
ClearDefaultValues();
await ViewModel.FillInputs(m);
ViewModel.FillInputs(m);
UpdateContactInfoVisibility(IsEditing || IsCreating);
FinishInputFilling();
}