[feat:] initial fully implemented address creation

DataStructures.cs

@@ -5,7 +5,7 @@ namespace Logof_Client;
 
 public class KasAddressList //Address-Set
 {
-    public List<KasPersonError> errors = new();
+    //public List<KasPersonError> errors = new();
     public List<KasPerson> KasPersons;
 
     public KasAddressList(string name)
@@ -13,12 +13,9 @@ public class KasAddressList //Address-Set
         KasPersons = new List<KasPerson>();
         Name = name;
         foreach (var set in Settings._instance.addressSets.addresses)
-        {
             if (Name == set.Name)
-            {
                 Name = name + "-new";
-            }
-        }
+
         var highest = 0;
         foreach (var k in Settings._instance.addressSets.addresses)
             if (highest <= k.ID)
@@ -39,15 +36,18 @@ public class KasAddressList //Address-Set
     {
         if (is_rest == true)
             return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
-        else
         return basic_type + " - " + DateTime.Now.ToShortDateString();
     }
 
-    public void UpdateErrorList(List<(int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>)> errorList)
-    {
-        errors.Clear();
-        foreach (var error in errorList) errors.Add(new KasPersonError(error));
-    }
+    // public void UpdateErrorList(List<KasPersonError> errorList)
+    // {
+    //     //errors.Clear();
+    //     // foreach (KasPersonError err in errorList)
+    //     // {
+    //     //     
+    //     // }
+    //     //foreach (var error in errorList) errors.Add(new KasPersonError(error));
+    // }
 
     public static int GetIDByAddressSetListItem(string listItemName)
     {
@@ -58,6 +58,8 @@ public class KasAddressList //Address-Set
 
 public class KasPerson
 {
+    public KasPersonError PersonError = null;
+
     public KasPerson()
     {
         refsid = 0;
@@ -165,37 +167,14 @@ public class KasPerson
 
 public class KasPersonError
 {
-    public KasPersonError((int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
+    public KasPersonError((List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
     {
-        refsid = single_result.Item1;
-        errors = single_result.Item2;
-        warnings = single_result.Item3;
-        // try
-        // {
-        //     foreach (var err in single_result.Item2) errors += err + ", ";
-        //     errors = errors.Trim();
-        //     errors = errors.TrimEnd(',');
-        // }
-        // catch
-        // {
-        // }
-        //
-        // try
-        // {
-        //     if (single_result.Item3 != null)
-        //     {
-        //         foreach (var err in single_result.Item3) warnings += err + ", ";
-        //         warnings = warnings.Trim();
-        //         warnings = warnings.TrimEnd(',');
-        //     }
-        // }
-        // catch (Exception e)
-        // {
-        //     Console.WriteLine(e.Message);
-        // }
+        //refsid = single_result.Item1;
+        errors = single_result.Item1;
+        warnings = single_result.Item2;
     }
 
-    public int refsid { get; set; }
+    //public int refsid { get; set; }
     public List<AddressCheck.ErrorTypes> errors { get; set; } = new();
     public List<AddressCheck.WarningTypes> warnings { get; set; } = new();
 }

ResultWindow.axaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -11,10 +12,10 @@ public partial class ResultWindow : Window
 {
     public List<CheckBox> errortypecheckboxes = new();
     public KasAddressList ur_addresses = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
-    public List<KasPersonError> ur_result;
+    public List<KasPerson> ur_result;
     public List<CheckBox> warningtypecheckboxes = new();
 
-    public ResultWindow(List<KasPersonError> result,
+    public ResultWindow(List<KasPerson> result,
         int addressSetID)
     {
         InitializeComponent();
@@ -24,12 +25,12 @@ public partial class ResultWindow : Window
         //ViewSingle(200552426);
     }
 
-    private void GenerateView(List<KasPersonError> result)
+    private void GenerateView(List<KasPerson> result)
     {
-        // var errors = new List<KasPersonError>();
-        //foreach (var single_result in result) errors.Add(single_result);
-        LblResultCount.Content = $"{result.Count}/{ur_result.Count} Ergebnisse";
-        DgResult.ItemsSource = result;
+        // Filter to only show persons with errors
+        var result_with_errors = result.Where(p => p.PersonError != null).ToList();
+        LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
+        DgResult.ItemsSource = result_with_errors;
     }
 
     private void ViewSingle(int refsid)
@@ -62,18 +63,20 @@ public partial class ResultWindow : Window
             }
     }
 
-    private void Load(List<KasPersonError> result)
+    private void Load(List<KasPerson> result)
     {
         var knownErrors = new List<AddressCheck.ErrorTypes>();
         var knownWarnings = new List<AddressCheck.WarningTypes>();
 
-        foreach (var single_result in result)
+        foreach (var person in result)
         {
-            foreach (var errtyp in single_result.errors)
+            if (person.PersonError == null) continue;
+
+            foreach (var errtyp in person.PersonError.errors)
                 if (!knownErrors.Contains(errtyp))
                     knownErrors.Add(errtyp);
 
-            foreach (var wartyp in single_result.warnings)
+            foreach (var wartyp in person.PersonError.warnings)
                 if (!knownWarnings.Contains(wartyp))
                     knownWarnings.Add(wartyp);
         }
@@ -108,7 +111,7 @@ public partial class ResultWindow : Window
 
     private void UpdateFilter()
     {
-        var temp_result = new List<KasPersonError>();
+        var temp_result = new List<KasPerson>();
         var checked_types = new List<AddressCheck.ErrorTypes>();
         var checked_types_war = new List<AddressCheck.WarningTypes>();
         foreach (var cb in errortypecheckboxes)
@@ -121,21 +124,19 @@ public partial class ResultWindow : Window
                 checked_types_war.Add(
                     (AddressCheck.WarningTypes)Enum.Parse(typeof(AddressCheck.WarningTypes), cb.Content.ToString()));
 
-        foreach (var sres in ur_result)
+        foreach (var person in ur_result)
         {
-            foreach (var err in sres.errors)
-                if (checked_types.Contains(err) && !temp_result.Contains(sres))
-                    temp_result.Add(sres);
+            if (person.PersonError == null) continue;
 
-            foreach (var war in sres.warnings)
-                if (checked_types_war.Contains(war) && !temp_result.Contains(sres))
-                    temp_result.Add(sres);
+            foreach (var err in person.PersonError.errors)
+                if (checked_types.Contains(err) && !temp_result.Contains(person))
+                    temp_result.Add(person);
+
+            foreach (var war in person.PersonError.warnings)
+                if (checked_types_war.Contains(war) && !temp_result.Contains(person))
+                    temp_result.Add(person);
         }
 
-
-        //var errors = new List<KasPersonError>();
-        //foreach (var single_result in temp_result) errors.Add(new KasPersonError(single_result));
-
         LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
         DgResult.ItemsSource = temp_result;
     }
@@ -145,7 +146,7 @@ public partial class ResultWindow : Window
         foreach (var selected in DgResult.SelectedItems)
             try
             {
-                var _asKas = (KasPersonError)selected;
+                var _asKas = (KasPerson)selected;
                 ViewSingle(_asKas.refsid);
             }
             catch (Exception ex)

Tasks/AddressCheck.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia.Threading;
@@ -35,12 +36,20 @@ public class AddressCheck
         _progress = progressWindow;
     }
 
-    public async Task<List<KasPersonError>> Perform(int id)
+    public async Task<List<KasPerson>> Perform(int id)
     {
-        foreach (var adset in Settings._instance.addressSets.addresses)
-            if (adset.ID == id)
+        // Find the index of the address set with the given id
+        var adset_index = -1;
+        for (var i = 0; i < Settings._instance.addressSets.addresses.Count; i++)
+            if (Settings._instance.addressSets.addresses[i].ID == id)
             {
-                var failed_refsids = new List<KasPersonError>();
+                adset_index = i;
+                break;
+            }
+
+        if (adset_index == -1) return new List<KasPerson>();
+
+        var adset = Settings._instance.addressSets.addresses[adset_index];
         var total = adset.KasPersons.Count;
         var current = 0;
 
@@ -92,7 +101,6 @@ public class AddressCheck
                         }
                         else
                         {
-                            
                             if (!AddressCreator.CheckPLZ(person.pplz, person.land))
                             {
                                 hasFaults = true;
@@ -224,9 +232,13 @@ public class AddressCheck
                         }
 
                         if (hasFaults)
-                            lock (failed_refsids)
+                            lock (Settings._instance.addressSets.addresses)
                             {
-                                failed_refsids.Add(new KasPersonError((person.refsid, errors, warnings)));
+                                // Directly set PersonError in the address set
+                                var person_index = adset.KasPersons.IndexOf(person);
+                                if (person_index >= 0)
+                                    Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index].PersonError = 
+                                        new KasPersonError((errors, warnings));
                             }
 
                         // Fortschritt aktualisieren
@@ -241,11 +253,12 @@ public class AddressCheck
                         });
                     }
                 });
-                adset.errors = failed_refsids;
-                Settings.Save();
-                return failed_refsids;
-            }
         
-        return null;
+        Settings.Save();
+        
+        // Return only the persons with errors from the address set
+        return Settings._instance.addressSets.addresses[adset_index].KasPersons
+            .Where(p => p.PersonError != null)
+            .ToList();
     }
 }

