fierke/logofclient
1
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

[fix:] fixed some logical errors in address creation

Browse Source
This commit is contained in:
Elias Fierke
2025-12-14 14:30:53 +01:00
parent 2c22306fef
commit 4ebd6bc407
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Tasks/AddressCreation.cs
View File

@@ -118,21 +118,21 @@ public static class AddressCreator
address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" && address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" &&
address.land.ToLower().Trim() != "deutschland") address.land.ToLower().Trim() != "deutschland")
{ {
string_address = "**" + address.land.Trim() + "**"; // Needs to be bold string_address = "\n**" + address.land.Trim() + "**"; // Needs to be bold
address_line_count++; address_line_count++;
} }
// Alternative A: pplz valid and city existing // Alternative A: pplz valid and city existing
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land)) if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
{ {
string_address = address.pplz + " " + address.ort + "\n" + string_address; string_address = address.pplz + " " + address.ort + string_address;
address_line_count++; address_line_count++;
if (!string.IsNullOrWhiteSpace(address.postfach)) if (!string.IsNullOrWhiteSpace(address.postfach))
{ {
string_address = address.postfach.Trim() + "\n" + string_address; string_address = address.postfach.Trim() + "\n" + string_address;
address_line_count++; address_line_count++;
} }
else else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
{ {
string_address = address.strasse.Trim() + "\n" + string_address; string_address = address.strasse.Trim() + "\n" + string_address;
address_line_count++; address_line_count++;
@@ -141,28 +141,33 @@ public static class AddressCreator
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname, var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
address.adel, address.name, address.namezus); address.adel, address.name, address.namezus);
if (string.IsNullOrWhiteSpace(nameline)) if (!string.IsNullOrWhiteSpace(nameline))
{ {
string_address = nameline + string_address; string_address = nameline + string_address;
address_line_count++; address_line_count++;
} }
// REIHENFOLGE
var nameattribs = new[] var nameattribs = new[]
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung }; { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
for (var i = 0; i < nameattribs.Length - 1; i++) var names = "";
if (address_line_count < 7) for (var i = 0; i < nameattribs.Length; i++)
try
{ {
if (address_line_count >= 7) break;
if (!string.IsNullOrWhiteSpace(nameattribs[i])) if (!string.IsNullOrWhiteSpace(nameattribs[i]))
{ {
string_address += nameattribs[i] + "\n" + string_address; names += "\n" + nameattribs[i];
address_line_count++; address_line_count++;
} }
} }
else catch
{ {
break; Console.WriteLine("ERROR 15821");
} }
string_address = names + "\n" + string_address;
} // Alternative B: plz valid and city existing } // Alternative B: plz valid and city existing
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land)) else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
{ {
@@ -173,7 +178,7 @@ public static class AddressCreator
string_address = address.strasse.Trim() + "\n" + string_address; string_address = address.strasse.Trim() + "\n" + string_address;
address_line_count++; address_line_count++;
} }
else else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
{ {
string_address = address.postfach.Trim() + "\n" + string_address; string_address = address.postfach.Trim() + "\n" + string_address;
address_line_count++; address_line_count++;
@@ -182,7 +187,7 @@ public static class AddressCreator
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname, var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
address.adel, address.name, address.namezus); address.adel, address.name, address.namezus);
if (string.IsNullOrWhiteSpace(nameline)) if (!string.IsNullOrWhiteSpace(nameline))
{ {
string_address = nameline + string_address; string_address = nameline + string_address;
address_line_count++; address_line_count++;
@@ -191,19 +196,23 @@ public static class AddressCreator
var nameattribs = new[] var nameattribs = new[]
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung }; { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
for (var i = 0; i < nameattribs.Length - 1; i++) var names = "";
if (address_line_count < 7) for (var i = 0; i < nameattribs.Length; i++)
try
{ {
if (address_line_count >= 7) break;
if (!string.IsNullOrWhiteSpace(nameattribs[i])) if (!string.IsNullOrWhiteSpace(nameattribs[i]))
{ {
string_address += nameattribs[i] + "\n" + string_address; names += "\n" + nameattribs[i];
address_line_count++; address_line_count++;
} }
} }
else catch
{ {
break; Console.WriteLine("ERROR 15821");
} }
string_address = names + "\n" + string_address;
} // Error-Handling? } // Error-Handling?
return string_address; return string_address;