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

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,25 +270,29 @@ namespace Elwig.Services {
                     Title = $"{DeliveryAncmtList.Name} speichern unter - Elwig"
                 };
                 if (d.ShowDialog() == true) {
-                    Mouse.OverrideCursor = Cursors.AppStarting;
-                    try {
-                        var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                        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 = Cursors.Wait;
+                    await Task.Run(async () => {
+                        try {
+                            var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
+                            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.AppStarting;
-                try {
-                    var data = await DeliveryAncmtListData.FromQuery(query, filterNames);
-                    using var doc = new DeliveryAncmtList(string.Join(" / ", filterNames), data);
-                    await Utils.ExportDocument(doc, mode);
-                } catch (Exception exc) {
-                    MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                }
+                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);
+                        await Utils.ExportDocument(doc, mode);
+                    } catch (Exception exc) {
+                        MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+                    }
+                });
                 Mouse.OverrideCursor = null;
             }
         }

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();
         }

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) {

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;
-                try {
-                    using (var ctx = new AppDbContext()) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
                         ctx.Remove(a);
                         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;
+                        MessageBox.Show(str, "Anmeldung löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                    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;

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;
-                try {
-                    using (var ctx = new AppDbContext()) {
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    try {
+                        using var ctx = new AppDbContext();
                         ctx.Remove(s);
                         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;
+                        MessageBox.Show(str, "Leseplan löschen", MessageBoxButton.OK, MessageBoxImage.Error);
                     }
-                    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 {

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,25 +828,27 @@ 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;
-                PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
-                if (EmailDocuments != null) {
-                    foreach (var (m, docs) in EmailDocuments) {
-                        var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
-                        Directory.CreateDirectory(folder);
-                        foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
-                            var doc = item.Doc;
-                            var name = Utils.NormalizeFileName(doc.Title);
-                            doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
-                        }
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(() => {
+                    PrintDocument?.SaveTo($"{d.FolderName}/Print.pdf");
+                    if (EmailDocuments != null) {
+                        foreach (var (m, docs) in EmailDocuments) {
+                            var folder = $"{d.FolderName}/E-Mail/{m.AdministrativeName.Trim()}";
+                            Directory.CreateDirectory(folder);
+                            foreach (var item in docs.Select((d, i) => new { Index = i, Doc = d })) {
+                                var doc = item.Doc;
+                                var name = Utils.NormalizeFileName(doc.Title);
+                                doc.SaveTo($"{folder}/{item.Index + 1:00}.{name}.pdf");
+                            }
 
+                        }
                     }
-                }
+                });
                 Mouse.OverrideCursor = null;
                 Process.Start("explorer.exe", d.FolderName);
             }
@@ -862,20 +864,22 @@ 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;
-                if (App.Config.Debug) {
-                    PrintDocument.Show();
-                } else {
-                    await PrintDocument.Print();
-                    await Utils.AddSentMails(
-                        PrintMemberDocuments.Select(d => (
-                            "postal", d.Key.MgNr, d.Key.AdministrativeName,
-                            new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
-                            d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
-                            d.Value.Select(d => d.Title).ToArray()
-                        ))
-                    );
-                }
+                Mouse.OverrideCursor = Cursors.Wait;
+                await Task.Run(async () => {
+                    if (App.Config.Debug) {
+                        PrintDocument.Show();
+                    } else {
+                        await PrintDocument.Print();
+                        await Utils.AddSentMails(
+                            PrintMemberDocuments.Select(d => (
+                                "postal", d.Key.MgNr, d.Key.AdministrativeName,
+                                new string[] { d.Value.Select(d => (d as BusinessDocument)?.Address).FirstOrDefault(a => a != null) ?? d.Key.FullAddress },
+                                d.Value.Select(d => d.Title).FirstOrDefault("Briefkopf"),
+                                d.Value.Select(d => d.Title).ToArray()
+                            ))
+                        );
+                    }
+                });
                 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,31 +907,33 @@ namespace Elwig.Windows {
                     return;
                 }
 
-                Mouse.OverrideCursor = Cursors.AppStarting;
+                Mouse.OverrideCursor = Cursors.Wait;
                 var subject = EmailSubjectInput.Text;
                 var text = EmailBodyInput.Text;
-                await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
-                foreach (var (m, docs) in EmailDocuments) {
-                    using var msg = new MimeMessage();
-                    msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
-                    msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
-                    msg.Subject = subject;
-                    var body = new Multipart("mixed") {
-                        new TextPart("plain") { Text = text }
-                    };
-                    foreach (var doc in docs) {
-                        var name = Utils.NormalizeFileName(doc.Title);
-                        body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                await Task.Run(async () => {
+                    await Utils.AddSentMailBody(subject, text, EmailDocuments.Count);
+                    foreach (var (m, docs) in EmailDocuments) {
+                        using var msg = new MimeMessage();
+                        msg.From.Add(new MailboxAddress(App.Client.NameFull, App.Config.Smtp.Value.From));
+                        msg.To.AddRange(m.EmailAddresses.OrderBy(a => a.Nr).Select(a => new MailboxAddress(m.AdministrativeName, a.Address)));
+                        msg.Subject = subject;
+                        var body = new Multipart("mixed") {
+                            new TextPart("plain") { Text = text }
+                        };
+                        foreach (var doc in docs) {
+                            var name = Utils.NormalizeFileName(doc.Title);
+                            body.Add(doc.AsEmailAttachment($"{name}.pdf"));
+                        }
+                        msg.Body = body;
+                        await client!.SendAsync(msg);
+                        await Utils.AddSentMails([(
+                            "email", m.MgNr, m.AdministrativeName,
+                            m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
+                            subject,
+                            docs.Select(d => d.Title).ToArray()
+                        )]);
                     }
-                    msg.Body = body;
-                    await client!.SendAsync(msg);
-                    await Utils.AddSentMails([(
-                        "email", m.MgNr, m.AdministrativeName,
-                        m.EmailAddresses.OrderBy(a => a.Nr).Select(a => a.Address).ToArray(),
-                        subject,
-                        docs.Select(d => d.Title).ToArray()
-                    )]);
-                }
+                });
 
                 MessageBox.Show("Erfolgreich alle E-Mails verschickt!", "Rundschreiben verschicken", MessageBoxButton.OK, MessageBoxImage.Information);
             } catch (Exception exc) {

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();
 
-                var b = new Billing(Year);
-                await b.AutoAdjustBusinessShares(new DateOnly(Year, 11, 30), kg ?? default, bs ?? default, kgPerBs ?? default, percent / 100.0 ?? default, minBs ?? default);
+                await 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 {
-                var b = new Billing(Year);
-                await b.UnAdjustBusinessShares();
+                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,29 +285,31 @@ 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 {
-                using var ctx = new AppDbContext();
-                if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
-                    ctx.Remove(p);
-                }
-                if (sender == SaveCustomButton) {
-                    var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
-                    var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
-                    var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
-                    var modText = CustomModCommentInput.Text.Trim();
-                    var text = CustomCommentInput.Text.Trim();
-                    ctx.Add(new PaymentCustom {
-                        MgNr = m.MgNr,
-                        Year = Year,
-                        ModAbs = modAbs,
-                        ModRel = modRel,
-                        ModComment = modText == "" ? null : modText,
-                        Amount = amount,
-                        Comment = text == "" ? null : text,
-                    });
-                }
-                await ctx.SaveChangesAsync();
+                await Task.Run(async () => {
+                    using var ctx = new AppDbContext();
+                    if (CustomPayments?.TryGetValue(m.MgNr, out var p) == true) {
+                        ctx.Remove(p);
+                    }
+                    if (sender == SaveCustomButton) {
+                        var modAbs = decimal.TryParse(CustomModAbsInput.Text, out var n1) ? (decimal?)n1 : null;
+                        var modRel = decimal.TryParse(CustomModRelInput.Text, out var n2) ? (decimal?)n2 / 100 : null;
+                        var amount = decimal.TryParse(CustomAmountInput.Text, out var n3) ? (decimal?)n3 : null;
+                        var modText = CustomModCommentInput.Text.Trim();
+                        var text = CustomCommentInput.Text.Trim();
+                        ctx.Add(new PaymentCustom {
+                            MgNr = m.MgNr,
+                            Year = Year,
+                            ModAbs = modAbs,
+                            ModRel = modRel,
+                            ModComment = modText == "" ? null : modText,
+                            Amount = amount,
+                            Comment = text == "" ? null : text,
+                        });
+                    }
+                    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;