Dialogs: Rename AreaComDialog to AreaComTransferDialog
	
		
			
	
		
	
	
		
	
		
			Some checks failed
		
		
	
	
		
			
				
	
				Test / Run tests (push) Has been cancelled
				
			
		
		
	
	
				
					
				
			
		
			Some checks failed
		
		
	
	Test / Run tests (push) Has been cancelled
				
			This commit is contained in:
		| @@ -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:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||||
|         xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||||
| @@ -3,7 +3,7 @@ using System.Windows; | ||||
| using System.Windows.Controls; | ||||
| 
 | ||||
| namespace Elwig.Dialogs { | ||||
|     public partial class AreaComDialog : Window { | ||||
|     public partial class AreaComTransferDialog : Window { | ||||
| 
 | ||||
|         public int CancelSeason { get; set; } | ||||
|         public int SuccessorSeason => 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}"; | ||||
| @@ -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; | ||||
|                     } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user