Bump version to 0.10.7

DeliveryAdminWindow: Add weight filter
DeliveryAncmtList: Add status to indicate late ancmts
2024-09-02 23:42:00 +02:00 · 2024-09-02 23:28:55 +02:00 · 2024-09-02 23:10:37 +02:00 · 2024-09-01 11:44:38 +02:00 · 2024-08-30 22:35:10 +02:00 · 2024-08-30 22:26:49 +02:00
40 changed files with 536 additions and 192 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,6 +3,125 @@ Changelog
 =========


+[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}
+
+* 2. Versuch: 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}
+------------------------------------------
+
+### Neue Funktionen {#v0.10.1-features}
+
+* In der Mitglieder-Liste (PDF und Excel) werden ggf. gefilterte Flächenbindungen angegeben. (d3839c288a)
+
+### Behobene Fehler {#v0.10.1-bugfixes}
+
+* Fehler beim Berechnen...
+  * falls in Saison keine Lieferungen vorhanden sind. (48970de652)
+  * falls der Vorname eines Mitgliedes nicht gesetzt ist. (2764a0ca21)
+
+[v0.10.1]: https://git.necronda.net/winzer/elwig/releases/tag/v0.10.1
+
+
+
+
 [v0.10.0][v0.10.0] (2024-08-13) {#v0.10.0}
 ------------------------------------------

--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@ -53,7 +53,7 @@ namespace Elwig {
        public static Dispatcher MainDispatcher { get; private set; }
        private DateTime LastChanged;
        private static DateTime CurrentLastWrite => File.GetLastWriteTime(Config.DatabaseFile);
-        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(2) };
+        private readonly DispatcherTimer ContextTimer = new() { Interval = TimeSpan.FromSeconds(5) };

        public App() : base() {
            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
@ -70,8 +70,9 @@ namespace Elwig {
            }

            ContextTimer.Tick += (object? sender, EventArgs evt) => {
-                if (CurrentLastWrite > LastChanged) {
-                    LastChanged = CurrentLastWrite;
+                var ch = CurrentLastWrite;
+                if (ch > LastChanged) {
+                    LastChanged = ch;
                    OnContextChanged();
                }
            };
@ -201,7 +202,9 @@ namespace Elwig {
        }

        public static async Task HintContextChange() {
-            CurrentApp.LastChanged = CurrentLastWrite;
+            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();
--- 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/DeliveryAncmtList.cshtml
+++ b/Elwig/Documents/DeliveryAncmtList.cshtml
@ -10,8 +10,9 @@
        <colgroup>
            <col style="width: 18mm;"/>
            <col style="width: 12mm;"/>
-            <col style="width: 81mm;"/>
+            <col style="width: 70mm;"/>
            <col style="width: 40mm;"/>
+            <col style="width: 11mm;"/>
            <col style="width: 14mm;"/>
        </colgroup>
        <thead>
@ -20,6 +21,7 @@
                <th rowspan="2">MgNr.</th>
                <th rowspan="2" style="text-align: left;">Mitglied</th>
                <th rowspan="2" style="text-align: left;">Sorte</th>
+                <th rowspan="2">Anmldg.</th>
                <th>Gewicht</th>
            </tr>
            <tr>
@ -33,13 +35,14 @@
                    <td class="number">@a.MgNr</td>
                    <td>@a.AdministrativeName</td>
                    <td>@a.Variety</td>
+                    <td class="small">@(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="2" class="number">@($"{Model.Announcements.Sum(a => a.Weight):N0}")</td>
            </tr>
        </tbody>
    </table>
--- a/Elwig/Documents/MemberList.cs
+++ b/Elwig/Documents/MemberList.cs
@ -1,5 +1,6 @@
 using Elwig.Models.Dtos;
 using System.Collections.Generic;
+using System.Linq;

 namespace Elwig.Documents {
    public class MemberList : Document {
@ -9,9 +10,17 @@ namespace Elwig.Documents {
        public string Filter;
        public IEnumerable<MemberListRow> Members;

+        public string[] AreaComFilters;
+        public bool FilterAreaComs => AreaComFilters.Length > 0;
+
        public MemberList(string filter, IEnumerable<MemberListRow> members) : base(Name) {
            Filter = filter;
            Members = members;
+            AreaComFilters = [..members
+                .SelectMany(m => m.AreaCommitmentsFiltered)
+                .Select(c => c.VtrgId)
+                .Distinct()
+                .Order()];
        }

        public MemberList(string filter, MemberListData data) :
--- a/Elwig/Documents/MemberList.cshtml
+++ b/Elwig/Documents/MemberList.cshtml
@ -8,30 +8,61 @@
    <h2>@Model.Filter</h2>
    <table class="members">
        <colgroup>
-            <col style="width: 8mm;"/>
-            <col style="width: 42mm;"/>
-            <col style="width: 40mm;"/>
            <col style="width:  8mm;"/>
-            <col style="width: 20mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 38mm;"/>
+            } else {
+                <col style="width: 42mm;"/>
+            }
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 36mm;"/>
+            } else {
+                <col style="width: 40mm;"/>
+            }
+            <col style="width:  8mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 18mm;"/>
+            } else {
+                <col style="width: 20mm;"/>
+            }
            <col style="width: 12mm;"/>
-            <col style="width:  5mm;" />
-            <col style="width: 18mm;"/>
+            <col style="width:  5mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 16mm;"/>
+            } else {
+                <col style="width: 18mm;"/>
+            }
            <col style="width: 12mm;"/>
+            @if (Model.AreaComFilters.Length > 1) {
+                <col style="width: 12mm;"/>
+            }
        </colgroup>
        <thead>
            <tr>
-                <th rowspan="2">Nr.</th>
-                <th rowspan="2" style="text-align: left;">Name</th>
-                <th rowspan="2" style="text-align: left;">Adresse</th>
-                <th rowspan="2">PLZ</th>
-                <th rowspan="2" style="text-align: left;">Ort</th>
-                <th rowspan="2">Betr.-Nr.</th>
-                <th rowspan="2">GA</th>
-                <th rowspan="2" style="text-align: left;">Stamm-KG</th>
-                <th>Geb. Fl.</th>
+                @{
+                    var headerSpan = Model.FilterAreaComs ? 3 : 2;
+                }
+                <th rowspan="@headerSpan">Nr.</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Name</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Adresse</th>
+                <th rowspan="@headerSpan">PLZ</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Ort</th>
+                <th rowspan="@headerSpan">Betr.-Nr.</th>
+                <th rowspan="@headerSpan">GA</th>
+                <th rowspan="@headerSpan" style="text-align: left;">Stamm-KG</th>
+                <th colspan="@(Model.FilterAreaComs ? Model.AreaComFilters.Length : 1)">Geb. Fl.</th>
            </tr>
+            @if (Model.FilterAreaComs) {
+                <tr>
+                    @foreach (var vtrgId in Model.AreaComFilters) {
+                        <th>@vtrgId</th>
+                    }
+                </tr>
+            }
            <tr>
-                <th class="unit">[m²]</th>
+                @for (int i = 0; i < Math.Max(Model.AreaComFilters.Length, 1); i++) {
+                    <th class="unit">[m²]</th>
+                }
            </tr>
        </thead>
        <tbody class="small">
@ -40,22 +71,28 @@
            }
            @foreach (var m in Model.Members) {
                if (lastBranch != null && m.Branch != lastBranch) {
-                    <tr class="spacing"><td colspan="9"></td></tr>
+                    <tr class="spacing"><td colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))"></td></tr>
                    <tr class="header">
-                        <th colspan="9">@m.Branch</th>
+                        <th colspan="@(8 + Math.Max(Model.AreaComFilters.Length, 1))">@m.Branch</th>
                    </tr>
                    lastBranch = m.Branch;
                }
                <tr>
                    <td class="number" rowspan="@(m.BillingName != null ? 2 : 1)">@m.MgNr</td>
-                    <td>@m.Name1.Replace('ß', 'ẞ').ToUpper() @m.Name2</td>
+                    <td>@m.AdminName1 @m.Name2</td>
                    <td>@m.Address</td>
                    <td>@m.Plz</td>
                    <td class="tiny">@m.Locality</td>
                    <td>@m.LfbisNr</td>
                    <td class="number">@m.BusinessShares</td>
                    <td class="tiny">@m.DefaultKg</td>
-                    <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    @if (Model.AreaComFilters.Length > 0) {
+                        foreach (var v in Model.AreaComFilters) {
+                            <td class="number">@($"{m.AreaCommitmentsFiltered.FirstOrDefault(c => c.VtrgId == v).Area:N0}")</td>
+                        }
+                    } else {
+                        <td class="number">@($"{m.AreaCommitment:N0}")</td>
+                    }
                </tr>
                if (m.BillingName != null) {
                    <tr>
--- 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.0</Version>
+    <Version>0.10.7</Version>
    <SatelliteResourceLanguages>de-AT</SatelliteResourceLanguages>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
    <ApplicationManifest>app.manifest</ApplicationManifest>
--- a/Elwig/Helpers/Billing/Billing.cs
+++ b/Elwig/Helpers/Billing/Billing.cs
@ -157,13 +157,15 @@ namespace Elwig.Helpers.Billing {
                lastMgNr = mgnr;
            }

-            await AppDbContext.ExecuteBatch(cnx, $"""
-                UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year};
-                INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
-                VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
-                ON CONFLICT DO UPDATE
-                SET discr = excluded.discr, value = value + excluded.value;
-                """);
+            await AppDbContext.ExecuteBatch(cnx, $"UPDATE delivery_part_bucket SET value = 0 WHERE year = {Year}");
+            if (inserts.Count > 0) {
+                await AppDbContext.ExecuteBatch(cnx, $"""
+                    INSERT INTO delivery_part_bucket (year, did, dpnr, bktnr, discr, value)
+                    VALUES {string.Join(",\n       ", inserts.Select(i => $"({Year}, {i.Item1}, {i.Item2}, {i.Item3}, '{i.Item4}', {i.Item5})"))}
+                    ON CONFLICT DO UPDATE
+                    SET discr = excluded.discr, value = value + excluded.value;
+                    """);
+            }

            if (!avoidUnderDlvrs) {
                if (ownCnx) await cnx.DisposeAsync();
--- 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));
                    }
@ -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;
--- 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();
        }
