diff --git a/Elwig/Dialogs/AreaComDialog.xaml b/Elwig/Dialogs/AreaComTransferDialog.xaml similarity index 98% rename from Elwig/Dialogs/AreaComDialog.xaml rename to Elwig/Dialogs/AreaComTransferDialog.xaml index b08ca1b..fcec9d1 100644 --- a/Elwig/Dialogs/AreaComDialog.xaml +++ b/Elwig/Dialogs/AreaComTransferDialog.xaml @@ -1,4 +1,4 @@ - CancelSeason + 1; @@ -12,7 +12,7 @@ namespace Elwig.Dialogs { public string AreaComNum { get; set; } public string Area { get; set; } - public AreaComDialog(string name, int areaComNum, int area) { + public AreaComTransferDialog(string name, int areaComNum, int area) { CancelSeason = Utils.FollowingSeason - 1; AreaComNum = $"{areaComNum:N0}"; Area = $"{area:N0}"; @@ -29,7 +29,7 @@ namespace Elwig.Dialogs { SeasonLabel.Margin = new(0, 40, 100, 0); } - public AreaComDialog(string name, string successorName, int areaComNum, int area) { + public AreaComTransferDialog(string name, string successorName, int areaComNum, int area) { CancelSeason = Utils.FollowingSeason - 1; AreaComNum = $"{areaComNum:N0}"; Area = $"{area:N0}"; diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs index 9bf83eb..0497284 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml.cs +++ b/Elwig/Windows/MemberAdminWindow.xaml.cs @@ -784,7 +784,7 @@ namespace Elwig.Windows { $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" + $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" + $"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}"; - var d = new AreaComDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area)); + var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area)); if (d.ShowDialog() != true) return; ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason; @@ -847,7 +847,7 @@ namespace Elwig.Windows { .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason)) .ToListAsync(); if (areaComs.Count > 0) { - var d = new AreaComDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area)); + var d = new AreaComTransferDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area)); if (d.ShowDialog() == true) { ViewModel.CancelAreaComs = d.CancelSeason; }