diff --git a/Elwig/Documents/DeliveryAncmtList.cshtml b/Elwig/Documents/DeliveryAncmtList.cshtml
index 4f5ec2e..5557c5d 100644
--- a/Elwig/Documents/DeliveryAncmtList.cshtml
+++ b/Elwig/Documents/DeliveryAncmtList.cshtml
@@ -8,10 +8,11 @@
@Model.Filter
-
+
-
-
+
+
+
@@ -20,6 +21,7 @@
Datum |
MgNr. |
Mitglied |
+ Ort |
Sorte |
Anmldg. |
Gewicht |
@@ -31,9 +33,10 @@
@foreach (var a in Model.Announcements) {
- @($"{a.Date:dd.MM.yyyy}") |
+ @($"{a.Date:dd.MM.yyyy}") |
@a.MgNr |
@a.AdministrativeName |
+ @a.DefaultKg |
@a.Variety |
@(a.Status ?? "-") |
@($"{a.Weight:N0}") |
@@ -41,7 +44,7 @@
}
Gesamt: |
- Anmeldungen: @($"{Model.Announcements.Count():N0}") |
+ Anmeldungen: @($"{Model.Announcements.Count():N0}") |
@($"{Model.Announcements.Sum(a => a.Weight):N0}") |
diff --git a/Elwig/Models/Dtos/DeliveryAncmtListData.cs b/Elwig/Models/Dtos/DeliveryAncmtListData.cs
index c4b9d0f..af2b0a6 100644
--- a/Elwig/Models/Dtos/DeliveryAncmtListData.cs
+++ b/Elwig/Models/Dtos/DeliveryAncmtListData.cs
@@ -15,6 +15,7 @@ namespace Elwig.Models.Dtos {
("MgNr", "MgNr.", null, 12),
("Name1", "Name", null, 40),
("Name2", "Vorname", null, 40),
+ ("DefaultKg", "Ort", null, 40),
("SortId", "Sorte", null, 10),
("Weight", "Gewicht", "kg", 20),
("CreatedTimestamp", "Angemeldet", null, 35),
@@ -43,6 +44,7 @@ namespace Elwig.Models.Dtos {
public string Name1;
public string? Name2;
public string AdministrativeName;
+ public string? DefaultKg;
public string SortId;
public string Variety;
public DateTime CreatedTimestamp;
@@ -60,6 +62,7 @@ namespace Elwig.Models.Dtos {
Name1 = m.AdministrativeName1;
Name2 = m.AdministrativeName2;
AdministrativeName = m.AdministrativeName;
+ DefaultKg = m.DefaultKg?.Name;
SortId = a.SortId;
Variety = a.Variety.Name;
CreatedTimestamp = a.CreatedTimestamp;
diff --git a/Tests/DocumentTests/DeliveryAncmtListTest.cs b/Tests/DocumentTests/DeliveryAncmtListTest.cs
index c3e50e3..a1ccf23 100644
--- a/Tests/DocumentTests/DeliveryAncmtListTest.cs
+++ b/Tests/DocumentTests/DeliveryAncmtListTest.cs
@@ -18,11 +18,11 @@ namespace Tests.DocumentTests {
Assert.That(text, Contains.Substring("Anmeldeliste"));
Assert.That(text, Contains.Substring("01.10.2020 – Matzen – GV Kabinettaktion"));
Assert.That(table, Is.EqualTo(new string[][] {
- ["01.10.2020", "101 MUSTERMANN Max", "Grüner Veltliner", "-", "5 000"],
- ["01.10.2020", "102 WEINBAUER Wernhardt", "Grüner Veltliner", "-", "10 000"],
- ["01.10.2020", "103 MUSTERBAUER Matthäus", "Grüner Veltliner", "-", "8 000"],
- ["01.10.2020", "104 WINZER Waltraud", "Grüner Veltliner", "-", "2 000"],
- ["Gesamt:", "Anmeldungen: 4", "25 000"],
+ ["01.10.2020", "101 MUSTERMANN Max", "Hohenruppersdorf", "Grüner Veltliner", "-", "5 000"],
+ ["01.10.2020", "102 WEINBAUER Wernhardt", "Hohenruppersdorf", "Grüner Veltliner", "-", "10 000"],
+ ["01.10.2020", "103 MUSTERBAUER Matthäus", "Wolkersdorf", "Grüner Veltliner", "-", "8 000"],
+ ["01.10.2020", "104 WINZER Waltraud", "Wolkersdorf", "Grüner Veltliner", "-", "2 000"],
+ ["Gesamt:", "Anmeldungen: 4", "25 000"],
}));
});
}