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

[#43] MemberAdminWindow: Context cleanup

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-03-10 20:39:36 +01:00
parent 1eba3d9d20
commit acc159ed9c
2 changed files with 96 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Elwig/Helpers/AppDbContext.cs
View File

@ -46,6 +46,7 @@ namespace Elwig.Helpers {
public DbSet<Member> Members { get; private set; } public DbSet<Member> Members { get; private set; }
public DbSet<BillingAddr> BillingAddresses { get; private set; } public DbSet<BillingAddr> BillingAddresses { get; private set; }
public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; } public DbSet<MemberTelNr> MemberTelephoneNrs { get; private set; }
public DbSet<MemberEmailAddr> MemberEmailAddrs { get; private set; }
public DbSet<MemberHistory> MemberHistory { get; private set; } public DbSet<MemberHistory> MemberHistory { get; private set; }
public DbSet<AreaCom> AreaCommitments { get; private set; } public DbSet<AreaCom> AreaCommitments { get; private set; }
public DbSet<Season> Seasons { get; private set; } public DbSet<Season> Seasons { get; private set; }

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

@ -191,13 +191,13 @@ namespace Elwig.Windows {
memberQuery = memberQuery memberQuery = memberQuery
.Include(m => m.Branch) .Include(m => m.Branch)
.Include(m => m.DefaultWbKg.AtKg) .Include(m => m.DefaultWbKg!.AtKg)
.Include(m => m.EmailAddresses) .Include(m => m.EmailAddresses)
.Include(m => m.TelephoneNumbers) .Include(m => m.TelephoneNumbers)
.Include(m => m.PostalDest.AtPlz.Ort) .Include(m => m.PostalDest.AtPlz!.Ort)
.Include(m => m.PostalDest.AtPlz.Country) .Include(m => m.PostalDest.AtPlz!.Country)
.Include(m => m.BillingAddress.PostalDest.AtPlz.Ort) .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
.Include(m => m.BillingAddress.PostalDest.AtPlz.Country); .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Country);
List<Member> members = await memberQuery.ToListAsync(); List<Member> members = await memberQuery.ToListAsync();
if (filter.Count > 0 && members.Count > 0) { if (filter.Count > 0 && members.Count > 0) {
@ -379,7 +379,14 @@ namespace Elwig.Windows {
} }
private async void SaveButton_Click(object sender, RoutedEventArgs evt) { private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
var mgnr = await UpdateMember((MemberList.SelectedItem as Member)?.MgNr); int? mgnr = null;
try {
mgnr = await UpdateMember((MemberList.SelectedItem as Member)?.MgNr);
} catch (Exception exc) {
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
}
IsEditing = false; IsEditing = false;
IsCreating = false; IsCreating = false;
MemberList.IsEnabled = true; MemberList.IsEnabled = true;
@ -392,7 +399,8 @@ namespace Elwig.Windows {
await RefreshMemberList(); await RefreshMemberList();
RefreshInputs(); RefreshInputs();
SearchInput.Text = ""; SearchInput.Text = "";
FocusMember(mgnr); if (mgnr is int m)
FocusMember(m);
} }
private void ResetButton_Click(object sender, RoutedEventArgs evt) { private void ResetButton_Click(object sender, RoutedEventArgs evt) {
@ -563,114 +571,93 @@ namespace Elwig.Windows {
} }
} }
private async Task<int> UpdateMember(int? mgnr) { private async Task<int> UpdateMember(int? oldMgNr) {
using var ctx = new AppDbContext(); using var ctx = new AppDbContext();
var m = ctx.CreateProxy<Member>(); var newMgNr = int.Parse(MgNrInput.Text);
if (mgnr != null) var m = new Member {
m.MgNr = (int)mgnr; MgNr = oldMgNr ?? newMgNr,
PredecessorMgNr = (PredecessorMgNrInput.Text == "") ? null : int.Parse(PredecessorMgNrInput.Text),
Prefix = (PrefixInput.Text == "") ? null : PrefixInput.Text,
GivenName = GivenNameInput.Text,
FamilyName = FamilyNameInput.Text,
Suffix = (SuffixInput.Text == "") ? null : SuffixInput.Text,
Birthday = (BirthdayInput.Text == "") ? null : string.Join("-", BirthdayInput.Text.Split(".").Reverse()),
IsDeceased = DeceasedInput.IsChecked ?? false,
CountryNum = 40, // Austria AT AUT
PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id,
Address = AddressInput.Text,
int newMgNr = int.Parse(MgNrInput.Text); Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", ""),
m.PredecessorMgNr = (PredecessorMgNrInput.Text == "") ? null : int.Parse(PredecessorMgNrInput.Text); Bic = (BicInput.Text == "") ? null : BicInput.Text,
m.Prefix = (PrefixInput.Text == "") ? null : PrefixInput.Text;
m.GivenName = GivenNameInput.Text;
m.FamilyName = FamilyNameInput.Text;
m.Suffix = (SuffixInput.Text == "") ? null : SuffixInput.Text;
m.Birthday = (BirthdayInput.Text == "") ? null : string.Join("-", BirthdayInput.Text.Split(".").Reverse());
m.IsDeceased = DeceasedInput.IsChecked ?? false;
m.CountryNum = 40; // Austria AT AUT
m.PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id;
m.Address = AddressInput.Text;
m.Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", ""); UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text,
m.Bic = (BicInput.Text == "") ? null : BicInput.Text; LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text,
IsBuchführend = BuchführendInput.IsChecked ?? false,
IsOrganic = OrganicInput.IsChecked ?? false,
m.UstIdNr = (UstIdNrInput.Text == "") ? null : UstIdNrInput.Text; EntryDateString = (EntryDateInput.Text == "") ? null : string.Join("-", EntryDateInput.Text.Split(".").Reverse()),
m.LfbisNr = (LfbisNrInput.Text == "") ? null : LfbisNrInput.Text; ExitDateString = (ExitDateInput.Text == "") ? null : string.Join("-", ExitDateInput.Text.Split(".").Reverse()),
m.IsBuchführend = BuchführendInput.IsChecked ?? false; BusinessShares = (BusinessSharesInput.Text == "") ? 0 : int.Parse(BusinessSharesInput.Text),
m.IsOrganic = OrganicInput.IsChecked ?? false; AccountingNr = (AccountingNrInput.Text == "") ? null : AccountingNrInput.Text,
IsActive = ActiveInput.IsChecked ?? false,
IsVollLieferant = VollLieferantInput.IsChecked ?? false,
IsFunktionär = FunkionärInput.IsChecked ?? false,
ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId,
DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr,
Comment = (CommentInput.Text == "") ? null : CommentInput.Text,
ContactViaPost = ContactPostalInput.IsChecked ?? false,
ContactViaEmail = ContactEmailInput.IsChecked ?? false,
};
m.EntryDateString = (EntryDateInput.Text == "") ? null : string.Join("-", EntryDateInput.Text.Split(".").Reverse()); if (oldMgNr != null) {
m.ExitDateString = (ExitDateInput.Text == "") ? null : string.Join("-", ExitDateInput.Text.Split(".").Reverse());
m.BusinessShares = (BusinessSharesInput.Text == "") ? 0 : int.Parse(BusinessSharesInput.Text);
m.AccountingNr = (AccountingNrInput.Text == "") ? null : AccountingNrInput.Text;
m.IsActive = ActiveInput.IsChecked ?? false;
m.IsVollLieferant = VollLieferantInput.IsChecked ?? false;
m.IsFunktionär = FunkionärInput.IsChecked ?? false;
m.ZwstId = ((Branch)BranchInput.SelectedItem).ZwstId;
m.DefaultKgNr = ((AT_Kg)DefaultKgInput.SelectedItem).KgNr;
m.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;
m.ContactViaPost = ContactPostalInput.IsChecked ?? false;
m.ContactViaEmail = ContactEmailInput.IsChecked ?? false;
try {
if (IsEditing) {
ctx.Update(m); ctx.Update(m);
} else if (IsCreating) {
m.MgNr = newMgNr;
await ctx.AddAsync(m);
} else { } else {
throw new Exception(); ctx.Add(m);
} }
if (BillingOrtInput.SelectedItem == null) { ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
if (m.BillingAddress != null) { if (BillingOrtInput.SelectedItem != null) {
ctx.Remove(m.BillingAddress);
}
} else {
BillingAddr b = m.BillingAddress ?? ctx.CreateProxy<BillingAddr>();
b.Name = BillingNameInput.Text;
b.Address = BillingAddressInput.Text;
var p = (AT_PlzDest)BillingOrtInput.SelectedItem; var p = (AT_PlzDest)BillingOrtInput.SelectedItem;
b.CountryNum = p.CountryNum; ctx.Add(new BillingAddr {
b.PostalDestId = p.Id; MgNr = m.MgNr,
if (m.BillingAddress == null) { Name = BillingNameInput.Text,
b.MgNr = newMgNr; Address = BillingAddressInput.Text,
await ctx.AddAsync(b); CountryNum = p.CountryNum,
} else { PostalDestId = p.Id,
ctx.Update(b); });
}
} }
ctx.RemoveRange(m.TelephoneNumbers); ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
for (int i = 0, j = 0; i < PhoneNrInputs.Length; i++) { ctx.AddRange(Enumerable.Range(0, PhoneNrInputs.Length)
var input = GetPhoneNrInput(i); .Select(GetPhoneNrInput)
if (input != null) { .Where(input => input != null)
var pInput = input.Value; .Select(input => input!.Value)
MemberTelNr p = ctx.CreateProxy<MemberTelNr>(); .Select((input, i) => new MemberTelNr {
p.MgNr = newMgNr; MgNr = m.MgNr,
p.Nr = ++j; Nr = i + 1,
p.Type = pInput.Type; Type = input.Type,
p.Number = pInput.Number; Number = input.Number,
p.Comment = pInput.Comment; Comment = input.Comment,
await ctx.AddAsync(p); }));
}
}
ctx.RemoveRange(m.EmailAddresses); ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
for (int i = 0, j = 0; i < EmailAddressInputs.Length; i++) { ctx.AddRange(Enumerable.Range(0, EmailAddressInputs.Length)
var input = GetEmailAddressInput(i); .Select(GetEmailAddressInput)
if (input != null && input != "") { .Where(input => input != null && input != "")
MemberEmailAddr a = ctx.CreateProxy<MemberEmailAddr>(); .Select((input, i) => new MemberEmailAddr {
a.MgNr = newMgNr; MgNr = m.MgNr,
a.Nr = ++j; Nr = i + 1,
a.Address = input; Address = input!,
a.Comment = null; Comment = null,
await ctx.AddAsync(a); }));
}
}
await ctx.SaveChangesAsync(); await ctx.SaveChangesAsync();
if (newMgNr != m.MgNr) { if (newMgNr != m.MgNr) {
await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {m.MgNr}"); await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
}
} catch (Exception exc) {
var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
} }
return m.MgNr; return newMgNr;
} }
private void FillInputs(Member m) { private void FillInputs(Member m) {