[#57 ] MailWindow: Use Task.Run()

[#57 ] PaymentAdjustmentWindow: Use Task.Run()
[#57 ] ChartWindow: Use Task.Run()
2025-07-08 00:19:00 +02:00 · 2025-07-07 23:59:41 +02:00 · 2025-07-07 23:53:08 +02:00 · 2025-07-07 23:39:55 +02:00 · 2025-07-07 23:36:08 +02:00 · 2025-07-07 23:31:03 +02:00
20 changed files with 805 additions and 655 deletions
--- a/Elwig/App.xaml.cs
+++ b/Elwig/App.xaml.cs
@@ -200,10 +200,12 @@ namespace Elwig {
            var ch = CurrentLastWrite;
            if (ch > CurrentApp.LastChanged)
                CurrentApp.LastChanged = ch;
+            MainDispatcher.Invoke(() => {
                foreach (Window w in CurrentApp.Windows) {
                    if (w is not ContextWindow c) continue;
                    MainDispatcher.BeginInvoke(c.HintContextChange);
                }
+            });
        }

        private void OnAutoUpdateTimer(object? sender, EventArgs? evt) {
--- a/Elwig/Helpers/Utils.cs
+++ b/Elwig/Helpers/Utils.cs
@@ -499,9 +499,11 @@ namespace Elwig.Helpers {
            if (App.Config.Smtp == null)
                return false;

+            Mouse.OverrideCursor = Cursors.Wait;
+
+            var success = await Task.Run(async () => {
                SmtpClient? client = null;
                try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
                    client = await GetSmtpClient();

                    using var msg = new MimeMessage();
@@ -524,9 +526,12 @@ namespace Elwig.Helpers {
                    if (client != null)
                        await client.DisconnectAsync(true);
                    client?.Dispose();
-                Mouse.OverrideCursor = null;
                }
                return true;
+            });
+
+            Mouse.OverrideCursor = null;
+            return success;
        }

        public static async Task ExportDocument(Document doc, ExportMode mode, string? filename = null, (Member, string, string)? emailData = null) {
--- a/Elwig/Services/AreaComService.cs
+++ b/Elwig/Services/AreaComService.cs
@@ -108,7 +108,8 @@ namespace Elwig.Services {
        public static async Task<int> UpdateAreaCommitment(this AreaComAdminViewModel vm, int? oldFbNr) {
            int newFbNr = (int)vm.FbNr!;

-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var a = new AreaCom {
                    FbNr = oldFbNr ?? newFbNr,
                    MgNr = (int)vm.MgNr!,
@@ -140,7 +141,7 @@ namespace Elwig.Services {
                if (newFbNr != a.FbNr) {
                    await ctx.Database.ExecuteSqlAsync($"UPDATE area_commitment SET fbnr = {newFbNr} WHERE fbnr = {oldFbNr}");
                }
-            }
+            });

            App.HintContextChange();

@@ -253,5 +254,16 @@ namespace Elwig.Services {
            }
            return grid;
        }
+
+        public static async Task DeleteAreaCom(int fbnr) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var l = (await ctx.AreaCommitments.FindAsync(fbnr))!;
+                ctx.Remove(l);
+                await ctx.SaveChangesAsync();
+            });
+
+            App.HintContextChange();
+        }
    }
 }
--- a/Elwig/Services/DeliveryAncmtService.cs
+++ b/Elwig/Services/DeliveryAncmtService.cs
@@ -211,7 +211,8 @@ namespace Elwig.Services {
            int newMgNr = vm.MgNr!.Value;
            string newSortId = vm.SortId!;

-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var a = new DeliveryAncmt {
                    Year = oldYear ?? year,
                    DsNr = oldDsNr ?? dsnr,
@@ -232,7 +233,7 @@ namespace Elwig.Services {
                if (oldDsNr != null && (oldYear != year || oldDsNr != dsnr || oldMgNr != newMgNr || oldSortId != newSortId)) {
                    await ctx.Database.ExecuteSqlAsync($"UPDATE delivery_announcement SET year = {year}, dsnr = {dsnr}, mgnr = {newMgNr}, sortid = {newSortId} WHERE (year, dsnr, mgnr, sortid) = ({a.Year}, {a.DsNr}, {a.MgNr}, {a.SortId})");
                }
-            }
+            });

            App.HintContextChange();

@@ -269,7 +270,8 @@ namespace Elwig.Services {
                    Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
                            using var ods = new OdsFile(d.FileName);
@@ -277,10 +279,12 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
                        using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
@@ -288,6 +292,7 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }
--- a/Elwig/Services/DeliveryScheduleService.cs
+++ b/Elwig/Services/DeliveryScheduleService.cs
@@ -152,7 +152,8 @@ namespace Elwig.Services {
        public static async Task UpdateDeliverySchedule(this DeliveryScheduleAdminViewModel vm, int? oldYear, int? oldDsNr) {
            int year = vm.Date!.Value.Year;

-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var s = new DeliverySchedule {
                    Year = oldYear ?? year,
                    DsNr = oldDsNr ?? await ctx.NextDsNr(year),
@@ -181,7 +182,7 @@ namespace Elwig.Services {
                    .ToList(), vm.MainVarieties.Select(v => (v, 1)).Union(vm.OtherVarieties.Select(v => (v, 2))).ToList());

                await ctx.SaveChangesAsync();
-            }
+            });

            App.HintContextChange();
        }