Tasks/AddressCreation.cs

@@ -1,24 +1,23 @@
 using System;
 using System.Linq;
-using System.Runtime.InteropServices.JavaScript;
 
 namespace Logof_Client;
 
 public static class AddressCreator
 {
     /// <summary>
-    /// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
+    ///     Creates max-seven-lines-long Markdown address-string. Analyzes the KasPerson-Instance to find the best result.
     /// </summary>
     /// <param name="refsid">KasPerson-ID</param>
-    /// <returns>A markdown string with the address that is maximum seven lines long</returns>
+    /// <returns>A Markdown string with the address that is maximum seven lines long</returns>
     public static string? CreateFinalMarkdownString2(int refsid)
     {
         // Maximum seven lines of information
 
         // find the address
-        KasPerson address = new KasPerson();
-        string string_address = "";
-        int address_line_count = 0;
+        var address = new KasPerson();
+        var string_address = "";
+        var address_line_count = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
         {
             var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
@@ -26,10 +25,7 @@ public static class AddressCreator
         }
 
         // no address found
-        if (address == null)
-        {
-            return null;
-        }
+        if (address == null) return null;
 
         // let's get started: the name (and anrede), block-line-count: 1
         if (!string.IsNullOrEmpty(address.anrede))
@@ -38,12 +34,13 @@ public static class AddressCreator
             else string_address += address.anrede;
             address_line_count++;
         }
+
         if (!string.IsNullOrEmpty(address.name) && !string.IsNullOrEmpty(address.vorname))
         {
             string_address += " " + address.vorname + " " + address.name;
-        } else if (!string.IsNullOrEmpty(address.name))
+        }
+        else if (!string.IsNullOrEmpty(address.name))
         {
-            
         }
         else // Anrede but no name? to the trash!
         {
@@ -85,18 +82,18 @@ public static class AddressCreator
     // Auswurf PDF mit PvSt.
 
     /// <summary>
-    /// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
+    ///     Creates max-seven-lines-long Markdown address-string. Analyzes the KasPerson-Instance to find the best result.
     /// </summary>
     /// <param name="refsid">KasPerson-ID</param>
-    /// <returns>A markdown string with the address that is maximum seven lines long</returns>
+    /// <returns>A Markdown string with the address that is maximum seven lines long</returns>
     public static string? CreateFinalMarkdownString(int refsid)
     {
         // Maximum seven lines of information
 
         // find the address
-        KasPerson address = new KasPerson();
-        string string_address = "";
-        int address_line_count = 0;
+        var address = new KasPerson();
+        var string_address = "";
+        var address_line_count = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
         {
             var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
@@ -104,15 +101,14 @@ public static class AddressCreator
         }
 
         // no address found
-        if (address == null)
-        {
-            return null;
-        }
+        if (address == null) return null;
 
         // let's get started: we start from the bottom
         // if the country is not germany, set it
         // LAND: GER oder DE
-        if (address.land.ToLower().Trim() != "germany" && address.land.ToLower().Trim() != "ger" && address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" && address.land.ToLower().Trim() != "deutschland")
+        if (address.land.ToLower().Trim() != "germany" && address.land.ToLower().Trim() != "ger" &&
+            address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" &&
+            address.land.ToLower().Trim() != "deutschland")
         {
             string_address = "**" + address.land.Trim() + "**"; // Needs to be bold
             address_line_count++;
@@ -134,21 +130,19 @@ public static class AddressCreator
                 address_line_count++;
             }
 
-            if (!string.IsNullOrWhiteSpace(address.anredzus))
+            var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
+                address.adel, address.name, address.namezus);
+
+            if (string.IsNullOrWhiteSpace(nameline))
             {
-                string_address = address.anredzus.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
-                address_line_count++;
-            }
-            else
-            {
-                string_address = address.anrede.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
+                string_address = nameline + string_address;
                 address_line_count++;
             }
 
-            string[] nameattribs = new[] { address.name1, address.name2, address.name3, address.name4, address.name5 };
+            var nameattribs = new[]
+                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
 
-            for (int i = 0; i < nameattribs.Length-1; i++)
-            {
+            for (var i = 0; i < nameattribs.Length - 1; i++)
                 if (address_line_count < 7)
                 {
                     if (!string.IsNullOrWhiteSpace(nameattribs[i]))
@@ -157,22 +151,77 @@ public static class AddressCreator
                         address_line_count++;
                     }
                 }
-                else break;
+                else
+                {
+                    break;
                 }
         } // Alternative B: plz valid and city existing 
         else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
         {
-            
-        }
-        else // Error-Handling?
+            string_address = address.plz + " " + address.ort + "\n" + string_address;
+            address_line_count++;
+            if (!string.IsNullOrWhiteSpace(address.strasse))
             {
-            
+                string_address = address.strasse.Trim() + "\n" + string_address;
+                address_line_count++;
             }
+            else
+            {
+                string_address = address.postfach.Trim() + "\n" + string_address;
+                address_line_count++;
+            }
+
+            var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
+                address.adel, address.name, address.namezus);
+
+            if (string.IsNullOrWhiteSpace(nameline))
+            {
+                string_address = nameline + string_address;
+                address_line_count++;
+            }
+
+            var nameattribs = new[]
+                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
+
+            for (var i = 0; i < nameattribs.Length - 1; i++)
+                if (address_line_count < 7)
+                {
+                    if (!string.IsNullOrWhiteSpace(nameattribs[i]))
+                    {
+                        string_address += nameattribs[i] + "\n" + string_address;
+                        address_line_count++;
+                    }
+                }
+                else
+                {
+                    break;
+                }
+        } // Error-Handling?
 
         return string_address;
         return "Hier könnte eine\nAdresse stehen";
     }
 
