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

Services: Extract GenerateToolTipData() from GenerateToolTip()
All checks were successful
Test / Run tests (push) Successful in 1m35s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-22 20:40:53 +02:00
parent dcec6f03fe
commit 7791d02979
5 changed files with 99 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Elwig/Windows/AreaComAdminWindow.xaml.cs
View File

@ -79,9 +79,9 @@ namespace Elwig.Windows {
if (filter.Count == 0) {
ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
var (text, grid) = await AreaComService.GenerateToolTip(areaComQuery, s?.MaxKgPerHa ?? 10_000);
var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
ViewModel.StatusArea = text;
ViewModel.StatusAreaToolTip = grid;
ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
} else {
ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";

6
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -394,8 +394,10 @@ namespace Elwig.Windows {
ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})";
var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
(ViewModel.StatusWeight, ViewModel.StatusWeightToolTip,
ViewModel.StatusGradation, ViewModel.StatusGradationToolTip) = await DeliveryService.GenerateToolTip(deliveryParts);
var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
ViewModel.StatusWeight = wText;
ViewModel.StatusGradation = gText;
(ViewModel.StatusWeightToolTip, ViewModel.StatusGradationToolTip) = DeliveryService.GenerateToolTip(wData, gData);
} else {
ViewModel.StatusVarieties = "-";
ViewModel.StatusWeight = "-";