winzer/elwig
2
1
Fork 0
Code Issues 11 Pull Requests Actions Releases 57 Activity

DeliveryAdminWindow: Include attribute and cultivation in wine variety column
All checks were successful
Test / Run tests (push) Successful in 2m24s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-10-05 21:21:03 +02:00
parent 67ba342c28
commit a0d4f19f30
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Elwig/Models/Entities/Delivery.cs
View File

@@ -1,4 +1,5 @@
using Elwig.Helpers; using Elwig.Helpers;
using Elwig.Helpers.Billing;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -108,16 +109,16 @@ namespace Elwig.Models.Entities {
public int Weight => Parts.Select(p => p.Weight).Sum(); public int Weight => Parts.Select(p => p.Weight).Sum();
public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum(); public int FilteredWeight => FilteredParts.Select(p => p.Weight).Sum();
public IEnumerable<string> SortIds => Parts public IEnumerable<RawVaribute> Vaributes => Parts
.GroupBy(p => p.SortId) .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
.OrderByDescending(g => g.Select(p => p.Weight).Sum()) .OrderByDescending(g => g.Select(p => p.Weight).Sum())
.Select(g => g.Key); .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
public IEnumerable<string> FilteredSortIds => FilteredParts public IEnumerable<RawVaribute> FilteredVaributes => FilteredParts
.GroupBy(p => p.SortId) .GroupBy(p => (p.SortId, p.AttrId, p.CultId))
.OrderByDescending(g => g.Select(p => p.Weight).Sum()) .OrderByDescending(g => g.Select(p => p.Weight).Sum())
.Select(g => g.Key); .Select(g => new RawVaribute(g.Key.SortId, g.Key.AttrId, g.Key.CultId));
public string SortIdString => string.Join(", ", SortIds); public string VaributeString => string.Join(", ", Vaributes);
public string FilteredSortIdString => string.Join(", ", FilteredSortIds); public string FilteredVaributeString => string.Join(", ", FilteredVaributes);
public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault(); public Brush? Color => Parts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();
public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault(); public Brush? FilteredColor => FilteredParts.Select(p => p.Variety.Color).Distinct().SingleOrDefault();

7
Elwig/Windows/DeliveryAdminWindow.xaml
View File

@@ -265,13 +265,18 @@
</Style> </Style>
</DataGridTextColumn.CellStyle> </DataGridTextColumn.CellStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Header="Sorte" Binding="{Binding FilteredSortIdString}" Width="50"> <DataGridTextColumn Header="Sorte" Binding="{Binding FilteredVaributeString}" Width="60">
<DataGridTextColumn.CellStyle> <DataGridTextColumn.CellStyle>
<Style> <Style>
<Setter Property="TextBlock.Foreground" Value="{Binding FilteredColor}"/> <Setter Property="TextBlock.Foreground" Value="{Binding FilteredColor}"/>
<Setter Property="TextBlock.TextAlignment" Value="Center"/> <Setter Property="TextBlock.TextAlignment" Value="Center"/>
</Style> </Style>
</DataGridTextColumn.CellStyle> </DataGridTextColumn.CellStyle>
<DataGridTextColumn.ElementStyle>
<Style TargetType="TextBlock">
<Setter Property="TextTrimming" Value="CharacterEllipsis"/>
</Style>
</DataGridTextColumn.ElementStyle>
</DataGridTextColumn> </DataGridTextColumn>
<DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75"> <DataGridTextColumn Header="Menge" Binding="{Binding FilteredWeight, StringFormat='{}{0:N0} kg '}" Width="75">
<DataGridTextColumn.CellStyle> <DataGridTextColumn.CellStyle>