+    public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
+        string name, string namezus)
+    {
+        if (!string.IsNullOrWhiteSpace(anredezus))
+            return string.Join(" ",
+                       new[] { anredezus, titel, vorname, adel, name }
+                           .Where(s => !string.IsNullOrWhiteSpace(s))
+                   )
+                   + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})")
+                   + "\n";
+
+        // else 
+        return string.Join(" ",
+                   new[] { anrede, titel, vorname, adel, name }
+                       .Where(s => !string.IsNullOrWhiteSpace(s))
+               )
+               + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})")
+               + "\n";
+    }
+
     /// <summary>
     ///     Returns true if a plz (or pplz) is valid
     /// </summary>
@@ -181,28 +230,21 @@ public static class AddressCreator
     /// <returns>true or faslse, depending on result :+1:</returns>
     public static bool CheckPLZ(string plz, string land)
     {
-        if (plz == null) return false;
-        if (land.ToLower().Trim() != "germany" && land.ToLower().Trim() != "ger" && land.ToLower().Trim() != "" && land.ToLower().Trim() != "de" && land.ToLower().Trim() != "deutschland")
-        {
-            // if country is not germany... how should we check for a valid plz?
+        if (string.IsNullOrWhiteSpace(plz)) return false;
         
-            // temporarily accept all of them
+        // For non-german countries, accept any non-empty postal code
+        if (land.ToLower().Trim() != "germany" && land.ToLower().Trim() != "ger" && land.ToLower().Trim() != "" &&
+            land.ToLower().Trim() != "de" && land.ToLower().Trim() != "deutschland")
+            return true;
+
+        // For Germany, check if it's a valid numeric postal code (5 digits)
+        if (int.TryParse(plz, out var iplz))
+        {
+            if (iplz > 99999 || iplz < 10000) return false;
             return true;
         }
         
-        try
-        {
-            int iplz = Convert.ToInt32(plz);
-            if (iplz > 999999 || iplz < 10000)
-            {
+        // If it can't be parsed as int, it's not a valid German postal code
         return false;
     }
-            return true;
-            
-        } catch
-        {
-            return false;
-        }
-        
-    }
 }