--- a/Elwig/Services/DeliveryService.cs
+++ b/Elwig/Services/DeliveryService.cs
@@ -430,9 +430,10 @@ namespace Elwig.Services {
        }

        public static async Task<DeliveryPart> UpdateDeliveryPart(this DeliveryAdminViewModel vm, int? oldYear, int? oldDid, int? oldDpnr, bool dateHasChanged, bool timeHasChanged, bool timeIsDefault) {
+            var p = await Task.Run(async () => {
                DeliveryPart p;

-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                int year = oldYear ?? Utils.CurrentYear;
                int did = oldDid ?? await ctx.NextDId(year);
                int dpnr = oldDpnr ?? await ctx.NextDPNr(year, did);
@@ -524,7 +525,9 @@ namespace Elwig.Services {
                }

                await ctx.SaveChangesAsync();
-            }
+
+                return p;
+            });

            App.HintContextChange();

@@ -532,9 +535,10 @@ namespace Elwig.Services {
        }

        public static async Task<Delivery> SplitDeliveryToMember(int year, int did, int[] weights, int mgnr) {
+            var n = await Task.Run(async () => {
                Delivery n;

-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                bool anyLeft = false;
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
                var lnr = await ctx.NextLNr(d.Date, d.ZwstId);
@@ -577,7 +581,9 @@ namespace Elwig.Services {
                await ctx.SaveChangesAsync();
                if (!anyLeft)
                    await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-            }
+
+                return n;
+            });

            App.HintContextChange();

@@ -585,9 +591,9 @@ namespace Elwig.Services {
        }

        public static async Task<Delivery> SplitDeliveryToLsNr(int year, int did, int[] weights, string lsnr) {
+            var n = await Task.Run(async () => {
                Delivery n;
-
-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                var anyLeft = false;
                n = (await ctx.Deliveries.FirstAsync(d => d.LsNr == lsnr))!;
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
@@ -616,7 +622,9 @@ namespace Elwig.Services {
                await ctx.SaveChangesAsync();
                if (!anyLeft && n.LsNr != d.LsNr)
                    await ctx.Database.ExecuteSqlAsync($"DELETE FROM delivery WHERE (year, did) = ({d.Year}, {d.DId})");
-            }
+
+                return n;
+            });

            App.HintContextChange();

@@ -624,7 +632,8 @@ namespace Elwig.Services {
        }

        public static async Task DepreciateDelivery(int year, int did, int[] weights) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var d = (await ctx.Deliveries.FindAsync(year, did))!;
                var dpnr = await ctx.NextDPNr(year, did);
                foreach (var (p, w) in d.Parts.ToList().Zip(weights)) {
@@ -648,13 +657,14 @@ namespace Elwig.Services {
                    }
                }
                await ctx.SaveChangesAsync();
-            }
+            });

            App.HintContextChange();
        }

        public static async Task GenerateDeliveryNote(int year, int did, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    using var ctx = new AppDbContext();
                    var d = (await ctx.Deliveries.FindAsync(year, did))!;
@@ -663,6 +673,7 @@ namespace Elwig.Services {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -707,7 +718,8 @@ namespace Elwig.Services {
                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            var data = await DeliveryJournalData.FromQuery(query, filterNames);
                            using var ods = new OdsFile(d.FileName);
@@ -715,6 +727,7 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Export) {
@@ -725,7 +738,8 @@ namespace Elwig.Services {
                    Title = $"{DeliveryJournal.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            await ElwigData.Export(d.FileName, await query
                                .Select(p => p.Delivery)
@@ -737,10 +751,12 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                        var path = Path.Combine(App.TempPath, filename);
@@ -767,9 +783,11 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
                        using var doc = new DeliveryJournal(string.Join(" / ", filterNames), data);
@@ -777,6 +795,7 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }
@@ -798,7 +817,8 @@ namespace Elwig.Services {
                throw new ArgumentException("Invalid value for ExportSubject");
            }

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var data = await WineQualityStatisticsData.FromQuery(query, App.Client.OrderingMemberList);
                    using var doc = new WineQualityStatistics(string.Join(" / ", filterNames), data);
@@ -806,6 +826,7 @@ namespace Elwig.Services {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -829,7 +850,8 @@ namespace Elwig.Services {
                Title = $"Lieferstatistik pro Ort speichern unter - Elwig"
            };
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        using var ods = new OdsFile(d.FileName);
                        var tbl = await WineLocalityStatisticsData.FromQuery(query, filterNames);
@@ -837,6 +859,7 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }
@@ -875,7 +898,8 @@ namespace Elwig.Services {
                    Title = $"{DeliveryDepreciationList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            using var ods = new OdsFile(d.FileName);
                            var tblTotal = await DeliveryJournalData.FromQuery(query, filterNames);
@@ -891,10 +915,12 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        var data = await DeliveryJournalData.FromQuery(query, filterNames);
                        using var doc = new DeliveryDepreciationList(string.Join(" / ", filterNames), data);
@@ -902,6 +928,7 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }
@@ -1070,10 +1097,12 @@ namespace Elwig.Services {
        }

        public static async Task DeleteDelivery(string lsnr) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                await ctx.Deliveries.Where(d => d.LsNr == lsnr).ExecuteDeleteAsync();
                await ctx.SaveChangesAsync();
-            }
+            });
+
            App.HintContextChange();
        }
    }
