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

DeliveryConfirmationsDialog: Add AllMemberInput checkbox

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-10-17 20:50:16 +02:00
parent 2f8e4ca812
commit f1084c716a
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Elwig/Dialogs/DeliveryConfirmationsDialog.xaml
View File

@ -8,7 +8,7 @@
ResizeMode="NoResize" ResizeMode="NoResize"
Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600"> Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600">
<Grid> <Grid>
<GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="150" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left"> <GroupBox Header="Sortieren nach" Margin="10,10,10,10" Width="180" Height="80" VerticalAlignment="Top" HorizontalAlignment="Left">
<StackPanel Margin="5,5,0,5"> <StackPanel Margin="5,5,0,5">
<RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/> <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
<RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/> <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
@ -16,8 +16,12 @@
</StackPanel> </StackPanel>
</GroupBox> </GroupBox>
<CheckBox x:Name="AllMembersInput" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,100,10,10">
<TextBlock>Auch Mitglieder ohne<LineBreak/>Lieferungen miteinbeziehen</TextBlock>
</CheckBox>
<TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True" <TextBox x:Name="TextElement" TextWrapping="Wrap" VerticalScrollBarVisibility="Visible" AcceptsReturn="True"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="170,10,10,10" Height="Auto"/> HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="200,10,10,10" Height="Auto"/>
<Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="150" Margin="10,10,10,74" Height="27" <Button x:Name="TestButton" Content="Stichprobe" FontSize="14" Width="150" Margin="10,10,10,74" Height="27"
Click="TestButton_Click" Click="TestButton_Click"

8
Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs
View File

@ -40,13 +40,19 @@ namespace Elwig.Dialogs {
Mouse.OverrideCursor = Cursors.AppStarting; Mouse.OverrideCursor = Cursors.AppStarting;
await UpdateTextParameter(); await UpdateTextParameter();
var members = Context.Members.FromSqlRaw($""" IQueryable<Member> members;
if (AllMembersInput.IsChecked == true) {
members = Context.Members.Where(m => m.IsActive);
} else {
members = Context.Members.FromSqlRaw($"""
SELECT m.* SELECT m.*
FROM member m FROM member m
INNER JOIN delivery d ON d.mgnr = m.mgnr INNER JOIN delivery d ON d.mgnr = m.mgnr
WHERE d.year = {Year} WHERE d.year = {Year}
GROUP BY m.mgnr GROUP BY m.mgnr
"""); """);
}
if (OrderMgNrInput.IsChecked == true) { if (OrderMgNrInput.IsChecked == true) {
members = members members = members
.OrderBy(m => m.MgNr); .OrderBy(m => m.MgNr);