From f1084c716a8b1308010ee4fc731e90f935272054 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 17 Oct 2023 20:50:16 +0200
Subject: [PATCH] DeliveryConfirmationsDialog: Add AllMemberInput checkbox

---
 .../Dialogs/DeliveryConfirmationsDialog.xaml  |  8 ++++++--
 .../DeliveryConfirmationsDialog.xaml.cs       | 20 ++++++++++++-------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml b/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml
index 6fc5d15..5eeb255 100644
--- a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml
+++ b/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml
@@ -8,7 +8,7 @@
                      ResizeMode="NoResize"
                      Title="Anlieferungsbestätingungen - Elwig" Height="400" Width="600">
     <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">
                 <RadioButton GroupName="Order" x:Name="OrderMgNrInput" Content="Mitgliedsnummer" IsChecked="True"/>
                 <RadioButton GroupName="Order" x:Name="OrderNameInput" Content="Name"/>
@@ -16,8 +16,12 @@
             </StackPanel>
         </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"
-                 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"
                 Click="TestButton_Click"
diff --git a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs b/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs
index 31f0d9c..62ecf59 100644
--- a/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs
+++ b/Elwig/Dialogs/DeliveryConfirmationsDialog.xaml.cs
@@ -40,13 +40,19 @@ namespace Elwig.Dialogs {
             Mouse.OverrideCursor = Cursors.AppStarting;
             await UpdateTextParameter();
 
-            var members = Context.Members.FromSqlRaw($"""
-                SELECT m.*
-                FROM member m
-                    INNER JOIN delivery d ON d.mgnr = m.mgnr
-                WHERE d.year = {Year}
-                GROUP BY m.mgnr
-                """);
+            IQueryable<Member> members;
+            if (AllMembersInput.IsChecked == true) {
+                members = Context.Members.Where(m => m.IsActive);
+            } else {
+                members = Context.Members.FromSqlRaw($"""
+                    SELECT m.*
+                    FROM member m
+                        INNER JOIN delivery d ON d.mgnr = m.mgnr
+                    WHERE d.year = {Year}
+                    GROUP BY m.mgnr
+                    """);
+            }
+
             if (OrderMgNrInput.IsChecked == true) {
                 members = members
                     .OrderBy(m => m.MgNr);