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

DeliveryAncmtAdminWindow: Add more filters and tooltip for weight
All checks were successful
Test / Run tests (push) Successful in 1m47s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-19 11:56:45 +02:00
parent 642fb3a625
commit 27d8a5cfb6
4 changed files with 234 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Elwig/Windows/DeliveryAncmtAdminWindow.xaml
View File

@ -105,7 +105,12 @@
Filtern nach:<LineBreak/>
<Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
<Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
<Bold>Mitglied</Bold>: z.B. 1234, 987, ...
<Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
<Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
<Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
<Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
<Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
<Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
</TextBlock>
</TextBox.ToolTip>
</TextBox>
@ -324,11 +329,11 @@
<ItemsPanelTemplate>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="1*" MinWidth="120"/>
<ColumnDefinition Width="0.5*" MinWidth="120"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="1*" MinWidth="150"/>
<ColumnDefinition Width="1.75*" MinWidth="150"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="2.25*"/>
<ColumnDefinition Width="2*"/>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="2*"/>
</Grid.ColumnDefinitions>
@ -342,7 +347,7 @@
</StatusBarItem>
<Separator Grid.Column="1"/>
<StatusBarItem Grid.Column="2">
<TextBlock>
<TextBlock ToolTip="{Binding StatusWeightToolTip}">
Gewicht: <Run Text="{Binding StatusWeight}"/>
</TextBlock>
</StatusBarItem>

9
Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
View File

@ -134,7 +134,14 @@ namespace Elwig.Windows {
DeliveryAncmtList.ScrollIntoView(DeliveryAncmtList.SelectedItem);
ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
if (filter.Count == 0) {
var (text, grid) = await DeliveryAncmtService.GenerateToolTip(deliveryAncmtQuery);
ViewModel.StatusWeight = text;
ViewModel.StatusWeightToolTip = grid;
} else {
ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
ViewModel.StatusWeightToolTip = null;
}
}
private async Task RefreshInputs(bool validate = false) {