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

[#26] MemberAdminWindow: Add tooltip to area commitment status bar

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-07-05 21:28:06 +02:00
parent 4229fbbef6
commit 46ea0f29ff
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Elwig/Services/MemberService.cs
View File

@ -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)

4
Elwig/ViewModels/MemberAdminViewModel.cs
View File

@ -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;

10
Elwig/Windows/MemberAdminWindow.xaml
View File

@ -628,11 +628,11 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="3*"/>
<ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions>
</Grid>
</ItemsPanelTemplate>
@ -650,8 +650,8 @@
</StatusBarItem>
<Separator Grid.Column="3"/>
<StatusBarItem Grid.Column="4">
<TextBlock>
Gebundene Fläche: <Run Text="{Binding StatusAreaCommitment}"/>
<TextBlock ToolTip="{Binding StatusAreaCommitmentToolTip}">
Gebundene Fläche (<Run Text="{Binding StatusAreaCommitmentInfo}"/>): <Run Text="{Binding StatusAreaCommitment}"/>
</TextBlock>
</StatusBarItem>
<Separator Grid.Column="5"/>