OverUnderDeliveryData: Fix absence of non-deliverers in list

Bug was introduced by commit 9930e6173c772fe433ff69397205872ad30f6a08
and shipped with v0.10.6 (2024-08-30)

Elwig/Elwig.csproj

@@ -26,20 +26,20 @@
 
   <ItemGroup>
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-    <PackageReference Include="LinqKit" Version="1.3.0" />
+    <PackageReference Include="LinqKit" Version="1.3.6" />
     <PackageReference Include="MailKit" Version="4.8.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2792.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2849.39" />
     <PackageReference Include="NJsonSchema" Version="11.0.2" />
     <PackageReference Include="PdfiumViewer" Version="2.13.0" />
     <PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
     <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.45" />
-    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
+    <PackageReference Include="System.IO.Ports" Version="9.0.0" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0" />
   </ItemGroup>
 
 </Project>

Elwig/Models/Dtos/OverUnderDeliveryData.cs

@@ -33,14 +33,13 @@ namespace Elwig.Models.Dtos {
                        m.business_shares * s.min_kg_per_bs AS min_kg,
                        m.business_shares * s.max_kg_per_bs AS max_kg,
                        COALESCE(SUM(d.weight), 0) AS sum
-                FROM v_delivery d
+                FROM season s, member m
-                    LEFT JOIN member m ON m.mgnr = d.mgnr
                     LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                     LEFT JOIN AT_ort o ON o.okz = p.okz
-                    LEFT JOIN season s ON s.year = d.year
+                    LEFT JOIN v_delivery d ON (d.year, d.mgnr) = (s.year, m.mgnr)
                 WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
-                GROUP BY d.year, m.mgnr
+                GROUP BY s.year, m.mgnr
-                ORDER BY 100.0 * sum / max_kg, m.mgnr;
+                ORDER BY 100.0 * sum / max_kg, m.mgnr
                 """).ToListAsync();
             return new OverUnderDeliveryData(rows, year);
         }

Setup/Setup.wixproj

@@ -13,7 +13,7 @@
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\Installer\Installer.wixproj" />
-    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.1" />
+    <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.2" />
-    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.1" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="5.0.2" />
   </ItemGroup>
 </Project>

Tests/Tests.csproj

@@ -21,10 +21,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageReference Include="NReco.PdfRenderer" Version="1.5.4" />
+    <PackageReference Include="NReco.PdfRenderer" Version="1.6.0" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>