From 579ed5348704af36657de4f7beeaab673364d1ff Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Wed, 25 Sep 2024 12:19:25 +0200 Subject: [PATCH] Windows: Prettify formatting for numbers --- Elwig/Services/DeliveryService.cs | 2 +- Elwig/Services/MemberService.cs | 2 +- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 8 ++++---- Elwig/Windows/MailWindow.xaml.cs | 2 +- Elwig/Windows/MainWindow.xaml.cs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Elwig/Services/DeliveryService.cs b/Elwig/Services/DeliveryService.cs index 75f60d5..0768aef 100644 --- a/Elwig/Services/DeliveryService.cs +++ b/Elwig/Services/DeliveryService.cs @@ -631,7 +631,7 @@ namespace Elwig.Services { } else { await ElwigData.Export(path, list, filterNames); await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); - MessageBox.Show($"Hochladen von {list.Count} Lieferungen erfolgreich!", "Lieferungen hochgeladen", + MessageBox.Show($"Hochladen von {list.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochgeladen", MessageBoxButton.OK, MessageBoxImage.Information); } } catch (HttpRequestException exc) { diff --git a/Elwig/Services/MemberService.cs b/Elwig/Services/MemberService.cs index 5a10af9..423a510 100644 --- a/Elwig/Services/MemberService.cs +++ b/Elwig/Services/MemberService.cs @@ -499,7 +499,7 @@ namespace Elwig.Services { } else { await ElwigData.Export(path, members, areaComs, filterNames); await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); - MessageBox.Show($"Hochladen von {members.Count} Mitgliedern erfolgreich!", "Mitglieder hochgeladen", + MessageBox.Show($"Hochladen von {members.Count:N0} Mitgliedern erfolgreich!", "Mitglieder hochgeladen", MessageBoxButton.OK, MessageBoxImage.Information); } } catch (HttpRequestException exc) { diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index fd42740..9176834 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -386,14 +386,14 @@ namespace Elwig.Windows { await RefreshDeliveryParts(); var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList(); - ViewModel.StatusMembers = $"{members.Count}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : ""); - ViewModel.StatusDeliveries = $"{deliveries.Count}"; + ViewModel.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : ""); + ViewModel.StatusDeliveries = $"{deliveries.Count:N0}"; if (filter.Count == 0) { var deliveryParts = deliveryPartsQuery; - ViewModel.StatusDeliveries = $"{deliveries.Count} ({await deliveryParts.CountAsync()})"; + ViewModel.StatusDeliveries = $"{deliveries.Count:N0} ({await deliveryParts.CountAsync():N0})"; var varieties = await deliveryParts.Select(d => d.SortId).Distinct().ToListAsync(); - ViewModel.StatusVarieties = $"{varieties.Count}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : ""); + ViewModel.StatusVarieties = $"{varieties.Count:N0}" + (varieties.Count > 0 && varieties.Count <= 10 ? $" ({string.Join(", ", varieties)})" : ""); var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts); ViewModel.StatusWeight = wText; ViewModel.StatusGradation = gText; diff --git a/Elwig/Windows/MailWindow.xaml.cs b/Elwig/Windows/MailWindow.xaml.cs index a2547a4..dc8fbce 100644 --- a/Elwig/Windows/MailWindow.xaml.cs +++ b/Elwig/Windows/MailWindow.xaml.cs @@ -730,7 +730,7 @@ namespace Elwig.Windows { client = await Utils.GetSmtpClient(); Mouse.OverrideCursor = null; - var res = MessageBox.Show($"Sollen {EmailDocuments.Count} E-Mails verschickt werden?", + var res = MessageBox.Show($"Sollen {EmailDocuments.Count:N0} E-Mails verschickt werden?", "Rundschreiben verschicken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No); if (res != MessageBoxResult.Yes) { return; diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs index 24c4400..1ffe8e0 100644 --- a/Elwig/Windows/MainWindow.xaml.cs +++ b/Elwig/Windows/MainWindow.xaml.cs @@ -206,7 +206,7 @@ namespace Elwig.Windows { } else { await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]); await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); - MessageBox.Show($"Hochladen von {deliveries.Count} Lieferungen erfolgreich!", "Lieferungen hochladen", + MessageBox.Show($"Hochladen von {deliveries.Count:N0} Lieferungen erfolgreich!", "Lieferungen hochladen", MessageBoxButton.OK, MessageBoxImage.Information); } } catch (HttpRequestException exc) {