winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

Windows: Prettify formatting for numbers
All checks were successful
Test / Run tests (push) Successful in 2m5s
Details

Browse Source
This commit is contained in:
Lorenz Stechauner
2024-09-25 12:19:25 +02:00
parent 1fc736ce16
commit 579ed53487
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Elwig/Services/DeliveryService.cs
View File

@ -631,7 +631,7 @@ namespace Elwig.Services {
} else { } else {
await ElwigData.Export(path, list, filterNames); await ElwigData.Export(path, list, filterNames);
await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); 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); MessageBoxButton.OK, MessageBoxImage.Information);
} }
} catch (HttpRequestException exc) { } catch (HttpRequestException exc) {

2
Elwig/Services/MemberService.cs
View File

@ -499,7 +499,7 @@ namespace Elwig.Services {
} else { } else {
await ElwigData.Export(path, members, areaComs, filterNames); await ElwigData.Export(path, members, areaComs, filterNames);
await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); 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); MessageBoxButton.OK, MessageBoxImage.Information);
} }
} catch (HttpRequestException exc) { } catch (HttpRequestException exc) {

8
Elwig/Windows/DeliveryAdminWindow.xaml.cs
View File

@ -386,14 +386,14 @@ namespace Elwig.Windows {
await RefreshDeliveryParts(); await RefreshDeliveryParts();
var members = deliveries.Select(d => d.Member).DistinctBy(m => m.MgNr).ToList(); 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.StatusMembers = $"{members.Count:N0}" + (members.Count > 0 && members.Count <= 4 ? $" ({string.Join(", ", members.Select(m => m.AdministrativeName))})" : "");
ViewModel.StatusDeliveries = $"{deliveries.Count}"; ViewModel.StatusDeliveries = $"{deliveries.Count:N0}";
if (filter.Count == 0) { if (filter.Count == 0) {
var deliveryParts = deliveryPartsQuery; 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(); 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); var (wText, wData, gText, gData) = await DeliveryService.GenerateToolTipData(deliveryParts);
ViewModel.StatusWeight = wText; ViewModel.StatusWeight = wText;
ViewModel.StatusGradation = gText; ViewModel.StatusGradation = gText;

2
Elwig/Windows/MailWindow.xaml.cs
View File

@ -730,7 +730,7 @@ namespace Elwig.Windows {
client = await Utils.GetSmtpClient(); client = await Utils.GetSmtpClient();
Mouse.OverrideCursor = null; 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); "Rundschreiben verschicken", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No);
if (res != MessageBoxResult.Yes) { if (res != MessageBoxResult.Yes) {
return; return;

2
Elwig/Windows/MainWindow.xaml.cs
View File

@ -206,7 +206,7 @@ namespace Elwig.Windows {
} else { } else {
await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]); await ElwigData.Export(path, deliveries, [$"{Utils.CurrentLastSeason}", $"Zweigstelle {App.BranchName}"]);
await Utils.UploadExportData(path, App.Config.SyncUrl, App.Config.SyncUsername, App.Config.SyncPassword); 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); MessageBoxButton.OK, MessageBoxImage.Information);
} }
} catch (HttpRequestException exc) { } catch (HttpRequestException exc) {