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

Dialogs: Rename AreaComDialog to AreaComTransferDialog
Some checks failed
Test / Run tests (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-07-09 16:56:08 +02:00
parent 7e9a27c75d
commit 267aa3d47c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Dialogs/AreaComDialog.xaml → Elwig/Dialogs/AreaComTransferDialog.xaml
View File

@ -1,4 +1,4 @@
<Window x:Class="Elwig.Dialogs.AreaComDialog" <Window x:Class="Elwig.Dialogs.AreaComTransferDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"

6
Elwig/Dialogs/AreaComDialog.xaml.cs → Elwig/Dialogs/AreaComTransferDialog.xaml.cs
View File

@ -3,7 +3,7 @@ using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
namespace Elwig.Dialogs { namespace Elwig.Dialogs {
public partial class AreaComDialog : Window { public partial class AreaComTransferDialog : Window {
public int CancelSeason { get; set; } public int CancelSeason { get; set; }
public int SuccessorSeason => CancelSeason + 1; public int SuccessorSeason => CancelSeason + 1;
@ -12,7 +12,7 @@ namespace Elwig.Dialogs {
public string AreaComNum { get; set; } public string AreaComNum { get; set; }
public string Area { 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; CancelSeason = Utils.FollowingSeason - 1;
AreaComNum = $"{areaComNum:N0}"; AreaComNum = $"{areaComNum:N0}";
Area = $"{area:N0}"; Area = $"{area:N0}";
@ -29,7 +29,7 @@ namespace Elwig.Dialogs {
SeasonLabel.Margin = new(0, 40, 100, 0); 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; CancelSeason = Utils.FollowingSeason - 1;
AreaComNum = $"{areaComNum:N0}"; AreaComNum = $"{areaComNum:N0}";
Area = $"{area:N0}"; Area = $"{area:N0}";

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

@ -784,7 +784,7 @@ namespace Elwig.Windows {
$"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" + $"{ViewModel.Prefix}{(!string.IsNullOrEmpty(ViewModel.Prefix) ? " " : "")}" +
$"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" + $"{ViewModel.GivenName}{(!string.IsNullOrEmpty(ViewModel.GivenName) ? " " : "")}" +
$"{ViewModel.Suffix}{(!string.IsNullOrEmpty(ViewModel.Suffix) ? " " : "")}"; $"{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) if (d.ShowDialog() != true)
return; return;
ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason; ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
@ -847,7 +847,7 @@ namespace Elwig.Windows {
.Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason)) .Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
.ToListAsync(); .ToListAsync();
if (areaComs.Count > 0) { 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) { if (d.ShowDialog() == true) {
ViewModel.CancelAreaComs = d.CancelSeason; ViewModel.CancelAreaComs = d.CancelSeason;
} }