Bump version to 0.11.4

Services: Fix spacing in tool tip grids
Bump version to 0.11.3
2024-09-22 23:33:45 +02:00 · 2024-09-22 23:22:23 +02:00 · 2024-09-22 21:05:42 +02:00 · 2024-09-22 21:01:48 +02:00 · 2024-09-22 20:49:14 +02:00 · 2024-09-22 20:47:06 +02:00
58 changed files with 1551 additions and 566 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,227 @@ Changelog
 =========


+[v0.11.4][v0.11.4] (2024-09-22) {#v0.11.4}
+------------------------------------------
+
+### Behobene Fehler {#v0.11.4-bugfixes}
+
+* In den Tooltips für Gewicht und Flächenbindungen wurden die Abstände wieder hergestellt. (e0fcaf1f53)
+
+[v0.11.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.4
+
+
+
+
+[v0.11.3][v0.11.3] (2024-09-22) {#v0.11.3}
+------------------------------------------
+
+### Behobene Fehler {#v0.11.3-bugfixes}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wurde das Berechnen der Mitgliederdaten pro Jahr und Mitglied rückgängig gemacht. (1d187c25f3)
+
+[v0.11.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.3
+
+
+
+
+[v0.11.2][v0.11.2] (2024-09-22) {#v0.11.2}
+------------------------------------------
+
+> [!WARNING]
+> Aufgrund eines Fehlers kann in dieser Version das Öffnen des Mitglieder-Fensters deutlich länger dauern!
+>
+> Es wird empfohlen die nächste Version zu verwenden.
+
+### Neue Funktionen {#v0.11.2-features}
+
+* In der Anmeldeliste (`DeliveryAncmtList`) wird die Stamm-KG des Mitgliedes angegeben. (165770fa37)
+* Im Hauptmenü wurde im Menüpunkt _Hilfe_ ein Fehler-Protokoll-Fenster (`LogWindow`) hinzugefügt. (526e951029)
+
+### Behobene Fehler {#v0.11.2-bugfixes}
+
+* Falls das Übernahme-Fenster (`DeliveryAdminWindow`) geöffnet war und man währenddessen die aktuellste Lieferung gelöscht hat kam es zum Fehler beim Nummerieren des Lieferscheines. (5c12dba125)
+* In Seltenen Fällen konnte es vorkommen, dass sich Elwig aufgrund eines internen Fehlers im Übernahme-Fenster (`DeliveryAdminWindow`) geschlossen hat. (dcec6f03fe)
+
+### Sonstiges {#v0.11.2-misc}
+
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) wurde das Layout der Teillieferungen-Liste angepasst. (9fa9d9fbec)
+* Alle Aufrufe von `FillInputs()` in `Services` sind nun synchron. (648c406ad2, 7791d02979)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden die Lieferinformationen pro Jahr und Mitglied im Voraus berechnet. (66be5a3e2c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) heißt es nun _Anmeldungen_, nicht mehr _Traubenanmeldungen_. (3cde360aaa)
+
+[v0.11.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.2
+
+
+
+
+[v0.11.1][v0.11.1] (2024-09-19) {#v0.11.1}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.1-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) mehr Filter hinzugefügt; das Gewicht wird (wie im Lieferungen-Fenster) aufgeschlüsselt. (27d8a5cfb6)
+
+### Behobene Fehler {#v0.11.1-bugfixes}
+
+* Beim Export der BKI-Liste werden Namen von Rechnungsadressen _immer_ richtig getrennt. (871bc299bd)
+* Flächenbindungen ohne Startsaison werden ohne Fehler gehandhabt. (21a1b11d68)
+
+### Sonstiges {#v0.11.1-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`)...
+	* die Liste der Lesepläne vergrößert. (a18b58f438)
+	* sind abgesagte Lesepläne durchgestrichen. (74200083ab)
+	* wird beim Erstellen das Feld für die MgNr direkt fokussiert. (3f7cd2a6ff)
+* Abhängigkeiten aktualisiert. (eee90c784b, d8beb03b96)
+* Kleinigkeiten in `DeliveryService`. (642fb3a625)
+
+[v0.11.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.1
+
+
+
+
+[v0.11.0][v0.11.0] (2024-09-16) {#v0.11.0}
+------------------------------------------
+
+### Neue Funktionen {#v0.11.0-features}
+
+* Im Rundschreiben-Fenster (`MailWindow`) können jetzt auch Funktionäre, Bio-Betriebe oder angemeldete Mitglieder für einen Leseplan adressiert werden. (5c08f61963)
+* Im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) können nun auch Attribut, Bewirtschaftungsart, und ob der Leseplan abgesagt ist angegeben werden. (d8a10152b3)
+
+### Sonstiges {#v0.11.0-misc}
+
+* `App.HintContextChange()` ist synchron und fügt Arbeitsaufträge dem Dispatcher hinzu. (f09c43c1bd)
+
+[v0.11.0]: https://git.necronda.net/winzer/elwig/releases/tag/v0.11.0
+
+
+
+
+[v0.10.8][v0.10.8] (2024-09-05) {#v0.10.8}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.8-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) gibt es eine neue Spalte `Datum` und es können alle Lesepläne nach z.B. einem Mitglied durchsucht werden. (a5638135a3, 7437187630)
+
+### Behobene Fehler {#v0.10.8-bugfixes}
+
+* Versuch 3: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8d9172f91e)
+
+### Sonstiges {#v0.10.8-misc}
+
+* Im Lieferjournal (`DeliveryJournal`) ist die Sortierung der Filter für das Gewicht korrigiert. (22514715c1)
+* In der Anmeldeliste (`DeliveryAncmtList`) wurde die Spalte `Anmldg.` zentriert. (f43d9c020c)
+* In Geschäftsdokumenten (`BusinessDocument`) wurden im Informationsblock `:` hinzugefügt. (26235f8c0a)
+* Im Mitgliedsstammdatenblat (`MemberDataSheet`) wird der USt.-Steuersatz zusätzlich zu _Buchführend: ja/nein_ angezeigt. (a04c7d538e)
+
+[v0.10.8]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.8
+
+
+
+
+[v0.10.7][v0.10.7] (2024-09-02) {#v0.10.7}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.7-features}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Anmeldezeitpunkt angezeigt; in der Anmeldeliste als `ok` oder `verspät.`. (141086673f)
+* Im Lieferungen-Fenster (`DeliveryAdminWindow`) kann nach dem Gesamtgewicht einer Lieferung gefiltert werden (z.B. `<500kg`, `>8000kg`). (543185d48e)
+
+### Behobene Fehler {#v0.10.7-bugfixes}
+
+* Versuch 2: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (6627ab6d12)
+
+[v0.10.7]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.7
+
+
+
+
+[v0.10.6][v0.10.6] (2024-08-30) {#v0.10.6}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.6-bugfixes}
+
+* Der Titel des Flächenbindungs-Fensters (`AreaComAdminWindow`) ist jetzt _Flächenbindungen_, nicht mehr _Lieferungen_. (ee1315929c)
+* Im Auszahlungsvariante-Fenster (`ChartWindow`) einen Skalierungs-Fehler behoben. ([#33][i33])
+* Versuch: Fehler bei automatischer Daten-Erneuerung bei längerer Benutzung. (8c8c0a8c2b)
+
+### Sonstiges {#v0.10.6-misc}
+
+* SQL-Queries für Auszahlung-Anpassen-Fenster (`PaymentAdjustmentWindow`) und Über-/Unterlieferungen effizienter umgeschrieben. (9930e6173c)
+* Im Haupt-Fenster (`MainWindow`) den Menüpunkt _Waagen_ zu _Waage_ geändert. (8ce8492c74)
+* Im Übernahme-Fenster (`DeliveryAdminWindow`) wird in der Teil-Lieferungen-Liste immer die letzte Teil-Lieferung angezeigt. (2ef10b4bb2)
+* Breite des Traubenanmeldungen-Fensters (`DeliveryAncmtAdminWindow`) leicht erhöht und Fehler beim Enter-Drücken im _Gewicht_ Eingabefeld. (21f68caf4c, e18bc58b6c)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) wird das ändern der Kontaktart E-Mail wieder farblich hervorgehoben. (78a72c641f)
+
+[v0.10.6]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.6
+[i33]: https://git.necronda.net/winzer/elwig/issues/33
+
+
+
+
+[v0.10.5][v0.10.5] (2024-08-24) {#v0.10.5}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.5-features}
+
+* Im Mitglieder-Fenster (`MemberAdminWindow`) kann der Benutzer beim Übertragen von Flächenbindungen entscheiden, ob der Beginn der Laufzeit übernommen werden soll, oder nicht. (bec1b165bf)
+* Im Haupt-Fenster (`MainWindow`) ist es nun möglich für Waagen vom Typ `SysTec-IT` Datum und Uhrzeit festzulegen. (cd2b482b5a)
+
+### Sonstiges {#v0.10.5-misc}
+
+* Abstände in der Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (adbe418b7c)
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) scheinen keine Warnungen mehr auf, wenn ein nicht-optionales Feld nicht ausgefüllt wurde. (2ae2564647)
+
+[v0.10.5]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.5
+
+
+
+
+[v0.10.4][v0.10.4] (2024-08-22) {#v0.10.4}
+------------------------------------------
+
+### Sonstiges {#v0.10.4-misc}
+
+* Im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) wird der Wochentag auch beim Bearbeiten angezeigt. (85931e62e8)
+* Im Mitglieder-Fenster (`MemberAdminWindow`) werden Anzahl der Mitglieder und Geschäftsanteile nicht mehr von allen aktiven angezeigt, sonder von den momentan gefilterten. (49e4b65c27)
+* Statusleiste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`). (f54677d429)
+
+[v0.10.4]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.4
+
+
+
+
+[v0.10.3][v0.10.3] (2024-08-21) {#v0.10.3}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.3-bugfixes}
+
+* Datum für _Anmeldungen bis_ im Leseplan-Fenster (`DeliveryScheduleAdminWindow`) ab jetzt änderbar. (84d8d0cecb)
+
+### Sonstiges {#v0.10.3-misc}
+
+* Wochentag bei Leseplan-Liste im Anmeldungen-Fenster (`DeliveryAncmtAdminWindow`) anzeigen. (fe7f9d675b)
+
+[v0.10.3]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.3
+
+
+
+
+[v0.10.2][v0.10.2] (2024-08-16) {#v0.10.2}
+------------------------------------------
+
+### Behobene Fehler {#v0.10.2-bugfixes}
+
+* Beim Hochladen der Mitgliederdaten sind Flächenbindungen nicht mitexportiert worden. (204dfe8745)
+* Beim Importieren von älteren Exportdaten kam es zu einem Fehler. (cd40075702)
+
+[v0.10.2]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.2
+
+
+
+
 [v0.10.1][v0.10.1] (2024-08-14) {#v0.10.1}
 ------------------------------------------

--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@ -70,15 +70,16 @@ namespace Elwig {
            }

            ContextTimer.Tick += (object? sender, EventArgs evt) => {
-                if (CurrentLastWrite > LastChanged) {
-                    LastChanged = CurrentLastWrite;
+                var ch = CurrentLastWrite;
+                if (ch > LastChanged) {
+                    LastChanged = ch;
                    OnContextChanged();
                }
            };
        }

        private static void OnContextChanged() {
-            MainDispatcher.BeginInvoke(async () => await HintContextChange());
+            MainDispatcher.BeginInvoke(HintContextChange);
        }

        private static void OverrideCulture() {
@ -200,11 +201,13 @@ namespace Elwig {
            BranchMobileNr = entry.Item8;
        }

-        public static async Task HintContextChange() {
-            CurrentApp.LastChanged = CurrentLastWrite;
+        public static void HintContextChange() {
+            var ch = CurrentLastWrite;
+            if (ch > CurrentApp.LastChanged)
+                CurrentApp.LastChanged = ch;
            foreach (Window w in CurrentApp.Windows) {
                if (w is not ContextWindow c) continue;
-                await c.HintContextChange();
+                MainDispatcher.BeginInvoke(c.HintContextChange);
            }
        }

--- a/Elwig/Dialogs/AreaComDialog.xaml
+++ b/Elwig/Dialogs/AreaComDialog.xaml
@ -8,7 +8,7 @@
        ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
        WindowStartupLocation="CenterOwner"
        DataContext="{Binding RelativeSource={RelativeSource Self}}"
-        Title="Flächenbindungen übertragen" Height="230" Width="450">
+        Title="Flächenbindungen übertragen" Height="260" Width="450">
    <Window.Resources>
        <Style TargetType="Label">
            <Setter Property="HorizontalAlignment" Value="Left"/>
@ -48,11 +48,15 @@
                            Minimum="1900" Maximum="9999"
                            HorizontalAlignment="Center" VerticalAlignment="Top"
                            TextChanged="SeasonInput_TextChanged"/>
+        <CheckBox x:Name="CopyYearToInput" Content="Beginn der Laufzeit von Vorgänger übernehmen" Margin="0,80,0,0"
+                  HorizontalAlignment="Center" VerticalAlignment="Top"
+                  Checked="CopyYearToInput_Changed" Unchecked="CopyYearToInput_Changed"
+                  IsChecked="{Binding MaintainYearTo}"/>

-        <TextBlock x:Name="DescBlock1" Margin="0,85,0,0" TextAlignment="Center"
+        <TextBlock x:Name="DescBlock1" Margin="0,105,0,0" TextAlignment="Center"
                   HorizontalAlignment="Center" VerticalAlignment="Top">
            Die Flächenbindungen beim <Bold>Vorgänger</Bold> sind bis inkl. Saison <Bold><Run x:Name="CancelSeason1"/></Bold> gültig,<LineBreak/>
-            und werden beim <Bold>Nachfolger</Bold> ab inkl. Saison <Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
+            und werden beim <Bold>Nachfolger</Bold> ab <Run x:Name="DescBlock1Season" Text="inkl. Saison "/><Bold><Run x:Name="TransferSeason"/></Bold> übernommen.
        </TextBlock>
        <TextBlock x:Name="DescBlock2" Margin="0,70,0,0" TextAlignment="Center" Visibility="Hidden"
                   HorizontalAlignment="Center" VerticalAlignment="Top">
--- a/Elwig/Dialogs/AreaComDialog.xaml.cs
+++ b/Elwig/Dialogs/AreaComDialog.xaml.cs
@ -7,6 +7,7 @@ namespace Elwig.Dialogs {

        public int CancelSeason { get; set; }
        public int SuccessorSeason => CancelSeason + 1;
+        public bool MaintainYearTo { get; set; }

        public string AreaComNum { get; set; }
        public string Area { get; set; }
@ -22,6 +23,7 @@ namespace Elwig.Dialogs {
            QuestionBlock2.Visibility = Visibility.Visible;
            DescBlock1.Visibility = Visibility.Hidden;
            DescBlock2.Visibility = Visibility.Visible;
+            CopyYearToInput.Visibility = Visibility.Hidden;
            Height = 240;
            SeasonInput.Margin = new(0, 40, 0, 0);
            SeasonLabel.Margin = new(0, 40, 100, 0);
@ -41,7 +43,13 @@ namespace Elwig.Dialogs {
            CancelSeason = (int)SeasonInput.Value!;
            CancelSeason1.Text = $"{CancelSeason}";
            CancelSeason2.Text = $"{CancelSeason}";
-            TransferSeason.Text = $"{SuccessorSeason}";
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
+        }
+
+        private void CopyYearToInput_Changed(object sender, RoutedEventArgs evt) {
+            TransferSeason.Text = MaintainYearTo ? "" : $"{SuccessorSeason}";
+            DescBlock1Season.Text = MaintainYearTo ? "dem originalen Beginn der FB" : "inkl. Saison ";
        }

        private void ConfirmButton_Click(object sender, RoutedEventArgs evt) {
--- a/Elwig/Documents/BusinessDocument.cs
+++ b/Elwig/Documents/BusinessDocument.cs
@ -22,9 +22,9 @@ namespace Elwig.Documents {
            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>" +
                $"<thead><tr><th colspan='2'>Mitglied</th></tr></thead><tbody>" +
-                $"<tr><th>Mitglieds-Nr.</th><td>{m.MgNr}</td></tr>" +
-                $"<tr><th>Betriebs-Nr.</th><td>{m.LfbisNr}</td></tr>" +
-                $"<tr><th>UID</th><td>{uid}</td></tr>" +
+                $"<tr><th>Mitglieds-Nr.:</th><td>{m.MgNr}</td></tr>" +
+                $"<tr><th>Betriebs-Nr.:</th><td>{m.LfbisNr}</td></tr>" +
+                $"<tr><th>UID:</th><td>{uid}</td></tr>" +
                $"</tbody></table>";
        }

--- a/Elwig/Documents/CreditNote.cs
+++ b/Elwig/Documents/CreditNote.cs
@ -54,9 +54,9 @@ namespace Elwig.Documents {
            }
            Aside = Aside.Replace("</table>", "") +
                $"<thead><tr><th colspan='2'>Gutschrift</th></tr></thead><tbody>" +
-                $"<tr><th>TG-Nr.</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
-                $"<tr><th>Datum</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
-                $"<tr><th>Überw. am</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>TG-Nr.:</th><td>{(p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : "-")}</td></tr>" +
+                $"<tr><th>Datum:</th><td>{p.Variant.Date:dd.MM.yyyy}</td></tr>" +
+                $"<tr><th>Überw. am:</th><td>{p.Variant.TransferDate:dd.MM.yyyy}</td></tr>" +
                $"</tbody></table>";
            Text = App.Client.TextCreditNote;
            DocumentId = $"Tr.-Gutschr. " + (p.Credit != null ? $"{p.Credit.Year}/{p.Credit.TgNr:000}" : p.MgNr);
--- a/Elwig/Documents/DeliveryAncmtList.cshtml
+++ b/Elwig/Documents/DeliveryAncmtList.cshtml
@ -8,10 +8,12 @@
    <h2>@Model.Filter</h2>
    <table class="announcement-list">
        <colgroup>
-            <col style="width: 18mm;"/>
+            <col style="width: 15mm;"/>
            <col style="width: 12mm;"/>
-            <col style="width: 81mm;"/>
-            <col style="width: 40mm;"/>
+            <col style="width: 50mm;"/>
+            <col style="width: 25mm;"/>
+            <col style="width: 38mm;"/>
+            <col style="width: 11mm;"/>
            <col style="width: 14mm;"/>
        </colgroup>
        <thead>
@ -19,7 +21,9 @@
                <th rowspan="2">Datum</th>
                <th rowspan="2">MgNr.</th>
                <th rowspan="2" style="text-align: left;">Mitglied</th>
+                <th rowspan="2" style="text-align: left;">Ort</th>
                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2">Anmldg.</th>
                <th>Gewicht</th>
            </tr>
            <tr>
@ -29,17 +33,19 @@
        <tbody>
            @foreach (var a in Model.Announcements) {
                <tr>
-                    <td>@($"{a.Date:dd.MM.yyyy}")</td>
+                    <td class="small">@($"{a.Date:dd.MM.yyyy}")</td>
                    <td class="number">@a.MgNr</td>
                    <td>@a.AdministrativeName</td>
+                    <td class="small">@a.DefaultKg</td>
                    <td>@a.Variety</td>
+                    <td class="small center">@(a.Status ?? "-")</td>
                    <td class="number">@($"{a.Weight:N0}")</td>
                </tr>
            }
            <tr class="sum bold">
                <td colspan="2">Gesamt:</td>
-                <td colspan="2">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
-                <td class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
+                <td colspan="3">Anmeldungen: @($"{Model.Announcements.Count():N0}")</td>
+                <td colspan="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
            </tr>
        </tbody>
    </table>
--- a/Elwig/Documents/DeliveryNote.cs
+++ b/Elwig/Documents/DeliveryNote.cs
@ -23,9 +23,9 @@ namespace Elwig.Documents {
            Delivery = d;
            Aside = Aside.Replace("</table>", "") +
                $"<thead><tr><th colspan='2'>Lieferung</th></tr></thead><tbody>" +
-                $"<tr><th>LS-Nr.</th><td>{d.LsNr}</td></tr>" +
-                $"<tr><th>Datum/Zeit</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
-                $"<tr><th>Zweigstelle</th><td>{d.Branch.Name}</td></tr>" +
+                $"<tr><th>LS-Nr.:</th><td>{d.LsNr}</td></tr>" +
+                $"<tr><th>Datum/Zeit:</th><td>{d.Date:dd.MM.yyyy} / {d.Time:HH:mm}</td></tr>" +
+                $"<tr><th>Zweigstelle:</th><td>{d.Branch.Name}</td></tr>" +
                $"</tbody></table>";
            Text = App.Client.TextDeliveryNote;
            DocumentId = d.LsNr;
--- a/Elwig/Documents/MemberDataSheet.cshtml
+++ b/Elwig/Documents/MemberDataSheet.cshtml
@ -115,7 +115,7 @@
                <th>Stammgemeinde:</th>
                <td>@Model.Member.DefaultKg?.Name</td>
                <th colspan="2">Buchführend:</th>
-                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein")</td>
+                <td colspan="2">@(Model.Member.IsBuchführend ? "Ja" : "Nein") <span class="small">(@((Model.Member.IsBuchführend ? Model.Season.VatNormal : Model.Season.VatFlatrate) * 100)% USt.)</span></td>
            </tr>
            <tr>
                <th colspan="2" class="small">(Katastralgemeinde mit dem größten Anteil an Weinbauflächen)</th>
@ -206,7 +206,7 @@
                            <td class="text">@areaCom.GstNr.Replace(",", ", ").Replace("-", "–")</td>
                            <td class="number">@($"{areaCom.Area:N0}")</td>
                            <td class="center">@areaCom.WineCult?.Name</td>
-                            <td class="center">@(areaCom.YearTo == null ? $"ab {areaCom.YearFrom}" : $"{areaCom.YearFrom}–{areaCom.YearTo}")</td>
+                            <td class="center">@(areaCom.YearTo == null ? (areaCom.YearFrom == null ? "unbefristet" : $"ab {areaCom.YearFrom}") : (areaCom.YearFrom == null ? $"bis {areaCom.YearTo}" : $"{areaCom.YearFrom}–{areaCom.YearTo}"))</td>
                        </tr>
                        lastContract = contractType.AreaComType.DisplayName;
                    }
--- a/Elwig/Elwig.csproj
+++ b/Elwig/Elwig.csproj
@ -7,7 +7,7 @@
    <UseWPF>true</UseWPF>
    <PreserveCompilationContext>true</PreserveCompilationContext>
    <ApplicationIcon>Resources\Images\Elwig.ico</ApplicationIcon>
-    <Version>0.10.1</Version>
+    <Version>0.11.4</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
@ -25,17 +25,17 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
    <PackageReference Include="LinqKit" Version="1.3.0" />
    <PackageReference Include="MailKit" Version="4.7.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.32" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.33" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
    <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2739.15" />
    <PackageReference Include="NJsonSchema" Version="11.0.2" />
    <PackageReference Include="RazorLight" Version="2.3.1" />
-    <PackageReference Include="ScottPlot.WPF" Version="5.0.36" />
+    <PackageReference Include="ScottPlot.WPF" Version="5.0.39" />
    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
  </ItemGroup>
--- a/Elwig/Helpers/AppDbUpdater.cs
+++ b/Elwig/Helpers/AppDbUpdater.cs
@ -9,7 +9,7 @@ namespace Elwig.Helpers {
    public static class AppDbUpdater {

        // Don't forget to update value in Tests/fetch-resources.bat!
-        public static readonly int RequiredSchemaVersion = 28;
+        public static readonly int RequiredSchemaVersion = 30;

        private static int VersionOffset = 0;

--- a/Elwig/Helpers/Export/ElwigData.cs
+++ b/Elwig/Helpers/Export/ElwigData.cs
@ -39,6 +39,7 @@ namespace Elwig.Helpers.Export {
                Dictionary<int, int> currentDids;
                Dictionary<string, int> currentLsNrs;
                Dictionary<int, List<WbRd>> currentWbRde;
+                Dictionary<int, AT_Kg> kgs;

                using (var ctx = new AppDbContext()) {
                    branches = await ctx.Branches.ToDictionaryAsync(b => b.ZwstId);
@ -50,6 +51,7 @@ namespace Elwig.Helpers.Export {
                    currentWbRde = await ctx.WbRde
                        .GroupBy(r => r.KgNr)
                        .ToDictionaryAsync(g => g.Key, g => g.ToList());
+                    kgs = await ctx.Katastralgemeinden.Include(k => k.WbKg).ToDictionaryAsync(k => k.KgNr);
                }

                var data = new List<(
@ -101,9 +103,9 @@ namespace Elwig.Helpers.Export {
                        string? line;
                        while ((line = await reader.ReadLineAsync()) != null) {
                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (m, b, telNrs, emailAddrs) = obj.ToMember();
+                            var (m, b, telNrs, emailAddrs) = obj.ToMember(kgs);
                            r.Members.Add(m);
-                            if (b != null) data[^1].BillingAddresses.Add(b);
+                            if (b != null) r.BillingAddresses.Add(b);
                            r.TelephoneNumbers.AddRange(telNrs);
                            r.EmailAddresses.AddRange(emailAddrs);
                        }
@ -115,9 +117,12 @@ namespace Elwig.Helpers.Export {
                        string? line;
                        while ((line = await reader.ReadLineAsync()) != null) {
                            var obj = JsonNode.Parse(line)!.AsObject();
-                            var (areaCom, wbrd) = obj.ToAreaCom(currentWbRde);
+                            var (areaCom, wbrd) = obj.ToAreaCom(kgs, currentWbRde);
                            r.AreaCommitments.Add(areaCom);
-                            if (wbrd != null) r.Riede.Add(wbrd);
+                            if (wbrd != null) {
+                                currentWbRde[wbrd.KgNr].Add(wbrd);
+                                r.Riede.Add(wbrd);
+                            }
                        }
                    }

@ -223,6 +228,7 @@ namespace Elwig.Helpers.Export {
                        importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters));
                    }
                    if (areaCommitments.Count > 0) {
+                        ctx.AddRange(riede);
                        var imported = areaCommitments.Where(c => (importNewMembers && !duplicateMgNrs.Contains(c.MgNr)) || (importDuplicateMembers && duplicateMgNrs.Contains(c.MgNr))).ToList();
                        importedAreaComs.Add((meta.FileName, meta.ZwstId, meta.Device, imported.Count, areaCommitments.Count - imported.Count, meta.AreaComFilters));
                    }
@ -268,7 +274,7 @@ namespace Elwig.Helpers.Export {
                    await ctx.SaveChangesAsync();
                    await AddImportedFiles(Path.GetFileName(meta.FileName));
                }
-                await App.HintContextChange();
+                App.HintContextChange();

                MessageBox.Show(
                    $"Das importieren der Daten war erfolgreich!\n" +
@ -457,12 +463,16 @@ namespace Elwig.Helpers.Export {
            };
        }

-        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json) {
+        public static (Member, BillingAddr?, List<MemberTelNr>, List<MemberEmailAddr>) ToMember(this JsonNode json, Dictionary<int, AT_Kg> kgs) {
            var mgnr = json["mgnr"]!.AsValue().GetValue<int>();
+            var kgnr = json["default_kgnr"]?.AsValue().GetValue<int>();
+            if (kgnr != null && !kgs.Values.Any(k => k.WbKg?.KgNr == kgnr)) {
+                throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr.Value, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
+            }
            return (new Member {
                MgNr = mgnr,
                PredecessorMgNr = json["predecessor_mgnr"]?.AsValue().GetValue<int>(),
-                Name = json["name"]!.AsValue().GetValue<string>(),
+                Name = json["name"]?.AsValue().GetValue<string>() ?? json["family_name"]!.AsValue().GetValue<string>(),
                Prefix = json["prefix"]?.AsValue().GetValue<string>(),
                GivenName = json["given_name"]?.AsValue().GetValue<string>(),
                MiddleName = json["middle_names"]?.AsValue().GetValue<string>(),
@ -488,7 +498,7 @@ namespace Elwig.Helpers.Export {
                CountryNum = json["address"]!["country"]!.AsValue().GetValue<int>(),
                PostalDestId = json["address"]!["postal_dest"]!.AsValue().GetValue<string>(),
                Address = json["address"]!["address"]!.AsValue().GetValue<string>(),
-                DefaultKgNr = json["default_kgnr"]?.AsValue().GetValue<int>(),
+                DefaultKgNr = kgnr,
                ContactViaPost = json["contact_postal"]?.AsValue().GetValue<bool>() ?? false,
                ContactViaEmail = json["contact_email"]?.AsValue().GetValue<bool>() ?? false,
                Comment = json["comment"]?.AsValue().GetValue<string>(),
@ -528,13 +538,13 @@ namespace Elwig.Helpers.Export {
            };
        }

-        public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, List<WbRd>> riede) {
+        public static (AreaCom, WbRd?) ToAreaCom(this JsonNode json, Dictionary<int, AT_Kg> kgs, Dictionary<int, List<WbRd>> riede) {
            var kgnr = json["kgnr"]!.AsValue().GetValue<int>();
            var ried = json["ried"]?.AsValue().GetValue<string>();
            WbRd? rd = null;
            bool newRd = false;
            if (ried != null) {
-                var rde = riede[kgnr] ?? throw new ArgumentException($"KG {kgnr:00000} is no WbKg");
+                var rde = riede[kgnr] ?? throw new ArgumentException($"Für KG {(kgs.TryGetValue(kgnr, out var k) ? k.Name : "?")} ({kgnr:00000}) ist noch keine Großlage festgelegt!\n(Stammdaten → Herkunftshierarchie)");
                rd = rde.FirstOrDefault(r => r.Name == ried);
                if (rd == null) {
                    newRd = true;
@ -555,7 +565,7 @@ namespace Elwig.Helpers.Export {
                KgNr = kgnr,
                GstNr = json["gstnr"]?.AsValue().GetValue<string>() ?? "-",
                RdNr = rd?.RdNr,
-                YearFrom = json["year_from"]!.AsValue().GetValue<int>(),
+                YearFrom = json["year_from"]?.AsValue().GetValue<int>(),
                YearTo = json["year_to"]?.AsValue().GetValue<int>(),
                Comment = json["comment"]?.AsValue().GetValue<string>(),
            }, newRd ? rd : null);
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@ -348,7 +348,7 @@ namespace Elwig.Helpers {
        }

        public static (string, string?) SplitName(string fullName, string? familyName) {
-            if (familyName == null || familyName == "") return (fullName, null);
+            if (string.IsNullOrWhiteSpace(familyName)) return (fullName, null);
            var p0 = fullName.IndexOf(familyName, StringComparison.CurrentCultureIgnoreCase);
            if (p0 == -1) return (fullName, null);
            var p1 = fullName.IndexOf(" und ");
@ -362,8 +362,10 @@ namespace Elwig.Helpers {
                    var p3 = fullName.LastIndexOf(' ', p2 - 1);
                    return (fullName[0..p3], fullName[(p3 + 1)..^0]);
                }
-            } else {
+            } else if (p0 + familyName.Length >= fullName.Length || fullName[p0 + familyName.Length] == ' ') {
                return (familyName, fullName.Replace(familyName, "").Replace("  ", " ").Trim());
+            } else {
+                return (fullName, null);
            }
        }

@ -537,6 +539,16 @@ namespace Elwig.Helpers {
            }
        }

+        public static List<EventLogEntry> GetLogEntries() {
+            using var log = new EventLog {
+                Log = "Application",
+                Source = ".NET Runtime",
+            };
+            return log.Entries.Cast<EventLogEntry>()
+                .Where(e => e.Message.StartsWith("Application: Elwig.exe"))
+                .ToList();
+        }
+
        public static int GetEntityIdetifierForPk(params object?[] primaryKey) {
            var pk = primaryKey.Select(k => k?.GetHashCode() ?? 0).ToArray();
            return ((IStructuralEquatable)pk).GetHashCode(EqualityComparer<int>.Default);
@ -558,7 +570,7 @@ namespace Elwig.Helpers {

        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments() => ActiveAreaCommitments(CurrentYear);
        public static Expression<Func<AreaCom, bool>> ActiveAreaCommitments(int year) =>
-            c => (c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);
+            c => (c.YearFrom == null || c.YearFrom <= year) && (c.YearTo == null || c.YearTo >= year);

        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query) => ActiveAreaCommitments(query, CurrentYear);
        public static IQueryable<AreaCom> ActiveAreaCommitments(IQueryable<AreaCom> query, int year) =>
--- a/Elwig/Helpers/Validator.cs
+++ b/Elwig/Helpers/Validator.cs
@ -8,7 +8,7 @@ namespace Elwig.Helpers {
    public static class Validator {

        private static readonly Dictionary<string, string[][]> PHONE_NRS = new() {
-            { "43", new string[][] {
+            { "43", [
                [],
                ["57", "59"],
                [
@ -17,17 +17,17 @@ namespace Elwig.Helpers {
                    "650", "651", "652", "653", "655", "657", "659", "660", "661",
                    "663", "664", "665", "666", "667", "668", "669", "67", "68", "69"
                ]
-            } },
-            { "49", Array.Empty<string[]>() },
-            { "48", Array.Empty<string[]>() },
-            { "420", Array.Empty<string[]>() },
-            { "421", Array.Empty<string[]>() },
-            { "36", Array.Empty<string[]>() },
-            { "386", Array.Empty<string[]>() },
-            { "39", Array.Empty<string[]>() },
-            { "33", Array.Empty<string[]>() },
-            { "41", Array.Empty<string[]>() },
-            { "423", Array.Empty<string[]>() },
+            ] },
+            { "49", [] },
+            { "48", [] },
+            { "420", [] },
+            { "421", [] },
+            { "36", [] },
+            { "386", [] },
+            { "39", [] },
+            { "33", [] },
+            { "41", [] },
+            { "423", [] },
        };

        public static ValidationResult CheckInteger(TextBox input, bool required) {
--- a/Elwig/Helpers/Weighing/GassnerScale.cs
+++ b/Elwig/Helpers/Weighing/GassnerScale.cs
@ -118,5 +118,9 @@ namespace Elwig.Helpers.Weighing {
        public async Task RevokeFillingClearance() {
            await SetFillingClearance(false);
        }
+
+        public Task SetDateAndTime(DateTime dateTime) {
+            throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert");
+        }
    }
 }
--- a/Elwig/Helpers/Weighing/ICommandScale.cs
+++ b/Elwig/Helpers/Weighing/ICommandScale.cs
@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;

 namespace Elwig.Helpers.Weighing {
@ -31,5 +32,10 @@ namespace Elwig.Helpers.Weighing {
        /// Revoke clearance to fill the scale container
        /// </summary>
        Task RevokeFillingClearance();
+
+        /// <summary>
+        /// Try to set date and time on the scale
+        /// </summary>
+        Task SetDateAndTime(DateTime dateTime);
    }
 }
--- a/Elwig/Helpers/Weighing/SysTecITScale.cs
+++ b/Elwig/Helpers/Weighing/SysTecITScale.cs
@ -161,5 +161,10 @@ namespace Elwig.Helpers.Weighing {
        public async Task RevokeFillingClearance() {
            await SetFillingClearance(false);
        }
+
+        public async Task SetDateAndTime(DateTime dateTime) {
+            await SendCommand($"ST{dateTime:dd.MM.yyHH:mm:ss}");
+            await ReceiveResponse();
+        }
    }
 }
--- a/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
+++ b/Elwig/Models/Dtos/AreaComUnderDeliveyData.cs
@ -40,12 +40,12 @@ namespace Elwig.Models.Dtos {
                           COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '') AS name_2,
                           p.plz, o.name AS ort, m.address,
                           c.bucket, c.area, u.min_kg, u.weight
-                    FROM member m
+                    FROM v_area_commitment_bucket_strict c
+                        LEFT JOIN member m ON m.mgnr = c.mgnr
                        LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                        LEFT JOIN AT_ort o ON o.okz = p.okz
-                        LEFT JOIN v_area_commitment_bucket_strict c ON c.mgnr = m.mgnr AND c.year = {year}
                        JOIN v_under_delivery u ON (u.mgnr, u.bucket, u.year) = (m.mgnr, c.bucket, c.year)
-                    WHERE m.active = 1
+                    WHERE c.year = {year} AND m.active = 1
                    ORDER BY m.mgnr, c.bucket
                    """).ToListAsync();
        }
--- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs
+++ b/Elwig/Models/Dtos/DeliveryAncmtListData.cs
@ -15,8 +15,12 @@ namespace Elwig.Models.Dtos {
            ("MgNr", "MgNr.", null, 12),
            ("Name1", "Name", null, 40),
            ("Name2", "Vorname", null, 40),
+            ("DefaultKg", "Ort", null, 40),
            ("SortId", "Sorte", null, 10),
            ("Weight", "Gewicht", "kg", 20),
+            ("CreatedTimestamp", "Angemeldet", null, 35),
+            ("ModifiedTimestamp", "Geändert", null, 35),
+            ("Status", "Status", null, 20),
        ];

        public DeliveryAncmtListData(IEnumerable<DeliveryAncmtListRow> rows, List<string> filterNames) :
@ -40,9 +44,13 @@ namespace Elwig.Models.Dtos {
        public string Name1;
        public string? Name2;
        public string AdministrativeName;
+        public string? DefaultKg;
        public string SortId;
        public string Variety;
+        public DateTime CreatedTimestamp;
+        public DateTime? ModifiedTimestamp;
        public int Weight;
+        public string? Status;

        public DeliveryAncmtListRow(DeliveryAncmt a) {
            var s = a.Schedule;
@ -54,9 +62,13 @@ namespace Elwig.Models.Dtos {
            Name1 = m.AdministrativeName1;
            Name2 = m.AdministrativeName2;
            AdministrativeName = m.AdministrativeName;
+            DefaultKg = m.DefaultKg?.Name;
            SortId = a.SortId;
            Variety = a.Variety.Name;
+            CreatedTimestamp = a.CreatedTimestamp;
+            ModifiedTimestamp = a.ModifiedTimestamp == a.CreatedTimestamp ? null : a.ModifiedTimestamp;
            Weight = a.Weight;
+            Status = s.AncmtTo == null ? null : a.CreatedTimestamp >= s.AncmtTo ? "verspät." : "ok";
        }
    }
 }
--- a/Elwig/Models/Dtos/OverUnderDeliveryData.cs
+++ b/Elwig/Models/Dtos/OverUnderDeliveryData.cs
@ -33,12 +33,12 @@ namespace Elwig.Models.Dtos {
                       m.business_shares * s.min_kg_per_bs AS min_kg,
                       m.business_shares * s.max_kg_per_bs AS max_kg,
                       COALESCE(SUM(d.weight), 0) AS sum
-                FROM member m
+                FROM v_delivery d
+                    LEFT JOIN member m ON m.mgnr = d.mgnr
                    LEFT JOIN AT_plz_dest p ON p.id = m.postal_dest
                    LEFT JOIN AT_ort o ON o.okz = p.okz
-                    LEFT JOIN season s ON s.year = {year}
-                    LEFT JOIN v_delivery d ON d.mgnr = m.mgnr AND d.year = s.year
-                WHERE m.active = TRUE OR d.weight > 0
+                    LEFT JOIN season s ON s.year = d.year
+                WHERE s.year = {year} AND (m.active = TRUE OR d.weight > 0)
                GROUP BY d.year, m.mgnr
                ORDER BY 100.0 * sum / max_kg, m.mgnr;
                """).ToListAsync();
--- a/Elwig/Models/Entities/AreaCom.cs
+++ b/Elwig/Models/Entities/AreaCom.cs
@ -32,7 +32,7 @@ namespace Elwig.Models.Entities {
        public int? RdNr { get; set; }

        [Column("year_from")]
-        public int YearFrom { get; set; }
+        public int? YearFrom { get; set; }

        [Column("year_to")]
        public int? YearTo { get; set; }
--- a/Elwig/Models/Entities/DeliverySchedule.cs
+++ b/Elwig/Models/Entities/DeliverySchedule.cs
@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
+using System.Windows;

 namespace Elwig.Models.Entities {
    [Table("delivery_schedule"), PrimaryKey("Year", "DsNr")]
@ -29,6 +30,15 @@ namespace Elwig.Models.Entities {
        [Column("description")]
        public required string Description { get; set; }

+        [NotMapped]
+        public string Identifier => $"{Date:dd.MM.} - {ZwstId} - {Description}";
+
+        [Column("attrid")]
+        public string? AttrId { get; set; }
+
+        [Column("cultid")]
+        public string? CultId { get; set; }
+
        [Column("max_weight")]
        public int? MaxWeight { get; set; }
        [NotMapped]
@ -36,6 +46,11 @@ namespace Elwig.Models.Entities {
        [NotMapped]
        public double? Percent => (double)AnnouncedWeight / MaxWeight * 100;

+        [Column("cancelled")]
+        public bool IsCancelled { get; set; }
+        [NotMapped]
+        public TextDecorationCollection? TextDecoration => IsCancelled ? TextDecorations.Strikethrough : null;
+
        [Column("ancmt_from")]
        public long? AncmtFromUnix { get; set; }
        [NotMapped]
@ -58,6 +73,12 @@ namespace Elwig.Models.Entities {
        [ForeignKey("ZwstId")]
        public virtual Branch Branch { get; private set; } = null!;

+        [ForeignKey("AttrId")]
+        public virtual WineAttr? Attribute { get; private set; }
+
+        [ForeignKey("CultId")]
+        public virtual WineCult? Cultivation { get; private set; }
+
        [InverseProperty(nameof(DeliveryScheduleWineVar.Schedule))]
        public virtual ICollection<DeliveryScheduleWineVar> Varieties { get; private set; } = null!;

--- a/Elwig/Models/Entities/Member.cs
+++ b/Elwig/Models/Entities/Member.cs
@ -167,6 +167,9 @@ namespace Elwig.Models.Entities {
        [InverseProperty(nameof(BillingAddr.Member))]
        public virtual BillingAddr? BillingAddress { get; private set; }

+        [InverseProperty(nameof(Delivery.Member))]
+        public virtual ICollection<DeliveryAncmt> Announcements { get; private set; } = null!;
+
        [InverseProperty(nameof(Delivery.Member))]
        public virtual ICollection<Delivery> Deliveries { get; private set; } = null!;

--- a/Elwig/Resources/Sql/28-29.sql
+++ b/Elwig/Resources/Sql/28-29.sql
@ -0,0 +1,23 @@
+-- schema version 28 to 29
+
+ALTER TABLE delivery_schedule ADD COLUMN attrid TEXT DEFAULT NULL;
+ALTER TABLE delivery_schedule ADD COLUMN cultid TEXT DEFAULT NULL;
+ALTER TABLE delivery_schedule ADD COLUMN cancelled INTEGER NOT NULL CHECK (cancelled IN (TRUE, FALSE)) DEFAULT FALSE;
+UPDATE delivery_schedule SET cultid = 'B' WHERE UPPER(description) LIKE '%BIO%';
+UPDATE delivery_schedule SET cancelled = TRUE WHERE zwstid = 'M' AND date IN ('2024-09-14', '2024-09-16');
+
+PRAGMA writable_schema = ON;
+
+UPDATE sqlite_schema SET sql = REPLACE(sql, '
+) STRICT', ',
+    CONSTRAINT fk_delivery_schedule_wine_attribute FOREIGN KEY (attrid) REFERENCES wine_attribute (attrid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT,
+    CONSTRAINT fk_delivery_schedule_wine_cultivation FOREIGN KEY (cultid) REFERENCES wine_cultivation (cultid)
+        ON UPDATE CASCADE
+        ON DELETE RESTRICT
+) STRICT')
+WHERE type = 'table' AND name = 'delivery_schedule';
+
+PRAGMA schema_version = 2801;
+PRAGMA writable_schema = OFF;
--- a/Elwig/Resources/Sql/29-30.sql
+++ b/Elwig/Resources/Sql/29-30.sql
@ -0,0 +1,18 @@
+-- schema version 29 to 30
+
+PRAGMA writable_schema = ON;
+
+DROP VIEW v_bki_member;
+CREATE VIEW v_bki_member AS
+SELECT s.year, m.mgnr, m.lfbis_nr, m.name,
+       (COALESCE(m.prefix || ' ', '') || m.given_name || COALESCE(' ' || m.middle_names, '') || COALESCE(' ' || m.suffix, '')) AS other_names,
+       a.name AS billing_name, COALESCE(a.address, m.address) AS address,
+       COALESCE(a.country, m.country) AS country, COALESCE(a.postal_dest, m.postal_dest) AS postal_dest,
+       SUM(COALESCE(IIF((c.year_from IS NULL OR c.year_from <= s.year) AND (c.year_to IS NULL OR c.year_to >= s.year), c.area, NULL), 0)) AS area
+FROM season s, member m
+    LEFT JOIN member_billing_address a ON a.mgnr = m.mgnr
+    LEFT JOIN area_commitment c ON c.mgnr = m.mgnr
+GROUP BY s.year, m.mgnr;
+
+PRAGMA schema_version = 2901;
+PRAGMA writable_schema = OFF;
--- a/Elwig/Services/AreaComService.cs
+++ b/Elwig/Services/AreaComService.cs
@ -100,42 +100,43 @@ namespace Elwig.Services {
        }

        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
-            using var ctx = new AppDbContext();
            int newFbNr = (int)vm.FbNr!;

-            var a = new AreaCom {
-                FbNr = oldFbNr ?? newFbNr,
-                MgNr = (int)vm.MgNr!,
-                YearFrom = (int)vm.YearFrom!,
-                YearTo = vm.YearTo,
-                VtrgId = vm.AreaComType!.VtrgId,
-                CultId = vm.WineCult?.CultId,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                KgNr = vm.Kg!.KgNr,
-                RdNr = vm.Rd?.RdNr,
-                GstNr = vm.GstNr!.Trim(),
-                Area = (int)vm.Area!,
-            };
+            using (var ctx = new AppDbContext()) {
+                var a = new AreaCom {
+                    FbNr = oldFbNr ?? newFbNr,
+                    MgNr = (int)vm.MgNr!,
+                    YearFrom = vm.YearFrom,
+                    YearTo = vm.YearTo,
+                    VtrgId = vm.AreaComType!.VtrgId,
+                    CultId = vm.WineCult?.CultId,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    KgNr = vm.Kg!.KgNr,
+                    RdNr = vm.Rd?.RdNr,
+                    GstNr = vm.GstNr!.Trim(),
+                    Area = (int)vm.Area!,
+                };

-            if (vm.Rd?.RdNr == 0) {
-                vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
-                a.RdNr = vm.Rd.RdNr;
-                ctx.Add(vm.Rd);
+                if (vm.Rd?.RdNr == 0) {
+                    vm.Rd.RdNr = await ctx.NextRdNr(a.KgNr);
+                    a.RdNr = vm.Rd.RdNr;
+                    ctx.Add(vm.Rd);
+                }
+
+                if (oldFbNr != null) {
+                    ctx.Update(a);
+                } else {
+                    ctx.Add(a);
+                }
+
+                await ctx.SaveChangesAsync();
+
+                if (newFbNr != a.FbNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
+                }
            }

-            if (oldFbNr != null) {
-                ctx.Update(a);
-            } else {
-                ctx.Add(a);
-            }
-
-            await ctx.SaveChangesAsync();
-
-            if (newFbNr != a.FbNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
-            }
-
-            await App.HintContextChange();
+            App.HintContextChange();

            return newFbNr;
        }
@ -161,20 +162,13 @@ namespace Elwig.Services {
            AddToolTipCell(grid, max == null ? "" : $"{max:N0} kg", row, 4, 1, bold, true);
        }

-        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
-            var grid = new Grid();
-            grid.ColumnDefinitions.Add(new() { Width = new(10) });
-            grid.ColumnDefinitions.Add(new() { Width = new(60) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            grid.ColumnDefinitions.Add(new() { Width = new(80) });
-            AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
-            AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
+        public static async Task<(string, (string?, string?, int, int?, int?)[])> GenerateToolTipData(IQueryable<AreaCom> areaComs, int maxKgPerHa) {
+            var grid = new List<(string?, string?, int, int?, int?)>();
            var text = "-";

            var area = await areaComs.SumAsync(p => p.Area);
            text = $"{area:N0} m²";
-            AddToolTipRow(grid, 1, "Geb. Fläche", null, area, null, null);
+            grid.Add(("Geb. Fläche", null, area, null, null));

            if (await areaComs.AnyAsync()) {
                var attrGroups = await areaComs
@ -220,24 +214,38 @@ namespace Elwig.Services {
                    .ThenBy(g => g.SortId)
                    .ToListAsync();

-                int rowNum = 2;
                if (noAttr.Count > 0) {
-                    rowNum++;
-                    AddToolTipRow(grid, rowNum++, null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max));
+                    grid.Add((null, null, noAttr.Sum(g => g.Area), noAttr.Sum(g => g.Min), noAttr.Sum(g => g.Max)));
                    foreach (var g in noAttr) {
-                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
+                        grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
                    }
                }
                foreach (var attrG in attrGroups) {
-                    rowNum++;
-                    AddToolTipRow(grid, rowNum++, attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max);
+                    grid.Add((attrG.Attr, null, attrG.Area, attrG.Min, attrG.Max));
                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr).OrderByDescending(g => g.Area).ThenBy(g => g.SortId)) {
-                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Area, g.Min, g.Max);
+                        grid.Add((null, g.SortId, g.Area, g.Min, g.Max));
                    }
                }
            }

-            return (text, grid);
+            return (text, grid.ToArray());
+        }
+
+        public static Grid GenerateToolTip((string?, string?, int, int?, int?)[] data) {
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            AddToolTipCell(grid, "Lieferpflicht", 0, 3, 1, false, false, true);
+            AddToolTipCell(grid, "Lieferrecht", 0, 4, 1, false, false, true);
+            int rowNum = 1;
+            foreach (var row in data) {
+                if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
+                AddToolTipRow(grid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+            return grid;
        }
    }
 }
--- a/Elwig/Services/DeliveryAncmtService.cs
+++ b/Elwig/Services/DeliveryAncmtService.cs
@ -9,10 +9,11 @@ using Elwig.Documents;
 using Elwig.Helpers.Export;
 using Elwig.Models.Dtos;
 using Microsoft.Win32;
-using System.Net.Http;
 using System.Windows.Input;
 using System.Windows;
 using System;
+using LinqKit;
+using System.Windows.Controls;

 namespace Elwig.Services {
    public static class DeliveryAncmtService {
@ -27,13 +28,17 @@ namespace Elwig.Services {
        }

        public static void ClearInputs(this DeliveryAncmtAdminViewModel vm) {
+            vm.StatusAncmtCreated = "-";
+            vm.StatusAncmtModified = "-";
        }

-        public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
+        public static void FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
            vm.MgNr = a.MgNr;
            vm.DeliverySchedule = (DeliverySchedule?)ControlUtils.GetItemFromSourceWithPk(vm.DeliveryScheduleSource, a.Year, a.DsNr);
            vm.SortId = a.SortId;
            vm.Weight = a.Weight;
+            vm.StatusAncmtCreated = $"{a.CreatedTimestamp:dd.MM.yyyy, HH:mm} ({a.Type})";
+            vm.StatusAncmtModified = a.ModifiedTimestamp != a.CreatedTimestamp ? $"{a.ModifiedTimestamp:dd.MM.yyyy, HH:mm}" : "-";
        }

        public static async Task<(List<string>, IQueryable<DeliveryAncmt>, List<string>)> GetFilters(this DeliveryAncmtAdminViewModel vm, AppDbContext ctx) {
@ -43,18 +48,28 @@ namespace Elwig.Services {
                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == s.Year && a.DsNr == s.DsNr);
                filterNames.Add($"{s.Date:dd.MM.yyyy} – {s.Branch.Name} – {s.Description}");
            } else {
-                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason);
+                deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Year == vm.FilterSeason && (!vm.FilterOnlyUpcoming || a.Schedule.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0));
                filterNames.Add($"{vm.FilterSeason}");
            }

            var filterVar = new List<string>();
            var filterNotVar = new List<string>();
            var filterMgNr = new List<int>();
+            var filterZwst = new List<string>();
+            var filterAttr = new List<string>();
+            var filterNotAttr = new List<string>();
+            var filterCult = new List<string>();
+            var filterNotCult = new List<string>();
+            var filterDate = new List<(string?, string?)>();
+            int filterWeightGt = 0, filterWeightLt = 0;

            var filter = vm.TextFilter;
            if (filter.Count > 0) {
                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
+                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
+                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);

                for (int i = 0; i < filter.Count; i++) {
                    var e = filter[i];
@ -78,6 +93,82 @@ namespace Elwig.Services {
                        filterMgNr.Add(int.Parse(e));
                        filter.RemoveAt(i--);
                        filterNames.Add(member.AdministrativeName);
+                    } else if (attr.ContainsKey(e.ToLower())) {
+                        var a = attr[e.ToLower()];
+                        filterAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Attribut {a.Name}");
+                    } else if (e[0] == '!' && attr.ContainsKey(e[1..].ToLower())) {
+                        var a = attr[e[1..].ToLower()];
+                        filterNotAttr.Add(a.AttrId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Attribut {a.Name}");
+                    } else if (cult.ContainsKey(e.ToLower())) {
+                        var c = cult[e.ToLower()];
+                        filterCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Bewirtschaftung {c.Name}");
+                    } else if (e[0] == '!' && cult.ContainsKey(e[1..].ToLower())) {
+                        var c = cult[e[1..].ToLower()];
+                        filterNotCult.Add(c.CultId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"ohne Bewirtschaftung {c.Name}");
+                    } else if (zwst.ContainsKey(e.ToLower())) {
+                        var b = zwst[e.ToLower()];
+                        filterZwst.Add(b.ZwstId);
+                        filter.RemoveAt(i--);
+                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if ((e.StartsWith('>') || e.StartsWith('<')) && e.EndsWith("kg")) {
+                        if (int.TryParse(e[1..^2], out var num)) {
+                            switch (e[0]) {
+                                case '>': filterWeightGt = num; break;
+                                case '<': filterWeightLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 3) filter.RemoveAt(i--);
+                    } else if (DateOnly.TryParse(e, out var date)) {
+                        var str = date.ToString("yyyy-MM-dd");
+                        filterDate.Add((str, str));
+                        filter.RemoveAt(i--);
+                        if (filterNames.Contains($"{vm.FilterSeason}") && vm.FilterSeason == date.Year)
+                            filterNames.Remove($"{vm.FilterSeason}");
+                        filterNames.Add(date.ToString("dd.MM.yyyy"));
+                    } else if (Utils.DateFromToRegex.IsMatch(e)) {
+                        var parts = e.Split("-");
+                        if (parts.Length == 1) {
+                            // single date
+                            var dParts = parts[0].Split('.');
+                            var str = $"{dParts[2]}-{dParts[1].PadLeft(2, '0')}-{dParts[0].PadLeft(2, '0')}";
+                            filterDate.Add((str, str));
+                            filter.RemoveAt(i--);
+                            var n = string.Join('.', str.Split('-').Reverse());
+                            if (dParts[2] == "") {
+                                filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n + $"{vm.FilterSeason}");
+                            } else {
+                                if ($"{vm.FilterSeason}" == dParts[2])
+                                    filterNames.Remove($"{vm.FilterSeason}");
+                                filterNames.Add(n);
+                            }
+                        } else if (parts.Length == 2) {
+                            // from/to date
+                            var d1Parts = parts[0].Split('.');
+                            var d2Parts = parts[1].Split('.');
+                            var s1 = d1Parts.Length < 2 ? null : $"{d1Parts.ElementAtOrDefault(2)}-{d1Parts[1].PadLeft(2, '0')}-{d1Parts[0].PadLeft(2, '0')}";
+                            var s2 = d2Parts.Length < 2 ? null : $"{d2Parts.ElementAtOrDefault(2)}-{d2Parts[1].PadLeft(2, '0')}-{d2Parts[0].PadLeft(2, '0')}";
+                            filterDate.Add((s1, s2));
+                            filter.RemoveAt(i--);
+                            var n1 = s1 == null ? null : string.Join('.', s1.Split('-').Reverse());
+                            var n2 = s2 == null ? null : string.Join('.', s2.Split('-').Reverse());
+                            if (n1 != null && n2 != null) {
+                                filterNames.Add($"{n1}–{n2}");
+                            } else if (n1 != null) {
+                                filterNames.Add($"ab dem {n1}");
+                            } else if (n2 != null) {
+                                filterNames.Add($"bis zum {n2}");
+                            }
+                        }
                    } else if (e.Length > 2 && e.StartsWith('"') && e.EndsWith('"')) {
                        filter[i] = e[1..^1];
                    } else if (e.Length <= 2) {
@ -85,9 +176,30 @@ namespace Elwig.Services {
                    }
                }

+                if (filterWeightGt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight >= filterWeightGt);
+                if (filterWeightLt > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Weight <= filterWeightLt);
                if (filterMgNr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterMgNr.Contains(a.MgNr));
+                if (filterDate.Count > 0) {
+                    var pr = PredicateBuilder.New<DeliveryAncmt>(false);
+                    foreach (var (d1, d2) in filterDate)
+                        pr.Or(a => (d1 == null || d1.CompareTo(a.Schedule.DateString.Substring(10 - d1.Length)) <= 0) && (d2 == null || d2.CompareTo(a.Schedule.DateString.Substring(10 - d2.Length)) >= 0));
+                    deliveryAncmtQuery = deliveryAncmtQuery.Where(pr);
+                }
                if (filterVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterVar.Contains(a.SortId));
                if (filterNotVar.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => !filterNotVar.Contains(a.SortId));
+                if (filterZwst.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => filterZwst.Contains(a.Schedule.ZwstId));
+                if (filterAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId != null && filterAttr.Contains(a.Schedule.AttrId));
+                if (filterNotAttr.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.AttrId == null || !filterNotAttr.Contains(a.Schedule.AttrId));
+                if (filterCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId != null && filterCult.Contains(a.Schedule.CultId));
+                if (filterNotCult.Count > 0) deliveryAncmtQuery = deliveryAncmtQuery.Where(a => a.Schedule.CultId == null || !filterNotCult.Contains(a.Schedule.CultId));
+
+                if (filterWeightGt > 0 && filterWeightLt > 0) {
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
+                }
            }

            return (filterNames, deliveryAncmtQuery, filter);
@ -122,7 +234,7 @@ namespace Elwig.Services {
                }
            }

-            await App.HintContextChange();
+            App.HintContextChange();

            return (year, dsnr, newMgNr, newSortId);
        }
@ -179,5 +291,108 @@ namespace Elwig.Services {
                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,
+                TextAlignment = alignRight ? TextAlignment.Right : alignCenter ? TextAlignment.Center : TextAlignment.Left,
+                Margin = new(0, 12 * row, 0, 0),
+                FontWeight = bold ? FontWeights.Bold : FontWeights.Normal,
+            };
+            tb.SetValue(Grid.ColumnProperty, col);
+            tb.SetValue(Grid.ColumnSpanProperty, colSpan);
+            grid.Children.Add(tb);
+        }
+
+        private static void AddToolTipRow(Grid grid, int row, string? h1, string? h2, int weight, int? total1, int total2) {
+            var bold = h2 == null;
+            if (h1 != null) AddToolTipCell(grid, h1 + ":", row, 0, (h2 == null) ? 2 : 1, bold);
+            if (h2 != null) AddToolTipCell(grid, h2 + ":", row, 1, 1, bold);
+            AddToolTipCell(grid, $"{weight:N0} kg", row, 2, 1, bold, true);
+            if (total1 != null && total1 != 0)
+                AddToolTipCell(grid, $"{weight * 100.0 / total1:N1} %", row, 3, 1, bold, true);
+            if (total2 != 0)
+                AddToolTipCell(grid, $"{weight * 100.0 / total2:N1} %", row, 4, 1, bold, true);
+        }
+
+        public static async Task<(string, Grid)> GenerateToolTip(IQueryable<DeliveryAncmt> deliveryAncmts) {
+            var grid = new Grid();
+            grid.ColumnDefinitions.Add(new() { Width = new(10) });
+            grid.ColumnDefinitions.Add(new() { Width = new(60) });
+            grid.ColumnDefinitions.Add(new() { Width = new(80) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            grid.ColumnDefinitions.Add(new() { Width = new(50) });
+            var text = "-";
+
+            var weight = await deliveryAncmts.SumAsync(p => p.Weight);
+            text = $"{weight:N0} kg";
+            AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight);
+
+            if (await deliveryAncmts.AnyAsync()) {
+                var attrGroups = await deliveryAncmts
+                    .GroupBy(a => new { Attr = a.Schedule.Attribute!.Name, Cult = a.Schedule.Cultivation!.Name })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ToListAsync();
+                var sortGroups = await deliveryAncmts
+                    .GroupBy(a => a.SortId)
+                    .Select(g => new {
+                        SortId = g.Key,
+                        Weight = g.Sum(a => a.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+                var groups = await deliveryAncmts
+                    .GroupBy(a => new {
+                        Attr = a.Schedule.Attribute!.Name,
+                        Cult = a.Schedule.Cultivation!.Name,
+                        a.SortId,
+                    })
+                    .Select(g => new {
+                        g.Key.Attr,
+                        g.Key.Cult,
+                        g.Key.SortId,
+                        Weight = g.Sum(p => p.Weight)
+                    })
+                    .OrderByDescending(g => g.Weight)
+                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
+                    .ThenBy(g => g.SortId)
+                    .ToListAsync();
+
+                int rowNum = 1;
+                foreach (var attrG in attrGroups) {
+                    rowNum++;
+                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
+                    AddToolTipRow(grid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
+                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
+                        AddToolTipRow(grid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                    }
+                }
+
+                if (attrGroups.Count == 1) {
+                    var g = attrGroups.First();
+                    var name = g.Attr == null && g.Cult == null ? null : g.Attr + (g.Attr != null && g.Cult != null ? " / " : "") + g.Cult;
+                    if (name != null) {
+                        text += $" [{name}]";
+                    }
+                    if (sortGroups.Count > 1 && sortGroups.Count <= 4) {
+                        text += $" = {string.Join(" + ", sortGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.SortId == null ? "" : $" [{g.SortId}]")))}";
+
+                    }
+                } else if (attrGroups.Count <= 4) {
+                    text += $" = {string.Join(" + ", attrGroups.Select(g => $"{g.Weight:N0} kg ({(double)g.Weight / weight:0%})" + (g.Attr == null && g.Cult == null ? "" : $" [{g.Attr}{(g.Attr != null && g.Cult != null ? " / " : "")}{g.Cult}]")))}";
+                }
+            }
+
+            return (text, grid);
+        }
    }
 }
--- a/Elwig/Services/DeliveryScheduleService.cs
+++ b/Elwig/Services/DeliveryScheduleService.cs
@ -21,11 +21,12 @@ namespace Elwig.Services {
        public static void ClearInputs(this DeliveryScheduleAdminViewModel vm) {
        }

-        public static async Task FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
+        public static void FillInputs(this DeliveryScheduleAdminViewModel vm, DeliverySchedule s) {
            vm.Date = s.Date;
            vm.Branch = (Branch?)ControlUtils.GetItemFromSourceWithPk(vm.BranchSource, s.ZwstId);
            vm.Description = s.Description;
            vm.MaxWeight = s.MaxWeight;
+            vm.IsCancelled = s.IsCancelled;
            vm.MainVarieties.Clear();
            foreach (var v in s.Varieties.Where(v => v.Priority == 1)) {
                vm.MainVarieties.Add((WineVar)ControlUtils.GetItemFromSourceWithPk(vm.MainVarietiesSource, v.SortId)!);
@ -34,6 +35,8 @@ namespace Elwig.Services {
            foreach (var v in s.Varieties.Where(v => v.Priority != 1)) {
                vm.OtherVarieties.Add((WineVar)ControlUtils.GetItemFromSourceWithPk(vm.OtherVarietiesSource, v.SortId)!);
            }
+            vm.Attribute = ControlUtils.GetItemFromSourceWithPk(vm.AttributeSource, s.AttrId) as WineAttr;
+            vm.Cultivation = ControlUtils.GetItemFromSourceWithPk(vm.CultivationSource, s.CultId) as WineCult;
            vm.AncmtFrom = s.AncmtFrom;
            vm.AncmtTo = s.AncmtTo?.AddSeconds(-1);
        }
@ -156,7 +159,10 @@ namespace Elwig.Services {
                    DateString = $"{vm.Date:yyyy-MM-dd}",
                    ZwstId = vm.Branch!.ZwstId,
                    Description = vm.Description,
+                    AttrId = vm.Attribute?.AttrId,
+                    CultId = vm.Cultivation?.CultId,
                    MaxWeight = vm.MaxWeight,
+                    IsCancelled = vm.IsCancelled,
                    AncmtFrom = vm.AncmtFrom,
                    AncmtTo = vm.AncmtTo?.AddMinutes(1),
                };
@ -177,7 +183,7 @@ namespace Elwig.Services {
                await ctx.SaveChangesAsync();
            }

-            await App.HintContextChange();
+            App.HintContextChange();
        }
    }
 }
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@ -124,6 +124,7 @@ namespace Elwig.Services {
            var filterNotCult = new List<string>();
            var filterDate = new List<(string?, string?)>();
            var filterTime = new List<(string?, string?)>();
+            int filterWeightGt = 0, filterWeightLt = 0;
            int filterYearGt = 0, filterYearLt = 0;
            double filterKmwGt = 0, filterKmwLt = 0;
            double filterOeGt = 0, filterOeLt = 0;
@ -133,7 +134,7 @@ namespace Elwig.Services {
                var var = await ctx.WineVarieties.ToDictionaryAsync(v => v.SortId, v => v);
                var qual = await ctx.WineQualityLevels.Where(q => !q.IsPredicate).ToDictionaryAsync(q => q.QualId, q => q);
                var mgnr = await ctx.Members.ToDictionaryAsync(m => m.MgNr.ToString(), m => m);
-                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(" ")[0], b => b);
+                var zwst = await ctx.Branches.ToDictionaryAsync(b => b.Name.ToLower().Split(' ')[0], b => b);
                var attr = await ctx.WineAttributes.ToDictionaryAsync(a => a.Name.ToLower().Split(' ')[0], a => a);
                var cult = await ctx.WineCultivations.ToDictionaryAsync(c => c.Name.ToLower().Split(' ')[0], c => c);

@ -182,11 +183,11 @@ namespace Elwig.Services {
                    } else if (e.ToLower() == "!gerebelt") {
                        prd = prd.And(p => p.IsNetWeight == false);
                        filter.RemoveAt(i--);
-                        filterNames.Add("brutto Wiegung");
+                        filterNames.Add("nicht gerebelt gewogen");
                    } else if (e.ToLower() == "gerebelt") {
                        prd = prd.And(p => p.IsNetWeight == true);
                        filter.RemoveAt(i--);
-                        filterNames.Add("netto Wiegung");
+                        filterNames.Add("gerebelt gewogen");
                    } else if (e.Length >= 5 && e.Length <= 9 && "lesewagen".StartsWith(e, StringComparison.CurrentCultureIgnoreCase)) {
                        prd = prd.And(p => p.IsLesewagen == true);
                        filter.RemoveAt(i--);
@ -250,6 +251,15 @@ namespace Elwig.Services {
                        filterZwst.Add(b.ZwstId);
                        filter.RemoveAt(i--);
                        filterNames.Add($"Zweigstelle {b.Name}");
+                    } else if ((e.StartsWith('>') || e.StartsWith('<')) && e.EndsWith("kg")) {
+                        if (int.TryParse(e[1..^2], out var num)) {
+                            switch (e[0]) {
+                                case '>': filterWeightGt = num; break;
+                                case '<': filterWeightLt = num; break;
+                            }
+                            filter.RemoveAt(i--);
+                        }
+                        if (e.Length == 3) filter.RemoveAt(i--);
                    } else if (e.StartsWith('>') || e.StartsWith('<')) {
                        if (double.TryParse(e[1..], out var num)) {
                            switch ((e[0], num)) {
@ -347,6 +357,8 @@ namespace Elwig.Services {
                    }
                }

+                if (filterWeightGt > 0) prd = prd.And(p => p.Delivery.Parts.Sum(p => p.Weight) >= filterWeightGt);
+                if (filterWeightLt > 0) prd = prd.And(p => p.Delivery.Parts.Sum(p => p.Weight) <= filterWeightLt);
                if (filterYearGt > 0) prd = prd.And(p => p.Year >= filterYearGt);
                if (filterYearLt > 0) prd = prd.And(p => p.Year < filterYearLt);
                if (filterMgNr.Count > 0) prd = prd.And(p => filterMgNr.Contains(p.Delivery.MgNr));
@ -376,6 +388,13 @@ namespace Elwig.Services {
                if (filterOeGt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) >= filterOeGt);
                if (filterOeLt > 0) prd = prd.And(p => p.Kmw * (4.54 + 0.022 * p.Kmw) < filterOeLt);

+                if (filterWeightGt > 0 && filterWeightLt > 0) {
+                    filterNames.Add($"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Add($"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Add($"bis {filterWeightLt:N0} kg");
+                }
                if (filterYearGt > 0 && filterYearLt > 0) {
                    filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
                } else if (filterYearGt > 0) {
@ -425,6 +444,7 @@ namespace Elwig.Services {

            var date = DateOnly.ParseExact(vm.Date!, "dd.MM.yyyy");
            int? newLnr = (deliveryNew || dateHasChanged) ? await ctx.NextLNr(date) : null;
+            string? newLsNr = (newLnr != null) ? Utils.GenerateLsNr(date, vm.Branch!.ZwstId, newLnr.Value) : null;

            string? newTimeString = null;
            if (partNew && timeIsDefault) {
@ -440,7 +460,7 @@ namespace Elwig.Services {
                TimeString = newTimeString ?? oldDelivery?.TimeString,
                LNr = newLnr ?? oldDelivery!.LNr,
                ZwstId = vm.Branch!.ZwstId,
-                LsNr = vm.LsNr!,
+                LsNr = newLsNr ?? vm.LsNr!,
                MgNr = (int)vm.MgNr!,
                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
            };
@ -701,36 +721,22 @@ namespace Elwig.Services {
            AddToolTipCell(grid, $"{max:N1}°", row, 4, 1, bold, true);
        }

-        public static async Task<(string WeightText, Grid WeightGrid, string GradationText, Grid GradationGrid)> GenerateToolTip(IQueryable<DeliveryPart> deliveryParts) {
-            var wGrid = new Grid();
-            wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
-            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
+        public static async Task<(string WeightText, (string?, string?, int, int?, int)[] WeightGrid, string GradationText, (string?, string?, double, double, double)[] GradationGrid)> GenerateToolTipData(IQueryable<DeliveryPart> deliveryParts) {
+            var wGrid = new List<(string?, string?, int, int?, int)>();
            var wText = "-";
-
-            var gGrid = new Grid();
-            gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
-            AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
-            AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
-            AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
+            var gGrid = new List<(string?, string?, double, double, double)>();
            var gText = "-";

            var weight = await deliveryParts.SumAsync(p => p.Weight);
            wText = $"{weight:N0} kg";
-            AddWeightToolTipRow(wGrid, 0, "Gewicht", null, weight, null, weight);
+            wGrid.Add(("Gewicht", null, weight, null, weight));

            if (await deliveryParts.AnyAsync()) {
                var kmwMin = await deliveryParts.MinAsync(p => p.Kmw);
                var kmwAvg = Utils.AggregateDeliveryPartsKmw(deliveryParts);
                var kmwMax = await deliveryParts.MaxAsync(p => p.Kmw);
                gText = $"{kmwMin:N1}° / {kmwAvg:N1}° / {kmwMax:N1}°";
-                AddGradationToolTipRow(gGrid, 1, "Gradation", null, kmwMin, kmwAvg, kmwMax);
+                gGrid.Add(("Gradation", null, kmwMin, kmwAvg, kmwMax));

                var attrGroups = await deliveryParts
                    .GroupBy(p => new { Attr = p.Attribute!.Name, Cult = p.Cultivation!.Name })
@ -744,6 +750,7 @@ namespace Elwig.Services {
                    })
                    .OrderByDescending(g => g.Weight)
                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                    .ToListAsync();
                var sortGroups = await deliveryParts
                    .GroupBy(p => p.SortId)
@ -772,27 +779,24 @@ namespace Elwig.Services {
                        Avg = g.Sum(p => p.Kmw * p.Weight) / g.Sum(p => p.Weight),
                        Max = g.Max(p => p.Kmw)
                    })
-                    .OrderByDescending(g => g.SortId)
+                    .OrderByDescending(g => g.Weight)
                    .ThenBy(g => g.Attr)
+                    .ThenBy(g => g.Cult)
                    .ThenBy(g => g.SortId)
                    .ToListAsync();

-                int rowNum = 1;
                foreach (var attrG in attrGroups) {
-                    rowNum++;
                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    AddWeightToolTipRow(wGrid, rowNum++, name, null, attrG.Weight, attrG.Weight, weight);
+                    wGrid.Add((name, null, attrG.Weight, attrG.Weight, weight));
                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Weight).ThenBy(g => g.SortId)) {
-                        AddWeightToolTipRow(wGrid, rowNum++, null, g.SortId, g.Weight, attrG.Weight, weight);
+                        wGrid.Add((null, g.SortId, g.Weight, attrG.Weight, weight));
                    }
                }
-                rowNum = 2;
                foreach (var attrG in attrGroups) {
-                    rowNum++;
                    var name = attrG.Attr == null && attrG.Cult == null ? null : attrG.Attr + (attrG.Attr != null && attrG.Cult != null ? " / " : "") + attrG.Cult;
-                    AddGradationToolTipRow(gGrid, rowNum++, name, null, attrG.Min, attrG.Avg, attrG.Max);
+                    gGrid.Add((name, null, attrG.Min, attrG.Avg, attrG.Max));
                    foreach (var g in groups.Where(g => g.Attr == attrG.Attr && g.Cult == attrG.Cult).OrderByDescending(g => g.Avg).ThenBy(g => g.SortId)) {
-                        AddGradationToolTipRow(gGrid, rowNum++, null, g.SortId, g.Min, g.Avg, g.Max);
+                        gGrid.Add((null, g.SortId, g.Min, g.Avg, g.Max));
                    }
                }

@ -814,7 +818,38 @@ namespace Elwig.Services {
                }
            }

-            return (wText, wGrid, gText, gGrid);
+            return (wText, wGrid.ToArray(), gText, gGrid.ToArray());
+        }
+
+        public static (Grid WeightGrid, Grid GradationGrid) GenerateToolTip((string?, string?, int, int?, int)[] weightData, (string?, string?, double, double, double)[] gradationData) {
+            var wGrid = new Grid();
+            wGrid.ColumnDefinitions.Add(new() { Width = new(10) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(80) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
+            wGrid.ColumnDefinitions.Add(new() { Width = new(50) });
+            int rowNum = 0;
+            foreach (var row in weightData) {
+                if (rowNum == 1 || (rowNum != 0 && row.Item1 != null)) rowNum++;
+                AddWeightToolTipRow(wGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+
+            var gGrid = new Grid();
+            gGrid.ColumnDefinitions.Add(new() { Width = new(10) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(60) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            gGrid.ColumnDefinitions.Add(new() { Width = new(35) });
+            AddToolTipCell(gGrid, "Min.", 0, 2, 1, false, false, true);
+            AddToolTipCell(gGrid, "⌀", 0, 3, 1, false, false, true);
+            AddToolTipCell(gGrid, "Max.", 0, 4, 1, false, false, true);
+            rowNum = 1;
+            foreach (var row in gradationData) {
+                if (rowNum == 2 || (rowNum != 1 && row.Item1 != null)) rowNum++;
+                AddGradationToolTipRow(gGrid, rowNum++, row.Item1, row.Item2, row.Item3, row.Item4, row.Item5);
+            }
+
+            return (wGrid, gGrid);
        }
    }
 }
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@ -51,7 +51,7 @@ namespace Elwig.Services {
            vm.Age = "-";
        }

-        public static async Task FillInputs(this MemberAdminViewModel vm, Member m) {
+        public static void FillInputs(this MemberAdminViewModel vm, Member m) {
            vm.IsMemberSelected = true;
            vm.MgNrString = $"{m.MgNr}";
            vm.PredecessorMgNrString = $"{m.PredecessorMgNr}";
@ -137,19 +137,26 @@ namespace Elwig.Services {
            vm.ContactViaPost = m.ContactViaPost;
            vm.ContactViaEmail = m.ContactViaEmail;

-            Dictionary<int, int> deliveries;
-            using (var ctx = new AppDbContext()) {
+            vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
+            vm.StatusDeliveriesLastSeason = "...";
+            vm.StatusDeliveriesLastSeasonToolTip = null;
+            vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
+            vm.StatusDeliveriesThisSeason = "...";
+            vm.StatusDeliveriesThisSeasonToolTip = null;
+            vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
+            vm.StatusAreaCommitment = "...";
+            vm.StatusAreaCommitmentToolTip = null;
+
+            Utils.RunBackground("Mitgliederdaten laden", async () => {
+                using var ctx = new AppDbContext();
+
                var d1 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason - 1 && d.MgNr == m.MgNr);
-                var (_, d1Grid, _, _) = await DeliveryService.GenerateToolTip(d1.SelectMany(d => d.Parts));
-                vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
-                vm.StatusDeliveriesLastSeason = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
+                var (_, d1GridData, _, _) = await DeliveryService.GenerateToolTipData(d1.SelectMany(d => d.Parts));
+                var textLast = $"{await d1.CountAsync():N0} ({await d1.SumAsync(d => d.Parts.Count):N0}), {await d1.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";

                var d2 = ctx.Deliveries.Where(d => d.Year == Utils.CurrentLastSeason && d.MgNr == m.MgNr);
-                var (_, d2Grid, _, _) = await DeliveryService.GenerateToolTip(d2.SelectMany(d => d.Parts));
-                vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
-                vm.StatusDeliveriesThisSeason = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";
-                vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
+                var (_, d2GridData, _, _) = await DeliveryService.GenerateToolTipData(d2.SelectMany(d => d.Parts));
+                var textThis = $"{await d2.CountAsync():N0} ({await d2.SumAsync(d => d.Parts.Count):N0}), {await d2.SelectMany(d => d.Parts).SumAsync(p => p.Weight):N0} kg";

                var c = m.ActiveAreaCommitments(ctx, Utils.CurrentLastSeason);
                int maxKgPerHa = 10_000;
@ -157,21 +164,33 @@ namespace Elwig.Services {
                    var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
                    if (s != null) maxKgPerHa = s.MaxKgPerHa;
                } catch { }
-                var (text, grid) = await AreaComService.GenerateToolTip(c, maxKgPerHa);
-                vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
-                vm.StatusAreaCommitment = text;
-                vm.StatusAreaCommitmentToolTip = grid;
+                var (text, gridData) = await AreaComService.GenerateToolTipData(c, maxKgPerHa);

-                deliveries = ctx.Deliveries
-                  .Where(d => d.MgNr == m.MgNr)
-                  .SelectMany(d => d.Parts)
-                  .GroupBy(d => d.Year)
-                  .ToDictionary(g => g.Key, g => g.Sum(d => d.Weight));
-            }
+                var deliveries = await ctx.Deliveries
+                    .Where(d => d.MgNr == m.MgNr)
+                    .GroupBy(d => d.Year)
+                    .ToDictionaryAsync(g => g.Key, g => g.Any());
+
+                await App.MainDispatcher.BeginInvoke(() => {
+                    var (d1Grid, _) = DeliveryService.GenerateToolTip(d1GridData, []);
+                    var (d2Grid, _) = DeliveryService.GenerateToolTip(d2GridData, []);
+                    var grid = AreaComService.GenerateToolTip(gridData);
+                    vm.StatusDeliveriesLastSeasonInfo = $"{Utils.CurrentLastSeason - 1}";
+                    vm.StatusDeliveriesLastSeason = textLast;
+                    vm.StatusDeliveriesLastSeasonToolTip = d1Grid;
+                    vm.StatusDeliveriesThisSeasonInfo = $"{Utils.CurrentLastSeason}";
+                    vm.StatusDeliveriesThisSeason = textThis;
+                    vm.StatusDeliveriesThisSeasonToolTip = d2Grid;
+                    vm.StatusAreaCommitmentInfo = $"{Utils.CurrentLastSeason}";
+                    vm.StatusAreaCommitment = text;
+                    vm.StatusAreaCommitmentToolTip = grid;
+                    vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, false)).ToList();
+                });
+            });

            vm.MemberHasEmail = m.EmailAddresses.Count > 0;
            vm.MemberCanSendEmail = App.Config.Smtp != null && m.EmailAddresses.Count > 0;
-            vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => deliveries.GetValueOrDefault(i, 0) > 0).ToList();
+            vm.MemberHasDeliveries = Enumerable.Range(0, 9999).Select(i => false).ToList();
        }

        public static async Task<(List<string>, IQueryable<Member>, List<string>)> GetFilters(this MemberAdminViewModel vm, AppDbContext ctx) {
@ -338,7 +357,7 @@ namespace Elwig.Services {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                var data = await DeliveryConfirmationDeliveryData.ForMember(ctx.DeliveryParts, year, m);
@ -460,26 +479,30 @@ namespace Elwig.Services {
                try {
                    var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                    var path = Path.Combine(App.TempPath, filename);
-                    var list = await query
+                    var members = await query
                        .OrderBy(m => m.MgNr)
                        .Include(m => m.BillingAddress)
                        .Include(m => m.TelephoneNumbers)
                        .Include(m => m.EmailAddresses)
                        .AsSplitQuery()
                        .ToListAsync();
-                    if (list.Count == 0) {
+                    var areaComs = await query
+                        .SelectMany(m => m.AreaCommitments)
+                        .Include(c => c.Rd)
+                        .ToListAsync();
+                    if (members.Count == 0) {
                        MessageBox.Show("Es wurden keine Mitglieder zum Hochladen ausgewählt!", "Mitglieder hochladen",
                            MessageBoxButton.OK, MessageBoxImage.Error);
                    } else {
-                        await ElwigData.Export(path, list, filterNames);
+                        await ElwigData.Export(path, members, areaComs, filterNames);
                        await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
-                        MessageBox.Show($"Hochladen von {list.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
+                        MessageBox.Show($"Hochladen von {members.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen",
                            MessageBoxButton.OK, MessageBoxImage.Information);
                    }
                } catch (HttpRequestException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                } catch (TaskCanceledException exc) {
-                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show("Eventuell Internetverbindung prüfen!\n\n" + exc.Message, "Mitglieder hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
@ -498,129 +521,131 @@ namespace Elwig.Services {
        }

        public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
-            using var ctx = new AppDbContext();
            var newMgNr = (int)vm.MgNr!;
-            var m = new Member {
-                MgNr = oldMgNr ?? newMgNr,
-                PredecessorMgNr = vm.PredecessorMgNr,
-                IsJuridicalPerson = vm.IsJuridicalPerson,
-                Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
-                GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
-                Name = vm.Name!,
-                Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
-                ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
-                Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
-                IsDeceased = vm.IsDeceased,
-                CountryNum = 40,  // Austria AT AUT
-                PostalDestId = vm.Ort!.Id,
-                Address = vm.Address!,

-                Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
-                Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,
+            using (var ctx = new AppDbContext()) {
+                var m = new Member {
+                    MgNr = oldMgNr ?? newMgNr,
+                    PredecessorMgNr = vm.PredecessorMgNr,
+                    IsJuridicalPerson = vm.IsJuridicalPerson,
+                    Prefix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Prefix) ? null : vm.Prefix,
+                    GivenName = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.GivenName) ? null : vm.GivenName,
+                    Name = vm.Name!,
+                    Suffix = vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.Suffix) ? null : vm.Suffix,
+                    ForTheAttentionOf = !vm.IsJuridicalPerson || string.IsNullOrWhiteSpace(vm.ForTheAttentionOf) ? null : vm.ForTheAttentionOf,
+                    Birthday = string.IsNullOrEmpty(vm.Birthday) ? null : string.Join("-", vm.Birthday!.Split(".").Reverse()),
+                    IsDeceased = vm.IsDeceased,
+                    CountryNum = 40,  // Austria AT AUT
+                    PostalDestId = vm.Ort!.Id,
+                    Address = vm.Address!,

-                UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
-                LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
-                IsBuchführend = vm.IsBuchführend,
-                IsOrganic = vm.IsOrganic,
+                    Iban = string.IsNullOrEmpty(vm.Iban) ? null : vm.Iban?.Replace(" ", ""),
+                    Bic = string.IsNullOrEmpty(vm.Bic) ? null : vm.Bic,

-                EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
-                ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
-                BusinessShares = (int)vm.BusinessShares!,
-                AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
-                IsActive = vm.IsActive,
-                IsVollLieferant = vm.IsVollLieferant,
-                IsFunktionär = vm.IsFunktionär,
-                ZwstId = vm.Branch?.ZwstId,
-                DefaultKgNr = vm.DefaultKg?.KgNr,
-                Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
-                ContactViaPost = vm.ContactViaPost,
-                ContactViaEmail = vm.ContactViaEmail,
-            };
+                    UstIdNr = string.IsNullOrEmpty(vm.UstIdNr) ? null : vm.UstIdNr,
+                    LfbisNr = string.IsNullOrEmpty(vm.LfbisNr) ? null : vm.LfbisNr,
+                    IsBuchführend = vm.IsBuchführend,
+                    IsOrganic = vm.IsOrganic,

-            if (oldMgNr != null) {
-                ctx.Update(m);
-            } else {
-                ctx.Add(m);
-            }
+                    EntryDateString = string.IsNullOrEmpty(vm.EntryDate) ? null : string.Join("-", vm.EntryDate.Split(".").Reverse()),
+                    ExitDateString = string.IsNullOrEmpty(vm.ExitDate) ? null : string.Join("-", vm.ExitDate.Split(".").Reverse()),
+                    BusinessShares = (int)vm.BusinessShares!,
+                    AccountingNr = string.IsNullOrEmpty(vm.AccountingNr) ? null : vm.AccountingNr,
+                    IsActive = vm.IsActive,
+                    IsVollLieferant = vm.IsVollLieferant,
+                    IsFunktionär = vm.IsFunktionär,
+                    ZwstId = vm.Branch?.ZwstId,
+                    DefaultKgNr = vm.DefaultKg?.KgNr,
+                    Comment = string.IsNullOrEmpty(vm.Comment) ? null : vm.Comment,
+                    ContactViaPost = vm.ContactViaPost,
+                    ContactViaEmail = vm.ContactViaEmail,
+                };

-            ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
-            if (vm.BillingOrt != null && vm.BillingName != null) {
-                var p = vm.BillingOrt;
-                ctx.Add(new BillingAddr {
-                    MgNr = m.MgNr,
-                    FullName = vm.BillingName,
-                    Address = vm.BillingAddress ?? "",
-                    CountryNum = p.CountryNum,
-                    PostalDestId = p.Id,
-                });
-            }
+                if (oldMgNr != null) {
+                    ctx.Update(m);
+                } else {
+                    ctx.Add(m);
+                }

-            ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
-            ctx.AddRange(vm.PhoneNrs
-                .Where(input => input.Number != null && input.Number != "")
-                .Select((input, i) => new MemberTelNr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
-                    Number = input.Number!,
-                    Comment = input.Comment,
-                }));
+                ctx.RemoveRange(ctx.BillingAddresses.Where(a => a.MgNr == oldMgNr));
+                if (vm.BillingOrt != null && vm.BillingName != null) {
+                    var p = vm.BillingOrt;
+                    ctx.Add(new BillingAddr {
+                        MgNr = m.MgNr,
+                        FullName = vm.BillingName,
+                        Address = vm.BillingAddress ?? "",
+                        CountryNum = p.CountryNum,
+                        PostalDestId = p.Id,
+                    });
+                }

-            ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
-            ctx.AddRange(vm.EmailAddresses
-                .Where(input => input != null && input != "")
-                .Select((input, i) => new MemberEmailAddr {
-                    MgNr = m.MgNr,
-                    Nr = i + 1,
-                    Address = input!,
-                    Comment = null,
-                }));
+                ctx.RemoveRange(ctx.MemberTelephoneNrs.Where(t => t.MgNr == oldMgNr));
+                ctx.AddRange(vm.PhoneNrs
+                    .Where(input => input.Number != null && input.Number != "")
+                    .Select((input, i) => new MemberTelNr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Type = input.Type == -1 ? (input.Number!.StartsWith("+43 ") && input.Number![4] == '6' ? "mobile" : "landline") : vm.PhoneNrTypes[input.Type].Key,
+                        Number = input.Number!,
+                        Comment = input.Comment,
+                    }));

-            await ctx.SaveChangesAsync();
+                ctx.RemoveRange(ctx.MemberEmailAddrs.Where(e => e.MgNr == oldMgNr));
+                ctx.AddRange(vm.EmailAddresses
+                    .Where(input => input != null && input != "")
+                    .Select((input, i) => new MemberEmailAddr {
+                        MgNr = m.MgNr,
+                        Nr = i + 1,
+                        Address = input!,
+                        Comment = null,
+                    }));

-            if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
-                    .ToListAsync();
-
-                var fbNr = await ctx.NextFbNr();
-                ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
-                    FbNr = fbNr + i,
-                    MgNr = m.MgNr,
-                    VtrgId = c.VtrgId,
-                    CultId = c.CultId,
-                    Area = c.Area,
-                    KgNr = c.KgNr,
-                    GstNr = c.GstNr,
-                    RdNr = c.RdNr,
-                    YearFrom = year,
-                    YearTo = c.YearTo,
-                }));
-
-                foreach (var ac in areaComs)
-                    ac.YearTo = year - 1;
-                ctx.UpdateRange(areaComs);
                await ctx.SaveChangesAsync();
-            }
-            vm.TransferPredecessorAreaComs = null;

-            if (vm.CancelAreaComs is int yearTo) {
-                var areaComs = await ctx.AreaCommitments
-                    .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
-                    .ToListAsync();
+                if (vm.TransferPredecessorAreaComs is int year && m.PredecessorMgNr is int predecessor) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == predecessor && (c.YearTo == null || c.YearTo >= year))
+                        .ToListAsync();

-                foreach (var ac in areaComs)
-                    ac.YearTo = yearTo;
-                ctx.UpdateRange(areaComs);
-                await ctx.SaveChangesAsync();
-            }
-            vm.CancelAreaComs = null;
+                    var fbNr = await ctx.NextFbNr();
+                    ctx.AddRange(areaComs.Select((c, i) => new AreaCom {
+                        FbNr = fbNr + i,
+                        MgNr = m.MgNr,
+                        VtrgId = c.VtrgId,
+                        CultId = c.CultId,
+                        Area = c.Area,
+                        KgNr = c.KgNr,
+                        GstNr = c.GstNr,
+                        RdNr = c.RdNr,
+                        YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
+                        YearTo = c.YearTo,
+                    }));

-            if (newMgNr != m.MgNr) {
-                await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                    foreach (var ac in areaComs)
+                        ac.YearTo = year - 1;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.TransferPredecessorAreaComs = null;
+
+                if (vm.CancelAreaComs is int yearTo) {
+                    var areaComs = await ctx.AreaCommitments
+                        .Where(c => c.MgNr == m.MgNr && (c.YearTo == null || c.YearTo > yearTo))
+                        .ToListAsync();
+
+                    foreach (var ac in areaComs)
+                        ac.YearTo = yearTo;
+                    ctx.UpdateRange(areaComs);
+                    await ctx.SaveChangesAsync();
+                }
+                vm.CancelAreaComs = null;
+
+                if (newMgNr != m.MgNr) {
+                    await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
+                }
            }

-            await App.HintContextChange();
+            App.HintContextChange();

            return newMgNr;
        }
--- a/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
+++ b/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
@ -3,6 +3,7 @@ using Elwig.Models.Entities;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;

 namespace Elwig.ViewModels {
    public partial class DeliveryAncmtAdminViewModel : ObservableObject {
@ -14,6 +15,8 @@ namespace Elwig.ViewModels {
        [ObservableProperty]
        private bool _filterOnlyUpcoming;
        [ObservableProperty]
+        private bool _filterFromAllSchedules;
+        [ObservableProperty]
        private string? _filterSeasonString;
        public int? FilterSeason {
            get => int.TryParse(FilterSeasonString, out var year) ? year : null;
@ -62,6 +65,18 @@ namespace Elwig.ViewModels {
            set => WeightString = $"{value}";
        }

+        [ObservableProperty]
+        private string _statusAncmts = "-";
+        [ObservableProperty]
+        private string _statusWeight = "-";
+        [ObservableProperty]
+        private string _statusAncmtCreated = "-";
+        [ObservableProperty]
+        private string _statusAncmtModified = "-";
+
+        [ObservableProperty]
+        private Grid? _statusWeightToolTip;
+
        [ObservableProperty]
        private Visibility _controlButtonsVisibility = Visibility.Visible;
        [ObservableProperty]
--- a/Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs
+++ b/Elwig/ViewModels/DeliveryScheduleAdminViewModel.cs
@ -47,12 +47,30 @@ namespace Elwig.ViewModels {
            get => int.TryParse(MaxWeightString, out var w) ? w : null;
            set => MaxWeightString = $"{value}";
        }
+        [ObservableProperty]
+        private bool _isCancelled;
        public ObservableCollection<WineVar> MainVarieties { get; set; } = [];
        [ObservableProperty]
        private IEnumerable<WineVar> _mainVarietiesSource = [];
        public ObservableCollection<WineVar> OtherVarieties { get; set; } = [];
        [ObservableProperty]
        private IEnumerable<WineVar> _otherVarietiesSource = [];
+        [ObservableProperty]
+        private IEnumerable<object> _attributeSource = [];
+        [ObservableProperty]
+        private object? _attributeObj;
+        public WineAttr? Attribute {
+            get => AttributeObj as WineAttr;
+            set => AttributeObj = value ?? AttributeSource.FirstOrDefault();
+        }
+        [ObservableProperty]
+        private IEnumerable<object> _cultivationSource = [];
+        [ObservableProperty]
+        private object? _cultivationObj;
+        public WineCult? Cultivation {
+            get => CultivationObj as WineCult;
+            set => CultivationObj = value ?? CultivationSource.FirstOrDefault();
+        }

        [ObservableProperty]
        private string _ancmtFromDateString = "";
--- a/Elwig/ViewModels/MemberAdminViewModel.cs
+++ b/Elwig/ViewModels/MemberAdminViewModel.cs
@ -11,6 +11,7 @@ namespace Elwig.ViewModels {
    public partial class MemberAdminViewModel : ObservableObject {

        public int? TransferPredecessorAreaComs = null;
+        public bool MaintainAreaComYearTo = false;
        public int? CancelAreaComs = null;

        public ObservableCollection<KeyValuePair<string, string>> PhoneNrTypes { get; set; } = new(Utils.PhoneNrTypes);
--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@ -79,9 +79,9 @@ namespace Elwig.Windows {
            if (filter.Count == 0) {
                ViewModel.StatusAreaCommitments = $"{await areaComQuery.CountAsync():N0}";
                var s = await ctx.Seasons.FindAsync(await ctx.Seasons.MaxAsync(s => s.Year));
-                var (text, grid) = await AreaComService.GenerateToolTip(areaComQuery, s?.MaxKgPerHa ?? 10_000);
+                var (text, gridData) = await AreaComService.GenerateToolTipData(areaComQuery, s?.MaxKgPerHa ?? 10_000);
                ViewModel.StatusArea = text;
-                ViewModel.StatusAreaToolTip = grid;
+                ViewModel.StatusAreaToolTip = AreaComService.GenerateToolTip(gridData);
            } else {
                ViewModel.StatusAreaCommitments = $"{areaComs.Count:N0}";
                ViewModel.StatusArea = $"{areaComs.Select(a => a.Area).Sum():N0} m²";
@ -133,7 +133,7 @@ namespace Elwig.Windows {
                return;
            }
            ViewModel.FilterMember = m;
-            ViewModel.Title = $"Lieferungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";
+            ViewModel.Title = $"Flächenbindungen - {ViewModel.FilterMember.AdministrativeName} - Elwig";

            ControlUtils.RenewItemsSource(KgInput, await ctx.WbKgs
                .Include(k => k.AtKg.WbKg!.Rds)
@ -209,7 +209,7 @@ namespace Elwig.Windows {
                        ctx.Remove(a);
                        await ctx.SaveChangesAsync();
                    }
-                    await App.HintContextChange();
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
--- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
@ -196,7 +196,7 @@ namespace Elwig.Windows {
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                    MessageBox.Show(str, "Saison anlegen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
                SeasonList.SelectedIndex = 0;
            }
@ -219,7 +219,7 @@ namespace Elwig.Windows {
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                    MessageBox.Show(str, "Saison löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
            }
        }
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@ -340,7 +340,7 @@ namespace Elwig.Windows {
                LockInputs();
            }

-            await App.HintContextChange();
+            App.HintContextChange();
        }

        private void FillInputs(ClientParameters p, Season? s) {
--- a/Elwig/Windows/ChartWindow.xaml
+++ b/Elwig/Windows/ChartWindow.xaml
@ -132,18 +132,20 @@
            <GroupBox Header="Datenpunkt" Grid.Row="0" Margin="0,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="85"/>
+                        <ColumnDefinition Width="65"/>
                        <ColumnDefinition Width="*"/>
                    </Grid.ColumnDefinitions>

                    <Label Content="Oechsle:" Margin="10,10,0,0" Grid.Column="0"/>
-                    <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False" LostFocus="OechsleInput_LostFocus"
-                                      Grid.Column="1" Width="90" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
-
+                    <ctrl:UnitTextBox x:Name="OechsleInput" Unit="°Oe" TextChanged="OechsleInput_TextChanged" IsEnabled="False"
+                                      Grid.Column="1" Width="52" Margin="0,10,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    <CheckBox x:Name="GebInput" Content="Geb." IsEnabled="False"
+                              Grid.Column="1" Margin="0,15,10,0" HorizontalAlignment="Right" VerticalAlignment="Top"
+                              Checked="GebInput_Changed" Unchecked="GebInput_Changed"/>

                    <Label Content="Preis:" Margin="10,40,0,0" Grid.Column="0"/>
-                    <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False" LostFocus="PriceInput_LostFocus"
-                                      Grid.Column="1" Width="90" Margin="0,40,0,0" HorizontalAlignment="Left" VerticalAlignment="Top"/>
+                    <ctrl:UnitTextBox x:Name="PriceInput" Unit="€/kg" TextChanged="PriceInput_TextChanged" IsEnabled="False"
+                                      Grid.Column="1" Margin="0,40,10,0" HorizontalAlignment="Stretch" VerticalAlignment="Top"/>
                </Grid>
            </GroupBox>

--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@ -5,7 +5,6 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using Elwig.Controls;
 using Elwig.Helpers;
 using Elwig.Helpers.Billing;
 using Elwig.Models.Entities;
@ -22,8 +21,10 @@ namespace Elwig.Windows {
        public readonly int Year;
        public readonly int AvNr;
        public Season Season;
+        public string CurrencySymbol;
        private PaymentVar PaymentVar;
        private bool HasChanged = false;
+        private bool Updating = false;

        private Scatter DataPlot;
        private Scatter? GebundenPlot;
@ -72,6 +73,9 @@ namespace Elwig.Windows {
            AvNr = avnr;
            using var ctx = new AppDbContext();
            Season = ctx.Seasons.Find(year) ?? throw new ArgumentException("Season not found");
+            CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
+            PriceInput.Unit = $"{CurrencySymbol}/kg";
+            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";
            PaymentVar = ctx.PaymentVariants.Find(year, avnr) ?? throw new ArgumentException("PaymentVar not found");
            Title = $"{PaymentVar?.Name} - Lese {year} - Elwig";
            LockContext = true;
@ -99,6 +103,9 @@ namespace Elwig.Windows {
        private async Task RefreshGraphList(AppDbContext ctx) {
            PaymentVar = await ctx.PaymentVariants.FindAsync(Year, AvNr) ?? throw new ArgumentException("PaymentVar not found");
            Season = await ctx.Seasons.FindAsync(Year) ?? throw new ArgumentException("Season not found");
+            CurrencySymbol = Season.Currency.Symbol ?? Season.Currency.Code;
+            PriceInput.Unit = $"{CurrencySymbol}/kg";
+            GebundenFlatBonus.Unit = $"{CurrencySymbol}/kg";

            try {
                var data = EditBillingData.FromJson(PaymentVar.Data, Utils.GetVaributes(ctx, Year));
@ -146,6 +153,8 @@ namespace Elwig.Windows {
            if (SelectedGraphEntry != null) {
                CopyButton.IsEnabled = true;
                DeleteButton.IsEnabled = true;
+                EnableTextBox(OechsleInput);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
                GebundenTypeFixed.IsEnabled = true;
                GebundenTypeGraph.IsEnabled = true;
                GebundenTypeNone.IsEnabled = true;
@ -156,15 +165,15 @@ namespace Elwig.Windows {
            } else {
                CopyButton.IsEnabled = false;
                DeleteButton.IsEnabled = false;
-                DisableUnitTextBox(OechsleInput);
+                DisableTextBox(OechsleInput);
+                GebInput.IsEnabled = false;
                DisableOptionButtons();
            }
            if (!PaymentVar.TestVariant) {
                AddButton.IsEnabled = false;
                CopyButton.IsEnabled = false;
                DeleteButton.IsEnabled = false;
-                DisableUnitTextBox(OechsleInput);
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(PriceInput);
                GebundenTypeFixed.IsEnabled = false;
                GebundenTypeGraph.IsEnabled = false;
                GebundenTypeNone.IsEnabled = false;
@ -388,26 +397,23 @@ namespace Elwig.Windows {
            OechslePricePlot.Plot.Legend.ManualItems.Clear();
        }

-        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            if (ActiveGraph == null || SelectedGraphEntry == null) {
+        private void UpdateSelectedPoint() {
+            if (ActiveGraph == null || SelectedGraphEntry == null)
                return;
-            }
-
-            bool success = int.TryParse(OechsleInput.Text, out int oechsle);

            SecondaryMarkedPoint = -1;
            ChangeMarker(SecondaryMarkedPointPlot, false);

-            if (success) { 
-                if (oechsle >= ActiveGraph.MinX && oechsle <= ActiveGraph.MaxX) {
-                    PrimaryMarkedPoint = oechsle - ActiveGraph.MinX;
+            if (int.TryParse(OechsleInput.Text, out int oe)) {
+                if (oe >= ActiveGraph.MinX && oe <= ActiveGraph.MaxX) {
+                    PrimaryMarkedPoint = oe - ActiveGraph.MinX;
                    ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));

                    PriceInput.Text = Math.Round(ActiveGraph.GetPriceAt(PrimaryMarkedPoint), Season.Precision).ToString();

                    EnableActionButtons();
                    OechslePricePlot.Refresh();
-                    EnableUnitTextBox(PriceInput);
+                    EnableTextBox(PriceInput);
                    return;
                }
            }
@ -416,9 +422,21 @@ namespace Elwig.Windows {
            ChangeMarker(PrimaryMarkedPointPlot, false);
            DisableActionButtons();
            PriceInput.Text = "";
-            DisableUnitTextBox(PriceInput);
+            DisableTextBox(PriceInput);
            OechslePricePlot.Refresh();
-            DisableUnitTextBox(PriceInput);
+            DisableTextBox(PriceInput);
+        }
+
+        private void OechsleInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            UpdateSelectedPoint();
+        }
+
+        private void GebInput_Changed(object sender, RoutedEventArgs evt) {
+            if (Updating)
+                return;
+            var sel = GebInput.IsChecked == true ? SelectedGraphEntry?.GebundenGraph : SelectedGraphEntry?.DataGraph;
+            if (sel != ActiveGraph) ChangeActiveGraph(sel);
+            UpdateSelectedPoint();
        }

        private void PriceInput_TextChanged(object sender, TextChangedEventArgs evt) {
@ -479,31 +497,34 @@ namespace Elwig.Windows {
        }

        private void OechslePricePlot_MouseDown(object sender, MouseEventArgs e) {
-            if (GraphList.SelectedItem == null) {
+            if (GraphList.SelectedItem == null)
                return;
-            }

            if (HoverActive) {
                if (PaymentVar.TestVariant && Keyboard.IsKeyDown(System.Windows.Input.Key.LeftCtrl)) {
-                    if (PrimaryMarkedPoint == -1 || ActiveGraph == null || ActiveGraph != Highlighted.Graph) {
+                    if (SecondaryMarkedPoint == -1 || ActiveGraph == null || ActiveGraph != Highlighted.Graph)
                        return;
-                    }
                    SecondaryMarkedPoint = Highlighted.Index;
-
                    ChangeMarker(SecondaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(SecondaryMarkedPoint), ActiveGraph.GetPriceAt(SecondaryMarkedPoint));
-
                    InterpolateButton.IsEnabled = true;
-
                    return;
                }

+                Updating = true;
                PrimaryMarkedPoint = Highlighted.Index;
-                if (ActiveGraph != Highlighted.Graph) ChangeActiveGraph(Highlighted.Graph);
+                if (ActiveGraph != Highlighted.Graph)
+                    ChangeActiveGraph(Highlighted.Graph);
+                Updating = false;
+                if (PrimaryMarkedPoint == -1 || ActiveGraph == null)
+                    return;

-                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph!.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));
+                ChangeMarker(PrimaryMarkedPointPlot, true, ActiveGraph.GetOechsleAt(PrimaryMarkedPoint), ActiveGraph.GetPriceAt(PrimaryMarkedPoint));

+                Updating = true;
                OechsleInput.Text = Highlighted.Graph!.GetOechsleAt(Highlighted.Index).ToString();
+                GebInput.IsChecked = Highlighted.Graph == SelectedGraphEntry?.GebundenGraph;
                PriceInput.Text = Math.Round(Highlighted.Graph.GetPriceAt(Highlighted.Index), Season.Precision).ToString();
+                Updating = false;

                EnableActionButtons();
            } else {
@ -516,8 +537,9 @@ namespace Elwig.Windows {
                ChangeMarker(SecondaryMarkedPointPlot, false);

                OechsleInput.Text = "";
+                GebInput.IsChecked = false;
                PriceInput.Text = "";
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(PriceInput);

                DisableActionButtons();
            }
@ -531,28 +553,39 @@ namespace Elwig.Windows {
            MouseChange(e);
        }

+        private Coordinates GetMouseCoordinates(Point p) {
+            Pixel px = new(p.X, p.Y);
+            var source = PresentationSource.FromVisual(this);
+            if (source?.CompositionTarget != null) {
+                var matrix = source.CompositionTarget.TransformToDevice;
+                px.X *= (float)matrix.M11;
+                px.Y *= (float)matrix.M22;
+            }
+            return OechslePricePlot.Plot.GetCoordinates(px);
+        }
+
        private void MouseChange(MouseEventArgs e) {
            if (GraphList.SelectedItem == null) {
                return;
            }

-            (double x, double y, int index)? mouseOnData = MouseOnPlot(DataPlot, e.GetPosition(OechslePricePlot));
-            (double x, double y, int index)? mouseOnGebunden = MouseOnPlot(GebundenPlot, e.GetPosition(OechslePricePlot));
+            var mouseOnData = MouseOnPlot(DataPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));
+            var mouseOnGebunden = MouseOnPlot(GebundenPlot, GetMouseCoordinates(e.GetPosition(OechslePricePlot)));

            Highlighted = LastHighlighted;

            if (mouseOnData != null) {
-                ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.x, mouseOnData.Value.y);
+                ChangeMarker(HighlightedPointPlot, true, mouseOnData.Value.X, mouseOnData.Value.Y);
                HighlightedPointPlot.IsVisible = true;
                HoverChanged = true ^ HoverActive;
                HoverActive = true;
-                HandleTooltip(mouseOnData.Value.x, mouseOnData.Value.y, mouseOnData.Value.index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnData.Value.X, mouseOnData.Value.Y, mouseOnData.Value.Index, SelectedGraphEntry!.DataGraph, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
            } else if (mouseOnGebunden != null) {
-                ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.x, mouseOnGebunden.Value.y);
+                ChangeMarker(HighlightedPointPlot, true, mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y);
                HighlightedPointPlot.IsVisible = true;
                HoverChanged = true ^ HoverActive;
                HoverActive = true;
-                HandleTooltip(mouseOnGebunden.Value.x, mouseOnGebunden.Value.y, mouseOnGebunden.Value.index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
+                HandleTooltip(mouseOnGebunden.Value.X, mouseOnGebunden.Value.Y, mouseOnGebunden.Value.Index, SelectedGraphEntry!.GebundenGraph!, e.GetPosition(OechslePricePlot), e is MouseWheelEventArgs);
            } else {
                ChangeMarker(HighlightedPointPlot, false);
                HoverChanged = false ^ HoverActive;
@ -562,30 +595,20 @@ namespace Elwig.Windows {
            }
        }

-        private (double, double, int)? MouseOnPlot(Scatter? plot, Point p) {
-            if (plot == null) {
+        private (double X, double Y, int Index)? MouseOnPlot(Scatter? plot, Coordinates c) {
+            if (plot == null)
                return null;
-            }
-
            OechslePricePlot.Refresh();
-            Pixel mousePixel = new(p.X, p.Y);
-            Coordinates mouseLocation = OechslePricePlot.Plot.GetCoordinates(mousePixel);
-            DataPoint nearestPoint = plot.Data.GetNearest(mouseLocation, OechslePricePlot.Plot.LastRender, 3);
-
-            if (nearestPoint.IsReal) {
-                return (nearestPoint.X, nearestPoint.Y, nearestPoint.Index);
-            } else {
-                return null;
-            }
+            DataPoint nearestPoint = plot.Data.GetNearest(c, OechslePricePlot.Plot.LastRender, 5);
+            return nearestPoint.IsReal ? (nearestPoint.X, nearestPoint.Y, nearestPoint.Index) : null;
        }

        private void HandleTooltip(double pointX, double pointY, int pointIndex, Graph g, Point p, bool force) {
            if (force || LastHighlighted != Highlighted || HoverChanged) {
                OechslePricePlot.Plot.PlottableList.Remove(TooltipPlot);
                if (TooltipInput.IsChecked == true) {
-                    Pixel mousePixel = new(p.X, p.Y - 30);
-                    Coordinates mouseLocation = OechslePricePlot.Plot.GetCoordinates(mousePixel);
-                    TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)}€/kg", mouseLocation.X, mouseLocation.Y);
+                    Coordinates mouseLocation = GetMouseCoordinates(new(p.X, p.Y - 30));
+                    TooltipPlot = OechslePricePlot.Plot.Add.Text($"Oechsle: {pointX:N2}, Preis: {Math.Round(pointY, Season.Precision)} {CurrencySymbol}/kg", mouseLocation.X, mouseLocation.Y);
                    TooltipPlot.LabelFontSize = 12;
                    TooltipPlot.LabelBold = true;
                    TooltipPlot.LabelBorderColor = Colors.Black;
@ -639,16 +662,17 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object sender, RoutedEventArgs e) {
            try {
-                using var ctx = new AppDbContext();
-                var origData = BillingData.FromJson(PaymentVar.Data);
-                var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
-                    AllVaributesAssigned, AllVaributesAssignedAbgew);
+                using (var ctx = new AppDbContext()) {
+                    var origData = BillingData.FromJson(PaymentVar.Data);
+                    var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
+                        AllVaributesAssigned, AllVaributesAssignedAbgew);

-                PaymentVar.Data = data.ToJsonString();
-                ctx.Update(PaymentVar);
-                await ctx.SaveChangesAsync();
+                    PaymentVar.Data = data.ToJsonString();
+                    ctx.Update(PaymentVar);
+                    await ctx.SaveChangesAsync();
+                }
                LockContext = false;
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -658,31 +682,37 @@ namespace Elwig.Windows {
            SetHasChanged(false);
        }

-        private void EnableUnitTextBox(UnitTextBox u) {
-            if (PaymentVar.TestVariant) {
+        private void EnableTextBox(TextBox u) {
+            if (PaymentVar.TestVariant || u == OechsleInput) {
                u.IsEnabled = true;
                u.IsReadOnly = false;
            }
        }

-        private void DisableUnitTextBox(UnitTextBox u) {
+        private void DisableTextBox(TextBox u) {
            u.IsEnabled = false;
            u.IsReadOnly = true;
        }

        private void ChangeActiveGraph(Graph? g) {
            if (g != null && g == SelectedGraphEntry?.DataGraph) {
-                EnableUnitTextBox(OechsleInput);
+                EnableTextBox(OechsleInput);
                if (SelectedGraphEntry?.GebundenGraph != null) ChangeLineWidth(DataPlot, 4);
                ChangeLineWidth(GebundenPlot, 1);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                GebInput.IsChecked = false;
            } else if (g != null && g == SelectedGraphEntry?.GebundenGraph) {
-                EnableUnitTextBox(OechsleInput);
+                EnableTextBox(OechsleInput);
                ChangeLineWidth(GebundenPlot, 4);
                ChangeLineWidth(DataPlot, 1);
+                GebInput.IsEnabled = SelectedGraphEntry?.GebundenGraph != null;
+                GebInput.IsChecked = true;
            } else {
-                DisableUnitTextBox(OechsleInput);
-                DisableUnitTextBox(PriceInput);
+                DisableTextBox(OechsleInput);
+                DisableTextBox(PriceInput);
                OechsleInput.Text = "";
+                GebInput.IsEnabled = false;
+                GebInput.IsChecked = false;
                PriceInput.Text = "";
                ChangeLineWidth(DataPlot, 1);
                ChangeLineWidth(GebundenPlot, 1);
@ -700,14 +730,6 @@ namespace Elwig.Windows {
            RefreshInputs();
        }

-        private void PriceInput_LostFocus(object sender, RoutedEventArgs e) {
-
-        }
-
-        private void OechsleInput_LostFocus(object sender, RoutedEventArgs e) {
-
-        }
-
        private void GebundenFlatBonus_TextChanged(object sender, TextChangedEventArgs e) {
            if (FillingInputs) return;
            var r = Validator.CheckDecimal(GebundenFlatBonus, true, 2, Season.Precision);
@ -778,19 +800,19 @@ namespace Elwig.Windows {
        private void GebundenType_Checked(object sender, RoutedEventArgs e) {
            if (FillingInputs) return;
            if (SelectedGraphEntry == null) {
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
                return;
            }
            if (GebundenTypeNone.IsChecked == true) {
                SelectedGraphEntry.RemoveGebundenGraph();
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            } else if (GebundenTypeFixed.IsChecked == true) {
                SelectedGraphEntry.GebundenFlatBonus = double.TryParse(GebundenFlatBonus.Text, out var val) ? val : 0.1;
                SelectedGraphEntry.AddGebundenGraph();
-                EnableUnitTextBox(GebundenFlatBonus);
+                EnableTextBox(GebundenFlatBonus);
            } else if (GebundenTypeGraph.IsChecked == true) {
                SelectedGraphEntry.AddGebundenGraph();
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            }
            SetHasChanged();
            RefreshInputs();
@ -801,11 +823,11 @@ namespace Elwig.Windows {
            if (SelectedGraphEntry?.GebundenFlatBonus is double bonus) {
                GebundenTypeFixed.IsChecked = true;
                GebundenFlatBonus.Text = $"{bonus}";
-                EnableUnitTextBox(GebundenFlatBonus);
+                EnableTextBox(GebundenFlatBonus);
            } else if (SelectedGraphEntry?.GebundenGraph != null) {
                GebundenTypeGraph.IsChecked = true;
                GebundenFlatBonus.Text = "";
-                DisableUnitTextBox(GebundenFlatBonus);
+                DisableTextBox(GebundenFlatBonus);
            }
            FillingInputs = false;
        }
--- a/Elwig/Windows/DeliveryAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml
@ -6,7 +6,7 @@
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:vm="clr-namespace:Elwig.ViewModels"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="{Binding Title}" Height="720" Width="1100" MinHeight="720" MinWidth="1000"
+        Title="{Binding Title}" Height="720" Width="1150" MinHeight="720" MinWidth="1000"
        Loaded="Window_Loaded">
    <Window.DataContext>
        <vm:DeliveryAdminViewModel/>
@ -176,6 +176,7 @@
                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ... (gilt für Gewicht der gesamten Lieferung)<LineBreak/>
                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...<LineBreak/>
                        <Bold>Uhrzeit</Bold>: z.B. 06:00-08:00, 18:00-, ...<LineBreak/>
                        <Bold>Handwiegung</Bold>: handw[iegung], !Handw[iegung] (alle ohne Handwiegung)<LineBreak/>
@ -355,14 +356,14 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Margin="5,5,5,5">
+            <GroupBox Header="Lieferung" Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" Margin="5,5,5,5">
                <Grid>
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="100"/>
                        <ColumnDefinition/>
                    </Grid.ColumnDefinitions>

-                    <Label Content="LieferscheinNr.:" Margin="10,10,0,0" Grid.Column="0"/>
+                    <Label Content="Lieferschein-Nr.:" Margin="10,10,0,0" Grid.Column="0"/>
                    <TextBox x:Name="LsNrInput" Text="{Binding LsNr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Width="126" Grid.Column="1" HorizontalAlignment="Left" Margin="0,10,0,0"
                             IsReadOnly="True" IsTabStop="False"
@ -389,6 +390,37 @@
                    <TextBox x:Name="CommentInput" Text="{Binding Comment, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                             Grid.Column="1" Margin="0,100,10,10"
                             TextChanged="TextBox_TextChanged"/>
+
+                    <Grid Grid.ColumnSpan="2" Margin="0,130,0,0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
+                                 SelectionChanged="DeliveryPartList_SelectionChanged">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <TextBlock Text="{Binding DPNr}" Width="20"/>
+                                        <TextBlock Text="{Binding SortId}" Width="30"/>
+                                        <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding QualId}" Width="30"/>
+                                        <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
+                                        <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
+                                        <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+
+                        <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
+                                ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
+                                Click="ExtractDeliveryPartButton_Click"/>
+                        <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
+                                HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
+                                Click="DeleteDeliveryPartButton_Click"/>
+                    </Grid>
                </Grid>
            </GroupBox>

@ -537,39 +569,6 @@
                </Grid>
            </GroupBox>

-            <GroupBox Header="Teillieferungen" Grid.Column="0" Grid.Row="2" Margin="5,5,5,5">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                    </Grid.ColumnDefinitions>
-                    <ListBox x:Name="DeliveryPartList" Margin="5,5,5,38" Grid.ColumnSpan="2"
-                             SelectionChanged="DeliveryPartList_SelectionChanged">
-                        <ListBox.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding DPNr}" Width="20"/>
-                                    <TextBlock Text="{Binding SortId}" Width="30"/>
-                                    <TextBlock Text="{Binding Kmw, StringFormat='{}{0:0.0}°'}" Width="40" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding QualId}" Width="30"/>
-                                    <TextBlock Text="{Binding Weight, StringFormat='{}{0:N0} kg'}" Width="60" TextAlignment="Right" Padding="0,0,10,0"/>
-                                    <TextBlock Text="{Binding Attribute.Name}" Width="60"/>
-                                    <TextBlock Text="{Binding Cultivation.Name}" Width="50"/>
-                                </StackPanel>
-                            </DataTemplate>
-                        </ListBox.ItemTemplate>
-                    </ListBox>
-
-                    <Button x:Name="ExtractDeliveryPartButton" Content="Extrahieren" IsEnabled="False"
-                            ToolTip="Ausgewählte Teillieferung aus aktueller Lieferung entfernen und entweder anderer oder neuer Lieferung zuordnen"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="5,10,2.5,5" Grid.Column="0" Grid.Row="2"
-                            Click="ExtractDeliveryPartButton_Click"/>
-                    <Button x:Name="DeleteDeliveryPartButton" Content="Löschen" IsEnabled="False"
-                            HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="2.5,10,5,5" Grid.Column="1" Grid.Row="2"
-                            Click="DeleteDeliveryPartButton_Click"/>
-                </Grid>
-            </GroupBox>
-
            <GroupBox Header="Herkunft" Grid.Column="0" Grid.Row="3" Margin="5,5,5,10">
                <Grid>
                    <Grid.ColumnDefinitions>
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@ -394,8 +394,10 @@ namespace Elwig.Windows {
                ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})";
                var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync();
                ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : "");
-                (ViewModel.StatusWeight, ViewModel.StatusWeightToolTip,
-                 ViewModel.StatusGradation, ViewModel.StatusGradationToolTip) = await DeliveryService.GenerateToolTip(deliveryParts);
+                var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
+                ViewModel.StatusWeight = wText;
+                ViewModel.StatusGradation = gText;
+                (ViewModel.StatusWeightToolTip, ViewModel.StatusGradationToolTip) = DeliveryService.GenerateToolTip(wData, gData);
            } else {
                ViewModel.StatusVarieties = "-";
                ViewModel.StatusWeight = "-";
@ -690,7 +692,7 @@ namespace Elwig.Windows {
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            NewDeliveryPartButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;
            var p = await ViewModel.UpdateDeliveryPart(
                (DeliveryList.SelectedItem as Delivery)?.Year,
@ -703,9 +705,10 @@ namespace Elwig.Windows {
            EmptyScale();
            await RefreshList();
            await RefreshDeliveryParts();
-            NewDeliveryPartButton.Cursor = null;
+            Mouse.OverrideCursor = null;
            ControlUtils.SelectItem(DeliveryList, p?.Delivery);
            DeliveryPartList.SelectedItem = null;
+            DeliveryPartList.ScrollIntoView(DeliveryPartList.ItemsSource.Cast<object>().Last());
            RefreshInputs();
            InitialInputs();
        }
@ -713,7 +716,7 @@ namespace Elwig.Windows {
        private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            FinishButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;
            DeliveryPartList.IsEnabled = false;
            var p = await ViewModel.UpdateDeliveryPart(
                (DeliveryList.SelectedItem as Delivery)?.Year,
@ -727,7 +730,6 @@ namespace Elwig.Windows {
            await RefreshList();
            await RefreshDeliveryParts();
            if (p?.Delivery != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
                    using var ctx = new AppDbContext();
                    using var doc = new DeliveryNote((await ctx.Deliveries.FindAsync(p.Year, p.DId))!, ctx);
@ -740,9 +742,8 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
-                Mouse.OverrideCursor = null;
            }
-            FinishButton.Cursor = null;
+            Mouse.OverrideCursor = null;
            DeliveryList.SelectedItem = null;
            await RenewContext();
            RefreshInputs();
@ -937,7 +938,7 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
            SaveButton.IsEnabled = false;
-            SaveButton.Cursor = Cursors.Wait;
+            Mouse.OverrideCursor = Cursors.AppStarting;

            IsEditing = false;
            IsCreating = false;
@ -953,7 +954,7 @@ namespace Elwig.Windows {
                !InputIsNotDefault(TimeInput)
            );

-            SaveButton.Cursor = null;
+            Mouse.OverrideCursor = null;

            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
@ -1310,8 +1311,7 @@ namespace Elwig.Windows {

        private void ModifiersInput_SelectionChanged(object sender, SelectionChangedEventArgs evt) {
            if (!IsEditing && !IsCreating) return;
-            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
-            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
            if (App.Client.IsMatzen) {
                var kl = mod.Where(m => m.Name.StartsWith("Klasse "));
                if (kl.Count() > 1) {
@ -1331,8 +1331,8 @@ namespace Elwig.Windows {

        private void LesewagenInput_Changed(object sender, RoutedEventArgs evt) {
            if (!IsEditing && !IsCreating) return;
-            var mod = ModifiersInput.SelectedItems.Cast<Modifier>();
-            var source = ModifiersInput.ItemsSource.Cast<Modifier>();
+            var mod = ModifiersInput.SelectedItems.Cast<Modifier>().ToList();
+            var source = ModifiersInput.ItemsSource.Cast<Modifier>().ToList();
            var lw = LesewagenInput.IsChecked == true;
            if (App.Client.IsMatzen) {
                var kl = mod.Where(m => m.Name.StartsWith("Klasse ")).Select(m => m.ModId).LastOrDefault("A")[0];
--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml
@ -8,7 +8,7 @@
        xmlns:local="clr-namespace:Elwig.Windows"
        xmlns:vm="clr-namespace:Elwig.ViewModels"
        xmlns:ctrl="clr-namespace:Elwig.Controls"
-        Title="Traubenanmeldungen - Elwig" Height="700" Width="900" MinWidth="600" MinHeight="400"
+        Title="Anmeldungen - Elwig" Height="700" Width="980" MinWidth="600" MinHeight="400"
        Loaded="Window_Loaded">
    <Window.DataContext>
        <vm:DeliveryAncmtAdminViewModel/>
@ -61,7 +61,7 @@
            <RowDefinition Height="24"/>
        </Grid.RowDefinitions>
        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1*" MinWidth="250"/>
+            <ColumnDefinition Width="1.25*" MinWidth="250"/>
            <ColumnDefinition Width="5"/>
            <ColumnDefinition Width="1*" MinWidth="300"/>
        </Grid.ColumnDefinitions>
@ -81,10 +81,10 @@

        <Grid Grid.Row="1" Margin="5,0,0,0">
            <Grid.RowDefinitions>
-                <RowDefinition Height="35"/>
+                <RowDefinition Height="42"/>
                <RowDefinition Height="1*" MinHeight="100"/>
                <RowDefinition Height="5"/>
-                <RowDefinition Height="2*" MinHeight="100"/>
+                <RowDefinition Height="1*" MinHeight="100"/>
                <RowDefinition Height="42"/>
            </Grid.RowDefinitions>
            <Grid.ColumnDefinitions>
@ -94,28 +94,36 @@
            </Grid.ColumnDefinitions>

            <TextBox x:Name="SearchInput" Text="{Binding SearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
-                     Grid.ColumnSpan="3" Margin="5,5,174,0" IsReadOnly="False"
+                     Grid.ColumnSpan="3" Margin="5,10,174,0" IsReadOnly="False"
                     TextChanged="SearchInput_TextChanged">
                <TextBox.ToolTip>
                    <TextBlock>
                        <Bold>Strg+F</Bold><LineBreak/><LineBreak/>
-                        Traubenanmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
+                        Anmeldungen filtern und durchsuchen. Die Filter sind beliebig kombinierbar.<LineBreak/>
                        Groß- und Kleinschreibung ist in den meisten Fällen egal.<LineBreak/>
                        <LineBreak/>
                        Filtern nach:<LineBreak/>
                        <Bold>Sorte</Bold>: z.B. GV, ZW, rr, sa, !gv (ausgenommen GV), ...<LineBreak/>
                        <Bold>Rot/Weiß</Bold>: z.B. r, Rot, w, weiß, ...<LineBreak/>
-                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...
+                        <Bold>Mitglied</Bold>: z.B. 1234, 987, ...<LineBreak/>
+                        <Bold>Zweigstelle</Bold>: z.B. musterort, ...<LineBreak/>
+                        <Bold>Attribut</Bold>: z.B. kabinett, !kabinett (alle außer kabinett), ...<LineBreak/>
+                        <Bold>Bewirtschaftung</Bold>: z.B. bio, !kip (alle außer KIP), ...<LineBreak/>
+                        <Bold>Gewicht</Bold>: z.B. &lt;500kg, &gt;6000kg, ...<LineBreak/>
+                        <Bold>Datum</Bold>: z.B. 1.9., 15.9.-10.10., -15.10.2020, ...
                    </TextBlock>
                </TextBox.ToolTip>
            </TextBox>
            <ctrl:IntegerUpDown x:Name="SeasonInput" Text="{Binding FilterSeasonString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding EnableSearchInputs}"
                                Grid.ColumnSpan="3" Height="25" Width="56" FontSize="14" Minimum="1900" Maximum="9999"
-                                Margin="5,5,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
+                                Margin="5,10,113,0" VerticalAlignment="Top" HorizontalAlignment="Right"
                                TextChanged="SeasonInput_TextChanged"/>
            <CheckBox x:Name="OnlyUpcomingInput" Content="Nur zukünftige" IsChecked="{Binding FilterOnlyUpcoming, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
-                      HorizontalAlignment="Right" Margin="0,10,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      HorizontalAlignment="Right" Margin="0,7,10,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
                      Checked="OnlyUpcomingInput_Changed" Unchecked="OnlyUpcomingInput_Changed"/>
+            <CheckBox x:Name="FromAllSchedulesInput" Content="Alle Lesepläne" IsChecked="{Binding FilterFromAllSchedules, Mode=TwoWay}" IsEnabled="{Binding EnableSearchInputs}"
+                      HorizontalAlignment="Right" Margin="0,24,13.5,0" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="3"
+                      Checked="FromAllSchedulesInput_Changed" Unchecked="FromAllSchedulesInput_Changed"/>

            <ListBox x:Name="DeliveryScheduleList" SelectedItem="{Binding SelectedDeliverySchedule, Mode=TwoWay}" ItemsSource="{Binding DeliverySchedules, Mode=TwoWay}"
                     Grid.Row="1" Grid.ColumnSpan="3" Margin="5,0,5,5" VerticalAlignment="Stretch" IsEnabled="{Binding EnableSearchInputs}"
@ -123,9 +131,10 @@
                <ListBox.ItemTemplate>
                    <DataTemplate>
                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="24"/>
                            <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="32"/>
                            <TextBlock Text="{Binding ZwstId}" Width="25" TextAlignment="Center"/>
-                            <TextBlock Text="{Binding Description}" Width="200"/>
+                            <TextBlock Text="{Binding Description}" Width="200" TextDecorations="{Binding TextDecoration}"/>
                            <TextBlock TextAlignment="Right">
                                <TextBlock Text="{Binding AnnouncedWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
                                / <TextBlock Text="{Binding MaxWeight, StringFormat='{}{0:N0}'}" Width="42" TextAlignment="Right"/> kg
@ -144,6 +153,13 @@
                      SelectionChanged="DeliveryAncmtList_SelectionChanged"
                      Margin="5,5,5,0" Grid.Row="3" FontSize="14" Grid.ColumnSpan="3">
                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Datum" Binding="{Binding Schedule.Date, StringFormat='{}{0:dd.MM.yy}'}" Width="60">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                    <DataGridTextColumn Header="MgNr." Binding="{Binding MgNr, StringFormat='{}{0} '}" Width="50">
                        <DataGridTextColumn.CellStyle>
                            <Style>
@ -151,7 +167,7 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
-                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="180"/>
+                    <DataGridTextColumn Header="Mitglied" Binding="{Binding Member.AdministrativeName}" Width="160"/>
                    <DataGridTextColumn Header="Sorte" Binding="{Binding SortId}" Width="50">
                        <DataGridTextColumn.CellStyle>
                            <Style>
@ -166,6 +182,13 @@
                            </Style>
                        </DataGridTextColumn.CellStyle>
                    </DataGridTextColumn>
+                    <DataGridTextColumn Header="Angemeldet" Binding="{Binding CreatedTimestamp, StringFormat='{}{0:HH:mm, dd.MM.}'}" Width="100">
+                        <DataGridTextColumn.CellStyle>
+                            <Style>
+                                <Setter Property="TextBlock.TextAlignment" Value="Center"/>
+                            </Style>
+                        </DataGridTextColumn.CellStyle>
+                    </DataGridTextColumn>
                </DataGrid.Columns>
            </DataGrid>

@ -267,9 +290,10 @@
                        <ComboBox.ItemTemplate>
                            <DataTemplate>
                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock Text="{Binding Date, StringFormat='ddd.'}" Width="28"/>
                                    <TextBlock Text="{Binding Date, StringFormat='dd.MM.'}" Width="35"/>
                                    <TextBlock Text="{Binding ZwstId}" Width="30" TextAlignment="Center"/>
-                                    <TextBlock Text="{Binding Description}"/>
+                                    <TextBlock Text="{Binding Description}" TextDecorations="{Binding TextDecoration}"/>
                                </StackPanel>
                            </DataTemplate>
                        </ComboBox.ItemTemplate>
@ -305,17 +329,39 @@
                <ItemsPanelTemplate>
                    <Grid>
                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="0.5*" MinWidth="120"/>
                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="1.75*" MinWidth="150"/>
                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="2*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="2*"/>
                        </Grid.ColumnDefinitions>
                    </Grid>
                </ItemsPanelTemplate>
            </StatusBar.ItemsPanel>
            <StatusBarItem>
-
+                <TextBlock>
+                    Anmeldungen: <Run Text="{Binding StatusAncmts}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="1"/>
+            <StatusBarItem Grid.Column="2">
+                <TextBlock ToolTip="{Binding StatusWeightToolTip}">
+                    Gewicht: <Run Text="{Binding StatusWeight}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="3"/>
+            <StatusBarItem Grid.Column="4">
+                <TextBlock>
+                    Anmldg. erstellt: <Run Text="{Binding StatusAncmtCreated}"/>
+                </TextBlock>
+            </StatusBarItem>
+            <Separator Grid.Column="5"/>
+            <StatusBarItem Grid.Column="6">
+                <TextBlock>
+                    Anmldg. geändert: <Run Text="{Binding StatusAncmtModified}"/>
+                </TextBlock>
            </StatusBarItem>
        </StatusBar>
    </Grid>
--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
@ -25,12 +25,14 @@ namespace Elwig.Windows {
            CommandBindings.Add(new CommandBinding(CtrlP, Menu_DeliveryAncmtList_ShowSelected_Click));
            CommandBindings.Add(new CommandBinding(CtrlShiftP, Menu_DeliveryAncmtList_PrintSelected_Click));
            ExemptInputs = [
-                SearchInput, SeasonInput, OnlyUpcomingInput, DeliveryScheduleList, DeliveryAncmtList,
+                SearchInput, SeasonInput, OnlyUpcomingInput, FromAllSchedulesInput, DeliveryScheduleList, DeliveryAncmtList,
            ];
            RequiredInputs = [
                MgNrInput, MemberInput, DeliveryScheduleInput, SortIdInput, WineVarietyInput, WeightInput,
            ];

+            DoShowWarningWindows = false;
+
            InitializeDelayTimer(SearchInput, SearchInput_TextChanged);
            SearchInput.TextChanged -= SearchInput_TextChanged;
            ViewModel.FilterSeason = Utils.CurrentLastSeason;
@ -51,7 +53,7 @@ namespace Elwig.Windows {
                WeightInput.Focus();
                WeightInput.SelectAll();
            } else if (ctrl == WeightInput) {
-                SaveButton_Click(null, null);
+                ShortcutSave();
            }
        }

@ -83,14 +85,15 @@ namespace Elwig.Windows {
            using var ctx = new AppDbContext();
            var deliverySchedules = await ctx.DeliverySchedules
                .Where(s => s.Year == ViewModel.FilterSeason)
-                .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
                .Include(s => s.Branch)
                .Include(s => s.Announcements)
                .OrderBy(s => s.DateString)
                .ThenBy(s => s.Branch.Name)
                .ThenBy(s => s.Description)
                .ToListAsync();
-            ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules, DeliveryScheduleList_SelectionChanged, ControlUtils.RenewSourceDefault.First);
+            ControlUtils.RenewItemsSource(DeliveryScheduleList, deliverySchedules
+                .Where(s => !ViewModel.FilterOnlyUpcoming || s.DateString.CompareTo(Utils.Today.ToString("yyyy-MM-dd")) >= 0)
+                .ToList(), DeliveryScheduleList_SelectionChanged, ViewModel.FilterFromAllSchedules ? ControlUtils.RenewSourceDefault.None : ControlUtils.RenewSourceDefault.First);
            ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged);
        }

@ -107,6 +110,7 @@ namespace Elwig.Windows {
                var dict = deliveryAncmts.AsParallel()
                    .ToDictionary(a => a, a => a.SearchScore(filter))
                    .OrderByDescending(a => a.Value)
+                    .ThenBy(a => a.Key.Schedule.DateString)
                    .ThenBy(a => a.Key.Member.Name)
                    .ThenBy(a => a.Key.Member.GivenName)
                    .ThenBy(a => a.Key.Member.MgNr);
@ -117,7 +121,8 @@ namespace Elwig.Windows {
                    .ToList();
            } else {
                deliveryAncmts = deliveryAncmts
-                    .OrderBy(a => a.Member.Name)
+                    .OrderBy(a => a.Schedule.DateString)
+                    .ThenBy(a => a.Member.Name)
                    .ThenBy(a => a.Member.GivenName)
                    .ThenBy(a => a.Member.MgNr)
                    .ToList();
@ -127,14 +132,24 @@ namespace Elwig.Windows {
                DeliveryAncmtList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            if (updateSort && DeliveryAncmtList.SelectedItem != null)
                DeliveryAncmtList.ScrollIntoView(DeliveryAncmtList.SelectedItem);
+
+            ViewModel.StatusAncmts = $"{deliveryAncmts.Count:N0}";
+            if (filter.Count == 0) {
+                var (text, grid) = await DeliveryAncmtService.GenerateToolTip(deliveryAncmtQuery);
+                ViewModel.StatusWeight = text;
+                ViewModel.StatusWeightToolTip = grid;
+            } else {
+                ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
+                ViewModel.StatusWeightToolTip = null;
+            }
        }

-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
            ClearInputStates();
            if (ViewModel.SelectedDeliveryAncmt is DeliveryAncmt a) {
                EditDeliveryAncmtButton.IsEnabled = true;
                DeleteDeliveryAncmtButton.IsEnabled = true;
-                await FillInputs(a);
+                FillInputs(a);
            } else {
                EditDeliveryAncmtButton.IsEnabled = false;
                DeleteDeliveryAncmtButton.IsEnabled = false;
@ -170,8 +185,8 @@ namespace Elwig.Windows {
            await RefreshList();
        }

-        private async void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+        private void DeliveryAncmtList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            RefreshInputs();
        }

        private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
@ -181,11 +196,13 @@ namespace Elwig.Windows {
                Menu_DeliveryAncmtList_ShowSelected.IsEnabled = !IsEditing && !IsCreating;
                Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = !IsEditing && !IsCreating;
                Menu_DeliveryAncmtList_PrintSelected.IsEnabled = !IsEditing && !IsCreating;
+                ViewModel.FilterFromAllSchedules = false;
            } else {
                Menu_DeliveryAncmtList_SaveSelected.IsEnabled = false;
                Menu_DeliveryAncmtList_ShowSelected.IsEnabled = false;
                Menu_DeliveryAncmtList_SavePdfSelected.IsEnabled = false;
                Menu_DeliveryAncmtList_PrintSelected.IsEnabled = false;
+                ViewModel.FilterFromAllSchedules = true;
            }
        }

@ -195,6 +212,16 @@ namespace Elwig.Windows {

        private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
            await RefreshDeliveryScheduleList();
+            await RefreshList(true);
+        }
+
+        private async void FromAllSchedulesInput_Changed(object sender, RoutedEventArgs evt) {
+            if (ViewModel.FilterFromAllSchedules) {
+                DeliveryScheduleList.SelectedItem = null;
+            } else if (DeliveryScheduleList.SelectedItem == null) {
+                ViewModel.FilterFromAllSchedules = true;
+            }
+            await RefreshList(true);
        }

        private async void SearchInput_TextChanged(object sender, TextChangedEventArgs evt) {
@ -237,6 +264,7 @@ namespace Elwig.Windows {
        private async void NewDeliveryAncmtButton_Click(object? sender, RoutedEventArgs? evt) {
            IsCreating = true;
            DeliveryAncmtList.IsEnabled = false;
+            var mgnr = ViewModel.MgNr;
            ViewModel.SelectedDeliveryAncmt = null;

            using var ctx = new AppDbContext();
@ -253,7 +281,11 @@ namespace Elwig.Windows {
            ShowSaveResetCancelButtons();
            UnlockInputs();
            InitInputs();
+            ViewModel.MgNr = mgnr;
            ViewModel.EnableSearchInputs = false;
+
+            MgNrInput.Focus();
+            MgNrInput.SelectAll();
        }

        protected override void ShortcutEdit() {
@ -282,8 +314,8 @@ namespace Elwig.Windows {
            if (ViewModel.SelectedDeliveryAncmt is not DeliveryAncmt a)
                return;
            var r = MessageBox.Show(
-                $"Soll die Traubenanmeldung wirklich unwiderruflich gelöscht werden?",
-                "Traubenanmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
+                $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
+                "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
@ -291,11 +323,11 @@ namespace Elwig.Windows {
                        ctx.Remove(a);
                        await ctx.SaveChangesAsync();
                    }
-                    await App.HintContextChange();
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                    MessageBox.Show(str, "Traubenanmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
+                    MessageBox.Show(str, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
                Mouse.OverrideCursor = null;
            }
@ -317,7 +349,7 @@ namespace Elwig.Windows {
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
-                MessageBox.Show(str, "Traubenanmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(str, "Anmeldung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
            }
            Mouse.OverrideCursor = null;
            IsEditing = false;
@ -329,8 +361,9 @@ namespace Elwig.Windows {
            ViewModel.EnableSearchInputs = true;
            FinishInputFilling();
            await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
            ViewModel.SearchQuery = "";
+            ControlUtils.SelectItemWithPk(DeliveryScheduleList, year, dsnr);
            if (sortid != null)
                ControlUtils.SelectItemWithPk(DeliveryAncmtList, year, dsnr, mgnr, sortid);
        }
@ -341,9 +374,9 @@ namespace Elwig.Windows {
            ResetButton_Click(null, null);
        }

-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
            if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
            } else if (IsCreating) {
                ClearInputs();
                InitInputs();
@ -368,15 +401,15 @@ namespace Elwig.Windows {

            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
            LockInputs();
            ViewModel.EnableSearchInputs = true;
        }

-        private async Task FillInputs(DeliveryAncmt a) {
+        private void FillInputs(DeliveryAncmt a) {
            ClearOriginalValues();
            ClearDefaultValues();
-            await ViewModel.FillInputs(a);
+            ViewModel.FillInputs(a);
            FinishInputFilling();
        }

--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
@ -195,29 +195,34 @@
                    <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="110"/>
                        <ColumnDefinition/>
+                        <ColumnDefinition/>
                    </Grid.ColumnDefinitions>

                    <Label Content="Datum/Zwst.:" Margin="10,10,0,10"/>
                    <TextBox x:Name="DateInput" Text="{Binding DateString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,10,10,10" Width="77" Grid.Column="1" HorizontalAlignment="Left" TextAlignment="Right"
-                             TextChanged="DateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
+                             Margin="0,10,10,10" Width="77" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left" TextAlignment="Right"
+                             TextChanged="ScheduleDateInput_TextChanged" LostFocus="DateInput_LostFocus"/>
                    <ComboBox x:Name="BranchInput" SelectedItem="{Binding Branch, Mode=TwoWay}" ItemsSource="{Binding BranchSource, Mode=TwoWay}"
                              DisplayMemberPath="Name" TextSearch.TextPath="Name"
-                              Margin="82,10,10,10" Width="150" Grid.Column="1" HorizontalAlignment="Left"/>
+                              Margin="82,10,10,10" Width="150" Grid.Column="1" Grid.ColumnSpan="2" HorizontalAlignment="Left"/>

                    <Label Content="Beschreibung:" Margin="10,40,0,10"/>
                    <TextBox x:Name="DescriptionInput" Text="{Binding Description, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Margin="0,40,10,10" Grid.Column="1"
+                             Margin="0,40,10,10" Grid.Column="1" Grid.ColumnSpan="2"
                             TextChanged="TextBox_TextChanged"/>

                    <Label Content="Max. Gewicht:" Margin="10,70,0,10"/>
                    <ctrl:UnitTextBox x:Name="MaxWeightInput" Unit="kg" Text="{Binding MaxWeightString, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                                      Margin="0,70,10,10" Grid.Column="1" Width="68" HorizontalAlignment="Left"
+                                      Margin="0,70,10,10" Grid.Column="1" Grid.ColumnSpan="2" Width="68" HorizontalAlignment="Left"
                                      TextChanged="MaxWeightInput_TextChanged"/>

+                    <CheckBox x:Name="CancelledInput" Content="Abgesagt" IsChecked="{Binding IsCancelled, Mode=TwoWay}"
+                              Grid.Column="1" Grid.ColumnSpan="2" Margin="80,75,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"
+                              Checked="CheckBox_Changed" Unchecked="CheckBox_Changed"/>
+
                    <Label Content="Sorten:" Margin="10,100,0,10"/>
                    <ctrl:CheckComboBox x:Name="MainWineVarietiesInput" SelectedItems="{Binding MainVarieties}" ItemsSource="{Binding MainVarietiesSource, Mode=TwoWay}"
-                                        Grid.Column="1" Margin="0,100,10,10"
+                                        Grid.Column="1" Grid.ColumnSpan="2" Margin="0,100,10,10"
                                        Delimiter=", " AllItemsSelectedContent="Alle Sorten" ListDisplayMemberPath="SortId" TextSearch.TextPath="Name">
                        <ctrl:CheckComboBox.ItemTemplateSelector>
                            <ctrl:WineVarietyTemplateSelector/>
@ -226,12 +231,20 @@

                    <Label Content="Weitere Sorten:" Margin="10,130,0,10"/>
                    <ctrl:CheckComboBox x:Name="OtherWineVarietiesInput" SelectedItems="{Binding OtherVarieties}" ItemsSource="{Binding OtherVarietiesSource, Mode=TwoWay}"
-                                        Grid.Column="1" Margin="0,130,10,10"
+                                        Grid.Column="1" Grid.ColumnSpan="2" Margin="0,130,10,10"
                                        Delimiter=", " AllItemsSelectedContent="Alle Sorten" ListDisplayMemberPath="SortId" TextSearch.TextPath="Name">
                        <ctrl:CheckComboBox.ItemTemplateSelector>
                            <ctrl:WineVarietyTemplateSelector/>
                        </ctrl:CheckComboBox.ItemTemplateSelector>
                    </ctrl:CheckComboBox>
+
+                    <Label Content="Attribut/Bewirt.:" Margin="10,160,0,10"/>
+                    <ComboBox x:Name="AttributeInput" SelectedItem="{Binding AttributeObj, Mode=TwoWay}" ItemsSource="{Binding AttributeSource, Mode=TwoWay}"
+                              Grid.Column="1" Margin="0,160,5,10"
+                              DisplayMemberPath="Name"/>
+                    <ComboBox x:Name="CultivationInput" SelectedItem="{Binding CultivationObj, Mode=TwoWay}" ItemsSource="{Binding CultivationSource, Mode=TwoWay}"
+                              Grid.Column="2" Margin="0,160,10,10"
+                              DisplayMemberPath="Name"/>
                </Grid>
            </GroupBox>

--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
@ -72,12 +72,12 @@ namespace Elwig.Windows {
                DeliveryScheduleList.ScrollIntoView(DeliveryScheduleList.SelectedItem);
        }

-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
            ClearInputStates();
            if (ViewModel.SelectedDeliverySchedule is DeliverySchedule s) {
                EditDeliveryScheduleButton.IsEnabled = true;
                DeleteDeliveryScheduleButton.IsEnabled = true;
-                await FillInputs(s);
+                FillInputs(s);
            } else {
                EditDeliveryScheduleButton.IsEnabled = false;
                DeleteDeliveryScheduleButton.IsEnabled = false;
@ -103,12 +103,18 @@ namespace Elwig.Windows {
            var varieties = await ctx.WineVarieties.OrderBy(v => v.Name).ToListAsync();
            ControlUtils.RenewItemsSource(MainWineVarietiesInput, varieties);
            ControlUtils.RenewItemsSource(OtherWineVarietiesInput, varieties);
+            var attrList = await ctx.WineAttributes.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            attrList.Insert(0, new NullItem("- Keine Angabe -"));
+            ControlUtils.RenewItemsSource(AttributeInput, attrList, null, ControlUtils.RenewSourceDefault.First);
+            var cultList = await ctx.WineCultivations.OrderBy(a => a.Name).Cast<object>().ToListAsync();
+            cultList.Insert(0, new NullItem("- Kein Angabe -"));
+            ControlUtils.RenewItemsSource(CultivationInput, cultList, null, ControlUtils.RenewSourceDefault.First);

            await RefreshList();
        }

-        private async void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+        private void DeliveryScheduleList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            RefreshInputs();
        }

        private async void OnlyUpcomingInput_Changed(object sender, RoutedEventArgs evt) {
@ -177,7 +183,7 @@ namespace Elwig.Windows {
                        ctx.Remove(s);
                        await ctx.SaveChangesAsync();
                    }
-                    await App.HintContextChange();
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -212,7 +218,7 @@ namespace Elwig.Windows {
            ViewModel.EnableSearchInputs = true;
            FinishInputFilling();
            await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
            ViewModel.SearchQuery = "";
        }

@ -222,9 +228,9 @@ namespace Elwig.Windows {
            ResetButton_Click(null, null);
        }

-        private async void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void ResetButton_Click(object? sender, RoutedEventArgs? evt) {
            if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
            } else if (IsCreating) {
                ClearInputs();
                InitInputs();
@ -232,21 +238,21 @@ namespace Elwig.Windows {
            UpdateButtons();
        }

-        private async void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
+        private void CancelButton_Click(object? sender, RoutedEventArgs? evt) {
            IsEditing = false;
            IsCreating = false;
            DeliveryScheduleList.IsEnabled = true;
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
            LockInputs();
            ViewModel.EnableSearchInputs = true;
        }

-        private async Task FillInputs(DeliverySchedule s) {
+        private void FillInputs(DeliverySchedule s) {
            ClearOriginalValues();
            ClearDefaultValues();
-            await ViewModel.FillInputs(s);
+            ViewModel.FillInputs(s);
            FinishInputFilling();
        }

@ -297,8 +303,8 @@ namespace Elwig.Windows {
            ViewModel.ControlButtonsVisibility = Visibility.Hidden;
        }

-        private new void DateInput_TextChanged(object sender, TextChangedEventArgs evt) {
-            base.DateInput_TextChanged(sender, evt);
+        private void ScheduleDateInput_TextChanged(object sender, TextChangedEventArgs evt) {
+            DateInput_TextChanged(sender, evt);
            if (ViewModel.Date is DateOnly date) {
                ViewModel.AncmtToDate = date.AddDays(-2);
            }
--- a/Elwig/Windows/LogWindow.xaml
+++ b/Elwig/Windows/LogWindow.xaml
@ -0,0 +1,34 @@
+<Window x:Class="Elwig.Windows.LogWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:local="clr-namespace:Elwig.Windows"
+        Title="Fehler-Protokoll - Elwig" Height="600" Width="1000"
+        Loaded="Window_Loaded">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition Width="5"/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+
+        <DataGrid x:Name="EventList" AutoGenerateColumns="False" HeadersVisibility="Column" IsReadOnly="True" GridLinesVisibility="None" SelectionMode="Single"
+                  CanUserDeleteRows="False" CanUserResizeRows="False" CanUserAddRows="False"
+                  SelectionChanged="EventList_SelectionChanged"
+                  Margin="10,10,5,10">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Ebene" Binding="{Binding Event.EntryType}" Width="60"/>
+                <DataGridTextColumn Header="Zeitpunkt" Binding="{Binding Event.TimeGenerated, StringFormat='{}{0:dd.MM.yyyy HH:mm:ss}'}" Width="120"/>
+                <DataGridTextColumn Header="Gerät" Binding="{Binding Event.MachineName}" Width="120"/>
+                <DataGridTextColumn Header="Fehler" Binding="{Binding ExceptionName}" Width="200"/>
+                <DataGridTextColumn Header="Beschreibung" Binding="{Binding ExceptionMessage}" Width="200"/>
+                <DataGridTextColumn Header="Herkunft" Binding="{Binding Location}" Width="200"/>
+            </DataGrid.Columns>
+        </DataGrid>
+
+        <GridSplitter Grid.Column="1" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+
+        <TextBox x:Name="EventData" Grid.Column="2" Margin="5,10,10,10" IsReadOnly="True"
+                 HorizontalScrollBarVisibility="Visible" VerticalScrollBarVisibility="Visible"/>
+    </Grid>
+</Window>
--- a/Elwig/Windows/LogWindow.xaml.cs
+++ b/Elwig/Windows/LogWindow.xaml.cs
@ -0,0 +1,44 @@
+using Elwig.Helpers;
+using System.Diagnostics;
+using System.Linq;
+using System.Windows;
+
+namespace Elwig.Windows {
+    public partial class LogWindow : Window {
+
+        public LogWindow() {
+            InitializeComponent();
+            WindowState = WindowState.Maximized;
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs evt) {
+            var log = Utils.GetLogEntries();
+            EventList.ItemsSource = log
+                .Select(e => new {
+                    Event = e,
+                    Lines = e.Message.Split('\n').ToArray(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    Exception = e.Lines.FirstOrDefault(l => l.StartsWith("Exception Info: "))?[16..].Trim().Split(':', 2),
+                    Location = e.Lines.FirstOrDefault(l => l.StartsWith("   at Elwig."))?[5..].Trim(),
+                })
+                .Select(e => new {
+                    e.Event,
+                    e.Exception,
+                    ExceptionName = e.Exception?[0].Trim(),
+                    ExceptionMessage = e.Exception?.Length >= 2 ? e.Exception?[1].Trim() : null,
+                    e.Location,
+                })
+                .OrderByDescending(e => e.Event.TimeGenerated)
+                .ToList();
+            EventList.SelectedIndex = 0;
+        }
+
+        private void EventList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            var t = EventList.SelectedItem.GetType();
+            var p = t.GetProperty("Event")!;
+            EventData.Text = ((EventLogEntry)p.GetValue(EventList.SelectedItem)!).Message;
+        }
+    }
+}
--- a/Elwig/Windows/MailWindow.xaml
+++ b/Elwig/Windows/MailWindow.xaml
@ -108,36 +108,67 @@
                        <RadioButton GroupName="Recipients" x:Name="RecipientsAreaComMembersInput" Content="Mitglieder mit Flächenbindung"
                                     Margin="10,30,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryAncmtMembersInput" Content="Mitglieder mit Anmeldung"
                                     Margin="10,50,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsDeliveryMembersInput" Content="Lieferanten der Saison"
                                     Margin="10,70,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
-                        <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsNonDeliveryMembersInput" Content="Nicht-Lieferanten der Saison"
                                     Margin="10,90,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>
+                        <RadioButton GroupName="Recipients" x:Name="RecipientsCustomInput" Content="Benutzerdefiniert"
+                                     Margin="10,110,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="RecipientsInput_Changed" Unchecked="RecipientsInput_Changed"/>

-                        <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,120,0,10"/>
+                        <Label Content="Zwst.:" x:Name="MemberBranchLabel" Margin="10,140,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberBranchInput" AllItemsSelectedContent="Alle Stammzweigstellen" Delimiter=", " DisplayMemberPath="Name"
-                                            Margin="50,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

-                        <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,150,0,10"/>
+                        <Label Content="Gem.:" x:Name="MemberKgLabel" Margin="10,170,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberKgInput" AllItemsSelectedContent="Alle Stammgemeinden" Delimiter=", " DisplayMemberPath="Name"
                                            IsSelectAllActive="True" SelectAllContent="Alle Stammgemeinden"
-                                            Margin="50,150,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,170,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

-                        <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,180,0,10"/>
+                        <Label Content="Bio-Betrieb:" x:Name="MemberOrganicLabel" Margin="10,200,0,10"/>
+                        <RadioButton x:Name="MemberOrganicYesInput" Content="Ja" GroupName="MemberOrganic"
+                                     Margin="80,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberOrganicNoInput" Content="Nein" GroupName="MemberOrganic"
+                                     Margin="125,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberOrganicIndifferentInput" Content="Egal" GroupName="MemberOrganic"
+                                     Margin="180,205,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+
+                        <Label Content="Funktionär:" x:Name="MemberFunktionärLabel" Margin="10,230,0,10"/>
+                        <RadioButton x:Name="MemberFunktionärYesInput" Content="Ja" GroupName="MemberFunktionär"
+                                     Margin="80,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberFunktionärNoInput" Content="Nein" GroupName="MemberFunktionär"
+                                     Margin="125,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+                        <RadioButton x:Name="MemberFunktionärIndifferentInput" Content="Egal" GroupName="MemberFunktionär"
+                                     Margin="180,235,10,10" VerticalAlignment="Top" HorizontalAlignment="Left"
+                                     Checked="MemberInput_Checked"/>
+
+                        <Label Content="Vtrg.:" x:Name="MemberAreaComLabel" Margin="10,260,0,10"/>
                        <ctrl:CheckComboBox x:Name="MemberAreaComInput" AllItemsSelectedContent="Alle Vertragsarten" Delimiter=", " DisplayMemberPath="VtrgId"
                                            IsSelectAllActive="True" SelectAllContent="Alle Vertragsarten"
-                                            Margin="50,180,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            SelectionChanged="MemberInput_SelectionChanged"/>
+
+                        <Label Content="Tag:" x:Name="MemberDeliveryAncmtLabel" Margin="10,260,0,10"/>
+                        <ctrl:CheckComboBox x:Name="MemberDeliveryAncmtInput" AllItemsSelectedContent="Alle Lesepläne" Delimiter=", " DisplayMemberPath="Identifier"
+                                            IsSelectAllActive="True" SelectAllContent="Alle Lesepläne"
+                                            Margin="50,260,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>

                        <ctrl:CheckComboBox x:Name="MemberCustomInput" AllItemsSelectedContent="Alle Mitglieder" Delimiter=", " DisplayMemberPath="AdministrativeName"
                                            IsSelectAllActive="True" SelectAllContent="Alle Mitglieder"
-                                            Margin="10,120,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
+                                            Margin="10,140,10,10" VerticalAlignment="Top" HorizontalAlignment="Stretch" Height="25"
                                            SelectionChanged="MemberInput_SelectionChanged"/>
                    </Grid>
                </GroupBox>
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@ -116,6 +116,9 @@ namespace Elwig.Windows {
            CreditNoteFooterInput.Visibility = Visibility.Hidden;
            RecipientsActiveMembersInput.IsChecked = true;

+            MemberOrganicIndifferentInput.IsChecked = true;
+            MemberFunktionärIndifferentInput.IsChecked = true;
+
            DeliveryConfirmationFooterInput.Text = App.Client.TextDeliveryConfirmation;
            CreditNoteFooterInput.Text = App.Client.TextCreditNote;

@ -164,6 +167,17 @@ namespace Elwig.Windows {
                MemberAreaComInput.SelectAll();
                MemberAreaComInput.SelectionChanged += MemberInput_SelectionChanged;
            }
+            ControlUtils.RenewItemsSource(MemberDeliveryAncmtInput, await ctx.DeliverySchedules
+                .Where(s => s.Year == Year)
+                .OrderBy(s => s.DateString)
+                .ThenBy(s => s.Branch.Name)
+                .ThenBy(s => s.Description)
+                .ToListAsync(), MemberInput_SelectionChanged);
+            if (MemberDeliveryAncmtInput.SelectedItems.Count == 0) {
+                MemberDeliveryAncmtInput.SelectionChanged -= MemberInput_SelectionChanged;
+                MemberDeliveryAncmtInput.SelectAll();
+                MemberDeliveryAncmtInput.SelectionChanged += MemberInput_SelectionChanged;
+            }
            ControlUtils.RenewItemsSource(MemberCustomInput, await ctx.Members
                .Where(m => m.IsActive)
                .OrderBy(m => m.Name)
@ -291,8 +305,18 @@ namespace Elwig.Windows {
            MemberBranchInput.Visibility = vis;
            MemberKgLabel.Visibility = vis;
            MemberKgInput.Visibility = vis;
+            MemberOrganicLabel.Visibility = vis;
+            MemberOrganicYesInput.Visibility = vis;
+            MemberOrganicNoInput.Visibility = vis;
+            MemberOrganicIndifferentInput.Visibility = vis;
+            MemberFunktionärLabel.Visibility = vis;
+            MemberFunktionärYesInput.Visibility = vis;
+            MemberFunktionärNoInput.Visibility = vis;
+            MemberFunktionärIndifferentInput.Visibility = vis;
            MemberAreaComInput.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            MemberAreaComLabel.Visibility = RecipientsAreaComMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberDeliveryAncmtInput.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
+            MemberDeliveryAncmtLabel.Visibility = RecipientsDeliveryAncmtMembersInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            MemberCustomInput.Visibility = RecipientsCustomInput.IsChecked == true ? Visibility.Visible : Visibility.Hidden;
            using var ctx = new AppDbContext();
            await UpdateRecipients(ctx);
@ -303,6 +327,11 @@ namespace Elwig.Windows {
            await UpdateRecipients(ctx);
        }

+        private async void MemberInput_Checked(object sender, RoutedEventArgs evt) {
+            using var ctx = new AppDbContext();
+            await UpdateRecipients(ctx);
+        }
+
        private void Date_TextChanged(object sender, RoutedEventArgs evt) {
            Validator.CheckDate((TextBox)sender, true);
        }
@ -325,10 +354,23 @@ namespace Elwig.Windows {
                    var kgs = MemberKgInput.SelectedItems.Cast<AT_Kg>().Select(k => k.KgNr).ToList();
                    query = query.Where(m => kgs.Contains((int)m.DefaultKgNr!));
                }
+                if (MemberOrganicYesInput.IsChecked == true) {
+                    query = query.Where(m => m.IsOrganic);
+                } else if (MemberOrganicNoInput.IsChecked == true) {
+                    query = query.Where(m => !m.IsOrganic);
+                }
+                if (MemberFunktionärYesInput.IsChecked == true) {
+                    query = query.Where(m => m.IsFunktionär);
+                } else if (MemberFunktionärNoInput.IsChecked == true) {
+                    query = query.Where(m => !m.IsFunktionär);
+                }

                if (RecipientsAreaComMembersInput.IsChecked == true) {
                    var vtrg = MemberAreaComInput.SelectedItems.Cast<AreaComType>().Select(a => a.VtrgId).ToList();
                    query = query.Where(m => m.IsActive && m.AreaCommitments.AsQueryable().Where(Utils.ActiveAreaCommitments(Year)).Any(c => vtrg.Contains(c.VtrgId)));
+                } else if (RecipientsDeliveryAncmtMembersInput.IsChecked == true) {
+                    var dsnrs = MemberDeliveryAncmtInput.SelectedItems.Cast<DeliverySchedule>().Select(s => s.DsNr).ToList();
+                    query = query.Where(m => m.Announcements.Any(a => a.Year == Year && dsnrs.Contains(a.DsNr)));
                } else if (RecipientsDeliveryMembersInput.IsChecked == true) {
                    query = query.Where(m => m.Deliveries.Any(d => d.Year == Year));
                } else if (RecipientsNonDeliveryMembersInput.IsChecked == true) {
@ -473,7 +515,7 @@ namespace Elwig.Windows {
                        var b = new Billing(year);
                        await b.FinishSeason();
                        await b.CalculateBuckets();
-                        await App.HintContextChange();
+                        App.HintContextChange();

                        dcData[year] = await DeliveryConfirmationDeliveryData.ForSeason(ctx.DeliveryParts, year);
                    } catch (Exception exc) {
--- a/Elwig/Windows/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@ -25,10 +25,14 @@
                <MenuItem Header="Abfragen stellen" Click="Menu_Database_Query_Click"/>
                <MenuItem Header="Speicherort öffnen..." Click="Menu_Database_Open_Click"/>
            </MenuItem>
+            <MenuItem Header="Waage">
+                <MenuItem Header="Datum und Uhrzeit setzen" Click="Menu_Scale_SetDateTime_Click"/>
+            </MenuItem>
            <MenuItem x:Name="HelpMenu" Header="Hilfe">
                <MenuItem Header="Über"/>
                <MenuItem x:Name="Menu_Help_Update" Header="Nach Updates suchen" Click="Menu_Help_Update_Click"/>
                <MenuItem x:Name="Menu_Help_Smtp" Header="E-Mail-Einstellungen testen" Click="Menu_Help_Smtp_Click"/>
+                <MenuItem x:Name="Menu_Help_Log" Header="Fehler-Protokoll anzeigen" Click="Menu_Help_Log_Click"/>
                <Separator/>
                <MenuItem x:Name="Menu_Help_Config" Header="Konfigurationsdatei öffnen..." Click="Menu_Help_Config_Click"/>
                <MenuItem x:Name="Menu_Help_Directory" Header="Konfigurationsspeicherort öffnen..." Click="Menu_Help_Directory_Click"/>
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@ -90,6 +90,26 @@ namespace Elwig.Windows {
            } catch { }
        }

+        private void Menu_Help_Log_Click(object sender, RoutedEventArgs evt) {
+            var w = new LogWindow();
+            w.Show();
+        }
+
+        private async void Menu_Scale_SetDateTime_Click(object sender, RoutedEventArgs evt) {
+            if (App.CommandScales.Count == 0) {
+                MessageBox.Show("Es sind keine geeigneten Waagen verfügbar!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Error);
+                return;
+            }
+            foreach (var s in App.CommandScales) {
+                try {
+                    await s.SetDateAndTime(DateTime.Now);
+                } catch (Exception exc) {
+                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                }
+            }
+            MessageBox.Show("Datum und Uhrzeit auf entsprechenden Waagen gesetzt!", "Datum und Uhrzeit setzen", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
        private void Menu_Database_Query_Click(object sender, RoutedEventArgs evt) {
            var w = new QueryWindow();
            w.Show();
@ -272,7 +292,7 @@ namespace Elwig.Windows {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                var tbl1 = await OverUnderDeliveryData.ForSeason(ctx.OverUnderDeliveryRows, year);
@ -311,7 +331,7 @@ namespace Elwig.Windows {
                var b = new Billing(year);
                await b.FinishSeason();
                await b.CalculateBuckets();
-                await App.HintContextChange();
+                App.HintContextChange();

                using var ctx = new AppDbContext();
                using var ods = new OdsFile(d.FileName);
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@ -150,14 +150,17 @@ namespace Elwig.Windows {
                MemberList_SelectionChanged, ViewModel.TextFilter.Count > 0 ? ControlUtils.RenewSourceDefault.IfOnly : ControlUtils.RenewSourceDefault.None, !updateSort);
            if (updateSort && MemberList.SelectedItem != null)
                MemberList.ScrollIntoView(MemberList.SelectedItem);
+
+            ViewModel.StatusMembers = $"{members.Count:N0} ({await ctx.Members.CountAsync():N0})";
+            ViewModel.StatusBusinessShares = $"{members.Sum(m => m.BusinessShares):N0} ({await ctx.Members.SumAsync(m => m.BusinessShares):N0})";
        }

-        private async Task RefreshInputs(bool validate = false) {
+        private void RefreshInputs(bool validate = false) {
            ClearInputStates();
            if (ViewModel.SelectedMember is Member m) {
                EditMemberButton.IsEnabled = true;
                DeleteMemberButton.IsEnabled = true;
-                await FillInputs(m);
+                FillInputs(m);
            } else {
                EditMemberButton.IsEnabled = false;
                DeleteMemberButton.IsEnabled = false;
@ -237,7 +240,6 @@ namespace Elwig.Windows {
            var mM = Math.Max(mA.Length, Math.Max(mI.Length, mT.Length));
            var mS = mM > 3;
            if (mS) mM--;
-            ViewModel.StatusMembers = $"{mA} ({mT})";
            ViewModel.StatusMembersToolTip =
                $"{new string(s1, Math.Max(0, mM - mA.Length))}{(mS && mA.Length < 4 ? s2 : "")}{mA} aktive Mitglieder\n" +
                $"{new string(s1, Math.Max(0, mM - mI.Length))}{(mS && mI.Length < 4 ? s2 : "")}{mI} nicht aktive Mitglieder\n" +
@ -249,7 +251,6 @@ namespace Elwig.Windows {
            var bM = Math.Max(bA.Length, Math.Max(bI.Length, bT.Length));
            var bS = bM > 3;
            if (bS) bM--;
-            ViewModel.StatusBusinessShares = $"{bA} ({bT})";
            ViewModel.StatusBusinessSharesToolTip =
                $"{new string(s1, Math.Max(0, bM - bA.Length))}{(bS && bA.Length < 4 ? s2 : "")}{bA} Geschäftsanteile von aktiven Mitgliedern\n" +
                $"{new string(s1, Math.Max(0, bM - bI.Length))}{(bS && bI.Length < 4 ? s2 : "")}{bI} Geschäftsanteile von nicht aktiven Mitgliedern\n" +
@ -282,8 +283,8 @@ namespace Elwig.Windows {
            inputs.Address.Visibility = vis;
        }

-        private async void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
-            await RefreshInputs();
+        private void MemberList_SelectionChanged(object sender, RoutedEventArgs evt) {
+            RefreshInputs();
            if (MemberList.SelectedItem is Member m) {
                Menu_Export_ExportSelected.IsEnabled = !IsEditing && !IsCreating;
                Menu_Export_UploadSelected.IsEnabled = !IsEditing && !IsCreating && App.Config.SyncUrl != null;
@ -373,7 +374,7 @@ namespace Elwig.Windows {
                        ctx.Remove(l);
                        await ctx.SaveChangesAsync();
                    }
-                    await App.HintContextChange();
+                    App.HintContextChange();
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -408,7 +409,7 @@ namespace Elwig.Windows {
            ViewModel.EnableSearchInputs = true;
            FinishInputFilling();
            await RefreshList();
-            await RefreshInputs();
+            RefreshInputs();
            ViewModel.SearchQuery = "";
            if (mgnr is int m)
                FocusMember(m);
@ -424,7 +425,7 @@ namespace Elwig.Windows {
            ViewModel.TransferPredecessorAreaComs = null;
            ViewModel.CancelAreaComs = null;
            if (IsEditing) {
-                await RefreshInputs();
+                RefreshInputs();
            } else if (IsCreating) {
                ClearInputs();
                await InitInputs();
@ -432,7 +433,7 @@ namespace Elwig.Windows {
            UpdateButtons();
        }

-        private async void CancelButton_Click(object sender, RoutedEventArgs evt) {
+        private void CancelButton_Click(object sender, RoutedEventArgs evt) {
            IsEditing = false;
            IsCreating = false;
            MemberList.IsEnabled = true;
@ -440,7 +441,7 @@ namespace Elwig.Windows {
            ViewModel.CancelAreaComs = null;
            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
-            await RefreshInputs();
+            RefreshInputs();
            LockInputs();
            UpdateContactInfoVisibility();
            ViewModel.EnableSearchInputs = true;
@ -685,10 +686,10 @@ namespace Elwig.Windows {
            }
        }

-        private async Task FillInputs(Member m) {
+        private void FillInputs(Member m) {
            ClearOriginalValues();
            ClearDefaultValues();
-            await ViewModel.FillInputs(m);
+            ViewModel.FillInputs(m);
            UpdateContactInfoVisibility(IsEditing || IsCreating);
            FinishInputFilling();
        }
@ -746,6 +747,7 @@ namespace Elwig.Windows {
                if (d.ShowDialog() != true)
                    return;
                ViewModel.TransferPredecessorAreaComs = d.SuccessorSeason;
+                ViewModel.MaintainAreaComYearTo = d.MaintainYearTo;
                if (IsEditing)
                    SetOriginalValue(PredecessorMgNrInput, -1);  // hack to allow user to save
                UpdateButtons();
@ -767,6 +769,7 @@ namespace Elwig.Windows {
        }

        private void ContactEmailInput_Changed(object sender, RoutedEventArgs evt) {
+            CheckBox_Changed(sender, evt);
            EmailAddressInput_TextChanged(EmailAddress1Input, new TextChangedEventArgs(evt.RoutedEvent, UndoAction.None));
        }

--- a/Elwig/Windows/OriginHierarchyWindow.xaml.cs
+++ b/Elwig/Windows/OriginHierarchyWindow.xaml.cs
@ -191,7 +191,7 @@ namespace Elwig.Windows {
                    }
                    await ctx.SaveChangesAsync();
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                ControlUtils.SelectItemWithPk(WbGlKgs, k.KgNr);
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@ -211,7 +211,7 @@ namespace Elwig.Windows {
                    ctx.Remove(k.WbKg);
                    await ctx.SaveChangesAsync();
                }
-                await App.HintContextChange();
+                App.HintContextChange();
                ControlUtils.SelectItemWithPk(WbKgs, k.KgNr);
            } catch (Exception exc) {
                await HintContextChange();
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
@ -173,7 +173,7 @@ namespace Elwig.Windows {

                var b = new Billing(Year);
                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -187,7 +187,7 @@ namespace Elwig.Windows {
            try {
                var b = new Billing(Year);
                await b.UnAdjustBusinessShares();
-                await App.HintContextChange();
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -309,7 +309,7 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Benutzerdefinierten Zu-/Abschlag speichern", MessageBoxButton.OK, MessageBoxImage.Error);
            }
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
        }
    }
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@ -225,19 +225,22 @@ namespace Elwig.Windows {

        private async void AddButton_Click(object sender, RoutedEventArgs evt) {
            try {
-                using var ctx = new AppDbContext();
-                var v = new PaymentVar {
-                    Year = Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = "Neue Auszahlungsvariante",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
-                };
+                PaymentVar? v;
+                using (var ctx = new AppDbContext()) {
+                    v = new PaymentVar {
+                        Year = Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = "Neue Auszahlungsvariante",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = "{\"mode\": \"elwig\", \"version\": 1, \"payment\": {}, \"curves\": []}",
+                    };

-                ctx.Add(v);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                    ctx.Add(v);
+                    await ctx.SaveChangesAsync();
+                }
+
+                App.HintContextChange();

                ControlUtils.SelectItem(PaymentVariantList, v);
            } catch (Exception exc) {
@ -250,19 +253,22 @@ namespace Elwig.Windows {
        private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
            try {
-                using var ctx = new AppDbContext();
-                var n = new PaymentVar {
-                    Year = orig.Year,
-                    AvNr = await ctx.NextAvNr(Year),
-                    Name = $"{orig.Name} (Kopie)",
-                    TestVariant = true,
-                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
-                    Data = orig.Data,
-                };
+                PaymentVar? n;
+                using (var ctx = new AppDbContext()) {
+                    n = new PaymentVar {
+                        Year = orig.Year,
+                        AvNr = await ctx.NextAvNr(Year),
+                        Name = $"{orig.Name} (Kopie)",
+                        TestVariant = true,
+                        DateString = $"{DateTime.Today:yyyy-MM-dd}",
+                        Data = orig.Data,
+                    };

-                ctx.Add(n);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                    ctx.Add(n);
+                    await ctx.SaveChangesAsync();
+                }
+
+                App.HintContextChange();

                ControlUtils.SelectItem(PaymentVariantList, n);
            } catch (Exception exc) {
@ -275,10 +281,11 @@ namespace Elwig.Windows {
        private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
            try {
-                using var ctx = new AppDbContext();
-                ctx.Remove(v);
-                await ctx.SaveChangesAsync();
-                await App.HintContextChange();
+                using (var ctx = new AppDbContext()) {
+                    ctx.Remove(v);
+                    await ctx.SaveChangesAsync();
+                }
+                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@ -297,7 +304,7 @@ namespace Elwig.Windows {
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
            CalculateButton.IsEnabled = true;
        }
@ -392,7 +399,7 @@ namespace Elwig.Windows {
            }
            Mouse.OverrideCursor = null;
            RevertButton.IsEnabled = true;
-            await App.HintContextChange();
+            App.HintContextChange();
        }

        private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
@ -408,7 +415,7 @@ namespace Elwig.Windows {
            Mouse.OverrideCursor = Cursors.AppStarting;
            var b = new BillingVariant(v.Year, v.AvNr);
            await b.Revert();
-            await App.HintContextChange();
+            App.HintContextChange();
            Mouse.OverrideCursor = null;
            CommitButton.IsEnabled = true;
        }
@ -500,7 +507,7 @@ namespace Elwig.Windows {
                    await ctx.SaveChangesAsync();
                }

-                await App.HintContextChange();
+                App.HintContextChange();
                CommentInput_TextChanged(null, null);
                ConsiderModifiersInput_Changed(null, null);
                ConsiderPenaltiesInput_Changed(null, null);
--- a/Tests/DocumentTests/DeliveryAncmtListTest.cs
+++ b/Tests/DocumentTests/DeliveryAncmtListTest.cs
@ -18,11 +18,11 @@ namespace Tests.DocumentTests {
                Assert.That(text, Contains.Substring("Anmeldeliste"));
                Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
                Assert.That(table, Is.EqualTo(new string[][] {
-                    ["01.10.2020", "101 MUSTERMANN Max",       "Grüner Veltliner",  "5 000"],
-                    ["01.10.2020", "102 WEINBAUER Wernhardt",  "Grüner Veltliner", "10 000"],
-                    ["01.10.2020", "103 MUSTERBAUER Matthäus", "Grüner Veltliner",  "8 000"],
-                    ["01.10.2020", "104 WINZER Waltraud",      "Grüner Veltliner",  "2 000"],
-                    ["Gesamt:",        "Anmeldungen: 4",                           "25 000"],
+                    ["01.10.2020", "101 MUSTERMANN Max",       "Hohenruppersdorf", "Grüner Veltliner", "-",  "5 000"],
+                    ["01.10.2020", "102 WEINBAUER Wernhardt",  "Hohenruppersdorf", "Grüner Veltliner", "-", "10 000"],
+                    ["01.10.2020", "103 MUSTERBAUER Matthäus", "Wolkersdorf",      "Grüner Veltliner", "-",  "8 000"],
+                    ["01.10.2020", "104 WINZER Waltraud",      "Wolkersdorf",      "Grüner Veltliner", "-",  "2 000"],
+                    ["Gesamt:",        "Anmeldungen: 4",                                                    "25 000"],
                }));
            });
        }
--- a/Tests/HelperTests/BillingTest.cs
+++ b/Tests/HelperTests/BillingTest.cs
@ -80,17 +80,17 @@ namespace Tests.HelperTests {
        }

        private Task<Dictionary<string, AreaComBucket>> GetMemberAreaCommitmentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberAreaCommitmentBuckets(year, mgnr, Connection);
        }

        private Task<Dictionary<string, int>> GetMemberDeliveryBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberDeliveryBuckets(year, mgnr, Connection);
        }

        private Task<Dictionary<string, int>> GetMemberPaymentBuckets(int year, int mgnr) {
-            var ctx = new AppDbContext();
+            using var ctx = new AppDbContext();
            return ctx.GetMemberPaymentBuckets(year, mgnr, Connection);
        }

--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@ -19,12 +19,12 @@
  </Target>

  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
    <PackageReference Include="Appium.WebDriver" Version="4.4.5" />
-    <PackageReference Include="NReco.PdfRenderer" Version="1.5.3" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.2.0">
+    <PackageReference Include="NReco.PdfRenderer" Version="1.5.4" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
--- a/Tests/fetch-resources.bat
+++ b/Tests/fetch-resources.bat
@ -1 +1 @@
-curl --fail -s -L "https://elwig.at/files/create.sql?v=28" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
+curl --fail -s -L "https://elwig.at/files/create.sql?v=30" -u "elwig:ganzGeheim123!" -o "Resources\Sql\Create.sql"
Author	SHA1	Message	Date
Lorenz Stechauner	0f87446906	Bump version to 0.11.4 All checks were successful Test / Run tests (push) Successful in 1m47s Details Deploy / Build and Deploy (push) Successful in 2m7s Details	2024-09-22 23:33:45 +02:00
Lorenz Stechauner	e0fcaf1f53	Services: Fix spacing in tool tip grids All checks were successful Test / Run tests (push) Successful in 2m3s Details	2024-09-22 23:22:23 +02:00
Lorenz Stechauner	26e549caa6	Bump version to 0.11.3 All checks were successful Test / Run tests (push) Successful in 1m37s Details Deploy / Build and Deploy (push) Successful in 2m28s Details	2024-09-22 21:05:42 +02:00
Lorenz Stechauner	1d187c25f3	MemberAdminWindow: Revert caching of MembersDeliveries All checks were successful Test / Run tests (push) Successful in 1m46s Details	2024-09-22 21:01:48 +02:00
Lorenz Stechauner	accbb9df08	Bump version to 0.11.2 All checks were successful Test / Run tests (push) Successful in 1m36s Details Deploy / Build and Deploy (push) Successful in 2m2s Details	2024-09-22 20:49:14 +02:00
Lorenz Stechauner	7791d02979	Services: Extract GenerateToolTipData() from GenerateToolTip() All checks were successful Test / Run tests (push) Successful in 1m35s Details	2024-09-22 20:47:06 +02:00
Lorenz Stechauner	dcec6f03fe	DeliveryAdminWindow: Fix 'Collection was modified' error All checks were successful Test / Run tests (push) Successful in 2m1s Details	2024-09-22 12:35:37 +02:00
Lorenz Stechauner	526e951029	Elwig: Add LogWindow All checks were successful Test / Run tests (push) Successful in 1m49s Details	2024-09-22 12:16:14 +02:00
Lorenz Stechauner	3cde360aaa	DeliveryAncmtAdminWindow: Replace 'Traubenanmeldung' with 'Anmeldung' All checks were successful Test / Run tests (push) Successful in 2m4s Details	2024-09-22 10:29:48 +02:00
Lorenz Stechauner	66be5a3e2c	MemberAdminWindow: Cache MembersDeliveries All checks were successful Test / Run tests (push) Successful in 1m46s Details	2024-09-21 23:29:10 +02:00
Lorenz Stechauner	5c12dba125	DeliveryService: Fix duplicate LsNr error All checks were successful Test / Run tests (push) Successful in 1m49s Details	2024-09-21 23:04:30 +02:00
Lorenz Stechauner	165770fa37	DeliveryAncmtList: Add DefaultKg of member	2024-09-21 23:04:30 +02:00
Lorenz Stechauner	648c406ad2	Services: Make FillInputs synchronous	2024-09-21 23:04:26 +02:00
Lorenz Stechauner	9fa9d9fbec	DeliveryAdminWindow: Minor layout changes	2024-09-21 21:37:57 +02:00
Lorenz Stechauner	5dc725620b	Bump version to 0.11.1 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 2m7s Details	2024-09-19 12:35:25 +02:00
Lorenz Stechauner	27d8a5cfb6	DeliveryAncmtAdminWindow: Add more filters and tooltip for weight All checks were successful Test / Run tests (push) Successful in 1m47s Details	2024-09-19 11:56:45 +02:00
Lorenz Stechauner	642fb3a625	DeliveryService: Small fixes	2024-09-19 11:54:57 +02:00
Lorenz Stechauner	3f7cd2a6ff	DeliveryAncmtAdminWindow: Focus MgNrInput when creating new ancmt All checks were successful Test / Run tests (push) Successful in 2m8s Details	2024-09-19 09:34:44 +02:00
Lorenz Stechauner	21a1b11d68	AreaCom: Make YearFrom nullable All checks were successful Test / Run tests (push) Successful in 1m48s Details	2024-09-18 18:26:16 +02:00
Lorenz Stechauner	d8beb03b96	Tests: Update dependencies All checks were successful Test / Run tests (push) Successful in 1m53s Details	2024-09-17 23:18:51 +02:00
Lorenz Stechauner	eee90c784b	Elwig: Update dependencies	2024-09-17 23:18:41 +02:00
Lorenz Stechauner	74200083ab	DeliveryAncmtAdminWindow: Mark cancelled schedules with Strikethrough All checks were successful Test / Run tests (push) Successful in 1m38s Details	2024-09-17 23:08:22 +02:00
Lorenz Stechauner	871bc299bd	Utils: Fix SplitName() for double names All checks were successful Test / Run tests (push) Successful in 1m46s Details	2024-09-17 19:18:43 +02:00
Lorenz Stechauner	a18b58f438	DeliveryAncmtAdminWindow: Make delivery schedule list bigger All checks were successful Test / Run tests (push) Successful in 2m10s Details	2024-09-17 19:07:59 +02:00
Lorenz Stechauner	cadb5515ea	Bump version to 0.11.0 All checks were successful Deploy / Build and Deploy (push) Successful in 2m9s Details	2024-09-16 11:17:23 +02:00
Lorenz Stechauner	d8a10152b3	DeliveryScheduleAdminWindow: Add Attribute, Cultivation and IsCancelled All checks were successful Test / Run tests (push) Successful in 1m37s Details	2024-09-16 10:10:31 +02:00
Lorenz Stechauner	f09c43c1bd	App: Make HintContextChange() synchronous by using MainDispatcher All checks were successful Test / Run tests (push) Successful in 2m37s Details	2024-09-12 11:40:32 +02:00
Lorenz Stechauner	5c08f61963	MailWindow: Add feature to address members with ancmts on specific day All checks were successful Test / Run tests (push) Successful in 2m28s Details	2024-09-08 15:55:10 +02:00
Lorenz Stechauner	7a15050575	Bump version to 0.10.8 All checks were successful Test / Run tests (push) Successful in 2m9s Details Deploy / Build and Deploy (push) Successful in 2m52s Details	2024-09-05 23:32:23 +02:00
Lorenz Stechauner	8d9172f91e	AppDbContext: Move all calls to App.HintContextChange() outside of any AppDbContext block All checks were successful Test / Run tests (push) Successful in 2m44s Details	2024-09-05 17:21:00 +02:00
Lorenz Stechauner	7437187630	DeliveryAncmtAdminWindow: Add date column	2024-09-05 15:28:55 +02:00
Lorenz Stechauner	a38cdaa8af	DeliveryAdminWindow: Slightly increase default width All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 18:18:19 +02:00
Lorenz Stechauner	a5638135a3	DeliveryAncmtAdminWindow: Add option to search in all delivery schedules and init mgnr with selected All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 18:11:56 +02:00
Lorenz Stechauner	a04c7d538e	MemberDataSheet: Add VAT to 'Buchführend' All checks were successful Test / Run tests (push) Successful in 2m2s Details	2024-09-04 17:32:34 +02:00
Lorenz Stechauner	26235f8c0a	BusinessDocument: Add ':' in aside block All checks were successful Test / Run tests (push) Successful in 2m6s Details	2024-09-04 17:23:22 +02:00
Lorenz Stechauner	f43d9c020c	DeliveryAncmtList: Center 'Anmldg.' column All checks were successful Test / Run tests (push) Successful in 2m54s Details	2024-09-04 17:18:36 +02:00
Lorenz Stechauner	22514715c1	DeliveryService: Small text fix	2024-09-04 17:16:14 +02:00
Lorenz Stechauner	5eda25ed14	Bump version to 0.10.7 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 3m42s Details	2024-09-02 23:42:00 +02:00
Lorenz Stechauner	543185d48e	DeliveryAdminWindow: Add weight filter All checks were successful Test / Run tests (push) Successful in 2m58s Details	2024-09-02 23:28:55 +02:00
Lorenz Stechauner	141086673f	DeliveryAncmtList: Add status to indicate late ancmts	2024-09-02 23:10:37 +02:00
Lorenz Stechauner	6627ab6d12	App: Try to fix auto context renewal 2 All checks were successful Test / Run tests (push) Successful in 2m57s Details	2024-09-01 11:44:38 +02:00
Lorenz Stechauner	7ef3faa39e	Bump version to 0.10.6 All checks were successful Deploy / Build and Deploy (push) Successful in 3m12s Details	2024-08-30 22:35:10 +02:00
Lorenz Stechauner	8c8c0a8c2b	App: Try to fix auto context renewal All checks were successful Test / Run tests (push) Successful in 2m23s Details	2024-08-30 22:26:49 +02:00
Lorenz Stechauner	78a72c641f	MemberAdminWindow: Fix checking and unchecking of ContactEmailInput All checks were successful Test / Run tests (push) Successful in 2m3s Details	2024-08-30 21:40:01 +02:00
Lorenz Stechauner	e18bc58b6c	DeliveryAncmtAdminWindow: Fix bug when pressing Enter in weight input All checks were successful Test / Run tests (push) Successful in 2m55s Details	2024-08-30 21:33:58 +02:00
Lorenz Stechauner	21f68caf4c	DeliveryAncmtAdminWindow: Increase window width	2024-08-30 21:33:16 +02:00
Lorenz Stechauner	2ef10b4bb2	DeliveryAdminWindow: Scroll DeliveryPartList down when adding new delivery parts	2024-08-30 21:31:44 +02:00
Lorenz Stechauner	5321be46c7	[#33 ] ChartWindow: Add CheckBox to indicate which graph (gebunden, normal) is currently selected All checks were successful Test / Run tests (push) Successful in 2m54s Details	2024-08-28 11:14:51 +02:00
Lorenz Stechauner	0f24f9da08	[#33 ] ChartWindow: Fix scaling bug	2024-08-28 10:20:21 +02:00
Lorenz Stechauner	8ce8492c74	MainWindow: Use 'Waage' instead of 'Waagen' All checks were successful Test / Run tests (push) Successful in 4m42s Details	2024-08-26 23:00:24 +02:00
Lorenz Stechauner	ee1315929c	AreaComAdminWindow: Fix window title All checks were successful Test / Run tests (push) Successful in 2m59s Details	2024-08-26 22:12:37 +02:00
Lorenz Stechauner	9930e6173c	Dtos: Rewrite SQL queries to be more efficient All checks were successful Test / Run tests (push) Successful in 2m28s Details	2024-08-24 16:37:41 +02:00
Lorenz Stechauner	b5c1bfb08f	Bump version to 0.10.5 All checks were successful Test / Run tests (push) Successful in 2m4s Details Deploy / Build and Deploy (push) Successful in 2m47s Details	2024-08-24 14:00:49 +02:00
Lorenz Stechauner	cd2b482b5a	Weighing: Add SetDateAndTime() All checks were successful Test / Run tests (push) Successful in 2m22s Details	2024-08-24 13:54:59 +02:00
Lorenz Stechauner	bec1b165bf	MemberAdminWindow: Allow user to keep AreaCom YearTo when transfering All checks were successful Test / Run tests (push) Successful in 2m49s Details	2024-08-24 13:35:14 +02:00
Lorenz Stechauner	2ae2564647	DeliveryAncmtAdminWinodw: Do not show warning windows All checks were successful Test / Run tests (push) Successful in 2m31s Details	2024-08-23 14:49:05 +02:00
Lorenz Stechauner	adbe418b7c	DeliveryAncmtAdminWindow: Change status bar spacing All checks were successful Test / Run tests (push) Successful in 2m51s Details	2024-08-23 08:53:48 +02:00
Lorenz Stechauner	94db0723c5	Bump version to 0.10.4 All checks were successful Test / Run tests (push) Successful in 2m2s Details Deploy / Build and Deploy (push) Successful in 2m48s Details	2024-08-22 13:36:38 +02:00
Lorenz Stechauner	f54677d429	DeliveryAncmtAdminWindow: Display stats in status bar All checks were successful Test / Run tests (push) Successful in 2m27s Details	2024-08-22 13:32:08 +02:00
Lorenz Stechauner	49e4b65c27	MemberAdminWindow: Display currently shown member count and business shares All checks were successful Test / Run tests (push) Successful in 2m25s Details	2024-08-22 12:29:41 +02:00
Lorenz Stechauner	ada5085cae	Validator: Add some syntax sugar All checks were successful Test / Run tests (push) Successful in 2m51s Details	2024-08-22 11:04:24 +02:00
Lorenz Stechauner	85931e62e8	DeliveryAncmtAdminWindow: Show weekday also in ComboBox All checks were successful Test / Run tests (push) Successful in 11m7s Details	2024-08-21 16:57:21 +02:00
Lorenz Stechauner	39956cbcbd	Bump version to 0.10.3 All checks were successful Test / Run tests (push) Successful in 2m25s Details Deploy / Build and Deploy (push) Successful in 3m20s Details	2024-08-21 00:01:47 +02:00
Lorenz Stechauner	84d8d0cecb	DeliveryScheduleAdminWindow: Fix AncmtToDateInput input bug All checks were successful Test / Run tests (push) Successful in 2m3s Details	2024-08-20 23:39:08 +02:00
Lorenz Stechauner	fe7f9d675b	DeliveryAncmtAdminWindow: Add day of week to delivery schedule list All checks were successful Test / Run tests (push) Successful in 3m0s Details	2024-08-20 23:31:37 +02:00
Lorenz Stechauner	9d1ee8638c	Bump version to 0.10.2 All checks were successful Test / Run tests (push) Successful in 1m59s Details Deploy / Build and Deploy (push) Successful in 2m41s Details	2024-08-16 21:31:43 +02:00
Lorenz Stechauner	cd40075702	ElwigData: Allow legacy field family_name to be used and other fixes All checks were successful Test / Run tests (push) Successful in 2m50s Details	2024-08-16 21:24:04 +02:00
Lorenz Stechauner	204dfe8745	MemberService: Include area commitments when uploading export data	2024-08-16 21:23:32 +02:00