DeliveryAdminWindow: Add Liefermengen Excel output

Elwig/Helpers/AppDbContext.cs

@@ -67,7 +67,7 @@ namespace Elwig.Helpers {
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
-        public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<MemberDeliveryPerVarietyRowSingle> MemberDeliveryPerVariantRows { get; private set; }
         public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }

Elwig/Models/Dtos/MemberDeliveryData.cs

@@ -0,0 +1,59 @@
+using Elwig.Models.Entities;
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class MemberDeliveryData : DataTable<MemberDeliveryRow> {
+
+        private static readonly (string, string, string?, int?)[] FieldNames = [
+          ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("Weight", "Geliefert", "kg", 22),
+        ];
+
+        public MemberDeliveryData(IEnumerable<MemberDeliveryRow> rows, List<string> filterNames) :
+            base("Liefermengen Gesamt", "Liefermengen pro Mitglied", string.Join(" / ", filterNames), rows, FieldNames) {
+        }
+
+        public static async Task<MemberDeliveryData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
+            return new((await query
+                .GroupBy(p => new {
+                    p.Delivery.MgNr,
+                    p.Delivery.Member.Name,
+                    p.Delivery.Member.GivenName,
+                    p.Delivery.Member.Address,
+                    p.Delivery.Member.PostalDest.AtPlz!.Plz,
+                    Ort = p.Delivery.Member.PostalDest.AtPlz!.Ort.Name,
+                })
+                .Select(g => new {
+                    g.Key,
+                    Weight = g.Sum(p => p.Weight),
+                }).ToListAsync())
+                .Select(g => new MemberDeliveryRow {
+                    MgNr = g.Key.MgNr,
+                    Name1 = g.Key.Name,
+                    Name2 = g.Key.GivenName,
+                    Address = g.Key.Address,
+                    Plz = g.Key.Plz,
+                    Locality = g.Key.Ort,
+                    Weight = g.Weight,
+                }), filterNames);
+        }
+    }
+
+    public class MemberDeliveryRow {
+        public required int MgNr;
+        public required string Name1;
+        public required string? Name2;
+        public required string Address;
+        public required int Plz;
+        public required string Locality;
+        public required int Weight;
+    }
+}

Elwig/Models/Dtos/MemberDeliveryPerVarietyData.cs

