Bump version number

DeliveryAdminWindow: Add DeliveryJournal filter options
Bump version to 0.3.2
2023-09-28 14:06:47 +02:00 · 2023-09-19 19:31:02 +02:00 · 2023-09-19 16:29:34 +02:00 · 2023-09-19 02:11:30 +02:00 · 2023-09-19 00:57:59 +02:00 · 2023-09-19 00:47:10 +02:00
33 changed files with 656 additions and 208 deletions
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -11,6 +11,7 @@ using System.Windows.Threading;
 using System.Globalization;
 using System.Threading;
 using System.Windows.Markup;
+using System.Reflection;

 namespace Elwig {
    public partial class App : Application {
@@ -20,10 +21,23 @@ namespace Elwig {
        public static readonly string TempPath = Path.Combine(Path.GetTempPath(), "Elwig");
        public static readonly Config Config = new(DataPath + "config.ini");

+        public static int VersionMajor { get; private set; }
+        public static int VersionMinor { get; private set; }
+        public static int VersionPatch { get; private set; }
+        public static string Version {
+            get => $"{VersionMajor}.{VersionMinor}.{VersionPatch}";
+            private set {
+                var p = value.Split(".").Select(p => int.Parse(p.Trim())).ToArray();
+                VersionMajor = p.ElementAtOrDefault(0);
+                VersionMinor = p.ElementAtOrDefault(1);
+                VersionPatch = p.ElementAtOrDefault(2);
+            }
+        }
+
        public static string ZwstId { get; private set; }
        public static string BranchName { get; private set; }
        public static int? BranchPlz { get; private set; }
-        public static string? BranchOrt { get; private set; }
+        public static string? BranchLocation { get; private set; }
        public static string? BranchAddress { get; private set; }
        public static string? BranchPhoneNr { get; private set; }
        public static string? BranchFaxNr { get; private set; }
@@ -36,7 +50,7 @@ namespace Elwig {

        public App() : base() {
            System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-            Directory.CreateDirectory(App.TempPath);
+            Directory.CreateDirectory(TempPath);
            Directory.CreateDirectory(DataPath);
            MainDispatcher = Dispatcher;
            Scales = Array.Empty<IScale>();
@@ -56,15 +70,19 @@ namespace Elwig {
                new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag))
            );

-            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
-            using (var ctx = new AppDbContext()) {
+            Version = typeof(App).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "";
+
            try {
-                    if (!ctx.Database.CanConnect()) {
-                        MessageBox.Show($"Invalid Database:\n\n{Config.DatabaseFile}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
+                AppDbUpdater.CheckDb();
+            } catch (Exception e) {
+                MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
                Shutdown();
                return;
-                    } else {
-                        branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Dest, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
+            }
+
+            Dictionary<string, (string, string, int?, string?, string?, string?, string?, string?)> branches = new();
+            using (var ctx = new AppDbContext()) {
+                branches = ctx.Branches.ToDictionary(b => b.Name.ToLower(), b => (b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr));
                try {
                    Client = new(ctx);
                } catch (Exception e) {
@@ -73,12 +91,7 @@ namespace Elwig {
                    return;
                }
            }
-                } catch (Exception e) {
-                    MessageBox.Show($"Invalid Database:\n\n{e.Message}", "Invalid Database", MessageBoxButton.OK, MessageBoxImage.Error);
-                    Shutdown();
-                    return;
-                }
-            }
+
            Utils.RunBackground("HTML Initialization", () => Documents.Html.Init(PrintingReadyChanged));
            Utils.RunBackground("PDF Initialization", () => Documents.Pdf.Init(PrintingReadyChanged));

@@ -114,7 +127,7 @@ namespace Elwig {
                    ZwstId = entry.Item1;
                    BranchName = entry.Item2;
                    BranchPlz = entry.Item3;
-                    BranchOrt = entry.Item4;
+                    BranchLocation = entry.Item4;
                    BranchAddress = entry.Item5;
                    BranchPhoneNr = entry.Item6;
                    BranchFaxNr = entry.Item7;
@@ -125,7 +138,7 @@ namespace Elwig {
                ZwstId = entry.Item1;
                BranchName = entry.Item2;
                BranchPlz = entry.Item3;
-                BranchOrt = entry.Item4;
+                BranchLocation = entry.Item4;
                BranchAddress = entry.Item5;
                BranchPhoneNr = entry.Item6;
                BranchFaxNr = entry.Item7;
--- a/Elwig/Documents/BusinessDocument.cshtml
+++ b/Elwig/Documents/BusinessDocument.cshtml
@@ -14,5 +14,8 @@
        <address>@Model.Address</address>
    </div>
    <aside>@Raw(Model.Aside)</aside>
+    @if (Model.ShowDateAndLocation) {
+        <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
+    }
 </div>
@RenderBody()
--- a/Elwig/Documents/BusinessDocument.cshtml.cs
+++ b/Elwig/Documents/BusinessDocument.cshtml.cs
@@ -3,6 +3,8 @@ using Elwig.Models;
 namespace Elwig.Documents {
    public abstract class BusinessDocument : Document {

+        public bool ShowDateAndLocation = false;
+
        public Member Member;
        public bool IncludeSender = false;
        public bool UseBillingAddress = false;
@@ -11,7 +13,7 @@ namespace Elwig.Documents {

        public BusinessDocument(string title, Member m, bool includeSender = false) : base(title) {
            Member = m;
-            Location = App.BranchName;
+            Location = App.BranchLocation;
            IncludeSender = includeSender;
            var uid = (m.UstIdNr ?? "-") + (m.IsBuchführend ? "" : " <i>(pauschaliert)</i>");
            Aside = $"<table><colgroup><col span='1' style='width: 22.5mm;'/><col span='1' style='width: 42.5mm;'/></colgroup>" +
--- a/Elwig/Documents/CreditNote.cshtml
+++ b/Elwig/Documents/CreditNote.cshtml
@@ -7,7 +7,6 @@
    var bucketNum = Model.BucketNames.Length;
 }
 <main>
-    <div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
    <h1>@Model.Title</h1>
    <table class="credit">
        <colgroup>
--- a/Elwig/Documents/CreditNote.cshtml.cs
+++ b/Elwig/Documents/CreditNote.cshtml.cs
@@ -16,6 +16,7 @@ namespace Elwig.Documents {

        public CreditNote(Credit c, AppDbContext ctx) : base($"Traubengutschrift Nr. {c.TgId} – {c.Payment.Variant.Name}", c.Member) {
            UseBillingAddress = true;
+            ShowDateAndLocation = true;
            Credit = c;
            Aside = Aside.Replace("</table>", "") +
                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
--- a/Elwig/Documents/DeliveryJournal.cshtml
+++ b/Elwig/Documents/DeliveryJournal.cshtml
@@ -0,0 +1,67 @@
+@using RazorLight
+@inherits TemplatePage<Elwig.Documents.DeliveryJournal>
+@model Elwig.Documents.DeliveryJournal
+@{ Layout = "Document"; }
+<link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliveryjournal.css"/>
+<main>
+    <h1>Lieferjournal</h1>
+    <h2>@Model.Filter</h2>
+    <table class="journal">
+        <colgroup>
+            <col style="width: 25mm;"/>
+            <col style="width: 5mm;"/>
+            <col style="width: 17mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 8mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 28mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 10mm;"/>
+            <col style="width: 14mm;"/>
+        </colgroup>
+        <thead>
+            <tr>
+                <th rowspan="2" style="text-align: left;">Lieferschein-Nr.</th>
+                <th rowspan="2">Pos.</th>
+                <th rowspan="2">Datum</th>
+                <th rowspan="2">Zeit</th>
+                <th colspan="2" rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th colspan="2">Gradation</th>
+                <th>Gewicht</th>
+            </tr>
+            <tr>
+                <th>[°Oe]</th>
+                <th>[°KMW]</th>
+                <th>[kg]</th>
+            </tr>
+        </thead>
+        <tbody>
+            @foreach (var p in Model.Deliveries) {
+                <tr>
+                    <td>@p.Delivery.LsNr</td>
+                    <td>@p.DPNr</td>
+                    <td>@($"{p.Delivery.Date:dd.MM.yyyy}")</td>
+                    <td>@($"{p.Delivery.Time:HH:mm}")</td>
+                    <td class="mgnr">@p.Delivery.Member.MgNr</td>
+                    <td>@p.Delivery.Member.AdministrativeName</td>
+                    <td>@p.Variant.Name</td>
+                    <td class="grad">@($"{p.Oe:N0}")</td>
+                    <td class="grad">@($"{p.Kmw:N1}")</td>
+                    <td class="weight">@($"{p.Weight:N0}")</td>
+                </tr>
+            }
+            <tr class="sum">
+                @{
+                    var kmw = Elwig.Helpers.Utils.AggregateDeliveryPartsKmw(Model.Deliveries);
+                    var oe = Elwig.Helpers.Utils.KmwToOe(kmw);
+                }
+                <td colspan="2">Gesamt:</td>
+                <td colspan="5">(Teil-)Lieferungen: @($"{Model.Deliveries.DistinctBy(p => p.Delivery).Count():N0}") (@($"{Model.Deliveries.Count():N0}"))</td>
+                <td class="grad">@($"{oe:N0}")</td>
+                <td class="grad">@($"{kmw:N1}")</td>
+                <td class="weight">@($"{Model.Deliveries.Sum(p => p.Weight):N0}")</td>
+            </tr>
+        </tbody>
+    </table>
+</main>
--- a/Elwig/Documents/DeliveryJournal.cshtml.cs
+++ b/Elwig/Documents/DeliveryJournal.cshtml.cs
@@ -0,0 +1,25 @@
+using Elwig.Helpers;
+using Elwig.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Elwig.Documents {
+    public class DeliveryJournal : Document {
+
+        public string Filter;
+        public IEnumerable<DeliveryPart> Deliveries;
+
+        public DeliveryJournal(string filter, IEnumerable<DeliveryPart> deliveries) : base($"Lieferjournal {filter}") {
+            Filter = filter;
+            Deliveries = deliveries;
+        }
+
+        public DeliveryJournal(AppDbContext ctx, DateOnly date) :
+            this(date.ToString("dd.MM.yyyy"), ctx.DeliveryParts
+                .Where(p => p.Delivery.DateString == date.ToString("yyy-MM-dd"))
+                .OrderBy(p => p.Delivery.LsNr)
+                .ThenBy(p => p.DPNr)
+                .ToList()) { }
+    }
+}
--- a/Elwig/Documents/DeliveryNote.cshtml
+++ b/Elwig/Documents/DeliveryNote.cshtml
@@ -4,7 +4,6 @@
@{ Layout = "BusinessDocument"; }
 <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-deliverynote.css" />
 <main>
-<div class="date">@Model.Location, am @($"{Model.Date:dd.MM.yyyy}")</div>
 <h1>@Model.Title</h1>
@{
    bool displayStats = true;  // Model.Delivery.Year == Model.CurrentNextSeason
@@ -91,7 +90,8 @@
                }
            }
            <tr><td></td><td colspan="5">
-                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}") (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))
+                @Raw(part.ManualWeighing ? "<i>Handwiegung</i>" : $"<i>Waage:</i> {part.ScaleId ?? "?"}, <i>ID:</i> {part.WeighingId ?? "?"}")
+                (@(part.IsGerebelt ? "gerebelt gewogen" : "nicht gerebelt gewogen"))@Raw(part.WeighingReason != null ? $", <i>Begründung:</i>" : "") @part.WeighingReason
            </td></tr>
            @if (part.Comment != null) {
                <tr><td></td><td colspan="5"><i>Anmerkung:</i> @part.Comment</td></tr>
@@ -127,7 +127,7 @@
            </colgroup>
            <thead>
                <tr>
-                    <th><b>Gesamtlieferung</b> [kg]</th>
+                    <th><b>Lese @Model.Delivery.Year</b> per @($"{Model.Date:dd.MM.yyyy}") [kg]</th>
                    <th>Lieferpflicht</th>
                    <th>Lieferrecht</th>
                    <th>Unterliefert</th>
@@ -147,13 +147,14 @@
                            $"<td>{sum:N0}</td>";
                    }
                    var sortids = Model.Delivery.Parts.Select(p => p.SortId).ToList();
+                    var buckets = Model.MemberBuckets.GroupBy(b => b.Item1[..2]).ToDictionary(g => g.Key, g => g.Count());
                }
                <tr>
-                    <th>Geschäftsanteile</th>
+                    <th>Gesamtlieferung</th>
                    @Raw(FormatRow(Model.Member.DeliveryObligation, Model.Member.DeliveryRight, Model.Member.Deliveries.Where(d => d.Year == Model.Delivery.Year).Sum(d => d.Weight)))
                </tr>
                @foreach (var (id, name, right, obligation, sum) in Model.MemberBuckets.OrderBy(b => b.Item1)) {
-                    if (right > 0 && obligation > 0) {
+                    if (right > 0 || obligation > 0 || (sum > 0 && buckets[id[..2]] > 1 && !id.EndsWith('_'))) {
                        <tr class="@(sortids.Contains(id[..2]) ? "" : "optional")">
                            <th>@name</th>
                            @Raw(FormatRow(obligation, right, sum))
--- a/Elwig/Documents/DeliveryNote.cshtml.cs
+++ b/Elwig/Documents/DeliveryNote.cshtml.cs
@@ -11,6 +11,7 @@ namespace Elwig.Documents {

        public DeliveryNote(Delivery d, AppDbContext ctx) : base($"Traubenübernahmeschein Nr. {d.LsNr}", d.Member) {
            UseBillingAddress = true;
+            ShowDateAndLocation = true;
            Delivery = d;
            Aside = Aside.Replace("</table>", "") +
                $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
--- a/Elwig/Documents/Document.cshtml
+++ b/Elwig/Documents/Document.cshtml
@@ -18,12 +18,14 @@
    <link rel="stylesheet" href="file:///@Raw(Model.DataPath)\resources\style-page.css"/>
 </head>
 <body>
+    @if (Model.ShowFoldMarks) {
        <div class="m1"></div>
        <div class="m2"></div>
        <div class="m3"></div>
        <div class="m1 r"></div>
        <div class="m2 r"></div>
        <div class="m3 r"></div>
+    }
    <div class="footer-wrapper">
        <div class="pre-footer">
            <span class="date">@($"{Model.Date:dddd, d. MMMM yyyy}")</span>
--- a/Elwig/Documents/Document.cshtml.cs
+++ b/Elwig/Documents/Document.cshtml.cs
@@ -8,6 +8,8 @@ namespace Elwig.Documents {

        private TempFile? PdfFile = null;

+        public bool ShowFoldMarks = App.Config.Debug;
+
        public string DataPath;
        public int CurrentNextSeason;
        public string? DocumentId;
@@ -22,8 +24,8 @@ namespace Elwig.Documents {
            DataPath = App.DataPath;
            CurrentNextSeason = Utils.CurrentNextSeason;
            Title = title;
-            Author = App.Client.NameFull;
-            Header = $"<h1>{c.Name}</h1>";
+            Author = c.NameFull;
+            Header = $"<div class='name'>{c.Name}</div><div class='suffix'>{c.NameSuffix}</div>";
            Footer = Utils.GenerateFooter("<br/>", " \u00b7 ")
                .Item(c.NameFull).NextLine()
                .Item(c.Address).Item($"{c.Plz} {c.Ort}").Item("Österreich").Item("Tel.", c.PhoneNr).Item("Fax", c.FaxNr).NextLine()
@@ -51,6 +53,8 @@ namespace Elwig.Documents {
                name = "DeliveryNote";
            } else if (this is CreditNote) {
                name = "CreditNote";
+            } else if (this is DeliveryJournal) {
+                name = "DeliveryJournal";
            } else {
                throw new InvalidOperationException("Invalid document object");
            }
--- a/Elwig/Documents/Html.cs
+++ b/Elwig/Documents/Html.cs
@@ -19,6 +19,7 @@ namespace Elwig.Documents {
            await e.CompileTemplateAsync("BusinessLetter");
            await e.CompileTemplateAsync("DeliveryNote");
            await e.CompileTemplateAsync("CreditNote");
+            await e.CompileTemplateAsync("DeliveryJournal");

            Engine = e;
            evtHandler();
--- a/Elwig/Documents/style-businessdocument.css
+++ b/Elwig/Documents/style-businessdocument.css
@@ -14,6 +14,13 @@
    position: relative;
 }

+.info-wrapper .date {
+    text-align: right;
+    position: absolute;
+    right: 0;
+    bottom: -1.5em;
+}
+
 .address-wrapper {
    height: 45mm;
    width: 85mm;
@@ -68,6 +75,14 @@ aside table tbody td {
    font-size: 10pt;
 }

+aside table tbody th {
+    padding: 0.25mm 0.5mm 0.25mm 1mm;
+}
+
+aside table tbody td {
+    padding: 0.25mm 0;
+}
+
 aside table tbody th {
    font-weight: normal;
 }
@@ -80,7 +95,7 @@ main > *:first-child {
    margin-top: 0;
 }

-.main-wrapper h1, .main-wrapper p {
+main h1, .main-wrapper p {
    font-size: 12pt;
    margin: 1em 0;
    text-align: justify;
@@ -92,12 +107,8 @@ main > *:first-child {
    hyphens: manual;
 }

-.main-wrapper .date {
-    margin-bottom: 2em;
-    text-align: right;
-}
-
-.main-wrapper h1 {
+main h1 {
+    margin-top: 0;
    margin-bottom: 2em;
 }

--- a/Elwig/Documents/style-deliveryjournal.css
+++ b/Elwig/Documents/style-deliveryjournal.css
@@ -0,0 +1,47 @@
+
+h1 {
+    text-align: center;
+    font-size: 24pt;
+    margin-bottom: 2mm;
+}
+
+h2 {
+    text-align: center;
+    font-size: 14pt;
+    margin-top: 2mm;
+}
+
+table.journal {
+    font-size: 10pt;
+}
+
+table.journal thead {
+    font-size: 8pt;
+}
+
+table.journal th {
+    font-weight: normal;
+    font-style: italic;
+}
+
+table.journal td {
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+table.journal .mgnr,
+table.journal .weight {
+    text-align: right;
+}
+
+table.journal .grad {
+    text-align: center;
+}
+
+table.journal tr.sum {
+    font-weight: bold;
+}
+
+table.journal tr.sum td {
+    border-top: 0.5pt solid black;
+}
--- a/Elwig/Documents/style-deliverynote.css
+++ b/Elwig/Documents/style-deliverynote.css
@@ -1,4 +1,8 @@

+main h1 {
+    margin-bottom: 1.5em !important;
+}
+
 table.delivery {
    margin-bottom: 5mm;
 }
--- a/Elwig/Documents/style.css
+++ b/Elwig/Documents/style.css
@@ -29,7 +29,7 @@ table th {

 header {
    height: 45mm;
-    padding: 5mm;
+    padding: 10mm 0 0 0;
    position: absolute;
    top: -25mm;
    left: 0;
@@ -38,9 +38,15 @@ header {
    overflow: hidden;
 }

-header h1 {
+header .name {
    font-size: 18pt;
    margin-top: 10mm;
+    font-weight: bold;
+}
+
+header .suffix {
+    font-size: 12pt;
+    font-weight: bold;
 }

 .footer-wrapper {
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>elwig.ico</ApplicationIcon>
-    <Version>0.2.0</Version>
+    <Version>0.3.3</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
  </PropertyGroup>

@@ -19,9 +19,9 @@
    <PackageReference Include="Balbarak.WeasyPrint" Version="2.0.2" />
    <PackageReference Include="Extended.Wpf.Toolkit" Version="4.5.1" />
    <PackageReference Include="ini-parser" Version="2.5.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.21" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.22" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.11" />
    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1938.49" />
    <PackageReference Include="RazorLight" Version="2.3.1" />
    <PackageReference Include="ScottPlot.WPF" Version="4.1.67" />
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@@ -0,0 +1,85 @@
+using Microsoft.Data.Sqlite;
+using System;
+
+namespace Elwig.Helpers {
+    public static class AppDbUpdater {
+
+        public static readonly int RequiredSchemaVersion = 2;
+
+        private static int _versionOffset = 0;
+        private static readonly Action<SqliteConnection>[] _updaters = new[] {
+            UpdateDbSchema_1_To_2, UpdateDbSchema_2_To_3
+        };
+
+        private static void ExecuteNonQuery(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            cmd.ExecuteNonQuery();
+        }
+
+        private static object? ExecuteScalar(SqliteConnection cnx, string sql) {
+            using var cmd = cnx.CreateCommand();
+            cmd.CommandText = sql;
+            return cmd.ExecuteScalar();
+        }
+
+        public static string CheckDb() {
+            using var cnx = AppDbContext.Connect();
+
+            var applId = (long?)ExecuteScalar(cnx, "PRAGMA application_id") ?? 0;
+            if (applId != 0x454C5747) throw new Exception("Invalid application_id of database");
+
+            var schemaVers = (long?)ExecuteScalar(cnx, "PRAGMA schema_version") ?? 0;
+            _versionOffset = (int)(schemaVers % 100);
+            if (_versionOffset != 0) {
+                // schema was modified manually/externally
+                // TODO issue warning
+            }
+            UpdateDbSchema(cnx, (int)(schemaVers / 100), RequiredSchemaVersion);
+
+            var userVers = (long?)ExecuteScalar(cnx, "PRAGMA user_version") ?? 0;
+            var major = userVers >> 24;
+            var minor = (userVers >> 16) & 0xFF;
+            var patch = userVers & 0xFFFF;
+
+            if (App.VersionMajor > major ||
+                (App.VersionMajor == major && App.VersionMinor > minor) ||
+                (App.VersionMajor == major && App.VersionMinor == minor && App.VersionPatch > patch))
+            {
+                long vers = (App.VersionMajor << 24) | (App.VersionMinor << 16) | App.VersionPatch;
+                ExecuteNonQuery(cnx, $"PRAGMA user_version = {vers}");
+            }
+
+            return $"{major}.{minor}.{patch}";
+        }
+
+        private static void UpdateDbSchema(SqliteConnection cnx, int fromVersion, int toVersion) {
+            if (fromVersion == toVersion) {
+                return;
+            } else if (fromVersion > toVersion) {
+                throw new Exception("schema_version of database is too new");
+            } else if (toVersion - 1 > _updaters.Length) {
+                throw new Exception("Unable to update database schema: Updater not implemented");
+            } else if (fromVersion <= 0) {
+                throw new Exception("schema_version of database is invalid");
+            }
+
+            ExecuteNonQuery(cnx, "PRAGMA locking_mode = EXCLUSIVE");
+            ExecuteNonQuery(cnx, "BEGIN EXCLUSIVE");
+            for (int i = fromVersion; i < toVersion; i++) {
+                _updaters[i - 1](cnx);
+            }
+            ExecuteNonQuery(cnx, "COMMIT");
+            ExecuteNonQuery(cnx, "VACUUM");
+            ExecuteNonQuery(cnx, $"PRAGMA schema_version = {toVersion * 100 + _versionOffset}");
+        }
+
+        private static void UpdateDbSchema_1_To_2(SqliteConnection cnx) {
+            ExecuteNonQuery(cnx, "DROP VIEW v_area_commitment");
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part DROP COLUMN weighing_reason");
+            ExecuteNonQuery(cnx, "ALTER TABLE delivery_part ADD COLUMN weighing_reason TEXT CHECK(NOT (manual_weighing = FALSE AND weighing_reason IS NOT NULL))");
+        }
+
+        private static void UpdateDbSchema_2_To_3(SqliteConnection cnx) { }
+    }
+}
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@@ -193,28 +193,27 @@ namespace Elwig.Helpers {
            if (!searchKeywords.Any())
                return 0;

-            return words
-                .Select(w => {
+            return searchKeywords
+                .Select(k => {
+                    k = k.ToLower();
+                    var scores = words.Select(w => {
                        w = w?.ToLower();
                        var p = w?.ToLower()?.Split(" ");
-                    if (w == null || p == null)
+                        if (w == null || p == null) {
                            return 0;
-
-                    var t1 = searchKeywords.Where(f => w == f).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t2 = searchKeywords.Where(f => p.Any(a => a == f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t3 = searchKeywords.Where(f => p.Any(a => a.StartsWith(f))).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    var t4 = searchKeywords.Where(f => w.Contains(f)).Select(f => f.Length).OrderDescending().FirstOrDefault(0);
-                    if (t1 > 0) {
-                        return 4 + t1;
-                    } else if (t2 > 0) {
-                        return 3 + t2;
-                    } else if (t3 > 0) {
-                        return 2 + t3;
-                    } else if (t4 > 0) {
-                        return 1 + t4;
+                        } else if (k == w) {
+                            return 4 + k.Length;
+                        } else if (p.Any(a => a == k)) {
+                            return 3 + k.Length;
+                        } else if (p.Any(a => a.StartsWith(k))) {
+                            return 2 + k.Length;
+                        } else if (w.Contains(k)) {
+                            return 1 + k.Length;
                        } else {
                            return 0;
                        }
+                    });
+                    return scores.Max() + scores.Count(s => s > 0);
                })
                .Sum();
        }
--- a/Elwig/Helpers/Validator.cs
+++ b/Elwig/Helpers/Validator.cs
@@ -70,9 +70,9 @@ namespace Elwig.Helpers {
            for (int i = 0; i < input.Text.Length; i++) {
                char ch = input.Text[i];
                if (char.IsAsciiDigit(ch)) {
-                    if (v2 == -1 && v1 < maxLen) {
+                    if (v2 == -1 && (maxLen == -1 || v1 < maxLen)) {
                        text += ch; v1++;
-                    } else if (v2 != -1 && v2 < maxDecimal) {
+                    } else if (v2 != -1 && (maxDecimal == -1 || v2 < maxDecimal)) {
                        text += ch; v2++;
                    }
                } else if (v2 == 0-1 && ch == ',' || ch == '.') {
--- a/Elwig/Models/DeliveryPart.cs
+++ b/Elwig/Models/DeliveryPart.cs
@@ -87,6 +87,9 @@ namespace Elwig.Models {
        [Column("weighing_id")]
        public string? WeighingId { get; set; }

+        [Column("weighing_reason")]
+        public string? WeighingReason { get; set; }
+
        [Column("comment")]
        public string? Comment { get; set; }

--- a/Elwig/Models/Member.cs
+++ b/Elwig/Models/Member.cs
@@ -128,9 +128,6 @@ namespace Elwig.Models {
        [Column("address")]
        public string Address { get; set; }

-        [Column("email")]
-        public string? Email { get; set; }
-
        [Column("default_kgnr")]
        public int? DefaultKgNr { get; set; }

@@ -174,6 +171,9 @@ namespace Elwig.Models {
        [InverseProperty("Member")]
        public virtual ISet<MemberTelNr> TelephoneNumbers { get; private set; }

+        [InverseProperty("member")]
+        public virtual ISet<MemberEmailAddr> EmailAddresses { get; private set; }
+
        public string FullAddress => $"{Address}, {PostalDest.AtPlz.Plz} {PostalDest.AtPlz.Ort.Name}";

        public int DeliveryRight => BusinessShares * App.Client.DeliveryRight;
--- a/Elwig/Models/MemberEmailAddr.cs
+++ b/Elwig/Models/MemberEmailAddr.cs
@@ -0,0 +1,22 @@
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Elwig.Models {
+    [Table("member_email_address"), PrimaryKey("MgNr", "Nr")]
+    public class MemberEmailAddr {
+        [Column("mgnr")]
+        public int MgNr { get; set; }
+
+        [Column("nr")]
+        public int Nr { get; set; }
+
+        [Column("address")]
+        public string Address { get; set; }
+
+        [Column("comment")]
+        public string? Comment { get; set; }
+
+        [ForeignKey("MgNr")]
+        public virtual Member Member { get; private set; }
+    }
+}
--- a/Elwig/Windows/AdministrationWindow.cs
+++ b/Elwig/Windows/AdministrationWindow.cs
@@ -16,20 +16,20 @@ namespace Elwig.Windows {
        protected Control[] ExemptInputs { private get; set; }
        protected Control[] RequiredInputs { private get; set; }

-        private bool _IsEditing;
-        private bool _IsCreating;
+        private bool _isEditing;
+        private bool _isCreating;
        protected bool IsEditing {
-            get { return _IsEditing; }
+            get { return _isEditing; }
            set {
-                _IsEditing = value;
-                LockContext = IsEditing;
+                _isEditing = value;
+                LockContext = IsEditing || IsCreating;
            }
        }
        protected bool IsCreating {
-            get { return _IsCreating; }
+            get { return _isCreating; }
            set {
-                _IsCreating = value;
-                LockContext = IsEditing;
+                _isCreating = value;
+                LockContext = IsEditing || IsCreating;
            }
        }
        protected bool DoShowWarningWindows = true;
@@ -99,7 +99,7 @@ namespace Elwig.Windows {

        abstract protected void UpdateButtons();

-        protected override async Task RenewContext() {
+        protected override async Task OnRenewContext() {
            for (int i = 0; i < PlzInputs.Length; i++)
                UpdatePlz(PlzInputs[i], PlzOrtInputs[i]);
        }
@@ -462,6 +462,10 @@ namespace Elwig.Windows {
            InputTextChanged((TextBox)sender, Validator.CheckInteger);
        }

+        protected void DecimalInput_TextChanged(object sender, RoutedEventArgs evt) {
+            InputTextChanged((TextBox)sender, Validator.CheckDecimal);
+        }
+
        protected void PartialDateInput_TextChanged(object sender, RoutedEventArgs evt) {
            InputTextChanged((TextBox)sender, Validator.CheckPartialDate);
        }
--- a/Elwig/Windows/AreaComAdminWindow.xaml
+++ b/Elwig/Windows/AreaComAdminWindow.xaml
@@ -131,6 +131,10 @@
                <Label Content="Bewirt.-Art:" Margin="10,100,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
                <ComboBox x:Name="WineCultivationInput" DisplayMemberPath="Name" TextSearch.TextPath="Name"
                          HorizontalAlignment="Stretch" Margin="0,100,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
+
+                <Label Content="Anmerkung:" Margin="10,130,0,0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                <TextBox x:Name="CommentInput" TextChanged="TextBox_TextChanged"
+                         HorizontalAlignment="Stretch" Margin="0,130,10,0" Grid.Column="1" Grid.ColumnSpan="3"/>
            </Grid>
        </GroupBox>

--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@@ -40,11 +40,8 @@ namespace Elwig.Windows {

        private async Task RefreshAreaCommitmentListQuery() {
            List<AreaCom> areaComs = await Context.AreaCommitments.Where(a => a.MgNr == Member.MgNr).OrderBy(a => a.FbNr).ToListAsync();
-
-            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr);
-            if (areaComs.Count == 1)
-                AreaCommitmentList.SelectedIndex = 0;
-
+            ControlUtils.RenewItemsSource(AreaCommitmentList, areaComs, i => (i as AreaCom)?.FbNr,
+                AreaCommitmentList_SelectionChanged, ControlUtils.RenewSourceDefault.None);
            RefreshInputs();
        }

@@ -82,6 +79,8 @@ namespace Elwig.Windows {
            AreaComTypeInput.SelectedItem = a.AreaComType;
            WineCultivationInput.SelectedItem = a.WineCult;

+            CommentInput.Text = a.Comment;
+
            FinishInputFilling();
        }

@@ -96,8 +95,8 @@ namespace Elwig.Windows {
            ValidateRequiredInputs();
        }

-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
            ControlUtils.RenewItemsSource(KgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
            ControlUtils.RenewItemsSource(AreaComTypeInput, await Context.AreaCommitmentTypes.OrderBy(v => v.VtrgId).ToListAsync(), i => (i as AreaComType)?.VtrgId);
            ControlUtils.RenewItemsSource(WineCultivationInput, await Context.WineCultivations.OrderBy(c => c.Name).ToListAsync(), i => (i as WineCult)?.CultId);
@@ -151,6 +150,7 @@ namespace Elwig.Windows {
            a.Area = int.Parse(AreaInput.Text);
            a.VtrgId = (AreaComTypeInput.SelectedItem as AreaComType)?.VtrgId;
            a.CultId = (WineCultivationInput.SelectedItem as WineCult)?.CultId;
+            a.Comment = (CommentInput.Text == "") ? null : CommentInput.Text;

            EntityEntry<AreaCom>? tr = null;
            try {
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@@ -52,8 +52,8 @@ namespace Elwig.Windows {
            FillInputs(App.Client);
        }

-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
            ControlUtils.RenewItemsSource(SeasonList, await Context.Seasons.OrderByDescending(s => s.Year).ToListAsync(), s => (s as Season)?.Year, null, ControlUtils.RenewSourceDefault.First);
            var year = (SeasonList.SelectedItem as Season)?.Year;
            ControlUtils.RenewItemsSource(SeasonModifierList, await Context.Modifiers.Where(m => m.Year == year).OrderBy(m => m.Ordering).ToListAsync(), m => (m as Modifier)?.ModId);
@@ -117,6 +117,7 @@ namespace Elwig.Windows {
            await Context.SaveChangesAsync();

            foreach (var mod in ModifierList.Where(m => !ModifierIds.ContainsKey(m))) {
+                if (mod.ModId == null) continue;
                await Context.AddAsync(mod);
            }
            await Context.SaveChangesAsync();
@@ -321,6 +322,7 @@ namespace Elwig.Windows {
        }

        private void SeasonModifierRelInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod) return;
            ModifiersChanged = ModifiersChanged || (SeasonModifierRelInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Rel?.ToString() ?? "");
            if (ModifierUpdate) return;
@@ -331,11 +333,13 @@ namespace Elwig.Windows {
        }

        private void SeasonModifierAbsInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod) return;
+            // DecimalInput_TextChanged(sender, evt); FIXME '-' is ignored
+            if ((!IsEditing && !IsCreating) || SeasonModifierList.SelectedItem is not Modifier mod || SeasonList.SelectedItem is not Season s) return;
            ModifiersChanged = ModifiersChanged || (SeasonModifierAbsInput.Text ?? "") != ((SeasonModifierList.SelectedItem as Modifier)?.Abs?.ToString() ?? "");
            if (ModifierUpdate) return;
-            mod.Abs = decimal.TryParse(SeasonModifierAbsInput.Text, out var v) ? v : null;
-            if (mod.Abs != null) SeasonModifierRelInput.Text = "";
+            // FIXME ValueStr does not work in ModifierList when modifier is newly created
+            mod.AbsValue = decimal.TryParse(SeasonModifierAbsInput.Text, out var v) ? Utils.DecToDb(v, s.Precision) : null;
+            if (mod.AbsValue != null) SeasonModifierRelInput.Text = "";
            CollectionViewSource.GetDefaultView(ModifierList).Refresh();
            UpdateButtons();
        }
--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@@ -214,8 +214,8 @@ namespace Elwig.Windows {
            FinishInputFilling();
        }

-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
            await RefreshGraphList();
        }

--- a/Elwig/Windows/ContextWindow.cs
+++ b/Elwig/Windows/ContextWindow.cs
@@ -7,30 +7,32 @@ using System.Windows.Threading;
 namespace Elwig.Windows {
    public abstract class ContextWindow : Window {

+        public static readonly int RenewSec = 10;
+
        protected AppDbContext Context { get; private set; }
        protected bool LockContext { get; set; } = false;

-        private readonly DispatcherTimer ContextRenewTimer;
-        private static readonly int ContextRenewSec = 10;
+        private readonly DispatcherTimer _timer;
+        private bool _renewPending = false;

        public ContextWindow() : base() {
-            ContextRenewTimer = new DispatcherTimer();
-            ContextRenewTimer.Tick += new EventHandler(OnRenewContext);
-            ContextRenewTimer.Interval = new TimeSpan(0, 0, ContextRenewSec);
-            ContextRenewTimer.Start();
+            _timer = new DispatcherTimer();
+            _timer.Tick += new EventHandler(OnShouldRenewContext);
+            _timer.Interval = new TimeSpan(0, 0, RenewSec);
+            _timer.Start();
            Context = new();
            Loaded += OnLoaded;
        }

-        private void OnRenewContext(object? sender, EventArgs evt) {
-            if (LockContext || !Context.HasBackendChanged) return;
-            Context.Dispose();
-            Context = new();
-            RenewContext().GetAwaiter().GetResult();
+        private async void OnShouldRenewContext(object? sender, EventArgs evt) {
+            if (!Context.HasBackendChanged) return;
+            _renewPending = true;
+            if (LockContext) return;
+            await RenewContext();
        }

        private void OnLoaded(object sender, RoutedEventArgs evt) {
-            RenewContext().GetAwaiter().GetResult();
+            OnRenewContext().GetAwaiter().GetResult();
        }

        protected override void OnClosed(EventArgs evt) {
@@ -38,6 +40,14 @@ namespace Elwig.Windows {
            Context.Dispose();
        }

-        abstract protected Task RenewContext();
+        protected async Task RenewContext() {
+            if (!_renewPending) return;
+            Context.Dispose();
+            Context = new();
+            await OnRenewContext();
+            _renewPending = false;
+        }
+
+        abstract protected Task OnRenewContext();
    }
 }
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@@ -56,20 +56,25 @@
        </Grid.ColumnDefinitions>

        <Menu Grid.ColumnSpan="3" BorderThickness="0,0,0,1" BorderBrush="LightGray" Background="White">
-            <MenuItem Header="Lieferung">
-            </MenuItem>
            <MenuItem Header="Drucken">
                <MenuItem x:Name="Menu_Print_ShowDeliveryNote" Header="Lieferschein anzeigen" IsEnabled="False"
                          Click="Menu_Print_ShowDeliveryNote_Click"/>
                <MenuItem x:Name="Menu_Print_PrintDeliveryNote" Header="Lieferschein drucken" IsEnabled="False"
                          Click="Menu_Print_PrintDeliveryNote_Click"/>
+                <MenuItem x:Name="Menu_Print_DeliveryJournal" Header="Lieferjournal">
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowToday" Header="von heute anzeigen"
+                              Click="Menu_Print_DeliveryJournal_ShowToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintToday" Header="von heute drucken"
+                              Click="Menu_Print_DeliveryJournal_PrintToday_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_ShowFilter" Header="aus Filtern anzeigen"
+                              Click="Menu_Print_DeliveryJournal_ShowFilter_Click"/>
+                    <MenuItem x:Name="Menu_Print_DeliveryJournal_PrintFilter" Header="aus Filtern drucken"
+                              Click="Menu_Print_DeliveryJournal_PrintFilter_Click"/>
+                </MenuItem>
            </MenuItem>
            <MenuItem Header="Exportieren">
                <MenuItem x:Name="Menu_Export_Bki" Header="Traubentransportscheinliste (BKI)"/>
            </MenuItem>
-            <MenuItem Header="Werkzeuge">
-                <MenuItem Header="Alle Lieferscheine überprüfen"/>
-            </MenuItem>
        </Menu>

        <Grid Grid.RowSpan="4" Grid.Row="1" Margin="5,0,5,0">
@@ -230,20 +235,20 @@
                <Label Content="Gradation:" Margin="10,10,10,10"/>
                <Grid Grid.Column="1" Width="54" Height="25" Margin="0,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
                    <TextBox x:Name="GradationOeInput"  TextAlignment="Right" Padding="2,2,23,2"
-                             TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus"/>
+                             TextChanged="GradationOeInput_TextChanged" LostFocus="GradationOeInput_LostFocus" KeyUp="Input_KeyUp"/>
                    <Label Content="°Oe" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
                </Grid>
                <Label Content="=" Margin="60,10,10,10" Grid.Column="1"/>
                <Grid Grid.Column="1" Width="68" Height="25" Margin="78,10,10,10" HorizontalAlignment="Left" VerticalAlignment="Top">
                    <TextBox x:Name="GradationKmwInput" TextAlignment="Right" Padding="2,2,34,2" SnapsToDevicePixels="True"
-                             TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus"/>
+                             TextChanged="GradationKmwInput_TextChanged" LostFocus="GradationKmwInput_LostFocus" KeyUp="Input_KeyUp"/>
                    <Label Content="°KMW" Margin="0,4,3,0" HorizontalAlignment="Right" FontSize="10"/>
                </Grid>

                <Label Content="Qualitätsstufe:" Margin="10,40,10,10"/>
                <ComboBox x:Name="WineQualityLevelInput" Width="146" Margin="0,40,10,10" Grid.Column="1" HorizontalAlignment="Left"
                          ItemTemplate="{StaticResource WineQualityLevelTemplate}"
-                          SelectionChanged="WineQualityLevelInput_SelectionChanged"/>
+                          SelectionChanged="WineQualityLevelInput_SelectionChanged" KeyUp="Input_KeyUp"/>

                <CheckBox x:Name="AbgewertetInput" Content="Abgewertet" IsEnabled="False"
                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"/>
@@ -272,22 +277,21 @@
                          VerticalAlignment="Top" HorizontalAlignment="Left" Margin="10,75,10,10" Grid.Column="0" Grid.ColumnSpan="2"
                          Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>

-                <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
-                        Click="WeighingManualButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
                <Button x:Name="WeighingAButton" Content="Wiegen A" Width="120"
                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
+                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,10,10,10" Grid.Column="2"/>
                <Button x:Name="WeighingBButton" Content="Wiegen B" Width="120"
                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
+                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,42,10,10" Grid.Column="2"/>
                <Button x:Name="WeighingCButton" Content="Wiegen C" Width="120"
                        Click="WeighingButton_Click"
-                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
+                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,74,10,10" Grid.Column="2"/>
                <Button x:Name="WeighingDButton" Content="Wiegen D" Width="120"
                        Click="WeighingButton_Click"
+                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,106,10,10" Grid.Column="2"/>
+                <Button x:Name="WeighingManualButton" Content="Handwiegung" Width="120"
+                        Click="WeighingManualButton_Click"
                        VerticalAlignment="Top" HorizontalAlignment="Right" Margin="10,138,10,10" Grid.Column="2"/>
-
            </Grid>
        </GroupBox>

--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -76,6 +76,7 @@ namespace Elwig.Windows {
                if (n >= 2) WeighingBButton.Content = $"Wiegen {App.Scales[1].ScaleId}";
                if (n >= 3) WeighingCButton.Content = $"Wiegen {App.Scales[2].ScaleId}";
                if (n >= 4) WeighingDButton.Content = $"Wiegen {App.Scales[3].ScaleId}";
+                WeighingManualButton.Margin = new Thickness(10, 10 + n * 32, 10, 10);
            } else {
                WeighingManualButton.Visibility = Visibility.Hidden;
                WeighingAButton.Visibility = Visibility.Hidden;
@@ -110,8 +111,8 @@ namespace Elwig.Windows {
            Mouse.OverrideCursor = Cursors.Wait;
            using var doc = new DeliveryNote(d, Context);
            await doc.Generate();
-            doc.Show();
            Mouse.OverrideCursor = null;
+            doc.Show();
        }

        private async void Menu_Print_PrintDeliveryNote_Click(object sender, RoutedEventArgs evt) {
@@ -127,8 +128,9 @@ namespace Elwig.Windows {
            if (sender is not MenuItem m) return;
            var year = int.Parse(m.Header.ToString()?.Split(" ")[^1] ?? Utils.CurrentLastSeason.ToString());
            var d = new SaveFileDialog() {
-                FileName = $"{App.Client.NameToken}-Traubentransportscheinliste-{year}",
+                FileName = $"{App.Client.NameToken}-Traubentransportscheinliste-{year}.{Bki.FileExtension}",
                DefaultExt = Bki.FileExtension,
+                Filter = "CSV-Datei (*.csv)|*.csv",
                Title = $"Traubentransportscheinliste (BKI) speichern unter - Elwig"
            };
            if (d.ShowDialog() == true) {
@@ -139,6 +141,40 @@ namespace Elwig.Windows {
            }
        }

+        private async void Menu_Print_DeliveryJournal_ShowToday_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            doc.Show();
+        }
+
+        private async void Menu_Print_DeliveryJournal_PrintToday_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            var doc = new DeliveryJournal(Context, DateOnly.FromDateTime(Utils.Today));
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            await doc.Print();
+        }
+
+        private async void Menu_Print_DeliveryJournal_ShowFilter_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            var (f, _, d, _) = await GetFilters();
+            var doc = new DeliveryJournal(string.Join(" / ", f), d);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            doc.Show();
+        }
+
+        private async void Menu_Print_DeliveryJournal_PrintFilter_Click(object sender, RoutedEventArgs evt) {
+            Mouse.OverrideCursor = Cursors.Wait;
+            var (f, _, d, _) = await GetFilters();
+            var doc = new DeliveryJournal(string.Join(" / ", f), d);
+            await doc.Generate();
+            Mouse.OverrideCursor = null;
+            doc.Show();
+        }
+
        private void OnSecondPassed(object? sender, EventArgs? evt) {
            if (IsReceipt && IsCreating) {
                var now = DateTime.Now;
@@ -194,9 +230,14 @@ namespace Elwig.Windows {
            if (sender is not Control ctrl) return;
            if (evt.Key != Key.Enter) return;
            if (ctrl == MgNrInput || ctrl == MemberInput) {
-                SortIdInput.Focus(); SortIdInput.SelectAll();
+                SortIdInput.Focus();
+                SortIdInput.SelectAll();
            } else if (ctrl == SortIdInput || ctrl == WineVarietyInput || ctrl == AttributesInput) {
-                GradationOeInput.Focus(); GradationOeInput.SelectAll();
+                GradationOeInput.Focus();
+                GradationOeInput.SelectAll();
+            } else if (ctrl == GradationKmwInput || ctrl == GradationOeInput || ctrl == WineQualityLevelInput) {
+                if (WeighingAButton.IsVisible) WeighingAButton.Focus();
+                else WeighingManualButton.Focus();
            }
        }

@@ -204,19 +245,28 @@ namespace Elwig.Windows {
            await RefreshDeliveryListQuery();
        }

-        private async Task RefreshDeliveryListQuery(bool updateSort = false) {
+        private async Task<(List<string>, IQueryable<Delivery>, IQueryable<DeliveryPart>, List<string>)> GetFilters() {
+            List<string> filterNames = new();
            IQueryable<Delivery> deliveryQuery = Context.Deliveries;
            if (Member != null) {
                deliveryQuery = deliveryQuery.Where(d => d.MgNr == Member.MgNr);
+                filterNames.Add(Member.AdministrativeName);
            }
            if (TodayOnlyInput.IsChecked == true) {
                deliveryQuery = deliveryQuery
                    .Where(d => (d.DateString == Utils.Today.ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") > 0) ||
                                (d.DateString == Utils.Today.AddDays(1).ToString("yyyy-MM-dd") && d.TimeString.CompareTo("03:00:00") <= 0));
+                filterNames.Add(Utils.Today.ToString("dd.MM.yyyy"));
            } else if (AllSeasonsInput.IsChecked == false) {
                deliveryQuery = deliveryQuery.Where(d => d.Year == SeasonInput.Value);
+                filterNames.Add(SeasonInput.Value.ToString() ?? "");
            }
+            deliveryQuery = deliveryQuery.OrderBy(d => d.DateString).ThenBy(d => d.TimeString);
+            IQueryable<DeliveryPart> dpq = deliveryQuery.SelectMany(d => d.Parts);

+            // TODO add filter for:
+            //      attributes
+            //      branches
            var filterVar = new List<string>();
            var filterQual = new List<string>();
            var filterMgNr = new List<int>();
@@ -232,23 +282,25 @@ namespace Elwig.Windows {
            double filterOeLt = 0;

            var filter = TextFilter.ToList();
-            var hasFilters = filter.Count > 0;
            if (filter.Count > 0) {
-                var var = await Context.WineVarieties.Select(v => v.SortId).ToListAsync();
-                var qual = await Context.WineQualityLevels.Select(q => q.QualId).ToListAsync();
-                var mgnr = await Context.Members.Select(m => m.MgNr.ToString()).ToListAsync();
+                var var = await Context.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
+                var qual = await Context.WineQualityLevels.ToDictionaryAsync(q => q.QualId, q => q);
+                var mgnr = await Context.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);

                for (int i = 0; i < filter.Count; i++) {
                    var e = filter[i];
-                    if (e.Length == 2 && var.Contains(e.ToUpper())) {
+                    if (e.Length == 2 && var.ContainsKey(e.ToUpper())) {
                        filterVar.Add(e.ToUpper());
                        filter.RemoveAt(i--);
-                    } else if (e.Length == 3 && qual.Contains(e.ToUpper())) {
+                        filterNames.Add(var[e.ToUpper()].Name);
+                    } else if (e.Length == 3 && qual.ContainsKey(e.ToUpper())) {
                        filterQual.Add(e.ToUpper());
                        filter.RemoveAt(i--);
-                    } else if (e.All(char.IsAsciiDigit) && mgnr.Contains(e)) {
+                        filterNames.Add(qual[e.ToUpper()].Name);
+                    } else if (e.All(char.IsAsciiDigit) && mgnr.ContainsKey(e)) {
                        filterMgNr.Add(int.Parse(e));
                        filter.RemoveAt(i--);
+                        filterNames.Add(mgnr[e].AdministrativeName);
                    } else if (e.StartsWith(">") || e.StartsWith("<")) {
                        if (double.TryParse(e[1..], out var num)) {
                            switch ((e[0], num)) {
@@ -297,12 +349,23 @@ namespace Elwig.Windows {
                        filterTimeLt = TimeOnly.TryParse(parts[1], out var to) ? $"{to:HH:mm}" : null;
                        filter.RemoveAt(i--);
                    } else if (DateOnly.TryParse(e, out var date)) {
-                        filterDate.Add($"{date:yyyy-MM-dd}");
+                        // TODO allow date ranges
+                        filterDate.Add(date.ToString("yyyy-MM-dd"));
                        filter.RemoveAt(i--);
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
                    } else if (Utils.PartialDateRegex.IsMatch(e)) {
+                        // TODO allow date ranges
                        var parts = e.Split(".");
-                        filterPartDate.Add($"-{int.Parse(parts[1]):00}-{int.Parse(parts[0]):00}");
+                        var p0 = int.Parse(parts[0]);
+                        var p1 = int.Parse(parts[1]);
+                        filterPartDate.Add($"-{p1:00}-{p0:00}");
                        filter.RemoveAt(i--);
+                        if (filterNames.Contains(SeasonInput.Value.ToString())) {
+                            filterNames.Remove(SeasonInput.Value.ToString());
+                            filterNames.Add($"{p0:00}.{p1:00}.{SeasonInput.Value:0000}");
+                        } else {
+                            filterNames.Add($"{p0:00}.{p1:00}.");
+                        }
                    } else if (e.Length > 2 && e.StartsWith("\"") && e.EndsWith("\"")) {
                        filter[i] = e[1..^1];
                    } else if (e.Length <= 2) {
@@ -310,22 +373,58 @@ namespace Elwig.Windows {
                    }
                }

-                if (filterMgNr.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterMgNr.Contains(d.MgNr));
-                if (filterDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterDate.Contains(d.DateString));
-                if (filterPartDate.Count > 0) deliveryQuery = deliveryQuery.Where(d => filterPartDate.Contains(d.DateString.Substring(4)));
-                if (filterYearGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year >= filterYearGt);
-                if (filterYearLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Year < filterYearLt);
-                if (filterTimeGt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeGt.CompareTo(d.TimeString) <= 0);
-                if (filterTimeLt != null) deliveryQuery = deliveryQuery.Where(d => filterTimeLt.CompareTo(d.TimeString) > 0);
-                if (filterVar.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterVar.Contains(p.SortId)));
-                if (filterQual.Count > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => filterQual.Contains(p.QualId)));
-                if (filterKmwGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw >= filterKmwGt));
-                if (filterKmwLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw < filterKmwLt));
-                if (filterOeGt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt));
-                if (filterOeLt > 0) deliveryQuery = deliveryQuery.Where(d => d.Parts.Any(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt));
+                if (filterMgNr.Count > 0) dpq = dpq.Where(p => filterMgNr.Contains(p.Delivery.MgNr));
+                if (filterDate.Count > 0) dpq = dpq.Where(p => filterDate.Contains(p.Delivery.DateString));
+                if (filterPartDate.Count > 0) dpq = dpq.Where(p => filterPartDate.Contains(p.Delivery.DateString.Substring(4)));
+                if (filterYearGt > 0) dpq = dpq.Where(p => p.Year >= filterYearGt);
+                if (filterYearLt > 0) dpq = dpq.Where(p => p.Year < filterYearLt);
+                if (filterTimeGt != null) dpq = dpq.Where(p => filterTimeGt.CompareTo(p.Delivery.TimeString) <= 0);
+                if (filterTimeLt != null) dpq = dpq.Where(p => filterTimeLt.CompareTo(p.Delivery.TimeString) > 0);
+                if (filterVar.Count > 0) dpq = dpq.Where(p => filterVar.Contains(p.SortId));
+                if (filterQual.Count > 0) dpq = dpq.Where(p => filterQual.Contains(p.QualId));
+                if (filterKmwGt > 0) dpq = dpq.Where(p => p.Kmw >= filterKmwGt);
+                if (filterKmwLt > 0) dpq = dpq.Where(p => p.Kmw < filterKmwLt);
+                if (filterOeGt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
+                if (filterOeLt > 0) dpq = dpq.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
+
+                if (filterYearGt > 0 && filterYearLt > 0) {
+                    filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
+                } else if (filterYearGt > 0) {
+                    filterNames.Insert(0, $"ab {filterYearGt}");
+                } else if (filterYearLt > 0) {
+                    filterNames.Insert(0, $"bis {filterYearLt - 1}");
+                }
+                if (filterKmwGt > 0 && filterKmwLt > 0) {
+                    filterNames.Add($"{filterKmwGt:N1}–{filterKmwLt:N1} °KMW");
+                } else if (filterKmwGt > 0) {
+                    filterNames.Add($"ab {filterKmwGt:N1} °KMW");
+                } else if (filterKmwLt > 0) {
+                    filterNames.Add($"bis {filterKmwLt:N1} °KMW");
+                }
+                if (filterOeGt > 0 && filterOeLt > 0) {
+                    filterNames.Add($"{filterOeGt:N1}–{filterOeLt:N1} °Oe");
+                } else if (filterOeGt > 0) {
+                    filterNames.Add($"ab {filterOeGt:N1} °Oe");
+                } else if (filterOeLt > 0) {
+                    filterNames.Add($"bis {filterOeLt:N1} °Oe");
+                }
+                if (filterTimeGt != null && filterTimeLt != null) {
+                    filterNames.Add($"{filterTimeGt}–{filterTimeLt}");
+                } else if (filterTimeGt != null) {
+                    filterNames.Add($"ab {filterTimeGt}");
+                } else if (filterTimeLt != null) {
+                    filterNames.Add($"bis {filterTimeLt}");
+                }
            }

-            List<Delivery> deliveries = await deliveryQuery.OrderByDescending(d => d.DateString).ThenByDescending(d => d.TimeString).ToListAsync();
+            return (filterNames, dpq.Select(p => p.Delivery).Distinct(), dpq, filter);
+        }
+
+        private async Task RefreshDeliveryListQuery(bool updateSort = false) {
+            var (_, deliveryQuery, deliveryPartsQuery, filter) = await GetFilters();
+            var deliveries = await deliveryQuery.ToListAsync();
+            deliveries.Reverse();
+
            if (filter.Count > 0 && deliveries.Count > 0) {
                var dict = deliveries.AsParallel()
                    .ToDictionary(d => d, d => d.SearchScore(TextFilter))
@@ -339,22 +438,14 @@ namespace Elwig.Windows {
            }

            ControlUtils.RenewItemsSource(DeliveryList, deliveries, d => ((d as Delivery)?.Year, (d as Delivery)?.DId),
-                DeliveryList_SelectionChanged, hasFilters ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
+                DeliveryList_SelectionChanged, filter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);

            var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList();
            StatusMembers.Text = $"Mitglieder: {members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
            StatusDeliveries.Text = $"Lieferungen: {deliveries.Count}";

            if (filter.Count == 0) {
-                var partsQuery = deliveryQuery.SelectMany(d => d.Parts);
-                if (filterVar.Count > 0) partsQuery = partsQuery.Where(p => filterVar.Contains(p.SortId));
-                if (filterQual.Count > 0) partsQuery = partsQuery.Where(p => filterQual.Contains(p.QualId));
-                if (filterKmwGt > 0) partsQuery = partsQuery.Where(p => p.Kmw >= filterKmwGt);
-                if (filterKmwLt > 0) partsQuery = partsQuery.Where(p => p.Kmw < filterKmwLt);
-                if (filterOeGt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
-                if (filterOeLt > 0) partsQuery = partsQuery.Where(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);
-                var deliveryParts = partsQuery;
-
+                var deliveryParts = deliveryPartsQuery;
                var n = await deliveryParts.CountAsync();
                StatusDeliveries.Text = $"Lieferungen: {deliveries.Count} ({n})";
                var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
@@ -372,9 +463,8 @@ namespace Elwig.Windows {
                    StatusGradation.Text = "Gradation: -";
                }

-
                if (n > 0 && (n <= 200 || TodayOnlyInput.IsChecked == true)) {
-                    var parts = (await deliveryParts.ToListAsync());
+                    var parts = await deliveryParts.ToListAsync();
                    var groups = parts
                        .GroupBy(p => string.Join("/", p.Attributes.Select(a => a.Name)))
                        .Select(g => (g.Key, g.Sum(p => p.Weight), g.Min(p => p.Kmw), Utils.AggregateDeliveryPartsKmw(g), g.Max(p => p.Kmw)))
@@ -410,8 +500,8 @@ namespace Elwig.Windows {
            }
        }

-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();

            if (Member != null) {
                if (Context.Members.Find(Member.MgNr) is not Member m) {
@@ -529,6 +619,7 @@ namespace Elwig.Windows {

            ScaleId = p?.ScaleId;
            WeighingId = p?.WeighingId;
+            ManualWeighingReason = p?.WeighingReason;

            FinishInputFilling();
        }
@@ -559,7 +650,7 @@ namespace Elwig.Windows {
            p.DPNr = dpnr;

            d.DateString = string.Join("-", DateInput.Text.Split(".").Reverse());
-            if (IsCreating || InputHasChanged(DateInput)) {
+            if (deliveryNew || InputHasChanged(DateInput)) {
                d.LNr = await Context.NextLNr(d.Date);
            }
            if (IsCreating) {
@@ -590,8 +681,7 @@ namespace Elwig.Windows {
            p.ManualWeighing = ManualWeighingInput.IsChecked ?? false;
            p.ScaleId = ScaleId;
            p.WeighingId = WeighingId;
-            if (ManualWeighingReason != null)
-                p.Comment = (p.Comment != null ? $"{p.Comment} / " : "") + $"Begründung Handwiegung: {ManualWeighingReason}";
+            p.WeighingReason = ManualWeighingReason;

            EntityEntry<Delivery>? dEntry = null;
            EntityEntry<DeliveryPart>? pEntry = null;
@@ -651,7 +741,6 @@ namespace Elwig.Windows {
                    WeightInput.Text = $"{res.Weight:N0}";
                    ScaleId = s.ScaleId;
                    WeighingId = res.FullWeighingId;
-                    s.Empty();
                } else {
                    WeightInput.Text = "";
                    ScaleId = null;
@@ -757,12 +846,19 @@ namespace Elwig.Windows {
            }
        }

+        private void EmptyScale() {
+            var scale = App.Scales.Where(s => s.ScaleId == ScaleId).FirstOrDefault();
+            if (scale == null) return;
+            scale.Empty();
+        }
+
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
            NewDeliveryPartButton.Cursor = Cursors.Wait;
            DeliveryPartList.IsEnabled = false;
            var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
+            EmptyScale();
            await RefreshDeliveryList();
            await RefreshDeliveryParts();
            NewDeliveryPartButton.Cursor = null;
@@ -778,6 +874,7 @@ namespace Elwig.Windows {
            FinishButton.Cursor = Cursors.Wait;
            DeliveryPartList.IsEnabled = false;
            var p = await UpdateDeliveryPart(DeliveryList.SelectedItem as Delivery, DeliveryPartList.SelectedItem as DeliveryPart);
+            EmptyScale();
            await RefreshDeliveryList();
            await RefreshDeliveryParts();
            if (p?.Delivery != null) {
@@ -789,10 +886,12 @@ namespace Elwig.Windows {
                    doc.Show();
                } else {
                    await doc.Print(2);
+                    Activate();
                }
            }
            FinishButton.Cursor = null;
            DeliveryList.SelectedItem = null;
+            await RenewContext();
            RefreshInputs();
            InitInputs();
        }
@@ -815,6 +914,7 @@ namespace Elwig.Windows {
                DisableWeighingButtons();
                HideFinishNewPartDeliveryCancelButtons();
                ShowNewEditDeleteButtons();
+                await RenewContext();
                RefreshInputs();
                ClearInputStates();
                LockInputs();
--- a/Elwig/Windows/MemberAdminWindow.xaml
+++ b/Elwig/Windows/MemberAdminWindow.xaml
@@ -178,60 +178,64 @@
                    <ColumnDefinition Width="2*"/>
                </Grid.ColumnDefinitions>

-                <Label Content="E-Mail-Adresse:" Margin="10,10,0,0" Grid.Column="0"/>
-                <TextBox x:Name="EmailAddressInput" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                <Label Content="E-Mail-Adresse (1):" Margin="10,10,0,0" Grid.Column="0"/>
+                <TextBox x:Name="EmailAddress1Input" Margin="0,10,10,0" Grid.Column="1" Grid.ColumnSpan="2"
                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>

-                <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,40,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr1Input" Margin="0,40,5,0" Grid.Column="1"
+                <Label Content="E-Mail-Adresse (2):" Margin="10,40,0,0" Grid.Column="0"/>
+                <TextBox x:Name="EmailAddress2Input" Margin="0,40,10,0" Grid.Column="1" Grid.ColumnSpan="2"
+                         TextChanged="EmailAddressInput_TextChanged" LostFocus="EmailAddressInput_LostFocus"/>
+
+                <ComboBox x:Name="PhoneNr1TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr1Input" Margin="0,70,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,40,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr1CommentInput" Margin="0,70,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,70,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr2Input" Margin="0,70,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr2TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr2Input" Margin="0,100,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,70,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr2CommentInput" Margin="0,100,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,100,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr3Input" Margin="0,100,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr3TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr3Input" Margin="0,130,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,100,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr3CommentInput" Margin="0,130,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,130,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr4Input" Margin="0,130,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr4TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr4Input" Margin="0,160,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,130,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr4CommentInput" Margin="0,160,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,160,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr5Input" Margin="0,160,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr5TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr5Input" Margin="0,190,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,160,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr5CommentInput" Margin="0,190,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,190,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr6Input" Margin="0,190,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr6TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr6Input" Margin="0,220,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,190,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr6CommentInput" Margin="0,220,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,220,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr7Input" Margin="0,220,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr7TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr7Input" Margin="0,250,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,220,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr7CommentInput" Margin="0,250,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,250,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr8Input" Margin="0,250,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr8TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr8Input" Margin="0,280,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
-                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,250,10,0" Grid.Column="2"
+                <TextBox x:Name="PhoneNr8CommentInput" Margin="0,280,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>

-                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,280,5,0" FontSize="12" Padding="6,4,4,4"/>
-                <TextBox x:Name="PhoneNr9Input" Margin="0,280,5,0" Grid.Column="1"
+                <ComboBox x:Name="PhoneNr9TypeInput" DisplayMemberPath="Value" Margin="6,310,5,0" FontSize="12" Padding="6,4,4,4"/>
+                <TextBox x:Name="PhoneNr9Input" Margin="0,310,5,0" Grid.Column="1"
                         TextChanged="PhoneNrInput_TextChanged" LostFocus="PhoneNrInput_LostFocus"/>
                <TextBox x:Name="PhoneNr9CommentInput" Margin="0,280,10,0" Grid.Column="2"
                         TextChanged="TextBox_TextChanged"/>
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -131,8 +131,8 @@ namespace Elwig.Windows {
            ValidateRequiredInputs();
        }

-        protected override async Task RenewContext() {
-            await base.RenewContext();
+        protected override async Task OnRenewContext() {
+            await base.OnRenewContext();
            ControlUtils.RenewItemsSource(BranchInput, await Context.Branches.OrderBy(b => b.Name).ToListAsync(), i => (i as Branch)?.ZwstId);
            ControlUtils.RenewItemsSource(DefaultKgInput, await Context.WbKgs.Select(k => k.AtKg).OrderBy(k => k.Name).ToListAsync(), i => (i as AT_Kg)?.KgNr);
            await RefreshMemberList();
@@ -266,7 +266,7 @@ namespace Elwig.Windows {
        }

        private void Menu_Member_SendEmail_Click(object sender, RoutedEventArgs evt) {
-            Utils.MailTo(((Member)MemberList.SelectedItem).Email);
+            Utils.MailTo(((Member)MemberList.SelectedItem).EmailAddresses.First().Address);
        }

        private void FocusSearchInput(object sender, RoutedEventArgs evt) {
@@ -349,8 +349,6 @@ namespace Elwig.Windows {
            m.PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id;
            m.Address = AddressInput.Text;

-            m.Email = (EmailAddressInput.Text == "") ? null : EmailAddressInput.Text;
-
            m.Iban = (IbanInput.Text == "") ? null : IbanInput.Text.Replace(" ", "");
            m.Bic = (BicInput.Text == "") ? null : BicInput.Text;

@@ -424,6 +422,27 @@ namespace Elwig.Windows {
                    }
                }

+                for (int i = 0; i < 2; i++) {
+                    var input = i == 0 ? EmailAddress1Input : EmailAddress2Input;
+                    var emailAddr = m.EmailAddresses.FirstOrDefault(a => a.Nr - 1 == i);
+                    if (input.Text == "") {
+                        if (emailAddr != null) {
+                            Context.Remove(emailAddr);
+                        }
+                    } else {
+                        MemberEmailAddr a = emailAddr ?? Context.CreateProxy<MemberEmailAddr>();
+                        a.Nr = i + 1;
+                        a.Address = input.Text;
+                        a.Comment = null;
+                        if (emailAddr == null) {
+                            a.MgNr = newMgNr;
+                            await Context.AddAsync(a);
+                        } else {
+                            Context.Update(a);
+                        }
+                    }
+                }
+
                await Context.SaveChangesAsync();

                if (newMgNr != m.MgNr) {
@@ -475,7 +494,10 @@ namespace Elwig.Windows {
                OrtInput.SelectedItem = null;
            }

-            EmailAddressInput.Text = m.Email;
+            var emailAddrs = m.EmailAddresses.OrderBy(a => a.Nr).ToList();
+            EmailAddress1Input.Text = emailAddrs.Count > 0 ? emailAddrs[0].Address : "";
+            EmailAddress2Input.Text = emailAddrs.Count > 1 ? emailAddrs[1].Address : "";
+
            var phoneNrs = m.TelephoneNumbers.OrderBy(p => p.Nr).ToList();
            for (int i = 0; i < PhoneNrInputs.Length; i++) {
                if (i < phoneNrs.Count) {
@@ -525,7 +547,7 @@ namespace Elwig.Windows {

            AreaCommitment.Text = $"{m.ActiveAreaCommitments.Select(c => c.Area).Sum():N0} m²";

-            Menu_Member_SendEmail.IsEnabled = m.Email != null;
+            Menu_Member_SendEmail.IsEnabled = m.EmailAddresses.Count > 0;

            FinishInputFilling();
        }
Author	SHA1	Message	Date
Thomas Hilscher	7347439034	Bump version number	2023-09-28 14:06:47 +02:00
Lorenz Stechauner	51ad8f99fd	DeliveryAdminWindow: Add DeliveryJournal filter options	2023-09-19 19:31:02 +02:00
Lorenz Stechauner	39279a5dda	Bump version to 0.3.2	2023-09-19 16:29:34 +02:00
Lorenz Stechauner	5271f357f5	DeliveryAdminWindow: Add DeliveryJournal	2023-09-19 02:11:30 +02:00
Lorenz Stechauner	13ba3f90f6	DeliveryAdminWindow: Add Filter to BKI export	2023-09-19 00:57:59 +02:00
Lorenz Stechauner	43be8bf391	DeliveryAdminWindow: Empty scale only after saving to database	2023-09-19 00:47:10 +02:00
Lorenz Stechauner	826a76c56c	AppDbUpdater: Add schema_version 2	2023-09-19 00:37:46 +02:00
Lorenz Stechauner	efaae5f490	DeliveryAdminWindow: 'Activate()' window after awaiting doc.Print(2)	2023-09-18 21:48:03 +02:00
Lorenz Stechauner	3a73265a75	ContextWindow: Change renew context event handling	2023-09-18 21:46:14 +02:00
Lorenz Stechauner	a6fef7fd9b	Utils: Fix GetSearchScore for multiple occurances of keyword in haystack	2023-09-18 21:17:37 +02:00
Lorenz Stechauner	a08df4c3ed	DeliveryAdminWindow: Add auto focus for weighing buttons on enter	2023-09-18 20:59:59 +02:00
Lorenz Stechauner	9701af9e36	AppDbUpdater: Fix version comparison	2023-09-18 10:03:48 +02:00
Lorenz Stechauner	b4f1eeee84	Bump version to 0.3.1	2023-09-18 02:05:16 +02:00
Lorenz Stechauner	2922fe0138	BaseDataWindow: Remove DecimalInput check	2023-09-18 01:40:59 +02:00
Lorenz Stechauner	704facbc6b	App: Use Ort insteas of Destination for Branch Location	2023-09-18 01:32:54 +02:00
Lorenz Stechauner	404e8a0c27	BaseDataWindow: Fix Modifier creation	2023-09-18 01:30:45 +02:00
Lorenz Stechauner	ef621fab2d	Validator: Fix usage of maxLen and maxDecimal in CheckDecimal	2023-09-18 01:27:15 +02:00
Lorenz Stechauner	0938e33fe1	DeliveryAdminWindow: Fix LNr calculation for new deliveries	2023-09-18 01:04:09 +02:00
Lorenz Stechauner	6b5c283e10	Update dependencies	2023-09-17 22:12:15 +02:00
Lorenz Stechauner	b6400c41c4	Bump version to 0.3.0	2023-09-17 21:31:06 +02:00
Lorenz Stechauner	24b7078a05	Add AppDbUpdater	2023-09-17 20:48:07 +02:00
Lorenz Stechauner	dc215d3350	BusinessDocument: Make aside table a bit more compact	2023-09-15 14:35:25 +02:00
Lorenz Stechauner	b80cbc037c	AreaComAdminWindow: Add comment input	2023-09-14 23:43:38 +02:00
Lorenz Stechauner	4891501f62	DeliveryAdminWindow: Fix filter count check	2023-09-14 23:27:43 +02:00
Lorenz Stechauner	6d3adc48f6	DeliveryNote: Add manual weighing reason	2023-09-14 23:25:37 +02:00
Lorenz Stechauner	f5eea1e906	Models: Add MemberEmailAddr	2023-09-14 22:32:28 +02:00
Lorenz Stechauner	ba691f4d17	Documents: Make business documents more compact	2023-09-14 20:44:48 +02:00
Lorenz Stechauner	470f092482	DeliveryAdminWindow: Move manual weighing button to last position	2023-09-14 17:51:48 +02:00
Lorenz Stechauner	e9e4c75edd	Bump version to 0.2.1	2023-09-13 23:37:26 +02:00
Lorenz Stechauner	ff1a4e7182	Documents: Add ShowFoldMarks flag	2023-09-13 23:22:35 +02:00