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

DeliveryAdminWindow: Hopefully fix 'Erste Übernahme' bug

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-09-13 22:57:21 +02:00
parent 7f01b85878
commit 62fe087598
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -91,13 +91,13 @@ namespace Elwig.Windows {
AllSeasonsInput.IsChecked = true;
}
private async void Window_Loaded(object sender, RoutedEventArgs evt) {
private void Window_Loaded(object sender, RoutedEventArgs evt) {
OnSecondPassed(null, null);
Timer.Start();
LockInputs();
if (IsReceipt) {
NewDeliveryButton_Click(null, null);
if ((await Context.Seasons.FindAsync(Utils.CurrentYear)) == null) {
if ((Context.Seasons.Find(Utils.CurrentYear)) == null) {
MessageBox.Show("Die Saison für das aktuelle Jahr wurde noch nicht erstellt. Neue Lieferungen können nicht abgespeichert werden.",
"Saison noch nicht erstellt", MessageBoxButton.OK, MessageBoxImage.Error);
}
@ -226,6 +226,7 @@ namespace Elwig.Windows {
double filterOeLt = 0;
var filter = TextFilter.ToList();
var hasFilters = filter.Count > 0;
if (filter.Count > 0) {
var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
@ -331,7 +332,8 @@ namespace Elwig.Windows {
.ToList();
}
ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId), DeliveryList_SelectionChanged, IsCreating ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId),
DeliveryList_SelectionChanged, hasFilters ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
@ -423,7 +425,6 @@ namespace Elwig.Windows {
Menu_Export_Bki.Items.Add(i);
}
// FIXME on "only one" delivery, RenewContext doees not work
await RefreshDeliveryList();
var d = DeliveryList.SelectedItem as Delivery;
var y = d?.Year ?? Utils.CurrentLastSeason;
@ -441,6 +442,7 @@ namespace Elwig.Windows {
if (IsCreating) await UpdateLsNr();
await RefreshDeliveryParts();
RefreshInputs();
}
private void FocusSearchInput(object sender, RoutedEventArgs evt) {

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

@ -89,7 +89,8 @@ namespace Elwig.Windows {
.ToList();
}
ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr, MemberList_SelectionChanged, ControlUtils.RenewSourceDefault.IfOnly, !updateSort);
ControlUtils.RenewItemsSource(MemberList, members, i => (i as Member)?.MgNr,
MemberList_SelectionChanged, TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
}
private void RefreshInputs(bool validate = false) {