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

AreaComDialog: Fix property name (MaintainYearFrom)

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-06-24 13:30:04 +02:00
parent 4234c7f994
commit 267797b55d
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Dialogs/AreaComDialog.xaml
View File

@ -51,7 +51,7 @@
<CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0" <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
HorizontalAlignment="Center" VerticalAlignment="Top" HorizontalAlignment="Center" VerticalAlignment="Top"
Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed" Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
IsChecked="{Binding MaintainYearTo}"/> IsChecked="{Binding MaintainYearFrom}"/>
<TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center" <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
HorizontalAlignment="Center" VerticalAlignment="Top"> HorizontalAlignment="Center" VerticalAlignment="Top">

10
Elwig/Dialogs/AreaComDialog.xaml.cs
View File

@ -7,7 +7,7 @@ namespace Elwig.Dialogs {
public int CancelSeason { get; set; } public int CancelSeason { get; set; }
public int SuccessorSeason => CancelSeason + 1; public int SuccessorSeason => CancelSeason + 1;
public bool MaintainYearTo { get; set; } public bool MaintainYearFrom { get; set; }
public string AreaComNum { get; set; } public string AreaComNum { get; set; }
public string Area { get; set; } public string Area { get; set; }
@ -43,13 +43,13 @@ namespace Elwig.Dialogs {
CancelSeason = (int)SeasonInput.Value!; CancelSeason = (int)SeasonInput.Value!;
CancelSeason1.Text = $"{CancelSeason}"; CancelSeason1.Text = $"{CancelSeason}";
CancelSeason2.Text = $"{CancelSeason}"; CancelSeason2.Text = $"{CancelSeason}";
TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
} }
private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) { private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}"; TransferSeason.Text = MaintainYearFrom ? "" : $"{SuccessorSeason}";
DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison "; DescBlock1Season.Text = MaintainYearFrom ? "dem originalen Beginn der FB" : "inkl. Saison ";
} }
private void ConfirmButton_Click(object sender, RoutedEventArgs evt) { private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {

2
Elwig/Services/MemberService.cs
View File

@ -655,7 +655,7 @@ namespace Elwig.Services {
KgNr = c.KgNr, KgNr = c.KgNr,
GstNr = c.GstNr, GstNr = c.GstNr,
RdNr = c.RdNr, RdNr = c.RdNr,
YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year, YearFrom = vm.MaintainAreaComYearFrom ? c.YearFrom : year,
YearTo = c.YearTo, YearTo = c.YearTo,
})); }));

2
Elwig/ViewModels/MemberAdminViewModel.cs
View File

@ -11,7 +11,7 @@ namespace Elwig.ViewModels {
public partial class MemberAdminViewModel : ObservableObject { public partial class MemberAdminViewModel : ObservableObject {
public int? TransferPredecessorAreaComs = null; public int? TransferPredecessorAreaComs = null;
public bool MaintainAreaComYearTo = false; public bool MaintainAreaComYearFrom = false;
public int? CancelAreaComs = null; public int? CancelAreaComs = null;
public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes); public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);

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

@ -784,7 +784,7 @@ namespace Elwig.Windows {
if (d.ShowDialog() != true) if (d.ShowDialog() != true)
return; return;
ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason; ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
ViewModel.MaintainAreaComYearTo = d.MaintainYearTo; ViewModel.MaintainAreaComYearFrom = d.MaintainYearFrom;
if (IsEditing) if (IsEditing)
SetOriginalValue(PredecessorMgNrInput, -1); // hack to allow user to save SetOriginalValue(PredecessorMgNrInput, -1); // hack to allow user to save
UpdateButtons(); UpdateButtons();