diff --git a/Elwig/Documents/MemberDataSheet.cs b/Elwig/Documents/MemberDataSheet.cs index 4296288..c671fd1 100644 --- a/Elwig/Documents/MemberDataSheet.cs +++ b/Elwig/Documents/MemberDataSheet.cs @@ -7,7 +7,7 @@ namespace Elwig.Documents { public class MemberDataSheet : BusinessDocument { public Season Season; - public int Year = 2023; + public int Year = Utils.CurrentYear; public Dictionary MemberBuckets; public Dictionary BucketAreas; diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs index 10cebc9..c62270b 100644 --- a/Elwig/Helpers/AppDbContext.cs +++ b/Elwig/Helpers/AppDbContext.cs @@ -267,8 +267,12 @@ namespace Elwig.Helpers { while (await reader.ReadAsync()) { var mgnr = reader.GetInt32(0); var bucket = reader.GetString(1); + var v = reader.GetInt32(2); if (!buckets.ContainsKey(mgnr)) buckets[mgnr] = new(); - buckets[mgnr][bucket] = reader.GetInt32(2); + buckets[mgnr][bucket] = v; + if (bucket.Length > 2) { + buckets[mgnr][bucket[..2]] = buckets[mgnr].GetValueOrDefault(bucket[..2], 0) + v; + } } } if (ownCnx) await cnx.DisposeAsync();