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

MemberListData: Include contact information like phone numbers and email addresses
All checks were successful
Test / Run tests (push) Successful in 2m25s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-07-24 19:28:34 +02:00
parent 8e9f2f4e90
commit b6afb94246
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Elwig/Models/Dtos/MemberListData.cs
View File

@ -34,7 +34,11 @@ namespace Elwig.Models.Dtos {
("UstIdNr", "UID", null, 25), ("UstIdNr", "UID", null, 25),
("Iban", "IBAN", null, 45), ("Iban", "IBAN", null, 45),
("Bic", "BIC", null, 30), ("Bic", "BIC", null, 30),
("Comment", "Anmerkung", null, 60), ("TelNrLandline", "Festnetz", null, 35),
("TelNrMobile", "Mobil", null, 35),
("EmailAddress", "E-Mail", null, 70),
("AdditionalContact", "Weitere", null, 70),
("Comment", "Anmerkung", null, 80),
]; ];
public MemberListData(IEnumerable<MemberListRow> rows, List<string> filterNames) : public MemberListData(IEnumerable<MemberListRow> rows, List<string> filterNames) :
@ -48,6 +52,9 @@ namespace Elwig.Models.Dtos {
.Include(m => m.Branch) .Include(m => m.Branch)
.Include(m => m.PostalDest.AtPlz!.Ort) .Include(m => m.PostalDest.AtPlz!.Ort)
.Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort) .Include(m => m.BillingAddress!.PostalDest.AtPlz!.Ort)
.Include(m => m.TelephoneNumbers)
.Include(m => m.EmailAddresses)
.AsSplitQuery()
.ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames); .ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames);
} }
} }
@ -76,6 +83,10 @@ namespace Elwig.Models.Dtos {
public bool IsActive; public bool IsActive;
public DateOnly? EntryDate; public DateOnly? EntryDate;
public DateOnly? ExitDate; public DateOnly? ExitDate;
public string? TelNrLandline;
public string? TelNrMobile;
public string? EmailAddress;
public string? AdditionalContact;
public string? Comment; public string? Comment;
public MemberListRow(Member m, int? areaCom = null) { public MemberListRow(Member m, int? areaCom = null) {
@ -103,6 +114,15 @@ namespace Elwig.Models.Dtos {
IsActive = m.IsActive; IsActive = m.IsActive;
EntryDate = m.EntryDate; EntryDate = m.EntryDate;
ExitDate = m.ExitDate; ExitDate = m.ExitDate;
TelNrLandline = m.TelephoneNumbers.OrderBy(n => n.Nr).FirstOrDefault(n => n.Type == "landline")?.Number;
TelNrMobile = m.TelephoneNumbers.OrderBy(n => n.Nr).FirstOrDefault(n => n.Type == "mobile")?.Number;
EmailAddress = m.EmailAddresses.OrderBy(a => a.Nr).FirstOrDefault()?.Address;
AdditionalContact = string.Join(", ", m.TelephoneNumbers
.OrderBy(n => n.Nr)
.Select(n => n.Number)
.Except([TelNrLandline, TelNrMobile])
.Distinct()
.Concat(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).Except([EmailAddress])));
Comment = m.Comment; Comment = m.Comment;
AreaCommitment = areaCom == 0 ? null : areaCom; AreaCommitment = areaCom == 0 ? null : areaCom;
} }