From 46ea0f29ffb3cd94973ea78aa7199753f74d0dd0 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Fri, 5 Jul 2024 21:28:06 +0200 Subject: [PATCH] [#26] MemberAdminWindow: Add tooltip to area commitment status bar --- Elwig/Services/MemberService.cs | 9 ++++++++- Elwig/ViewModels/MemberAdminViewModel.cs | 4 ++++ Elwig/Windows/MemberAdminWindow.xaml | 10 +++++----- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs index b2e56df..157ceab 100644 --- a/Elwig/Services/MemberService.cs +++ b/Elwig/Services/MemberService.cs @@ -40,6 +40,8 @@ namespace Elwig.Services { vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}"; vm.StatusDeliveriesThisSeasonToolTip = null; vm.StatusAreaCommitment = "-"; + vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}"; + vm.StatusAreaCommitmentToolTip = null; vm.Age = "-"; } @@ -141,7 +143,12 @@ namespace Elwig.Services { vm.StatusDeliveriesThisSeason = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg"; vm.StatusDeliveriesThisSeasonToolTip = d2Grid; - vm.StatusAreaCommitment = $"{m.ActiveAreaCommitments(ctx).Select(c => c.Area).Sum():N0} m²"; + var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason); + var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year)); + var (text, grid) = await AreaComService.GenerateToolTip(c, s?.MaxKgPerHa ?? 10_000); + vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}"; + vm.StatusAreaCommitment = text; + vm.StatusAreaCommitmentToolTip = grid; deliveries = ctx.Deliveries .Where(d => d.MgNr == m.MgNr) diff --git a/Elwig/ViewModels/MemberAdminViewModel.cs b/Elwig/ViewModels/MemberAdminViewModel.cs index be58099..b8b3e1a 100644 --- a/Elwig/ViewModels/MemberAdminViewModel.cs +++ b/Elwig/ViewModels/MemberAdminViewModel.cs @@ -167,6 +167,10 @@ namespace Elwig.ViewModels { private Grid? _statusDeliveriesThisSeasonToolTip; [ObservableProperty] private string _statusAreaCommitment = "-"; + [ObservableProperty] + private Grid? _statusAreaCommitmentToolTip; + [ObservableProperty] + private string _statusAreaCommitmentInfo = "aktuelle Saison"; [ObservableProperty] private Visibility _controlButtonsVisibility = Visibility.Visible; diff --git a/Elwig/Windows/MemberAdminWindow.xaml b/Elwig/Windows/MemberAdminWindow.xaml index 4834fd3..ff1aa35 100644 --- a/Elwig/Windows/MemberAdminWindow.xaml +++ b/Elwig/Windows/MemberAdminWindow.xaml @@ -628,11 +628,11 @@ - + - + - + @@ -650,8 +650,8 @@ - - Gebundene Fläche: + + Gebundene Fläche ():