--- a/Elwig/Services/MemberService.cs
+++ b/Elwig/Services/MemberService.cs
@@ -378,7 +378,8 @@ namespace Elwig.Services {
        }

        public static async Task GenerateMemberDataSheet(Member m, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    using var ctx = new AppDbContext();
                    using var doc = new MemberDataSheet(m, ctx);
@@ -386,11 +387,13 @@ namespace Elwig.Services {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

        public static async Task GenerateDeliveryConfirmation(Member m, int year, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var b = new Billing(year);
                    await b.FinishSeason();
@@ -404,11 +407,13 @@ namespace Elwig.Services {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

        public static async Task GenerateCreditNote(Member m, int year, int avnr, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    using var ctx = new AppDbContext();
                    var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
@@ -423,6 +428,7 @@ namespace Elwig.Services {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -475,7 +481,8 @@ namespace Elwig.Services {
                    Title = $"{MemberList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            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);
@@ -483,6 +490,7 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Export) {
@@ -493,7 +501,8 @@ namespace Elwig.Services {
                    Title = $"{MemberList.Name} speichern unter - Elwig"
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        try {
                            var members = await query
                                .OrderBy(m => m.MgNr)
@@ -510,10 +519,12 @@ namespace Elwig.Services {
                        } catch (Exception exc) {
                            MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                        }
+                    });
                    Mouse.OverrideCursor = null;
                }
            } else if (mode == ExportMode.Upload && App.Config.SyncUrl != null) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        var filename = $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip";
                        var path = Path.Combine(App.TempPath, filename);
@@ -544,9 +555,11 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            } else {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        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);
@@ -554,14 +567,13 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }

        public static async Task<int> UpdateMember(this MemberAdminViewModel vm, int? oldMgNr) {
            var newMgNr = (int)vm.MgNr!;
-
-            using (var ctx = new AppDbContext()) {
            var m = new Member {
                MgNr = oldMgNr ?? newMgNr,
                PredecessorMgNr = vm.PredecessorMgNr,
@@ -599,6 +611,8 @@ namespace Elwig.Services {
                ContactViaEmail = vm.ContactViaEmail,
            };

+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                if (oldMgNr != null) {
                    ctx.Update(m);
                } else {
@@ -681,7 +695,7 @@ namespace Elwig.Services {
                if (newMgNr != m.MgNr) {
                    await ctx.Database.ExecuteSqlAsync($"UPDATE member SET mgnr = {newMgNr} WHERE mgnr = {oldMgNr}");
                }
-            }
+            });

            App.HintContextChange();

@@ -689,7 +703,8 @@ namespace Elwig.Services {
        }

        public static async Task DeleteMember(int mgnr, bool deletePaymentData, bool deleteDeliveries, bool deleteAreaComs) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var l = (await ctx.Members.FindAsync(mgnr))!;
                if (deletePaymentData) {
                    ctx.RemoveRange(l.Credits);
@@ -702,7 +717,8 @@ namespace Elwig.Services {
                }
                ctx.Remove(l);
                await ctx.SaveChangesAsync();
-            }
+            });
+
            App.HintContextChange();
        }
    }
--- a/Elwig/Services/PaymentVariantService.cs
+++ b/Elwig/Services/PaymentVariantService.cs
@@ -189,7 +189,30 @@ namespace Elwig.Services {
        }

        public static async Task GenerateSummary(PaymentVar v, ExportMode mode) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            if (mode == ExportMode.SaveList) {
+                var d = new SaveFileDialog() {
+                    FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
+                    DefaultExt = "ods",
+                    Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
+                    Title = $"Variantendaten {v.Name} speichern unter - Elwig"
+                };
+                if (d.ShowDialog() == false)
+                    return;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
+                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
+                        using var ods = new OdsFile(d.FileName);
+                        await ods.AddTable(data);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
+                Mouse.OverrideCursor = null;
+            } else {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        using var ctx = new AppDbContext();
                        var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
@@ -198,8 +221,10 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
+        }

        public static async Task GenerateEbics(int year, int avnr) {
            using var ctx = new AppDbContext();
@@ -225,13 +250,15 @@ namespace Elwig.Services {
                Title = $"Überweisungsdaten speichern unter - Elwig",
            };
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        using var e = new Ebics(v, d.FileName, App.Client.ExportEbicsVersion, (Ebics.AddressMode)App.Client.ExportEbicsAddress);
                        await e.ExportAsync(Transaction.FromPaymentVariant(v));
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }
@@ -244,7 +271,8 @@ namespace Elwig.Services {
                Title = $"Buchungsliste speichern unter - Elwig"
            };
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
                        using var ctx = new AppDbContext();
                        var tbl = await CreditNoteData.ForPaymentVariant(ctx, year, avnr);
@@ -253,14 +281,16 @@ namespace Elwig.Services {
                    } catch (Exception exc) {
                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
                Mouse.OverrideCursor = null;
            }
        }

        public static async Task<PaymentVar> CreatePaymentVariant(int year) {
-            PaymentVar? v;
-            using (var ctx = new AppDbContext()) {
-                v = new PaymentVar {
+            Mouse.OverrideCursor = Cursors.Wait;
+            var v = await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var v = new PaymentVar {
                    Year = year,
                    AvNr = await ctx.NextAvNr(year),
                    Name = "Neue Auszahlungsvariante",
@@ -270,15 +300,17 @@ namespace Elwig.Services {
                };
                ctx.Add(v);
                await ctx.SaveChangesAsync();
-            }
+                return v;
+            });
            App.HintContextChange();
+            Mouse.OverrideCursor = null;
            return v;
        }

        public static async Task<PaymentVar> Duplicate(this PaymentVar orig) {
-            PaymentVar? n;
-            using (var ctx = new AppDbContext()) {
-                n = new PaymentVar {
+            var n = await Task.Run(async () => {
+                using var ctx = new AppDbContext();
+                var n = new PaymentVar {
                    Year = orig.Year,
                    AvNr = await ctx.NextAvNr(orig.Year),
                    Name = $"{orig.Name} (Kopie)",
@@ -286,10 +318,10 @@ namespace Elwig.Services {
                    DateString = $"{DateTime.Today:yyyy-MM-dd}",
                    Data = orig.Data,
                };
-
                ctx.Add(n);
                await ctx.SaveChangesAsync();
-            }
+                return n;
+            });
            App.HintContextChange();
            return n;
        }
@@ -297,7 +329,7 @@ namespace Elwig.Services {
        public static async Task<(int, int)> UpdatePaymentVariant(this PaymentVariantsViewModel vm, int? oldYear, int? oldAvNr) {
            var year = oldYear ?? Utils.CurrentYear;
            int avnr = 0;
-
+            await Task.Run(async () => {
                var d = App.Config.Debug ? BillingData.FromJson(vm.Data ?? "{}") : vm.BillingData!;
                d.ConsiderDelieryModifiers = vm.ConsiderModifiers;
                d.ConsiderContractPenalties = vm.ConsiderPenalties;
@@ -308,7 +340,7 @@ namespace Elwig.Services {
                d.NetWeightModifier = modVal > 0 ? modVal / 100.0 : 0;
                d.GrossWeightModifier = modVal < 0 ? modVal / 100.0 : 0;

-            using (var ctx = new AppDbContext()) {
+                using var ctx = new AppDbContext();
                var v = new PaymentVar {
                    Year = year,
                    AvNr = oldAvNr ?? await ctx.NextAvNr(year),
@@ -323,24 +355,44 @@ namespace Elwig.Services {
                avnr = v.AvNr;
                ctx.Update(v);
                await ctx.SaveChangesAsync();
-            }
+            });
            vm.WeightModifierChanged = false;
            App.HintContextChange();
            return (year, avnr);
        }

        public static async Task DeletePaymentVariant(int year, int avnr) {
-            using (var ctx = new AppDbContext()) {
+            await Task.Run(async () => {
+                using var ctx = new AppDbContext();
                var v = (await ctx.PaymentVariants.FindAsync(year, avnr))!;
                ctx.Remove(v);
                await ctx.SaveChangesAsync();
-            }
+            });
            App.HintContextChange();
        }

        public static async Task Calculate(int year, int avnr) {
+            await Task.Run(async () => {
                var b = new BillingVariant(year, avnr);
                await b.Calculate();
+            });
+            App.HintContextChange();
+        }
+
+        public static async Task Commit(int year, int avnr) {
+            await Task.Run(async () => {
+                var b = new BillingVariant(year, avnr);
+                await b.Commit();
+            });
+            App.HintContextChange();
+        }
+
+        public static async Task Revert(int year, int avnr) {
+            await Task.Run(async () => {
+                var b = new BillingVariant(year, avnr);
+                await b.Revert();
+            });
+            App.HintContextChange();
        }
    }
 }
--- a/Elwig/Windows/AreaComAdminWindow.xaml.cs
+++ b/Elwig/Windows/AreaComAdminWindow.xaml.cs
@@ -203,13 +203,9 @@ namespace Elwig.Windows {
                $"Soll die Flächenbindung {a.GstNr} ({a.Area} m²) wirklich unwiderruflich gelöscht werden?",
                "Flächenbindung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                try {
-                    using (var ctx = new AppDbContext()) {
-                        ctx.Remove(a);
-                        await ctx.SaveChangesAsync();
-                    }
-                    App.HintContextChange();
+                    await AreaComService.DeleteAreaCom(a.FbNr);
                } catch (Exception exc) {
                    var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                    if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
@@ -227,7 +223,7 @@ namespace Elwig.Windows {

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

            int fbnr;
            try {
@@ -237,9 +233,8 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Flächenbindung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                AreaCommitmentSaveButton.IsEnabled = true;
-                return;
-            } finally {
                Mouse.OverrideCursor = null;
+                return;
            }

            IsEditing = false;
@@ -252,6 +247,7 @@ namespace Elwig.Windows {
            FinishInputFilling();
            await RefreshList();
            RefreshInputs();
+            Mouse.OverrideCursor = null;
            ViewModel.SearchQuery = "";
            ControlUtils.SelectItem(AreaCommitmentList, AreaCommitmentList.ItemsSource.Cast<AreaCom>().Where(a => a.FbNr == fbnr).FirstOrDefault());
        }
--- a/Elwig/Windows/BaseDataWindow.xaml.Season.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.Season.cs
@@ -157,7 +157,7 @@ namespace Elwig.Windows {
            }
            var d = new NewSeasonDialog(s, currencies);
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                try {
                    using var ctx = new AppDbContext();
                    ctx.Add(new Season {
@@ -209,7 +209,7 @@ namespace Elwig.Windows {
                $"Soll die Saison {s.Year} wirklich unwiderruflich gelöscht werden?",
                "Saison löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                try {
                    using var ctx = new AppDbContext();
                    ctx.Remove(s);
--- a/Elwig/Windows/BaseDataWindow.xaml.cs
+++ b/Elwig/Windows/BaseDataWindow.xaml.cs
@@ -318,8 +318,7 @@ namespace Elwig.Windows {

        private async void SaveButton_Click(object? sender, RoutedEventArgs? evt) {
            SaveButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                await Save();
            } catch (Exception exc) {
@@ -327,9 +326,8 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Stammdaten aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                return;
-            } finally {
                Mouse.OverrideCursor = null;
+                return;
            }

            IsEditing = false;
@@ -349,6 +347,7 @@ namespace Elwig.Windows {
            }

            App.HintContextChange();
+            Mouse.OverrideCursor = null;
        }

        private void FillInputs(ClientParameters p, Season? s) {
--- a/Elwig/Windows/ChartWindow.xaml.cs
+++ b/Elwig/Windows/ChartWindow.xaml.cs
@@ -639,10 +639,11 @@ namespace Elwig.Windows {

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

            try {
-                using (var ctx = new AppDbContext()) {
+                await Task.Run(async () => {
+                    using var ctx = new AppDbContext();
                    var origData = BillingData.FromJson(PaymentVar.Data);
                    var data = BillingData.FromGraphEntries(GraphEntries, origData, Utils.GetVaributes(ctx, Year),
                        AllVaributesAssigned, AllVaributesAssignedAbgew);
@@ -650,27 +651,31 @@ namespace Elwig.Windows {
                    PaymentVar.Data = data.ToJsonString();
                    ctx.Update(PaymentVar);
                    await ctx.SaveChangesAsync();
-                }
-                try {
-                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
-                    await b.Calculate();
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
-                LockContext = false;
-                App.HintContextChange();
+                });
            } catch (Exception exc) {
+                Mouse.OverrideCursor = null;
                var str = "Der Eintrag konnte nicht in der Datenbank gespeichert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Auszahlungsvariante speichern", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
                return;
-            } finally {
-                Mouse.OverrideCursor = null;
            }

+            try {
+                await Task.Run(async () => {
+                    var b = new BillingVariant(PaymentVar.Year, PaymentVar.AvNr);
+                    await b.Calculate();
+                });
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+
+            LockContext = false;
+            App.HintContextChange();
            LockContext = true;
            SetHasChanged(false);
+
+            Mouse.OverrideCursor = null;
        }

        private void EnableTextBox(TextBox u) {
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -719,7 +719,7 @@ namespace Elwig.Windows {
        private async void NewDeliveryPartButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            DeliveryPartList.IsEnabled = false;

            DeliveryPart? p;
@@ -757,7 +757,7 @@ namespace Elwig.Windows {
        private async void FinishButton_Click(object sender, RoutedEventArgs evt) {
            FinishButton.IsEnabled = false;
            NewDeliveryPartButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            DeliveryPartList.IsEnabled = false;

            DeliveryPart? p;
@@ -888,7 +888,7 @@ namespace Elwig.Windows {
            if (res == null)
                return;

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                var id = res.Value.Item1;
                var weights = res.Value.Item2;
@@ -959,7 +959,7 @@ namespace Elwig.Windows {
                $"Soll die Lieferung {d.LsNr} ({d.Member.AdministrativeName}, MgNr. {d.Member.MgNr}) wirklich unwiderruflich gelöscht werden?",
                "Lieferung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                try {
                    await DeliveryService.DeleteDelivery(d.LsNr);
                } catch (Exception exc) {
@@ -979,7 +979,7 @@ namespace Elwig.Windows {

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

            DeliveryPart? p;
            try {
@@ -996,9 +996,8 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Lieferung aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                return;
-            } finally {
                Mouse.OverrideCursor = null;
+                return;
            }

            IsEditing = false;
@@ -1015,6 +1014,7 @@ namespace Elwig.Windows {
            await RefreshDeliveryParts();
            RefreshInputs();

+            Mouse.OverrideCursor = null;
            DepreciateButton.IsEnabled = true;
        }

--- a/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAncmtAdminWindow.xaml.cs
@@ -317,18 +317,19 @@ namespace Elwig.Windows {
                $"Soll die Anmeldung wirklich unwiderruflich gelöscht werden?",
                "Anmeldung löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
-                    using (var ctx = new AppDbContext()) {
+                        using var ctx = new AppDbContext();
                        ctx.Remove(a);
                        await ctx.SaveChangesAsync();
-                    }
-                    App.HintContextChange();
                    } catch (Exception exc) {
                        var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                        MessageBox.Show(str, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
            }
        }
@@ -340,7 +341,7 @@ namespace Elwig.Windows {
        }

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

            int year = -1, dsnr = -1, mgnr = -1;
--- a/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryScheduleAdminWindow.xaml.cs
@@ -177,18 +177,19 @@ namespace Elwig.Windows {
                $"Soll der Leseplan \"{s.Description}\" vom {s.Date:dd.MM.yyyy} wirklich unwiderruflich gelöscht werden?",
                "Leseplan löschen", MessageBoxButton.OKCancel, MessageBoxImage.Warning, MessageBoxResult.Cancel);
            if (r == MessageBoxResult.OK) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    try {
-                    using (var ctx = new AppDbContext()) {
+                        using var ctx = new AppDbContext();
                        ctx.Remove(s);
                        await ctx.SaveChangesAsync();
-                    }
-                    App.HintContextChange();
                    } catch (Exception exc) {
                        var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                        if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                        MessageBox.Show(str, "Leseplan löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                    }
+                });
+                App.HintContextChange();
                Mouse.OverrideCursor = null;
            }
        }
@@ -200,7 +201,7 @@ namespace Elwig.Windows {
        }

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

            try {
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -602,7 +602,7 @@ namespace Elwig.Windows {
            PreviewButton.IsEnabled = false;
            PrintButton.IsEnabled = false;
            EmailButton.IsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            GenerateButton.IsEnabled = false;

            DisposeDocs();
@@ -828,12 +828,13 @@ namespace Elwig.Windows {
            EmailButton.IsEnabled = EmailDocuments != null && App.Config.Smtp != null;
        }

-        private void PreviewButton_Click(object sender, RoutedEventArgs evt) {
+        private async void PreviewButton_Click(object sender, RoutedEventArgs evt) {
            var d = new OpenFolderDialog() {
                Title = "Ordner auswählen - Elwig",
            };
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(() => {
                    PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
                    if (EmailDocuments != null) {
                        foreach (var (m, docs) in EmailDocuments) {
@@ -847,6 +848,7 @@ namespace Elwig.Windows {

                        }
                    }
+                });
                Mouse.OverrideCursor = null;
                Process.Start("explorer.exe", d.FolderName);
            }
@@ -862,7 +864,8 @@ namespace Elwig.Windows {
            var res = MessageBox.Show($"Sollen {PrintDocument.Pages} Blätter ({PrintDocument.TotalPages} Seiten) gedruckt werden?",
                "Rundschreiben drucken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
            if (res == MessageBoxResult.Yes) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
                    if (App.Config.Debug) {
                        PrintDocument.Show();
                    } else {
@@ -876,6 +879,7 @@ namespace Elwig.Windows {
                            ))
                        );
                    }
+                });
                Mouse.OverrideCursor = null;
            }

@@ -893,8 +897,8 @@ namespace Elwig.Windows {

            SmtpClient? client = null;
            try {
-                Mouse.OverrideCursor = Cursors.AppStarting;
-                client = await Utils.GetSmtpClient();
+                Mouse.OverrideCursor = Cursors.Wait;
+                client = await Task.Run(Utils.GetSmtpClient);
                Mouse.OverrideCursor = null;

                var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?",
@@ -903,9 +907,10 @@ namespace Elwig.Windows {
                    return;
                }

-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                var subject = EmailSubjectInput.Text;
                var text = EmailBodyInput.Text;
+                await Task.Run(async () => {
                    await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
                    foreach (var (m, docs) in EmailDocuments) {
                        using var msg = new MimeMessage();
@@ -928,6 +933,7 @@ namespace Elwig.Windows {
                            docs.Select(d => d.Title).ToArray()
                        )]);
                    }
+                });

                MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
            } catch (Exception exc) {
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -62,7 +62,7 @@ namespace Elwig.Windows {
        }

        private async void Menu_Help_Smtp_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                using var client = await Utils.GetSmtpClient();
                await client!.DisconnectAsync(true);
@@ -133,8 +133,10 @@ namespace Elwig.Windows {
                    Multiselect = true,
                };
                if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
+                    Mouse.OverrideCursor = Cursors.Wait;
+                    await Task.Run(async () => {
                        await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively);
+                    });
                }
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -145,7 +147,8 @@ namespace Elwig.Windows {
        private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {
            if (App.Config.SyncUrl == null)
                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var data = await Utils.GetExportMetaData(App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword);
                    var files = data
@@ -181,13 +184,15 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

        private async void UploadButton_Click(object sender, RoutedEventArgs evt) {
            if (App.Config.SyncUrl == null)
                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var path = Path.Combine(App.TempPath, $"{DateTime.Now:yyyy-MM-dd_HH-mm-ss}_{App.ZwstId}.elwig.zip");
                    using var ctx = new AppDbContext();
@@ -216,6 +221,7 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -270,24 +276,31 @@ namespace Elwig.Windows {
            AreaCommitmentsButton.IsEnabled = valid;
            BreakdownMemberVarietyButton.IsEnabled = valid;

-            if (valid) {
-                var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
-                var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
-                var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
-                SeasonStatMembersTotal.Text = $"{await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync():N0}";
-                SeasonStatMembersGeb.Text = $"{await areaComs.Select(c => c.Member).Distinct().CountAsync():N0}";
-                SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
-                SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
-                SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
-                SeasonStatArea.Text = $"{await areaComs.SumAsync(c => c.Area):N0} m²";
-            } else {
            SeasonStatMembersTotal.Text = "-";
            SeasonStatMembersGeb.Text = "-";
            SeasonStatWeightTotal.Text = "-";
            SeasonStatWeightGeb.Text = "-";
            SeasonStatWeightUngeb.Text = "-";
            SeasonStatArea.Text = "-";
-            }
+            if (valid) {
+                await Task.Run(async () => {
+                    var membersTotal = await ctx.Deliveries.Where(d => d.Year == year).Select(d => d.Member).Distinct().CountAsync();
+                    var areaComs = Utils.ActiveAreaCommitments(ctx.AreaCommitments, year!.Value);
+                    var membersGeb = await areaComs.Select(c => c.Member).Distinct().CountAsync();
+                    var weightTotal = await ctx.DeliveryParts.Where(p => p.Year == year).SumAsync(p => p.Weight);
+                    var gebWeight = await ctx.DeliveryPartBuckets.Where(b => b.Year == year && b.Discr != "_").SumAsync(b => b.Value);
+                    var area = await areaComs.SumAsync(c => c.Area);
+                    await App.MainDispatcher.BeginInvoke(() => {
+                        if (year != SeasonInput.Value) return;
+                        SeasonStatMembersTotal.Text = $"{membersTotal:N0}";
+                        SeasonStatMembersGeb.Text = $"{membersGeb:N0}";
+                        SeasonStatWeightTotal.Text = $"{weightTotal:N0} kg";
+                        SeasonStatWeightGeb.Text = $"{gebWeight:N0} kg";
+                        SeasonStatWeightUngeb.Text = $"{weightTotal - gebWeight:N0} kg";
+                        SeasonStatArea.Text = $"{area:N0} m²";
+                    });
+                });
+            };
        }

        private void DeliveryConfirmationButton_Click(object sender, RoutedEventArgs evt) {
@@ -315,7 +328,8 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var b = new Billing(year);
                    await b.FinishSeason();
@@ -331,6 +345,7 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -346,7 +361,8 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var b = new Billing(year);
                    await b.FinishSeason();
@@ -364,6 +380,7 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -379,7 +396,8 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var b = new Billing(year);
                    await b.FinishSeason();
@@ -393,6 +411,7 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }

@@ -408,7 +427,8 @@ namespace Elwig.Windows {
            if (d.ShowDialog() == false)
                return;

-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
+            await Task.Run(async () => {
                try {
                    var b = new Billing(year);
                    await b.FinishSeason();
@@ -422,6 +442,7 @@ namespace Elwig.Windows {
                } catch (Exception exc) {
                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
                }
+            });
            Mouse.OverrideCursor = null;
        }
    }
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -389,7 +389,7 @@ namespace Elwig.Windows {
            }
            var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
            if (d.ShowDialog() == true) {
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                try {
                    await MemberService.DeleteMember(m.MgNr, d.DeletePaymentData, d.DeleteDeliveries, d.DeleteAreaComs);
                } catch (Exception exc) {
@@ -408,7 +408,7 @@ namespace Elwig.Windows {
        }

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

            int mgnr;
@@ -419,9 +419,8 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Mitglied aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
                SaveButton.IsEnabled = true;
-                return;
-            } finally {
                Mouse.OverrideCursor = null;
+                return;
            }

            IsEditing = false;
@@ -436,6 +435,7 @@ namespace Elwig.Windows {
            await RefreshList();
            RefreshInputs();
            ViewModel.SearchQuery = "";
+            Mouse.OverrideCursor = null;
            if (mgnr is int m)
                FocusMember(m);
        }
@@ -491,8 +491,9 @@ namespace Elwig.Windows {

        private async void Menu_Contact_Letterhead_Click(object sender, RoutedEventArgs evt) {
            if (ViewModel.SelectedMember is not Member m) return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
+                await Task.Run(async () => {
                    using var doc = new Letterhead(m);
                    await doc.Generate();
                    if (!App.Config.Debug) {
@@ -500,6 +501,7 @@ namespace Elwig.Windows {
                    } else {
                        doc.Show();
                    }
+                });
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
--- a/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
+++ b/Elwig/Windows/PaymentAdjustmentWindow.xaml.cs
@@ -156,7 +156,7 @@ namespace Elwig.Windows {
        }

        private async void AutoAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                int? kg = AllowanceKgInput.Text == "" ? null : int.Parse(AllowanceKgInput.Text);
                double? bs = AllowanceBsInput.Text == "" ? null : double.Parse(AllowanceBsInput.Text);
@@ -169,10 +169,12 @@ namespace Elwig.Windows {
                App.Client.AutoAdjustBs.AllowanceKgPerBs = kgPerBs;
                App.Client.AutoAdjustBs.AllowancePercent = percent;
                App.Client.AutoAdjustBs.MinBs = minBs;
-                await App.Client.UpdateValues();

+                await Task.Run(async () => {
+                    await App.Client.UpdateValues();
                    var b = new Billing(Year);
                    await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                });
                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -183,10 +185,12 @@ namespace Elwig.Windows {
        }

        private async void UnAdjustBsButton_Click(object sender, RoutedEventArgs evt) {
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
+                await Task.Run(async () => {
                    var b = new Billing(Year);
                    await b.UnAdjustBusinessShares();
+                });
                App.HintContextChange();
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
@@ -281,8 +285,9 @@ namespace Elwig.Windows {

        private async void CustomButton_Click(object sender, RoutedEventArgs evt) {
            if (MemberInput.SelectedItem is not Member m) return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
+                await Task.Run(async () => {
                    using var ctx = new AppDbContext();
                    if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
                        ctx.Remove(p);
@@ -304,6 +309,7 @@ namespace Elwig.Windows {
                        });
                    }
                    await ctx.SaveChangesAsync();
+                });
            } catch (Exception exc) {
                var str = "Der Eintrag konnte nicht in der Datenbank aktualisiert werden!\n\n" + exc.Message;
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@@ -98,7 +98,9 @@ namespace Elwig.Windows {
        }

        private async void CopyButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar orig) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar orig)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                PaymentVar n = await orig.Duplicate();
                ControlUtils.SelectItem(PaymentVariantList, n);
@@ -107,10 +109,13 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Auszahlungsvariante kopieren", MessageBoxButton.OK, MessageBoxImage.Error);
            }
+            Mouse.OverrideCursor = null;
        }

        private async void DeleteButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || !v.TestVariant)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                await PaymentVariantService.DeletePaymentVariant(v.Year, v.AvNr);
            } catch (Exception exc) {
@@ -118,19 +123,19 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Auszahlungsvariante löschen", MessageBoxButton.OK, MessageBoxImage.Error);
            }
+            Mouse.OverrideCursor = null;
        }

        private async void CalculateButton_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar v)
                return;
            ViewModel.CalculateIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                await PaymentVariantService.Calculate(v.Year, v.AvNr);
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Berechnungsfehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
-            App.HintContextChange();
            Mouse.OverrideCursor = null;
            ViewModel.CalculateIsEnabled = true;
        }
@@ -161,24 +166,7 @@ namespace Elwig.Windows {
        private async void Menu_SummaryExport_Click(object sender, RoutedEventArgs evt) {
            if (PaymentVariantList.SelectedItem is not PaymentVar v)
                return;
-            var d = new SaveFileDialog() {
-                FileName = $"Variantendaten-{v.Name.Trim().Replace(' ', '-')}.ods",
-                DefaultExt = "ods",
-                Filter = "OpenDocument Format Spreadsheet (*.ods)|*.ods",
-                Title = $"Variantendaten {v.Name} speichern unter - Elwig"
-            };
-            if (d.ShowDialog() == false)
-                return;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            try {
-                using var ctx = new AppDbContext();
-                var data = await PaymentVariantSummaryData.ForPaymentVariant(v, ctx.PaymentVariantSummaryRows);
-                using var ods = new OdsFile(d.FileName);
-                await ods.AddTable(data);
-            } catch (Exception exc) {
-                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-            Mouse.OverrideCursor = null;
+            await PaymentVariantService.GenerateSummary(v, ExportMode.SaveList);
        }

        private async void Menu_SummaryShow_Click(object sender, RoutedEventArgs evt) {
@@ -203,16 +191,14 @@ namespace Elwig.Windows {
            if (PaymentVariantList.SelectedItem is not PaymentVar v)
                return;
            ViewModel.CommitIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
-                var b = new BillingVariant(v.Year, v.AvNr);
-                await b.Commit();
+                await PaymentVariantService.Commit(v.Year, v.AvNr);
            } catch (Exception exc) {
                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
            }
            Mouse.OverrideCursor = null;
            ViewModel.RevertIsEnabled = true;
-            App.HintContextChange();
        }

        private async void RevertButton_Click(object sender, RoutedEventArgs evt) {
@@ -225,10 +211,12 @@ namespace Elwig.Windows {
            if (res != MessageBoxResult.Yes)
                return;
            ViewModel.RevertIsEnabled = false;
-            Mouse.OverrideCursor = Cursors.AppStarting;
-            var b = new BillingVariant(v.Year, v.AvNr);
-            await b.Revert();
-            App.HintContextChange();
+            Mouse.OverrideCursor = Cursors.Wait;
+            try {
+                await PaymentVariantService.Revert(v.Year, v.AvNr);
+            } catch (Exception exc) {
+                MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
            Mouse.OverrideCursor = null;
            ViewModel.CommitIsEnabled = true;
        }
@@ -250,7 +238,9 @@ namespace Elwig.Windows {
        }

        private async void SaveButton_Click(object sender, RoutedEventArgs evt) {
-            if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null) return;
+            if (PaymentVariantList.SelectedItem is not PaymentVar v || ViewModel.BillingData == null)
+                return;
+            Mouse.OverrideCursor = Cursors.Wait;
            try {
                await ViewModel.UpdatePaymentVariant(v.Year, v.AvNr);
            } catch (Exception exc) {
@@ -259,6 +249,7 @@ namespace Elwig.Windows {
                if (exc.InnerException != null) str += "\n\n" + exc.InnerException.Message;
                MessageBox.Show(str, "Auszahlungsvariante aktualisieren", MessageBoxButton.OK, MessageBoxImage.Error);
            }
+            Mouse.OverrideCursor = null;
            await HintContextChange();
            CommentInput_TextChanged(null, null);
            DateInput_TextChanged(null, null);
Author	SHA1	Message	Date
Lorenz Stechauner	8ff576257b	[#57 ] MailWindow: Use Task.Run() All checks were successful Test / Run tests (push) Successful in 2m0s Details	2025-07-08 00:19:00 +02:00
Lorenz Stechauner	6eaa928147	[#57 ] PaymentAdjustmentWindow: Use Task.Run()	2025-07-07 23:59:41 +02:00
Lorenz Stechauner	070dda1bde	[#57 ] ChartWindow: Use Task.Run()	2025-07-07 23:53:08 +02:00
Lorenz Stechauner	b6bfc60ab8	[#57 ] DeliveryScheduleAdminWindow: Use Task.Run()	2025-07-07 23:39:55 +02:00
Lorenz Stechauner	8aaa22fcb4	[#57 ] DeliveryAncmtAdminWindow: Use Task.Run()	2025-07-07 23:36:08 +02:00
Lorenz Stechauner	64832e9a53	[#57 ] PaymentVariantsWindow: Use Task.Run() All checks were successful Test / Run tests (push) Successful in 1m49s Details	2025-07-07 23:31:03 +02:00
Lorenz Stechauner	7c9844e277	[#57 ] MainWindow: Use Task.Run() All checks were successful Test / Run tests (push) Successful in 1m40s Details	2025-07-07 22:45:28 +02:00
Lorenz Stechauner	19d2208fc3	[#57 ] AreaComAdminWindow: Use Task.Run()	2025-07-07 22:45:28 +02:00
Lorenz Stechauner	38d0ff969d	BaseDataWindow: Use Cursors.Wait instead of Cursors.AppStarting	2025-07-07 22:45:28 +02:00
Lorenz Stechauner	fb2b998d1b	[#57 ] DeliveryAdminWindow: Use Task.Run()	2025-07-07 22:45:28 +02:00
Lorenz Stechauner	10d5f49f63	[#57 ] MemberAdminWinodw: Use Task.Run()	2025-07-07 22:45:28 +02:00