From 6ba2aa714304d451b236d3d4e697d59b27ab5217 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Mon, 25 Nov 2024 12:09:00 +0100 Subject: [PATCH] OverUnderDeliveryData: Fix absence of non-deliverers in list Bug was introduced by commit 9930e6173c772fe433ff69397205872ad30f6a08 and shipped with v0.10.6 (2024-08-30) --- Elwig/Models/Dtos/OverUnderDeliveryData.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Elwig/Models/Dtos/OverUnderDeliveryData.cs b/Elwig/Models/Dtos/OverUnderDeliveryData.cs index 0abd721..df7a5a4 100644 --- a/Elwig/Models/Dtos/OverUnderDeliveryData.cs +++ b/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 - LEFT JOIN member m ON m.mgnr = d.mgnr + FROM season s, member m 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 - ORDER BY 100.0 * sum / max_kg, m.mgnr; + GROUP BY s.year, m.mgnr + ORDER BY 100.0 * sum / max_kg, m.mgnr """).ToListAsync(); return new OverUnderDeliveryData(rows, year); }