@@ -1,13 +1,13 @@
+using Elwig.Models.Entities;
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    public class MemberDeliveryPerVarietyData : DataTable<MemberDeliveryPerVariantRow> {
+    public class MemberDeliveryPerVarietyData : DataTable<MemberDeliveryPerVarietyRow> {
 
-        private static readonly (string, string, string?, int)[] FieldNames = [
+        private static readonly (string, string, string?, int?)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
             ("Name1", "Name", null, 40),
             ("Name2", "Vorname", null, 40),
@@ -16,104 +16,63 @@ namespace Elwig.Models.Dtos {
             ("Locality", "Ort", null, 60),
             ("SortIds", "Sorte", null, 12),
             ("AttrIds", "Attribut", null, 16),
+            ("CultIds", "Bewirt.", null, 16),
             ("Weights", "Geliefert", "kg", 22),
-            ("Areas", "Fläche", "m²", 22),
-            ("Yields", "Ertrag", "kg/ha", 22),
         ];
 
-        public MemberDeliveryPerVarietyData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
+        public MemberDeliveryPerVarietyData(IEnumerable<MemberDeliveryPerVarietyRow> rows, List<string> filterNames) :
-            base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
+            base("Liefermengen pro Sorte", "Liefermengen pro Mitglied, Sorte, Attribut und Bewirtschaftungsart", string.Join(" / ", filterNames), rows, FieldNames) {
         }
 
-        public static async Task<MemberDeliveryPerVarietyData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+        public static async Task<MemberDeliveryPerVarietyData> FromQuery(IQueryable<DeliveryPart> query, List<string> filterNames) {
-            return new MemberDeliveryPerVarietyData(
+            return new((await query
-               (await FromDbSet(table, year)).GroupBy(
+                .GroupBy(p => new {
-                   r => r.MgNr,
+                    p.Delivery.MgNr,
-                   (k, g) => new MemberDeliveryPerVariantRow(g)
+                    p.Delivery.Member.Name,
-             ), year);
+                    p.Delivery.Member.GivenName,
-        }
+                    p.Delivery.Member.Address,
-
+                    p.Delivery.Member.PostalDest.AtPlz!.Plz,
-        private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+                    Ort = p.Delivery.Member.PostalDest.AtPlz!.Ort.Name,
-            return await table.FromSql($"""
+                    p.SortId,
-                    SELECT m.mgnr, m.name AS name_1,
+                    p.AttrId,
-                           COALESCE(m.prefix || ' ', '') || m.given_name ||
+                    p.CultId,
-                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                })
-                           p.plz, o.name AS ort, m.address,
+                .Select(g => new {
-                           v.bucket, v.weight, v.area
+                    g.Key,
-                    FROM (
+                    Weight = g.Sum(p => p.Weight),
-                            SELECT c.year AS year,
+                })
-                                   c.mgnr AS mgnr,
+                .ToListAsync()).GroupBy(g => new {
-                                   c.bucket AS bucket,
+                    g.Key.MgNr,
-                                   COALESCE(d.weight, 0) AS weight,
+                    g.Key.Name,
-                                   COALESCE(c.area, 0) AS area
+                    g.Key.GivenName,
-                            FROM v_area_commitment_bucket_strict c
+                    g.Key.Address,
-                                LEFT JOIN v_delivery_bucket_strict d ON (d.year, d.mgnr, d.bucket) = (c.year, c.mgnr, c.bucket)
+                    g.Key.Plz,
-                            WHERE c.year = {year}
+                    g.Key.Ort,
-                            UNION
+                }).Select(g => new MemberDeliveryPerVarietyRow {
-                            SELECT d.year,
+                    MgNr = g.Key.MgNr,
-                                   d.mgnr,
+                    Name1 = g.Key.Name,
-                                   d.bucket,
+                    Name2 = g.Key.GivenName,
-                                   COALESCE(d.weight, 0),
+                    Address = g.Key.Address,
-                                   COALESCE(c.area, 0)
+                    Plz = g.Key.Plz,
-                            FROM v_delivery_bucket_strict d
+                    Locality = g.Key.Ort,
-                                LEFT JOIN v_area_commitment_bucket_strict c ON (c.year, c.mgnr, c.bucket) = (d.year, d.mgnr, d.bucket)
+                    SortIds = [.. g.Select(d => d.Key.SortId)],
-                            WHERE d.year = {year}
+                    AttrIds = [.. g.Select(d => d.Key.AttrId)],
-                        ) v
+                    CultIds = [.. g.Select(d => d.Key.CultId)],
-                        LEFT JOIN member m ON m.mgnr = v.mgnr
+                    Weights = [.. g.Select(d => d.Weight)],
-                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                }), filterNames);
-                        LEFT JOIN AT_ort o ON o.okz = p.okz
-                    ORDER BY m.mgnr, v.bucket
-                    """).ToListAsync();
         }
     }
 
-    public class MemberDeliveryPerVariantRow {
+    public class MemberDeliveryPerVarietyRow {
-        public int MgNr;
+        public required int MgNr;
-        public string Name1;
+        public required string Name1;
-        public string? Name2;
+        public required string? Name2;
-        public string Address;
+        public required string Address;
-        public int Plz;
+        public required int Plz;
-        public string Locality;
+        public required string Locality;
-        public string[] SortIds;
+        public required string[] SortIds;
-        public string[] AttrIds;
+        public required string?[] AttrIds;
-        public int[] Areas;
+        public required string?[] CultIds;
-        public int[] Weights;
+        public required int[] Weights;
-        public int?[] Yields => Weights.Zip(Areas).Select(i => i.Second > 0 ? (int?)i.First * 10_000 / i.Second : null).ToArray();
-
-        public MemberDeliveryPerVariantRow(IEnumerable<MemberDeliveryPerVariantRowSingle> rows) {
-            var f = rows.First();
-            MgNr = f.MgNr;
-            Name1 = f.Name1;
-            Name2 = f.Name2;
-            Address = f.Address;
-            Plz = f.Plz;
-            Locality = f.Locality.Split(",")[0];
-            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
-            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
-            Areas = rows.Select(r => r.Area).ToArray();
-            Weights = rows.Select(r => r.Weight).ToArray();
-        }
-    }
-
-    [Keyless]
-    public class MemberDeliveryPerVariantRowSingle {
-        [Column("mgnr")]
-        public int MgNr { get; set; }
-        [Column("name_1")]
-        public required string Name1 { get; set; }
-        [Column("name_2")]
-        public string? Name2 { get; set; }
-        [Column("address")]
-        public required string Address { get; set; }
-        [Column("plz")]
-        public int Plz { get; set; }
-        [Column("ort")]
-        public required string Locality { get; set; }
-        [Column("bucket")]
-        public required string VtrgId { get; set; }
-        [Column("area")]
-        public int Area { get; set; }
-        [Column("weight")]
-        public int Weight { get; set; }
     }
 }

Elwig/Models/Dtos/MemberDeliveryYieldsPerVarietyData.cs

@@ -0,0 +1,119 @@
+using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Elwig.Models.Dtos {
+    public class MemberDeliveryYieldsPerVarietyData : DataTable<MemberDeliveryYieldsPerVarietyRow> {
+
+        private static readonly (string, string, string?, int)[] FieldNames = [
+            ("MgNr", "MgNr.", null, 12),
+            ("Name1", "Name", null, 40),
+            ("Name2", "Vorname", null, 40),
+            ("Address", "Adresse", null, 60),
+            ("Plz", "PLZ", null, 10),
+            ("Locality", "Ort", null, 60),
+            ("SortIds", "Sorte", null, 12),
+            ("AttrIds", "Attribut", null, 16),
+            ("Weights", "Geliefert", "kg", 22),
+            ("Areas", "Fläche", "m²", 22),
+            ("Yields", "Ertrag", "kg/ha", 22),
+        ];
+
+        public MemberDeliveryYieldsPerVarietyData(IEnumerable<MemberDeliveryYieldsPerVarietyRow> rows, int year) :
+            base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
+        }
+
+        public static async Task<MemberDeliveryYieldsPerVarietyData> ForSeason(DbSet<MemberDeliveryPerVarietyRowSingle> table, int year) {
+            return new MemberDeliveryYieldsPerVarietyData(
+               (await FromDbSet(table, year)).GroupBy(
+                   r => r.MgNr,
+                   (k, g) => new MemberDeliveryYieldsPerVarietyRow(g)
+             ), year);
+        }
+
+        private static async Task<IEnumerable<MemberDeliveryPerVarietyRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVarietyRowSingle> table, int year) {
+            return await table.FromSql($"""
+                    SELECT m.mgnr, m.name AS name_1,
+                           COALESCE(m.prefix || ' ', '') || m.given_name ||
+                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
+                           p.plz, o.name AS ort, m.address,
+                           v.bucket, v.weight, v.area
+                    FROM (
+                            SELECT c.year AS year,
+                                   c.mgnr AS mgnr,
+                                   c.bucket AS bucket,
+                                   COALESCE(d.weight, 0) AS weight,
+                                   COALESCE(c.area, 0) AS area
+                            FROM v_area_commitment_bucket_strict c
+                                LEFT JOIN v_delivery_bucket_strict d ON (d.year, d.mgnr, d.bucket) = (c.year, c.mgnr, c.bucket)
+                            WHERE c.year = {year}
+                            UNION
+                            SELECT d.year,
+                                   d.mgnr,
+                                   d.bucket,
+                                   COALESCE(d.weight, 0),
+                                   COALESCE(c.area, 0)
+                            FROM v_delivery_bucket_strict d
+                                LEFT JOIN v_area_commitment_bucket_strict c ON (c.year, c.mgnr, c.bucket) = (d.year, d.mgnr, d.bucket)
+                            WHERE d.year = {year}
+                        ) v
+                        LEFT JOIN member m ON m.mgnr = v.mgnr
+                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
+                        LEFT JOIN AT_ort o ON o.okz = p.okz
+                    ORDER BY m.mgnr, v.bucket
+                    """).ToListAsync();
+        }
+    }
+
+    public class MemberDeliveryYieldsPerVarietyRow {
+        public int MgNr;
+        public string Name1;
+        public string? Name2;
+        public string Address;
+        public int Plz;
+        public string Locality;
+        public string[] SortIds;
+        public string[] AttrIds;
+        public int[] Areas;
+        public int[] Weights;
+        public int?[] Yields => Weights.Zip(Areas).Select(i => i.Second > 0 ? (int?)i.First * 10_000 / i.Second : null).ToArray();
+
+        public MemberDeliveryYieldsPerVarietyRow(IEnumerable<MemberDeliveryPerVarietyRowSingle> rows) {
+            var f = rows.First();
+            MgNr = f.MgNr;
+            Name1 = f.Name1;
+            Name2 = f.Name2;
+            Address = f.Address;
+            Plz = f.Plz;
+            Locality = f.Locality.Split(",")[0];
+            SortIds = rows.Select(r => r.VtrgId[..2]).ToArray();
+            AttrIds = rows.Select(r => r.VtrgId[2..]).ToArray();
+            Areas = rows.Select(r => r.Area).ToArray();
+            Weights = rows.Select(r => r.Weight).ToArray();
+        }
+    }
+
+    [Keyless]
+    public class MemberDeliveryPerVarietyRowSingle {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+        [Column("name_1")]
+        public required string Name1 { get; set; }
+        [Column("name_2")]
+        public string? Name2 { get; set; }
+        [Column("address")]
+        public required string Address { get; set; }
+        [Column("plz")]
+        public int Plz { get; set; }
+        [Column("ort")]
+        public required string Locality { get; set; }
+        [Column("bucket")]
+        public required string VtrgId { get; set; }
+        [Column("area")]
+        public int Area { get; set; }
+        [Column("weight")]
+        public int Weight { get; set; }
+    }
+}

Elwig/Services/DeliveryService.cs

@@ -962,6 +962,52 @@ namespace Elwig.Services {
             }
         }
 
+        public static async Task GenerateDeliveryDataList(this DeliveryAdminViewModel vm, ExportSubject subject, ExportMode mode) {
+            using var ctx = new AppDbContext();
+            IQueryable<DeliveryPart> query;
+            List<string> filterNames = [];
+            if (subject == ExportSubject.FromFilters) {
+                var (f, _, q, _, _) = await vm.GetFilters(ctx);
+                query = q;
+                filterNames.AddRange(f);
+            } else if (subject == ExportSubject.FromSeason) {
+                var year = vm.FilterSeason ?? Utils.CurrentLastSeason;
+                query = ctx.DeliveryParts
+                    .Where(p => p.Year == year);
+                filterNames.Add($"{year}");
+            } else {
+                throw new ArgumentException("Invalid value for ExportSubject");
+            }
+
+            query = query
+                .OrderBy(p => p.Delivery.MgNr)
+                .ThenBy(p => p.SortId)
+                .ThenBy(p => p.AttrId)
+                .ThenBy(p => p.CultId);
+
+            var d = new SaveFileDialog() {
+                FileName = $"Liefermengen.ods",
+                DefaultExt = "ods",
+                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                Title = $"Liefermengen speichern unter - Elwig"
+            };
+            if (d.ShowDialog() == true) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ods = new OdsFile(d.FileName);
+                        var tblTotal = await MemberDeliveryData.FromQuery(query, filterNames);
+                        var tbl = await MemberDeliveryPerVarietyData.FromQuery(query, filterNames);
+                        await ods.AddTable(tblTotal);
+                        await ods.AddTable(tbl);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            }
+        }
+
         private static void AddToolTipCell(Grid grid, string text, int row, int col, int colSpan = 1, bool bold = false, bool alignRight = false, bool alignCenter = false) {
             var tb = new TextBlock() {
                 Text = text,

Elwig/Windows/DeliveryAdminWindow.xaml

@@ -129,6 +129,10 @@
                 <MenuItem x:Name="Menu_DeliveryDepreciationList_PrintSeason" Header="...von Saison drucken"
                           Click="Menu_DeliveryDepreciationList_PrintSeason_Click"/>
             </MenuItem>
+            <MenuItem Header="Liefermengen" x:Name="Menu_DeliveryDataList">
+                <MenuItem x:Name="Menu_DeliveryDataList_SaveFilters" Header="...aus Filtern speichern... (Excel)"
+                          Click="Menu_DeliveryDataList_SaveFilters_Click"/>
+            </MenuItem>
             <MenuItem Header="Statistik" x:Name="Menu_Statistics">
                 <MenuItem Header="Qualitätsstatistik..." x:Name="Menu_Statistics_WineQuality">
                     <MenuItem x:Name="Menu_Statistics_WineQuality_ShowFilters" Header="...aus Filtern anzeigen (PDF)"

Elwig/Windows/DeliveryAdminWindow.xaml.cs

@@ -260,7 +260,7 @@ namespace Elwig.Windows {
             await App.Client.UpdateValues();
         }
 
-        private async void Menu_Statistic_Locality_SaveFilters_Click(object sender, RoutedEventArgs evt)=>
+        private async void Menu_Statistic_Locality_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateLocalityStatistics(DeliveryService.ExportSubject.FromFilters);
 
         private async void Menu_DeliveryDepreciationList_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
@@ -280,6 +280,9 @@ namespace Elwig.Windows {
         private async void Menu_DeliveryDepreciationList_PrintSeason_Click(object sender, RoutedEventArgs evt) =>
             await ViewModel.GenerateDeliveryDepreciationList(DeliveryService.ExportSubject.FromSeason, ExportMode.Print);
 
+        private async void Menu_DeliveryDataList_SaveFilters_Click(object sender, RoutedEventArgs evt) =>
+            await ViewModel.GenerateDeliveryDataList(DeliveryService.ExportSubject.FromFilters, ExportMode.SaveList);
+
         private void Menu_Settings_EnableFreeEditing_Checked(object sender, RoutedEventArgs evt) {
             if (IsEditing || IsCreating) {
                 DateInput.IsReadOnly = false;

Elwig/Windows/MainWindow.xaml.cs

@@ -579,7 +579,7 @@ namespace Elwig.Windows {
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
-                    var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
+                    var tbl = await MemberDeliveryYieldsPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
                     using var ods = new OdsFile(d.FileName);
                     await ods.AddTable(tbl);
                 } catch (Exception exc) {