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

AppDbContext: Remove support for multiple attributes in buckets

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-12-19 19:31:35 +01:00
parent 8811ca25ce
commit 480f99234c
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Elwig/Helpers/AppDbContext.cs
View File

@ -289,9 +289,8 @@ namespace Elwig.Helpers {
var buckets = new Dictionary<string, MemberBucket>(); var buckets = new Dictionary<string, MemberBucket>();
foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) { foreach (var id in rightsAndObligations.Keys.Union(deliveryBuckets.Keys).Union(paymentBuckets.Keys)) {
var variety = await WineVarieties.FindAsync(id[..2]); var variety = await WineVarieties.FindAsync(id[..2]);
var attrIds = id[2..]; var attribute = await WineAttributes.FindAsync(id[2..]);
var attrs = await WineAttributes.Where(a => attrIds.Contains(a.AttrId)).ToListAsync(); var name = (variety?.Name ?? "") + (id[2..] == "_" ? " (kein Qual.Wein)" : attribute != null ? $" ({attribute})" : "");
var name = (variety?.Name ?? "") + (attrIds == "_" ? " (kein Qual.Wein)" : attrs.Count > 0 ? $" ({string.Join(" / ", attrs.Select(a => a.Name))})" : "");
buckets[id] = new( buckets[id] = new(
name, name,
rightsAndObligations.GetValueOrDefault(id).Area, rightsAndObligations.GetValueOrDefault(id).Area,