@ -54,7 +54,7 @@ namespace Elwig.Models.Dtos {
    public class AreaComUnderDeliveryRow {
        public int MgNr;
        public string Name1;
-        public string Name2;
+        public string? Name2;
        public string Address;
        public int Plz;
        public string Locality;
@ -88,7 +88,7 @@ namespace Elwig.Models.Dtos {
        [Column("name_1")]
        public required string Name1 { get; set; }
        [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
        [Column("address")]
        public required string Address { get; set; }
        [Column("plz")]
--- a/Elwig/Models/Dtos/CreditNoteData.cs
+++ b/Elwig/Models/Dtos/CreditNoteData.cs
@ -79,7 +79,7 @@ namespace Elwig.Models.Dtos {
    public class CreditNoteRow {
        public int MgNr;
        public string Name1;
-        public string Name2;
+        public string? Name2;
        public string Address;
        public int Plz;
        public string Locality;
@ -144,7 +144,7 @@ namespace Elwig.Models.Dtos {
        [Column("name_1")]
        public required string Name1 { get; set; }
        [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
        [Column("address")]
        public required string Address { get; set; }
        [Column("plz")]
--- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs
+++ b/Elwig/Models/Dtos/DeliveryAncmtListData.cs
@ -17,6 +17,9 @@ namespace Elwig.Models.Dtos {
            ("Name2", "Vorname", 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) :
@ -38,11 +41,14 @@ namespace Elwig.Models.Dtos {
        public string Branch;
        public int MgNr;
        public string Name1;
-        public string Name2;
+        public string? Name2;
        public string AdministrativeName;
        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;
@ -56,7 +62,10 @@ namespace Elwig.Models.Dtos {
            AdministrativeName = m.AdministrativeName;
            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/DeliveryJournalData.cs
+++ b/Elwig/Models/Dtos/DeliveryJournalData.cs
@ -58,7 +58,7 @@ namespace Elwig.Models.Dtos {
        public string DeliveryBranch;
        public int MgNr;
        public string Name1;
-        public string Name2;
+        public string? Name2;
        public string AdministrativeName;
        public string? MemberBranch;
        public string SortId;
--- a/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
+++ b/Elwig/Models/Dtos/MemberDeliveryPerVariantData.cs
@ -72,7 +72,7 @@ namespace Elwig.Models.Dtos {
    public class MemberDeliveryPerVariantRow {
        public int MgNr;
        public string Name1;
-        public string Name2;
+        public string? Name2;
        public string Address;
        public int Plz;
        public string Locality;
@ -104,7 +104,7 @@ namespace Elwig.Models.Dtos {
        [Column("name_1")]
        public required string Name1 { get; set; }
        [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
        [Column("address")]
        public required string Address { get; set; }
        [Column("plz")]
--- a/Elwig/Models/Dtos/MemberListData.cs
+++ b/Elwig/Models/Dtos/MemberListData.cs
@ -31,6 +31,7 @@ namespace Elwig.Models.Dtos {
            ("EntryDate", "Eintritt", null, 20),
            ("ExitDate", "Austritt", null, 20),
            ("AreaCommitment", "geb. Fläche", "m²", 20),
+            ("AreaCommitmentsFiltered", "geb. Fläche", "Vtrg.|m²", 30),
            ("UstIdNr", "UID", null, 25),
            ("Iban", "IBAN", null, 45),
            ("Bic", "BIC", null, 30),
@ -45,8 +46,8 @@ namespace Elwig.Models.Dtos {
            base(MemberList.Name, MemberList.Name, string.Join(" / ", filterNames), rows, FieldNames) {
        }

-        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames) {
-            var areaCom = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments).Sum(c => c.Area));
+        public static async Task<MemberListData> FromQuery(IQueryable<Member> query, List<string> filterNames, IEnumerable<string> filterAreaCom) {
+            var areaComs = await query.ToDictionaryAsync(m => m.MgNr, m => Utils.ActiveAreaCommitments(m.AreaCommitments));
            return new((await query
                .Include(m => m.DefaultWbKg!.AtKg)
                .Include(m => m.Branch)
@ -55,13 +56,17 @@ namespace Elwig.Models.Dtos {
                .Include(m => m.TelephoneNumbers)
                .Include(m => m.EmailAddresses)
                .AsSplitQuery()
-                .ToListAsync()).Select(m => new MemberListRow(m, areaCom[m.MgNr])), filterNames);
+                .ToListAsync()).Select(m => new MemberListRow(m,
+                    areaComs[m.MgNr].Sum(c => c.Area),
+                    areaComs[m.MgNr].Where(c => filterAreaCom.Contains(c.VtrgId)).GroupBy(c => c.VtrgId).ToDictionary(g => g.Key, g => g.Sum(c => c.Area)))),
+                filterNames);
        }
    }

    public class MemberListRow {
        public int MgNr;
        public string? Name1;
+        public string? AdminName1;
        public string? Name2;
        public string? DefaultKg;
        public string? Branch;
@ -78,6 +83,7 @@ namespace Elwig.Models.Dtos {
        public string? Iban;
        public string? Bic;
        public int? AreaCommitment;
+        public (string VtrgId, int Area)[] AreaCommitmentsFiltered;
        public bool IsBuchführend;
        public bool IsOrganic;
        public bool IsActive;
@ -89,9 +95,10 @@ namespace Elwig.Models.Dtos {
        public string? AdditionalContact;
        public string? Comment;

-        public MemberListRow(Member m, int? areaCom = null) {
+        public MemberListRow(Member m, int? areaCom = null, Dictionary<string, int>? filtered = null) {
            MgNr = m.MgNr;
            Name1 = m.Name;
+            AdminName1 = m.AdministrativeName1;
            Name2 = m.AdministrativeName2;
            DefaultKg = m.DefaultKg?.Name;
            Branch = m.Branch?.Name;
@ -125,6 +132,7 @@ namespace Elwig.Models.Dtos {
                .Concat(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).Except([EmailAddress])));
            Comment = m.Comment;
            AreaCommitment = areaCom == 0 ? null : areaCom;
+            AreaCommitmentsFiltered = filtered != null ? filtered.OrderBy(f => f.Key).Select(f => (f.Key, f.Value)).ToArray() : [];
        }
    }
 }
--- 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();
@ -53,7 +53,7 @@ namespace Elwig.Models.Dtos {
        [Column("name_1")]
        public required string Name1 { get; set; }
        [Column("name_2")]
-        public required string Name2 { get; set; }
+        public string? Name2 { get; set; }
        [Column("address")]
        public required string Address { get; set; }
        [Column("plz")]
--- a/Elwig/Services/DeliveryAncmtService.cs
+++ b/Elwig/Services/DeliveryAncmtService.cs
@ -9,7 +9,6 @@ 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;
@ -27,6 +26,8 @@ namespace Elwig.Services {
        }

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

        public static async Task FillInputs(this DeliveryAncmtAdminViewModel vm, DeliveryAncmt a) {
@ -34,6 +35,8 @@ namespace Elwig.Services {
            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) {
--- 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;
@ -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.Insert(0, $"{filterWeightGt:N0}–{filterWeightLt:N0} kg");
+                } else if (filterWeightGt > 0) {
+                    filterNames.Insert(0, $"ab {filterWeightGt:N0} kg");
+                } else if (filterWeightLt > 0) {
+                    filterNames.Insert(0, $"unter {filterWeightLt:N0} kg");
+                }
                if (filterYearGt > 0 && filterYearLt > 0) {
                    filterNames.Insert(0, $"{filterYearGt}–{filterYearLt - 1}");
                } else if (filterYearGt > 0) {
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@ -420,7 +420,7 @@ namespace Elwig.Services {
                if (d.ShowDialog() == true) {
                    Mouse.OverrideCursor = Cursors.AppStarting;
                    try {
-                        var data = await MemberListData.FromQuery(query, filterNames);
+                        var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                        using var ods = new OdsFile(d.FileName);
                        await ods.AddTable(data);
                    } catch (Exception exc) {
@ -460,26 +460,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);
                }
@ -487,7 +491,7 @@ namespace Elwig.Services {
            } else {
                Mouse.OverrideCursor = Cursors.AppStarting;
                try {
-                    var data = await MemberListData.FromQuery(query, filterNames);
+                    var data = await MemberListData.FromQuery(query, filterNames, filterNames.Where(f => f.StartsWith("Flächenbindung")).Select(f => f.Split(' ')[^1]));
                    using var doc = new MemberList(string.Join(" / ", filterNames), data);
                    await Utils.ExportDocument(doc, mode);
                } catch (Exception exc) {
@ -593,7 +597,7 @@ namespace Elwig.Services {
                    KgNr = c.KgNr,
                    GstNr = c.GstNr,
                    RdNr = c.RdNr,
-                    YearFrom = year,
+                    YearFrom = vm.MaintainAreaComYearTo ? c.YearFrom : year,
                    YearTo = c.YearTo,
                }));

--- a/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
+++ b/Elwig/ViewModels/DeliveryAncmtAdminViewModel.cs
@ -62,6 +62,15 @@ namespace Elwig.ViewModels {
            set => WeightString = $"{value}";
        }

+        [ObservableProperty]
+        private string _statusAncmts = "-";
+        [ObservableProperty]
+        private string _statusWeight = "-";
+        [ObservableProperty]
+        private string _statusAncmtCreated = "-";
+        [ObservableProperty]
+        private string _statusAncmtModified = "-";
+
        [ObservableProperty]
        private Visibility _controlButtonsVisibility = Visibility.Visible;
        [ObservableProperty]
--- 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
@ -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)
--- 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;
@ -658,31 +681,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 +729,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 +799,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 +822,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
@ -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/>
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@ -690,7 +690,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 +703,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 +714,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 +728,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 +740,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 +936,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 +952,7 @@ namespace Elwig.Windows {
                !InputIsNotDefault(TimeInput)
            );

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

            HideSaveResetCancelButtons();
            ShowNewEditDeleteButtons();
--- 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="Traubenanmeldungen - Elwig" Height="700" Width="940" 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>
@ -123,6 +123,7 @@
                <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"/>
@ -166,6 +167,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,6 +275,7 @@
                        <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}"/>
@ -305,17 +314,39 @@
                <ItemsPanelTemplate>
                    <Grid>
                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150"/>
+                            <ColumnDefinition Width="1*" MinWidth="120"/>
                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="200"/>
+                            <ColumnDefinition Width="1*" MinWidth="150"/>
                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="2.25*"/>
+                            <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>
+                    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
@ -31,6 +31,8 @@ namespace Elwig.Windows {
                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, ControlUtils.RenewSourceDefault.First);
            ControlUtils.RenewItemsSource(DeliveryScheduleInput, deliverySchedules, DeliveryScheduleInput_SelectionChanged);
        }

@ -127,6 +130,9 @@ 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}";
+            ViewModel.StatusWeight = $"{deliveryAncmts.Sum(a => a.Weight):N0} kg";
        }

        private async Task RefreshInputs(bool validate = false) {
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml
@ -200,7 +200,7 @@
                    <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"/>
+                             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"/>
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
@ -297,8 +297,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/MainWindow.xaml
+++ b/Elwig/Windows/MainWindow.xaml
@ -25,6 +25,9 @@
                <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"/>
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@ -90,6 +90,21 @@ namespace Elwig.Windows {
            } catch { }
        }

+        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();
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@ -150,6 +150,9 @@ 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) {
@ -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" +
@ -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/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",       "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"],
                }));
            });
        }
--- a/Tests/DocumentTests/MemberListTest.cs
+++ b/Tests/DocumentTests/MemberListTest.cs
@ -9,7 +9,7 @@ namespace Tests.DocumentTests {
        [Test]
        public async Task Test_01_TwoMembers() {
            using var ctx = new AppDbContext();
-            var data = await MemberListData.FromQuery(ctx.Members, []);
+            var data = await MemberListData.FromQuery(ctx.Members, [], []);
            using var doc = new MemberList("Alle Mitglieder", data);
            var text = await Utils.GeneratePdfText(doc, true);
            var table = Utils.ExtractTable(text);
Author	SHA1	Message	Date
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
Lorenz Stechauner	f97dfc3c72	Bump version to 0.10.1 All checks were successful Test / Run tests (push) Successful in 2m7s Details Deploy / Build and Deploy (push) Successful in 2m59s Details	2024-08-14 12:02:36 +02:00
Lorenz Stechauner	d3839c288a	MemberList: Allow filtering area commitments	2024-08-14 11:57:19 +02:00
Lorenz Stechauner	2764a0ca21	Dtos: Fix error when given_name is null	2024-08-14 11:57:04 +02:00
Lorenz Stechauner	48970de652	Billing: Fix error when no deliveries exist in season	2024-08-14 11:56:25 +02:00