fierke/logofclient
2
2
Fork 0
Code Issues 15 Pull Requests Releases 8 Wiki Activity

[fix:] label pdf is not sorted by used_plz

Browse Source
This commit is contained in:
fierke
2026-09-23 17:30:09 +02:00
parent 6ed8c0e231
commit cbda6d6563
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tasks/PdfBuilder.cs
+13 -10
View File
@@ -121,17 +121,18 @@ public class PdfBuilder
} }
// national addresses // national addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++) foreach (var person in addressSet.KasPersons
.Where(person => person.IsGermany())
.OrderBy(person => person.used_plz))
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
if (!addressSet.KasPersons[i].IsGermany()) continue; var addr = AddressCreator.CreateFinalMarkdownString(person.id);
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0) if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>"; senderLineID += $"ID: {person.refsid}\n</font6>";
else else
senderLineID += "\n</font6>"; senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID)) if (!string.IsNullOrEmpty(senderLineID))
@@ -141,17 +142,19 @@ public class PdfBuilder
} }
// international addresses // international addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++) foreach (var person in addressSet.KasPersons
.Where(person => !person.IsGermany())
.OrderBy(person => person.land)
.ThenBy(person => person.used_plz))
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
if (addressSet.KasPersons[i].IsGermany()) continue; var addr = AddressCreator.CreateFinalMarkdownString(person.id);
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0) if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>"; senderLineID += $"ID: {person.refsid}\n</font6>";
else else
senderLineID += "\n</font6>"; senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID)) if (!string.IsNullOrEmpty(senderLineID))