winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 85 Activity

Elwig: Rename AreaCom to AreaCmt

Browse Source
This commit is contained in:
lorenz.stechauner
2026-09-30 12:14:30 +02:00
parent a18d687f18
commit 3d96c31a70
42 changed files with 387 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Elwig/Windows/MemberAdminWindow.xaml.cs
+21 -21
View File
@@ -474,8 +474,8 @@ namespace Elwig.Windows {
IsCreating = true;
MemberList.IsEnabled = false;
ViewModel.SelectedMember = null;
ViewModel.TransferPredecessorAreaComs = null;
ViewModel.CancelAreaComs = null;
ViewModel.TransferPredecessorAreaCmts = null;
ViewModel.CancelAreaCmts = null;
HideNewEditDeleteButtons();
ShowSaveResetCancelButtons();
UnlockInputs();
@@ -495,8 +495,8 @@ namespace Elwig.Windows {
IsEditing = true;
MemberList.IsEnabled = false;
ViewModel.TransferPredecessorAreaComs = null;
ViewModel.CancelAreaComs = null;
ViewModel.TransferPredecessorAreaCmts = null;
ViewModel.CancelAreaCmts = null;
HideNewEditDeleteButtons();
ShowSaveResetCancelButtons();
@@ -517,17 +517,17 @@ namespace Elwig.Windows {
if (ViewModel.SelectedMember is not Member m)
return;
int areaComs = 0, deliveries = 0, credits = 0;
int areaCmts = 0, deliveries = 0, credits = 0;
using (var ctx = new AppDbContext()) {
areaComs = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
areaCmts = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
deliveries = await ctx.Deliveries.Where(d => d.MgNr == m.MgNr).CountAsync();
credits = await ctx.Credits.Where(c => c.MgNr == m.MgNr).CountAsync();
}
var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaCmts, deliveries, credits);
if (d.ShowDialog() == true) {
Mouse.OverrideCursor = Cursors.Wait;
try {
await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaCmts);
App.HintContextChange();
} catch (Exception exc) {
InteractionService.ShowDbException("Mitglied löschen", exc);
@@ -580,8 +580,8 @@ namespace Elwig.Windows {
}
private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
ViewModel.TransferPredecessorAreaComs = null;
ViewModel.CancelAreaComs = null;
ViewModel.TransferPredecessorAreaCmts = null;
ViewModel.CancelAreaCmts = null;
if (IsEditing) {
RefreshInputs();
} else if (IsCreating) {
@@ -595,8 +595,8 @@ namespace Elwig.Windows {
IsEditing = false;
IsCreating = false;
MemberList.IsEnabled = true;
ViewModel.TransferPredecessorAreaComs = null;
ViewModel.CancelAreaComs = null;
ViewModel.TransferPredecessorAreaCmts = null;
ViewModel.CancelAreaCmts = null;
HideSaveResetCancelButtons();
ShowNewEditDeleteButtons();
RefreshInputs();
@@ -610,7 +610,7 @@ namespace Elwig.Windows {
}
private void AreaCommitmentButton_Click(object sender, RoutedEventArgs evt) {
App.FocusMemberAreaComs(ViewModel.SelectedMember!.MgNr);
App.FocusMemberAreaCmts(ViewModel.SelectedMember!.MgNr);
}
private void DeliveryButton_Click(object sender, RoutedEventArgs evt) {
@@ -920,10 +920,10 @@ namespace Elwig.Windows {
if (ViewModel.MgNr == mgnr)
return;
using var ctx = new AppDbContext();
var areaComs = await ctx.AreaCommitments
var areaCmts = await ctx.AreaCommitments
.Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
.ToListAsync();
if (areaComs.Count == 0)
if (areaCmts.Count == 0)
return;
var oldMember = await ctx.FetchMembers(mgnr).SingleAsync();
@@ -931,10 +931,10 @@ namespace Elwig.Windows {
$"{ViewModel.Prefix}{(!string.IsNullOrWhiteSpace(ViewModel.Prefix) ? " " : "")}" +
$"{ViewModel.GivenName}{(!string.IsNullOrWhiteSpace(ViewModel.GivenName) ? " " : "")}" +
$"{ViewModel.Suffix}{(!string.IsNullOrWhiteSpace(ViewModel.Suffix) ? " " : "")}";
var d = new AreaComTransferDialog(oldMember.AdministrativeName, newName, areaComs.Count, areaComs.Sum(c => c.Area));
var d = new AreaCmtTransferDialog(oldMember.AdministrativeName, newName, areaCmts.Count, areaCmts.Sum(c => c.Area));
if (d.ShowDialog() != true)
return;
ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
ViewModel.TransferPredecessorAreaCmts = d.SuccessorSeason;
if (IsEditing)
SetOriginalValue(PredecessorMgNrInput, -1); // hack to allow user to save
UpdateButtons();
@@ -979,13 +979,13 @@ namespace Elwig.Windows {
return;
if ((IsEditing || IsCreating) && ViewModel.IsActive == false && ViewModel.MgNr is int mgnr) {
using var ctx = new AppDbContext();
var areaComs = await ctx.AreaCommitments
var areaCmts = await ctx.AreaCommitments
.Where(c => c.MgNr == mgnr && (c.YearTo == null || c.YearTo >= Utils.FollowingSeason))
.ToListAsync();
if (areaComs.Count > 0) {
var d = new AreaComTransferDialog(m.AdministrativeName, areaComs.Count, areaComs.Sum(c => c.Area));
if (areaCmts.Count > 0) {
var d = new AreaCmtTransferDialog(m.AdministrativeName, areaCmts.Count, areaCmts.Sum(c => c.Area));
if (d.ShowDialog() == true) {
ViewModel.CancelAreaComs = d.CancelSeason;
ViewModel.CancelAreaCmts = d.CancelSeason;
}
}
}