From 0f3ce39f35e17bcd60583733daab3791ae6cf62a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 20 May 2025 15:55:11 +0200 Subject: [PATCH] Elwig: Use 'Menge' instead of 'Gewicht' where applicable --- Elwig/Documents/DeliveryAncmtList.cshtml | 2 +- Elwig/Documents/DeliveryConfirmation.cshtml | 2 +- Elwig/Documents/DeliveryDepreciationList.cshtml | 2 +- Elwig/Documents/DeliveryJournal.cshtml | 2 +- Elwig/Documents/DeliveryNote.cshtml | 2 +- Elwig/Models/Dtos/DeliveryAncmtListData.cs | 2 +- Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs | 2 +- Elwig/Models/Dtos/DeliveryJournalData.cs | 2 +- Elwig/Models/Dtos/WeightBreakdownData.cs | 2 +- Elwig/Models/Dtos/WineLocalityStatisticsData.cs | 2 +- Elwig/Services/DeliveryAncmtService.cs | 2 +- Elwig/Services/DeliveryService.cs | 2 +- Elwig/Windows/DeliveryAdminWindow.xaml | 8 ++++---- Elwig/Windows/DeliveryAncmtAdminWindow.xaml | 8 ++++---- Elwig/Windows/DeliveryScheduleAdminWindow.xaml | 4 ++-- Elwig/Windows/MainWindow.xaml | 4 ++-- 16 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Elwig/Documents/DeliveryAncmtList.cshtml b/Elwig/Documents/DeliveryAncmtList.cshtml index 5557c5d..55f8f0e 100644 --- a/Elwig/Documents/DeliveryAncmtList.cshtml +++ b/Elwig/Documents/DeliveryAncmtList.cshtml @@ -24,7 +24,7 @@ Ort Sorte Anmldg. - Gewicht + Menge [kg] diff --git a/Elwig/Documents/DeliveryConfirmation.cshtml b/Elwig/Documents/DeliveryConfirmation.cshtml index 52f91b1..c2f579a 100644 --- a/Elwig/Documents/DeliveryConfirmation.cshtml +++ b/Elwig/Documents/DeliveryConfirmation.cshtml @@ -30,7 +30,7 @@ Qualitätsstufe Gradation Flächenbindung - Gewicht + Menge Sorte Attr./Bewirt. Gradation - Gewicht + Menge
[°Oe] diff --git a/Elwig/Documents/DeliveryJournal.cshtml b/Elwig/Documents/DeliveryJournal.cshtml index 6ef0a21..ac87568 100644 --- a/Elwig/Documents/DeliveryJournal.cshtml +++ b/Elwig/Documents/DeliveryJournal.cshtml @@ -29,7 +29,7 @@ Mitglied Sorte Gradation - Gewicht + Menge
[°Oe] diff --git a/Elwig/Documents/DeliveryNote.cshtml b/Elwig/Documents/DeliveryNote.cshtml index 6acf883..2d4c613 100644 --- a/Elwig/Documents/DeliveryNote.cshtml +++ b/Elwig/Documents/DeliveryNote.cshtml @@ -24,7 +24,7 @@ Attribut Qualitätsstufe Gradation - Gewicht + Menge
[°Oe] diff --git a/Elwig/Models/Dtos/DeliveryAncmtListData.cs b/Elwig/Models/Dtos/DeliveryAncmtListData.cs index af2b0a6..d10e5d8 100644 --- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs +++ b/Elwig/Models/Dtos/DeliveryAncmtListData.cs @@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos { ("Name2", "Vorname", null, 40), ("DefaultKg", "Ort", null, 40), ("SortId", "Sorte", null, 10), - ("Weight", "Gewicht", "kg", 20), + ("Weight", "Menge", "kg", 20), ("CreatedTimestamp", "Angemeldet", null, 35), ("ModifiedTimestamp", "Geändert", null, 35), ("Status", "Status", null, 20), diff --git a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs index 23e964a..cccd279 100644 --- a/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs +++ b/Elwig/Models/Dtos/DeliveryConfirmationDeliveryData.cs @@ -16,7 +16,7 @@ namespace Elwig.Models.Dtos { ("QualityLevel", "Qualitätsstufe", null, 25), ("Gradation", "Gradation", "°Oe|°KMW", 32), ("Buckets", "Flächenbindung", "|kg", 36), - ("Weight", "Gewicht", "kg", 16), + ("Weight", "Menge", "kg", 16), ]; private readonly int MgNr; diff --git a/Elwig/Models/Dtos/DeliveryJournalData.cs b/Elwig/Models/Dtos/DeliveryJournalData.cs index 99e80df..79a40aa 100644 --- a/Elwig/Models/Dtos/DeliveryJournalData.cs +++ b/Elwig/Models/Dtos/DeliveryJournalData.cs @@ -24,7 +24,7 @@ namespace Elwig.Models.Dtos { ("CultId", "Bewirt.", null, 15), ("QualId", "Qualität", null, 15), ("Gradation", "Gradation", "°Oe|°KMW", 40), - ("Weight", "Gewicht", "kg", 20), + ("Weight", "Menge", "kg", 20), ("IsNetWeight", "Gerebelt", null, 20), ("HkId", "Herkunft", null, 20), ("Modifiers", "Zu-/Abschläge", null, 40), diff --git a/Elwig/Models/Dtos/WeightBreakdownData.cs b/Elwig/Models/Dtos/WeightBreakdownData.cs index d6f7dc2..4d2bb0d 100644 --- a/Elwig/Models/Dtos/WeightBreakdownData.cs +++ b/Elwig/Models/Dtos/WeightBreakdownData.cs @@ -14,7 +14,7 @@ namespace Elwig.Models.Dtos { ("CultId", "Bewirt.", null, 15), ("QualId", "Qual.", null, 15), ("Geb", "gebunden", null, 20), - ("Weight", "Gewicht", "kg", 20), + ("Weight", "Menge", "kg", 20), ]; public WeightBreakdownData(IEnumerable rows, int year, string name) : diff --git a/Elwig/Models/Dtos/WineLocalityStatisticsData.cs b/Elwig/Models/Dtos/WineLocalityStatisticsData.cs index edd8e74..f71bd95 100644 --- a/Elwig/Models/Dtos/WineLocalityStatisticsData.cs +++ b/Elwig/Models/Dtos/WineLocalityStatisticsData.cs @@ -17,7 +17,7 @@ namespace Elwig.Models.Dtos { ("Members", "Mitgl.", "#", 15), ("Deliveries", "Lfrg.", "#", 15), ("Parts", "Teill.", "#", 15), - ("Weight", "Gewicht", "kg", 20), + ("Weight", "Menge", "kg", 20), ("Gradation", "Gradation", "°Oe|°KMW", 30), ]; diff --git a/Elwig/Services/DeliveryAncmtService.cs b/Elwig/Services/DeliveryAncmtService.cs index 7536b0d..f132439 100644 --- a/Elwig/Services/DeliveryAncmtService.cs +++ b/Elwig/Services/DeliveryAncmtService.cs @@ -326,7 +326,7 @@ namespace Elwig.Services { var weight = await deliveryAncmts.SumAsync(p => p.Weight); text = $"{weight:N0} kg"; - AddToolTipRow(grid, 0, "Gewicht", null, weight, null, weight); + AddToolTipRow(grid, 0, "Menge", null, weight, null, weight); if (await deliveryAncmts.AnyAsync()) { var attrGroups = await deliveryAncmts diff --git a/Elwig/Services/DeliveryService.cs b/Elwig/Services/DeliveryService.cs index 1425314..055cdba 100644 --- a/Elwig/Services/DeliveryService.cs +++ b/Elwig/Services/DeliveryService.cs @@ -946,7 +946,7 @@ namespace Elwig.Services { var weight = await deliveryParts.SumAsync(p => p.Weight); wText = $"{weight:N0} kg"; - wGrid.Add(("Gewicht", null, weight, null, weight)); + wGrid.Add(("Menge", null, weight, null, weight)); if (await deliveryParts.AnyAsync()) { var kmwMin = await deliveryParts.MinAsync(p => p.Kmw); diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml b/Elwig/Windows/DeliveryAdminWindow.xaml index 024fd3b..843da3d 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml +++ b/Elwig/Windows/DeliveryAdminWindow.xaml @@ -217,7 +217,7 @@ Zweigstelle: z.B. musterort, ... Attribut: z.B. kabinett, !kabinett (alle außer kabinett), ... Bewirtschaftung: z.B. bio, !kip (alle außer KIP), ... - Gewicht: z.B. <500kg, >6000kg, ... (gilt für Gewicht der gesamten Lieferung) + Gewicht: z.B. <500kg, >6000kg, ... (gilt für Menge der gesamten Lieferung) Datum: z.B. 1.9., 15.9.-10.10., -15.10.2020, ... Uhrzeit: z.B. 06:00-08:00, 18:00-, ... Handwiegung: handw[iegung], !Handw[iegung] (alle ohne Handwiegung) @@ -272,7 +272,7 @@ - + - + - +