From 267797b55d4aae1698d4ff74fac94849df90de72 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 24 Jun 2025 13:30:04 +0200 Subject: [PATCH] AreaComDialog: Fix property name (MaintainYearFrom) --- Elwig/Dialogs/AreaComDialog.xaml | 2 +- Elwig/Dialogs/AreaComDialog.xaml.cs | 10 +++++----- Elwig/Services/MemberService.cs | 2 +- Elwig/ViewModels/MemberAdminViewModel.cs | 2 +- Elwig/Windows/MemberAdminWindow.xaml.cs | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Elwig/Dialogs/AreaComDialog.xaml b/Elwig/Dialogs/AreaComDialog.xaml index a0a9a06..b08ca1b 100644 --- a/Elwig/Dialogs/AreaComDialog.xaml +++ b/Elwig/Dialogs/AreaComDialog.xaml @@ -51,7 +51,7 @@ + IsChecked="{Binding MaintainYearFrom}"/> diff --git a/Elwig/Dialogs/AreaComDialog.xaml.cs b/Elwig/Dialogs/AreaComDialog.xaml.cs index 8a014d4..ca305c6 100644 --- a/Elwig/Dialogs/AreaComDialog.xaml.cs +++ b/Elwig/Dialogs/AreaComDialog.xaml.cs @@ -7,7 +7,7 @@ namespace Elwig.Dialogs { public int CancelSeason { get; set; } public int SuccessorSeason => CancelSeason + 1; - public bool MaintainYearTo { get; set; } + public bool MaintainYearFrom { get; set; } public string AreaComNum { get; set; } public string Area { get; set; } @@ -43,13 +43,13 @@ namespace Elwig.Dialogs { CancelSeason = (int)SeasonInput.Value!; CancelSeason1.Text = $"{CancelSeason}"; CancelSeason2.Text = $"{CancelSeason}"; - TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; - DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; + TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}"; + DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison "; } private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) { - TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; - DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; + TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}"; + DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison "; } private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs index d0f6056..4293803 100644 --- a/Elwig/Services/MemberService.cs +++ b/Elwig/Services/MemberService.cs @@ -655,7 +655,7 @@ namespace Elwig.Services { KgNr = c.KgNr, GstNr = c.GstNr, RdNr = c.RdNr, - YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year, + YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year, YearTo = c.YearTo, })); diff --git a/Elwig/ViewModels/MemberAdminViewModel.cs b/Elwig/ViewModels/MemberAdminViewModel.cs index 8d28889..ca66959 100644 --- a/Elwig/ViewModels/MemberAdminViewModel.cs +++ b/Elwig/ViewModels/MemberAdminViewModel.cs @@ -11,7 +11,7 @@ namespace Elwig.ViewModels { public partial class MemberAdminViewModel : ObservableObject { public int? TransferPredecessorAreaComs = null; - public bool MaintainAreaComYearTo = false; + public bool MaintainAreaComYearFrom = false; public int? CancelAreaComs = null; public ObservableCollection> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes); diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index 2633023..8755de9 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -784,7 +784,7 @@ namespace Elwig.Windows { if (d.ShowDialog() != true) return; ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason; - ViewModel.MaintainAreaComYearTo = d.MaintainYearTo; + ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom; if (IsEditing) SetOriginalValue(PredecessorMgNrInput, -1); // hack to allow user to save UpdateButtons();