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

SeasonFinishWindow: Fix Über-/Unterlieferungen export

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-11-02 20:51:08 +01:00
parent 1413f480cd
commit 12226c3d0f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Elwig/Windows/SeasonFinishWindow.xaml.cs
View File

@ -80,13 +80,14 @@ namespace Elwig.Windows {
using (var cmd = cnx.CreateCommand()) {
cmd.CommandText = $"""
SELECT m.mgnr, m.family_name, m.given_name, p.plz, o.name, m.address, m.business_shares,
m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_OBLIGATION') AS min_kg,
m.business_shares * (SELECT value FROM client_parameter WHERE param = 'DELIVERY_RIGHT') AS max_kg,
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 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 v_delivery d ON d.mgnr = m.mgnr AND d.year = {year}
LEFT JOIN season s ON s.year = {year}
LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
WHERE m.active = 1
GROUP BY d.year, m.mgnr
ORDER BY sum = 0 DESC, 100.0 * sum / max_kg, m.mgnr;
@ -97,7 +98,7 @@ namespace Elwig.Windows {
var familyName = reader.GetString(1);
var givenName = reader.GetString(2);
var plz = reader.GetInt32(3);
var ort = reader.GetString(4);
var ort = reader.GetString(4).Split(',')[0];
var addr = reader.GetString(5);
var ga = reader.GetInt32(6);
var minKg = reader.GetInt32(7);
@ -130,7 +131,7 @@ namespace Elwig.Windows {
var familyName = reader.GetString(1);
var givenName = reader.GetString(2);
var plz = reader.GetInt32(3);
var ort = reader.GetString(4);
var ort = reader.GetString(4).Split(',')[0];
var addr = reader.GetString(5);
var id = reader.GetString(6);
var minKg = reader.GetInt32(7);