[chore:] logging for ResultWindow.axaml.cs

# Conflicts:
#	MainWindow.axaml
#	MainWindow.axaml.cs

DataStore/DataStructures.cs

@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
         var id = listItemName.Split(" - ")[0];
         return int.Parse(id);
     }
+
+    public override string ToString()
+    {
+        return Name + " (" + KasPersons.Count + " Einträge)";
+    }
 }
 
 public class KasPerson
@@ -188,6 +193,18 @@ public class KasPerson
 
         return highest + base_id + 1;
     }
+
+    public override string ToString()
+    {
+        if (refsid != null && refsid != 0)
+        {
+            return refsid + " - " + name;
+        }
+        else
+        {
+            return id + " - " + name;
+        }
+    }
 }
 
 public class KasPersonError
@@ -212,4 +229,9 @@ public class KasPersonError
 
         return output;
     }
+
+    public string ToString(KasPerson person)
+    {
+        return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
+    }
 }

DataStore/Settings.cs

@@ -45,9 +45,8 @@ public class Settings
         }
         catch (Exception ex)
         {
-            Console.WriteLine(ex.Message);
-            Console.WriteLine(ex.StackTrace);
-            Console.WriteLine("Error while reading settings. Generating new...");
+            Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
+
             _instance = new Settings();
         }
     }
@@ -123,9 +122,7 @@ public class Global
         }
         catch (Exception ex)
         {
-            Console.WriteLine(ex.Message);
-            Console.WriteLine(ex.StackTrace);
-            Console.WriteLine("Error while reading global settings. Generating new...");
+            Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
             _instance = new Global();
             Save();
         }
@@ -135,7 +132,7 @@ public class Global
 public class Customers
 {
     public List<Customer> customers = new();
-    public int current { get; set; } = 0;
+    public Customer current { get; set; } = null;
 }
 
 public class Customer
@@ -149,6 +146,11 @@ public class Customer
 
         ID = highestID + 1;
     }
+    
+    public override string ToString()
+    {
+        return name;
+    }
 
     public string name { get; set; } = "";
     public string description { get; set; } = "";
@@ -158,11 +160,11 @@ public class Customer
     public int ID { get; }
 
 
-    public static int GetIDByCustomerListItem(string item_content)
-    {
-        var id = item_content.Split(" - ")[0];
-        return int.Parse(id);
-    }
+    // public static int GetIDByCustomerListItem(string item_content)
+    // {
+    //     var id = item_content.Split(" - ")[0];
+    //     return int.Parse(id);
+    // }
 }
 
 public class AddressSets

Logger.cs

@@ -0,0 +1,40 @@
+using System;
+using System.IO;
+using Newtonsoft.Json;
+
+namespace Logof_Client;
+
+public static class Logger
+{
+    public static void Log(string text, LogType logType = LogType.Info)
+    {
+        try
+        {
+            string config_path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                "logofclient");
+            if (!Directory.Exists(config_path))
+                Directory.CreateDirectory(config_path);
+
+            string log_path = Path.Combine(config_path, $"log-{DateTime.Now:dd-MM-yy}.log");
+            if(!File.Exists(log_path))
+                File.Create(log_path).Close();
+
+            string line = $"[{DateTime.Now:dd.MM.yyyy - hh:mm:ss}]: ({logType.ToString()}) {text}";
+            Console.WriteLine(line);
+            
+            File.AppendAllLines(log_path, [line]);
+        }
+        catch (Exception ex)
+        {
+            Console.WriteLine(ex);
+        }
+        
+    }
+
+    public enum LogType
+    {
+        Error,
+        Warning,
+        Info
+    }
+}

MainWindow.axaml

@@ -121,7 +121,7 @@
                                                FontWeight="Bold" />
                                     </StackPanel>
                                 </Button>
-                                <Button Width="250" IsEnabled="False"
+                                <Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
                                         HorizontalContentAlignment="Center" x:Name="BtnShorten"
                                         Margin="0,0,0,10">
                                     <StackPanel Orientation="Horizontal">
@@ -220,10 +220,18 @@
                                             </StackPanel>
                                             <Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
                                         </StackPanel>
-
                                     </Button>
                                 </StackPanel>
-                                <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
+                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
+                                    <StackPanel Orientation="Vertical" >
+                                        <RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
+                                        <RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
+                                    </StackPanel>
+                                    <StackPanel Orientation="Vertical">
+                                        <CheckBox HorizontalAlignment="Left" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
+                                        <CheckBox HorizontalAlignment="Left" x:Name="CbMergeDeleteOld" IsChecked="False">Lösche ursprüngliche Sets</CheckBox>
+                                    </StackPanel>
+                                </StackPanel>
                             </StackPanel>
                         </Grid>
                         <Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
@@ -477,12 +485,20 @@
                                                  TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
                                                  x:Name="TbSettingsCustomerSenderAddress" />
                                     </Grid>
-                                    <Grid ColumnDefinitions="150,*">
+                                    <Grid ColumnDefinitions="150,*,Auto">
                                         <Label Content="CSV-Trennzeichen" />
                                         <TextBox Grid.Column="1" Watermark=","
-                                                 HorizontalAlignment="Stretch"
+                                                 HorizontalAlignment="Stretch" Margin="0,0,5,0"
                                                  TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
                                                  x:Name="TbSettingsCustomerCsvSeparator" />
+                                        <StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
+                                            <Button Click="ChangeCSVDivider" Content=","></Button>
+                                            <Button Click="ChangeCSVDivider" Content=";"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="TAB"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="|"></Button>
+                                            <Button Click="ChangeCSVDivider" Content="SPACE"></Button>
+                                            <Button Click="ChangeCSVDivider" Content=":"></Button>
+                                        </StackPanel>
                                     </Grid>
                                     <Grid ColumnDefinitions="150,*">
                                         <Label Content="Address-Patch-Info" />
@@ -509,7 +525,7 @@
                                                    VerticalContentAlignment="Center" />
                                         </StackPanel>
                                     </Button>
-                                    <Button Background="#99963434" HorizontalAlignment="Stretch"
+                                    <Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
                                             HorizontalContentAlignment="Center">
                                         <StackPanel Orientation="Horizontal">
                                             <LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />

NamingWindow.axaml

@@ -2,7 +2,7 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" SizeToContent="WidthAndHeight"
+        mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
         x:Class="Logof_Client.NamingWindow"
         Title="NamingWindow">
     <StackPanel Orientation="Vertical">

NamingWindow.axaml.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Avalonia.Controls;
 
@@ -45,12 +46,13 @@ public partial class NamingWindow : Window
             if (parent != null)
                 wind.ShowDialog(parent);
             else wind.Show();
+            wind.Focus();
 
             return tcs.Task;
         }
         catch (Exception ex)
         {
-            Console.WriteLine("Error while showing naming window: " + ex.Message);
+            Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
             return Task.FromResult<string>(null!);
         }
     }

ProgressWindow.axaml

@@ -3,7 +3,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
-        Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico"
+        Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico" WindowStartupLocation="CenterScreen" Topmost="True"
         x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
     <Grid>
         <!-- <ScrollViewer x:Name="ScvLog"> -->

ProgressWindow.axaml.cs

@@ -16,9 +16,9 @@ public partial class ProgressWindow : Window
         PbProgress.Value = percentage;
     }
 
-    public void AddToLog(string message)
+    public void AddToLog(string message, string percent)
     {
-        TbLog.Text = message;
+        TbLog.Text = message + $"\n{percent}%";
         //ScvLog.ScrollToEnd();
     }
 }

ResultWindow.axaml

@@ -20,7 +20,9 @@
                     Margin="10,10,10,10" />
         </Grid>
         <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-            <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" />
+            <!-- <TextBlock x:Name="TbResults"></TextBlock> -->
+            <ListBox x:Name="LbResults"></ListBox>
+            <!-- <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" /> -->
         </ScrollViewer>
 
     </Grid>

ResultWindow.axaml.cs

@@ -28,12 +28,25 @@ public partial class ResultWindow : Window
 
     private void GenerateView(List<KasPerson> 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";
+        try
+        {
 
-        StkResults.Children.Clear();
-        foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
+
+            // 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";
+
+            // TbResults.Text = "";
+            // foreach (var person in result_with_errors) TbResults.Text += person.PersonError.GetString()+"\n";
+            LbResults.Items.Clear();
+            foreach (var person in result_with_errors) LbResults.Items.Add(person.PersonError.ToString(person));
+            // StkResults.Children.Clear();
+            // foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
+        }
+        catch (Exception ex)
+        {
+            Logger.Log("Error while generating result view: " + ex.Message, Logger.LogType.Warning);
+        }
     }
 
     private Grid CreatePersonGrid(KasPerson person)
@@ -102,44 +115,52 @@ public partial class ResultWindow : Window
 
     private void Load(List<KasPerson> result)
     {
-        var knownErrors = new List<AddressCheck.ErrorTypes>();
-        var knownWarnings = new List<AddressCheck.WarningTypes>();
-
-        foreach (var person in result)
+        try
         {
-            if (person.PersonError == null) continue;
+            var knownErrors = new List<AddressCheck.ErrorTypes>();
+            var knownWarnings = new List<AddressCheck.WarningTypes>();
 
-            foreach (var errtyp in person.PersonError.errors)
-                if (!knownErrors.Contains(errtyp))
-                    knownErrors.Add(errtyp);
+            foreach (var person in result)
+            {
+                if (person.PersonError == null) continue;
 
-            foreach (var wartyp in person.PersonError.warnings)
-                if (!knownWarnings.Contains(wartyp))
-                    knownWarnings.Add(wartyp);
+                foreach (var errtyp in person.PersonError.errors)
+                    if (!knownErrors.Contains(errtyp))
+                        knownErrors.Add(errtyp);
+
+                foreach (var wartyp in person.PersonError.warnings)
+                    if (!knownWarnings.Contains(wartyp))
+                        knownWarnings.Add(wartyp);
+            }
+
+
+            foreach (var errtype in knownErrors)
+            {
+                var cb = new CheckBox();
+                cb.IsChecked = true;
+                cb.Content = errtype.ToString();
+                //cb.Click += (sender, e) => UpdateFilter();
+                errortypecheckboxes.Add(cb);
+                StpFilterOptions.Children.Add(cb);
+            }
+
+            foreach (var wartype in knownWarnings)
+            {
+                var cb = new CheckBox();
+                cb.IsChecked = true;
+                cb.Content = wartype.ToString();
+                //cb.Click += (sender, e) => UpdateFilter();
+                warningtypecheckboxes.Add(cb);
+                StpFilterOptions.Children.Add(cb);
+            }
+
+            GenerateView(result);
         }
-
-
-        foreach (var errtype in knownErrors)
+        catch (Exception ex)
         {
-            var cb = new CheckBox();
-            cb.IsChecked = true;
-            cb.Content = errtype.ToString();
-            //cb.Click += (sender, e) => UpdateFilter();
-            errortypecheckboxes.Add(cb);
-            StpFilterOptions.Children.Add(cb);
+            Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
         }
-
-        foreach (var wartype in knownWarnings)
-        {
-            var cb = new CheckBox();
-            cb.IsChecked = true;
-            cb.Content = wartype.ToString();
-            //cb.Click += (sender, e) => UpdateFilter();
-            warningtypecheckboxes.Add(cb);
-            StpFilterOptions.Children.Add(cb);
-        }
-
-        GenerateView(result);
+        
     }
 
     private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
@@ -148,7 +169,9 @@ public partial class ResultWindow : Window
 
     private void UpdateFilter()
     {
-        var temp_result = new List<KasPerson>();
+        try
+        {
+            var temp_result = new List<KasPerson>();
 
         var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
         var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
@@ -201,8 +224,17 @@ public partial class ResultWindow : Window
 
         LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
 
-        StkResults.Children.Clear();
-        foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
+        LbResults.Items.Clear();
+        foreach (var person in temp_result) LbResults.Items.Add(person.PersonError.ToString(person));
+        // TbResults.Text = "";
+        // foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
+        // StkResults.Children.Clear();
+        // foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
+        } catch (Exception ex)
+        {
+            Logger.Log("Error while updating filter: " + ex.Message, Logger.LogType.Warning);
+        }
+        
     }
 
 

Tasks/AddressCheck.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -38,227 +39,240 @@ public class AddressCheck
 
     public async Task<List<KasPerson>> Perform(int 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)
-            {
-                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;
-
-        await Task.Run(async () =>
+        try
         {
-            foreach (var person in adset.KasPersons)
+            // 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)
+                {
+                    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;
+
+            await Task.Run(async () =>
             {
-                var errors = new List<ErrorTypes>();
-                var warnings = new List<WarningTypes>();
-                var hasFaults = false;
-
-                var address_component_count = 2; // cause anrede and name are first
-
-                // PLZ-Prüfung
-                if (person.plz == "" || person.plz == null)
+                foreach (var person in adset.KasPersons)
                 {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoPLZ);
-                }
-                else
-                {
-                    if (!AddressCreator.CheckPLZ(person.plz, person.land))
+                    var errors = new List<ErrorTypes>();
+                    var warnings = new List<WarningTypes>();
+                    var hasFaults = false;
+
+                    var address_component_count = 2; // cause anrede and name are first
+
+                    // PLZ-Prüfung
+                    if (person.plz == "" || person.plz == null)
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.PlzNotUsable);
+                        warnings.Add(WarningTypes.NoPLZ);
+                    }
+                    else
+                    {
+                        if (!AddressCreator.CheckPLZ(person.plz, person.land))
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.PlzNotUsable);
+                        }
+                        // if ((person.plz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //     (person.plz < 10000 && person.land == "GER") ||
+                        //     (person.plz < 10000 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PlzTooShort);
+                        // }
+                        // else if ((person.plz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //          (person.plz > 99999 && person.land == "GER") ||
+                        //          (person.plz > 99999 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PlzTooLong);
+                        // }
                     }
-                    // if ((person.plz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //     (person.plz < 10000 && person.land == "GER") ||
-                    //     (person.plz < 10000 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PlzTooShort);
-                    // }
-                    // else if ((person.plz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //          (person.plz > 99999 && person.land == "GER") ||
-                    //          (person.plz > 99999 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PlzTooLong);
-                    // }
-                }
 
 
-                // PPLZ-Prüfung
-                if (person.pplz == "" || person.pplz == null)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoPPLZ);
-                }
-                else
-                {
-                    if (!AddressCreator.CheckPLZ(person.pplz, person.land))
+                    // PPLZ-Prüfung
+                    if (person.pplz == "" || person.pplz == null)
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.PPlzNotUsable);
+                        warnings.Add(WarningTypes.NoPPLZ);
+                    }
+                    else
+                    {
+                        if (!AddressCreator.CheckPLZ(person.pplz, person.land))
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.PPlzNotUsable);
+                        }
+
+                        // if ((person.pplz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //     (person.pplz < 10000 && person.land == "GER") ||
+                        //     (person.pplz < 10000 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PPlzTooShort);
+                        // }
+                        // else if ((person.pplz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
+                        //          (person.pplz > 99999 && person.land == "GER") ||
+                        //          (person.pplz > 99999 && person.land == "DE"))
+                        // {
+                        //     hasFaults = true;
+                        //     errors.Add(ErrorTypes.PPlzTooLong);
+                        // }
                     }
 
-                    // if ((person.pplz < 10000 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //     (person.pplz < 10000 && person.land == "GER") ||
-                    //     (person.pplz < 10000 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PPlzTooShort);
-                    // }
-                    // else if ((person.pplz > 99999 && string.IsNullOrWhiteSpace(person.land)) ||
-                    //          (person.pplz > 99999 && person.land == "GER") ||
-                    //          (person.pplz > 99999 && person.land == "DE"))
-                    // {
-                    //     hasFaults = true;
-                    //     errors.Add(ErrorTypes.PPlzTooLong);
-                    // }
-                }
-
-                if (warnings.Contains(WarningTypes.NoPLZ) && warnings.Contains(WarningTypes.NoPPLZ))
-                {
-                    hasFaults = true;
-                    errors.Add(ErrorTypes.NoPLZorPPLZ);
-                }
-
-                // Ort-Prüfung
-                if (string.IsNullOrWhiteSpace(person.ort))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoCity);
-                }
-                else
-                {
-                    address_component_count++;
-                }
-
-                // Street-Number
-                var street = person.strasse.ToCharArray();
-                var intcount = 0;
-                foreach (var c in street)
-                {
-                    int maybe;
-                    if (int.TryParse(c.ToString(), out maybe)) intcount++;
-                }
-
-                if (intcount == 0)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoStreetNumber);
-                }
-
-                // Last-Name
-                if (string.IsNullOrWhiteSpace(person.name))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoLastName);
-                }
-
-                // First-Name
-                if (string.IsNullOrWhiteSpace(person.vorname))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoFirstName);
-                }
-
-                // Street-Check
-                if (string.IsNullOrWhiteSpace(person.strasse))
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.NoStreet);
-                }
-                else
-                {
-                    address_component_count++;
-                }
-
-                // Address-Component-Count
-                if (!string.IsNullOrWhiteSpace(person.strasse2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.land)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name1)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name3)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name4)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.name5)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktion)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktion2)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.funktionad)) address_component_count++;
-                if (!string.IsNullOrWhiteSpace(person.abteilung)) address_component_count++;
-
-                // Double-Refsid or DoubleAddresses
-                foreach (var person2 in adset.KasPersons)
-                {
-                    if (adset.KasPersons.IndexOf(person) == adset.KasPersons.IndexOf(person2)) continue;
-
-                    if (person.refsid == person2.refsid) // trifft auf Patch-Addressen nicht zu
+                    if (warnings.Contains(WarningTypes.NoPLZ) && warnings.Contains(WarningTypes.NoPPLZ))
                     {
                         hasFaults = true;
-                        warnings.Add(WarningTypes.DoubledRefsid);
+                        errors.Add(ErrorTypes.NoPLZorPPLZ);
                     }
 
-                    if (person.name == person2.name &&
-                        person.strasse == person2.strasse &&
-                        person.vorname == person2.vorname &&
-                        person.ort == person2.ort &&
-                        person.funktion == person2.funktion &&
-                        person.funktion2 == person2.funktion2 &&
-                        person.funktionad == person2.funktionad &&
-                        person.abteilung == person2.abteilung &&
-                        person.name1 == person2.name1 &&
-                        person.name2 == person2.name2 &&
-                        person.name3 == person2.name3 &&
-                        person.name4 == person2.name4 &&
-                        person.name5 == person2.name5) // 
-
+                    // Ort-Prüfung
+                    if (string.IsNullOrWhiteSpace(person.ort))
                     {
                         hasFaults = true;
-                        errors.Add(ErrorTypes.MayBeSameAddress);
+                        warnings.Add(WarningTypes.NoCity);
                     }
-                }
-
-                // Adressen-Länge
-                if (address_component_count > 10)
-                {
-                    hasFaults = true;
-                    warnings.Add(WarningTypes.FullAddressTooLong);
-                }
-
-                if (hasFaults)
-                    lock (Settings._instance.addressSets.addresses)
+                    else
                     {
-                        // 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));
+                        address_component_count++;
+                    }
+
+                    // Street-Number
+                    var street = person.strasse.ToCharArray();
+                    var intcount = 0;
+                    foreach (var c in street)
+                    {
+                        int maybe;
+                        if (int.TryParse(c.ToString(), out maybe)) intcount++;
+                    }
+
+                    if (intcount == 0)
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoStreetNumber);
+                    }
+
+                    // Last-Name
+                    if (string.IsNullOrWhiteSpace(person.name))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoLastName);
+                    }
+
+                    // First-Name
+                    if (string.IsNullOrWhiteSpace(person.vorname))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoFirstName);
+                    }
+
+                    // Street-Check
+                    if (string.IsNullOrWhiteSpace(person.strasse))
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.NoStreet);
+                    }
+                    else
+                    {
+                        address_component_count++;
+                    }
+
+                    // Address-Component-Count
+                    if (!string.IsNullOrWhiteSpace(person.strasse2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.land)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name1)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name3)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name4)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.name5)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktion)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktion2)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.funktionad)) address_component_count++;
+                    if (!string.IsNullOrWhiteSpace(person.abteilung)) address_component_count++;
+
+                    // Double-Refsid or DoubleAddresses
+                    foreach (var person2 in adset.KasPersons)
+                    {
+                        if (adset.KasPersons.IndexOf(person) == adset.KasPersons.IndexOf(person2)) continue;
+
+                        if (person.refsid == person2.refsid) // trifft auf Patch-Addressen nicht zu
+                        {
+                            hasFaults = true;
+                            warnings.Add(WarningTypes.DoubledRefsid);
+                        }
+
+                        if (person.name == person2.name &&
+                            person.strasse == person2.strasse &&
+                            person.vorname == person2.vorname &&
+                            person.ort == person2.ort &&
+                            person.funktion == person2.funktion &&
+                            person.funktion2 == person2.funktion2 &&
+                            person.funktionad == person2.funktionad &&
+                            person.abteilung == person2.abteilung &&
+                            person.name1 == person2.name1 &&
+                            person.name2 == person2.name2 &&
+                            person.name3 == person2.name3 &&
+                            person.name4 == person2.name4 &&
+                            person.name5 == person2.name5) // 
+
+                        {
+                            hasFaults = true;
+                            errors.Add(ErrorTypes.MayBeSameAddress);
+                        }
+                    }
+
+                    // Adressen-Länge
+                    if (address_component_count > 10)
+                    {
+                        hasFaults = true;
+                        warnings.Add(WarningTypes.FullAddressTooLong);
                     }
 
-                // Fortschritt aktualisieren
-                Interlocked.Increment(ref current);
-                var percent = current / (double)total * 100;
-                await Dispatcher.UIThread.InvokeAsync(() =>
-                {
                     if (hasFaults)
-                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
+                        lock (Settings._instance.addressSets.addresses)
+                        {
+                            // 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));
+                        }
 
-                    _progress.ChangePercentage(percent);
-                });
-            }
-        });
+                    // Fortschritt aktualisieren
+                    Interlocked.Increment(ref current);
+                    var percent = current / (double)total * 100;
+                    await Dispatcher.UIThread.InvokeAsync(() =>
+                    {
+                        if (hasFaults)
+                            _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
+                                Convert.ToInt32(percent).ToString());
 
-        Settings.Save();
+                        _progress.ChangePercentage(percent);
+                    });
+                }
+            });
 
-        // Return only the persons with errors from the address set
-        return Settings._instance.addressSets.addresses[adset_index].KasPersons
-            .Where(p => p.PersonError != null)
-            .ToList();
+            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();
+
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address check: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return null;
     }
+
 }

Tasks/AddressCreation.cs

@@ -43,177 +43,195 @@ public static class AddressCreator
     public static string? CreateFinalMarkdownString(int id)
     {
         // Maximum seven lines of information
-
-        // find the address
-        KasPerson? address = null;
-        var string_address = "";
-        var address_line_count = 0;
-        foreach (var set in Settings._instance.addressSets.addresses)
+        try
         {
-            var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
-            if (temp != null)
-            {
-                address = temp;
-                break;
-            }
-        }
-
-        // no address found
-        if (address == null) return null;
-
-        // let's get started: we start from the bottom
-        // if the country is not Germany, set it; try to map via Global countries alternatives -> translation
-        var trimmedLand = (address.land ?? "").Trim();
-        var trimmedLowerLand = trimmedLand.ToLower();
-        var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
-                        trimmedLowerLand == "" || trimmedLowerLand == "de" ||
-                        trimmedLowerLand == "deutschland";
-
-        if (!isGermany)
-        {
-            var countryToShow = trimmedLand; // default: use raw land value
-
-            if (!string.IsNullOrEmpty(trimmedLand))
-                // search for matching country via alternatives using for-loops
-                for (var ci = 0; ci < Global._instance.countries.Count; ci++)
-                {
-                    var country = Global._instance.countries[ci];
-                    for (var ai = 0; ai < country.alternatives.Count; ai++)
-                        try
+            // find the address
+                    KasPerson? address = null;
+                    var string_address = "";
+                    var address_line_count = 0;
+                    foreach (var set in Settings._instance.addressSets.addresses)
+                    {
+                        var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
+                        if (temp != null)
                         {
-                            var alt = (country.alternatives[ai] ?? "").Trim();
-                            if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
+                            address = temp;
+                            break;
+                        }
+                    }
+            
+                    // no address found
+                    if (address == null) return null;
+            
+                    // let's get started: we start from the bottom
+                    // if the country is not Germany, set it; try to map via Global countries alternatives -> translation
+                    var trimmedLand = (address.land ?? "").Trim();
+                    var trimmedLowerLand = trimmedLand.ToLower();
+                    var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
+                                    trimmedLowerLand == "" || trimmedLowerLand == "de" ||
+                                    trimmedLowerLand == "deutschland";
+            
+                    if (!isGermany)
+                    {
+                        var countryToShow = trimmedLand; // default: use raw land value
+            
+                        if (!string.IsNullOrEmpty(trimmedLand))
+                            // search for matching country via alternatives using for-loops
+                            for (var ci = 0; ci < Global._instance.countries.Count; ci++)
                             {
-                                countryToShow = string.IsNullOrWhiteSpace(country.translation)
-                                    ? country.name
-                                    : country.translation;
-                                goto CountryFound;
+                                var country = Global._instance.countries[ci];
+                                for (var ai = 0; ai < country.alternatives.Count; ai++)
+                                    try
+                                    {
+                                        var alt = (country.alternatives[ai] ?? "").Trim();
+                                        if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
+                                        {
+                                            countryToShow = string.IsNullOrWhiteSpace(country.translation)
+                                                ? country.name
+                                                : country.translation;
+                                            goto CountryFound;
+                                        }
+                                    }
+                                    catch
+                                    {
+                                        // ignore malformed alternative
+                                    }
                             }
-                        }
-                        catch
+            
+                        CountryFound:
+                        string_address = "**" + countryToShow + "**"; // Needs to be bold
+                        address_line_count++;
+                    }
+            
+                    // Alternative A: pplz valid and city existing
+                    if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
+                    {
+                        string_address = address.pplz + " " + address.ort + "\n" + string_address;
+                        address_line_count++;
+                        if (!string.IsNullOrWhiteSpace(address.postfach))
                         {
-                            // ignore malformed alternative
+                            string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
+                            address_line_count++;
                         }
-                }
-
-            CountryFound:
-            string_address = "**" + countryToShow + "**"; // Needs to be bold
-            address_line_count++;
+                        else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
+                        {
+                            string_address = address.strasse.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 + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        // REIHENFOLGE
+                        var nameattribs = new[]
+                            { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
+            
+                        var names = "";
+                        for (var i = 0; i < nameattribs.Length; i++)
+                            try
+                            {
+                                if (address_line_count >= 7) break;
+                                if (!string.IsNullOrWhiteSpace(nameattribs[i]))
+                                {
+                                    names += "\n" + nameattribs[i];
+                                    address_line_count++;
+                                }
+                            }
+                            catch
+                            {
+                                Console.WriteLine("ERROR 15821");
+                            }
+            
+                        string_address = names + "\n" + string_address;
+                    } // Alternative B: plz valid and city existing 
+                    else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
+                    {
+                        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 if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
+                        {
+                            string_address = "Postfach " + 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 + "\n" + string_address;
+                            address_line_count++;
+                        }
+            
+                        var nameattribs = new[]
+                            { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
+            
+                        var names = "";
+                        for (var i = 0; i < nameattribs.Length; i++)
+                            try
+                            {
+                                if (address_line_count >= 7) break;
+                                if (!string.IsNullOrWhiteSpace(nameattribs[i]))
+                                {
+                                    names += "\n" + nameattribs[i];
+                                    address_line_count++;
+                                }
+                            }
+                            catch
+                            {
+                                Console.WriteLine("ERROR 15821");
+                            }
+            
+                        string_address = names + "\n" + string_address;
+                    } // Error-Handling?
+            
+                    if (address_line_count > 1) return string_address;
+                    return null;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while creating markdown string: {ex.Message}", Logger.LogType.Error);
         }
 
-        // Alternative A: pplz valid and city existing
-        if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
-        {
-            string_address = address.pplz + " " + address.ort + "\n" + string_address;
-            address_line_count++;
-            if (!string.IsNullOrWhiteSpace(address.postfach))
-            {
-                string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
-                address_line_count++;
-            }
-            else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
-            {
-                string_address = address.strasse.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 + "\n" + string_address;
-                address_line_count++;
-            }
-
-            // REIHENFOLGE
-            var nameattribs = new[]
-                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
-
-            var names = "";
-            for (var i = 0; i < nameattribs.Length; i++)
-                try
-                {
-                    if (address_line_count >= 7) break;
-                    if (!string.IsNullOrWhiteSpace(nameattribs[i]))
-                    {
-                        names += "\n" + nameattribs[i];
-                        address_line_count++;
-                    }
-                }
-                catch
-                {
-                    Console.WriteLine("ERROR 15821");
-                }
-
-            string_address = names + "\n" + string_address;
-        } // Alternative B: plz valid and city existing 
-        else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
-        {
-            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 if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
-            {
-                string_address = "Postfach " + 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 + "\n" + string_address;
-                address_line_count++;
-            }
-
-            var nameattribs = new[]
-                { address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
-
-            var names = "";
-            for (var i = 0; i < nameattribs.Length; i++)
-                try
-                {
-                    if (address_line_count >= 7) break;
-                    if (!string.IsNullOrWhiteSpace(nameattribs[i]))
-                    {
-                        names += "\n" + nameattribs[i];
-                        address_line_count++;
-                    }
-                }
-                catch
-                {
-                    Console.WriteLine("ERROR 15821");
-                }
-
-            string_address = names + "\n" + string_address;
-        } // Error-Handling?
-
-        if (address_line_count > 1) return string_address;
         return null;
     }
 
     public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
         string name, string namezus)
     {
-        if (!string.IsNullOrWhiteSpace(anredezus))
+        try
+        {
+            if (!string.IsNullOrWhiteSpace(anredezus))
+                    return string.Join(" ",
+                               new[] { anredezus, titel, vorname, adel, name }
+                                   .Where(s => !string.IsNullOrWhiteSpace(s))
+                           )
+                           + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+        
+            // else 
             return string.Join(" ",
-                       new[] { anredezus, titel, vorname, adel, name }
+                       new[] { anrede, titel, vorname, adel, name }
                            .Where(s => !string.IsNullOrWhiteSpace(s))
                    )
                    + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address name line creation: {ex.Message}", Logger.LogType.Error);
+        }
 
-        // else 
-        return string.Join(" ",
-                   new[] { anrede, titel, vorname, adel, name }
-                       .Where(s => !string.IsNullOrWhiteSpace(s))
-               )
-               + (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
+        return null;
+        
     }
 
     /// <summary>
@@ -224,29 +242,39 @@ public static class AddressCreator
     /// <returns>true or faslse, depending on result :+1:</returns>
     public static bool CheckPLZ(string plz, string land)
     {
-        if (string.IsNullOrWhiteSpace(plz)) return false;
+        try
+        {
+            if (string.IsNullOrWhiteSpace(plz)) return false;
+            
+            var trimmedPlz = plz.Trim();
+            var trimmedLand = land.ToLower().Trim();
+    
+            // Check if it's a German country code
+            var isGermany = trimmedLand == "germany" || trimmedLand == "ger" || trimmedLand == "de" ||
+                            trimmedLand == "deutschland" || trimmedLand == "";
+    
+            if (isGermany)
+                // For Germany (including empty land), accept numeric postal codes with 5 digits
+                try
+                {
+                    var iplz = Convert.ToInt32(trimmedPlz);
+                    if (trimmedPlz.Length == 5) return true;
+                    return false;
+                }
+                catch
+                {
+                    return false;
+                }
+    
+            // For non-German countries, accept any non-empty postal code
+            return true;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address plz check: {ex.Message}", Logger.LogType.Error);
+        }
 
-        var trimmedPlz = plz.Trim();
-        var trimmedLand = land.ToLower().Trim();
-
-        // Check if it's a German country code
-        var isGermany = trimmedLand == "germany" || trimmedLand == "ger" || trimmedLand == "de" ||
-                        trimmedLand == "deutschland" || trimmedLand == "";
-
-        if (isGermany)
-            // For Germany (including empty land), accept numeric postal codes with 5 digits
-            try
-            {
-                var iplz = Convert.ToInt32(trimmedPlz);
-                if (trimmedPlz.Length == 5) return true;
-                return false;
-            }
-            catch
-            {
-                return false;
-            }
-
-        // For non-German countries, accept any non-empty postal code
-        return true;
+        return false;
+        
     }
 }

Tasks/AddressPatch.cs

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using Logof_Client;
 
 public class AddressPatch
 {
@@ -58,61 +59,82 @@ public class AddressPatch
 
     public static AddressPatch Import(Uri filename)
     {
-        var patch = new AddressPatch();
-
-        // Alle Zeilen aus der Datei laden
-        var lines = File.ReadAllLines(filename.LocalPath);
-
-        // Alle Properties der Klasse (Strings und bools)
-        var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
-
-        // Nur die Properties, die mit _is enden (also die String-Werte)
-        var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
-
-        foreach (var prop in stringProps)
+        try
         {
-            // Beispiel: prop.Name = "name_is"
-            var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
-
-            // In der Datei wird nach "name:" gesucht (ohne _is)
-            var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
-            if (line != null)
-            {
-                // Wert extrahieren (alles nach dem Doppelpunkt)
-                var value = line.Substring(line.IndexOf(':') + 1).Trim();
-
-                // Wert im Patch-Objekt setzen
-                prop.SetValue(patch, value);
-
-                // Passendes has_ Feld aktivieren, z.B. "has_name"
-                var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
-                if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
-            }
+            var patch = new AddressPatch();
+            
+                    // Alle Zeilen aus der Datei laden
+                    var lines = File.ReadAllLines(filename.LocalPath);
+            
+                    // Alle Properties der Klasse (Strings und bools)
+                    var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            
+                    // Nur die Properties, die mit _is enden (also die String-Werte)
+                    var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
+            
+                    foreach (var prop in stringProps)
+                    {
+                        // Beispiel: prop.Name = "name_is"
+                        var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
+            
+                        // In der Datei wird nach "name:" gesucht (ohne _is)
+                        var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
+                        if (line != null)
+                        {
+                            // Wert extrahieren (alles nach dem Doppelpunkt)
+                            var value = line.Substring(line.IndexOf(':') + 1).Trim();
+            
+                            // Wert im Patch-Objekt setzen
+                            prop.SetValue(patch, value);
+            
+                            // Passendes has_ Feld aktivieren, z.B. "has_name"
+                            var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
+                            if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
+                        }
+                    }
+            
+                    return patch;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while importing address patch: {ex.Message}", Logger.LogType.Error);
         }
 
-        return patch;
+        return null;
+
+
     }
 
 
     public override string ToString()
     {
-        var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
-        var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
-
-        var lines = new StringBuilder();
-
-        foreach (var prop in stringProps)
+        try
         {
-            // passendes has_ Feld
-            var hasProp =
-                properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
-            if (hasProp != null && (bool)hasProp.GetValue(this))
-            {
-                var value = (string)prop.GetValue(this);
-                lines.AppendLine($"{prop.Name} => {value}");
-            }
+            var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+                    var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
+            
+                    var lines = new StringBuilder();
+            
+                    foreach (var prop in stringProps)
+                    {
+                        // passendes has_ Feld
+                        var hasProp =
+                            properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
+                        if (hasProp != null && (bool)hasProp.GetValue(this))
+                        {
+                            var value = (string)prop.GetValue(this);
+                            lines.AppendLine($"{prop.Name} => {value}");
+                        }
+                    }
+            
+                    return lines.ToString().TrimEnd();
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while parsing: {ex.Message}", Logger.LogType.Error);
         }
 
-        return lines.ToString().TrimEnd();
+        return "Error while parsing";
+        
     }
 }

Tasks/AddressRepair.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 
 namespace Logof_Client;
@@ -9,15 +10,16 @@ public class AddressRepair(ProgressWindow progressWindow)
     public KasAddressList Perform(KasAddressList all_addresses,
         List<(int, List<AddressCheck.ErrorTypes>)> failed_addresses)
     {
-        // foreach (var k in all_addresses.KasPersons)
-        // foreach (var p in failed_addresses)
-        // {
-        //     if (k.refsid != p.Item1) continue;
-        //
-        //     if (p.Item1.Contains(AddressCheck.WarningTypes.DoubledRefsid))
-        //     {
-        //     }
-        // }
+        try
+        {
+            
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address repair: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return null;
 
         return null;
     }

Tasks/AddressShortener.cs

@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Threading.Tasks.Dataflow;
+
+namespace Logof_Client;
+
+public class AddressShortener(ProgressWindow progressWindow)
+{
+    private readonly ProgressWindow _progress = progressWindow;
+
+    public async Task Perform(KasAddressList list)
+    {
+        try
+        {
+            List<int> doubled_ids = new List<int>();
+                    for (int i = 0; i < list.KasPersons.Count; i++)
+                    {
+                        var address =  list.KasPersons[i];
+                        for (int j = 0; j < list.KasPersons.Count; j++)
+                        {
+                            if (i == j) continue;
+                            var sec_address =  list.KasPersons[j];
+                            
+                            if (address.refsid == sec_address.refsid && !doubled_ids.Contains(address.refsid) && address.refsid != 0)
+                            {
+                                doubled_ids.Add(address.refsid);
+                            }
+                        }
+                    }
+                    
+                    
+                    // delete doubled addresses by refsid
+                    foreach (int id in doubled_ids)
+                    {
+                        // does this remove both of the doubled addresses?
+                        list.KasPersons.Remove(list.KasPersons.FirstOrDefault(x => x.refsid == id));
+                    }
+            
+                    List<int> toRemove = new List<int>();
+                    foreach (var address in list.KasPersons)
+                    {
+                        try
+                        {
+                            if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.NoPLZorPPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                            else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
+                                     address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable))
+                            {
+                                toRemove.Add(address.id);
+                            } else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
+                                       address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                            else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable) &&
+                                     address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPLZ))
+                            {
+                                toRemove.Add(address.id);
+                            }
+                        }
+                        catch
+                        {
+                            Console.WriteLine("PersonError not accessible: " + address.id);
+                        }
+                    }
+                    
+                    // delete doubled addresses by refsid
+                    foreach (int id in toRemove)
+                    {
+                        // does this remove both of the doubled addresses?
+                        list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
+                    }
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address shortener: {ex.Message}", Logger.LogType.Error);
+        }
+        
+    }
+}

Tasks/CombineAddresses.cs

@@ -15,16 +15,59 @@ public class CombineAddresses
     {
         _progress = progressWindow;
     }
+    
+    public enum CombineType
+    {
+        refsid,
+        final_adress,
+        none
+    }
 
-    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
+    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
+        bool? exportUnused, bool? deleteOld)
+    {
+        try
+        {
+            var result = await Execute(address_lists,type,comb_type,exportUnused);
+            
+                    if (deleteOld == true)
+                    {
+                        foreach (var list in address_lists)
+                        {
+                            Settings._instance.addressSets.addresses.Remove(list);
+                        }
+                    }
+            
+                    return result;
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing address combining: {ex.Message}", Logger.LogType.Error);
+        }
+
+        return (null,null);
+        
+
+    }
+
+    private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
         bool? exportUnused)
     {
-        if (type == "difference") return await Difference(address_lists, exportUnused);
-        if (type == "union") return await Union(address_lists, exportUnused);
-        if (type == "intersection") return await Intersection(address_lists, exportUnused);
-        if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
+        try
+        {
+            if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
+            if (type == "union") return await Union(address_lists, comb_type, exportUnused);
+            if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
+            if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
+            return (null, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while executing address combining: {ex.Message}", Logger.LogType.Error);
+        }
 
-        return (null, null);
+        return (null,null);
+        
     }
 
 
@@ -35,11 +78,13 @@ public class CombineAddresses
     /// <param name="second">Second address to compare</param>
     /// <param name="only_refsid">If true, only a refsid-check will be done</param>
     /// <returns></returns>
-    public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
+    public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
     {
+        
         // A refsid of 0 means "missing", so it must not collapse unrelated entries.
-        if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
-        if (!only_refsid)
+        if(comb_type == CombineType.refsid)
+            if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
+        if (comb_type == CombineType.final_adress)
             if (first.name == second.name &&
                 first.anrede == second.anrede &&
                 first.anredzus == second.anredzus &&
@@ -68,81 +113,105 @@ public class CombineAddresses
         return false;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused,
         Progress? progress = null)
     {
-        if (address_lists == null || address_lists.Count == 0)
-            return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
-
-        progress ??= new Progress
+        try
         {
-            TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
-            ComparedPersons = 0
-        };
-
-        // Vereinigung aller Listen außer der ersten
-        var restUnion = new List<KasPerson>();
-        for (var i = 1; i < address_lists.Count; i++)
-            restUnion.AddRange(address_lists[i].KasPersons);
-        var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
-
-        foreach (var person in address_lists[0].KasPersons)
+            if (address_lists == null || address_lists.Count == 0)
+                return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
+    
+            progress ??= new Progress
+            {
+                TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
+                ComparedPersons = 0
+            };
+    
+            // Vereinigung aller Listen außer der ersten
+            var restUnion = new List<KasPerson>();
+            for (var i = 1; i < address_lists.Count; i++)
+                restUnion.AddRange(address_lists[i].KasPersons);
+            var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
+            var second_result = new KasAddressList("none");
+            if(return_unused == true)
+                second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
+    
+            foreach (var person in address_lists[0].KasPersons)
+            {
+                var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
+                if (!isDouble)
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+    
+                progress.Increment();
+                if (progress.LogAction == null) continue;
+                var logMessage =
+                    $"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
+                await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
+            }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
         {
-            var isDouble = restUnion.Any(p => CompareAddresses(person, p));
-            if (!isDouble)
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
-
-
-            progress.Increment();
-            if (progress.LogAction == null) continue;
-            var logMessage =
-                $"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
-            await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
+            Logger.Log($"Error while performing difference-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        if (return_unused == true) return (result, second_result);
-        return (result, null);
+        return (null,null);
+        
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
+    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
         Progress progress = null)
     {
-        var result = new KasAddressList(await KasAddressList.GenerateName("union"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        var total = address_lists.Sum(l => l.KasPersons.Count);
-        var processed = 0;
-
-        foreach (var list in address_lists)
-        foreach (var person in list.KasPersons)
+        try
         {
-            if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
-
-            processed++;
-            var percent = processed / (double)total * 100;
-            var logMessage =
-                $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
-
-            if (progress == null) continue;
-            if (Dispatcher.UIThread.CheckAccess())
-                progress.LogAction?.Invoke(logMessage);
-            else
-                Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+            var result = new KasAddressList(await KasAddressList.GenerateName("union"));
+            var second_result = new KasAddressList("none");
+            if(return_unused == true)
+                second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
+    
+            if (address_lists == null || address_lists.Count == 0)
+                return (result, null);
+    
+            var total = address_lists.Sum(l => l.KasPersons.Count);
+            var processed = 0;
+    
+            foreach (var list in address_lists)
+            foreach (var person in list.KasPersons)
+            {
+                if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
+    
+                if (progress == null) continue;
+                if (Dispatcher.UIThread.CheckAccess())
+                    progress.LogAction?.Invoke(logMessage);
+                else
+                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+            }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing union-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        if (return_unused == true) return (result, second_result);
-        return (result, null);
+        return (null,null);
+        
     }
 
 
@@ -151,169 +220,132 @@ public class CombineAddresses
         return null;
     }
 
-    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        // Nur die erste Liste als Ausgangspunkt verwenden
-        var baseList = address_lists[0];
-        var otherLists = address_lists.Skip(1).ToList();
-
-        var total = baseList.KasPersons.Count;
-        var processed = 0;
-
-        foreach (var person in baseList.KasPersons)
+        try
         {
-            // Prüfen, ob Person in *allen* anderen Listen vorkommt
-            var isInAll = otherLists.All(list =>
-                list.KasPersons.Any(existing => CompareAddresses(existing, person)));
-
-            if (isInAll)
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
-
-            processed++;
-            var percent = processed / (double)total * 100;
-            var logMessage =
-                $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
-
-            // Sicher und nicht blockierend loggen
-            if (progress != null)
+            var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
+            var second_result = new KasAddressList("none");
+            if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
+    
+            if (address_lists == null || address_lists.Count == 0)
+                return (result, null);
+    
+            // Nur die erste Liste als Ausgangspunkt verwenden
+            var baseList = address_lists[0];
+            var otherLists = address_lists.Skip(1).ToList();
+    
+            var total = baseList.KasPersons.Count;
+            var processed = 0;
+    
+            foreach (var person in baseList.KasPersons)
             {
-                if (Dispatcher.UIThread.CheckAccess())
-                    progress.LogAction?.Invoke(logMessage);
+                // Prüfen, ob Person in *allen* anderen Listen vorkommt
+                var isInAll = otherLists.All(list =>
+                    list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
+    
+                if (isInAll)
+                    result.KasPersons.Add(person);
                 else
-                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                    second_result.KasPersons.Add(person);
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
+    
+                // Sicher und nicht blockierend loggen
+                if (progress != null)
+                {
+                    if (Dispatcher.UIThread.CheckAccess())
+                        progress.LogAction?.Invoke(logMessage);
+                    else
+                        Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                }
             }
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing intersection-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        if (return_unused == true) return (result, second_result);
-        return (result, null);
+        return (null,null);
+        
     }
 
 
-    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
+    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
         bool? return_unused, Progress progress = null)
     {
-        var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
-        var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
-
-        if (address_lists == null || address_lists.Count == 0)
-            return (result, null);
-
-        var total = address_lists.Sum(l => l.KasPersons.Count);
-        var processed = 0;
-
-        // Wir sammeln alle Personen + zählen, wie oft sie vorkommen
-        var allPersons = new List<(KasPerson person, int count)>();
-
-        foreach (var list in address_lists)
-        foreach (var person in list.KasPersons)
+        try
         {
-            // Prüfen, ob schon vorhanden
-            var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
-            if (existing.person != null)
+            var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
+            var second_result = new KasAddressList("none");
+            if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
+    
+            if (address_lists == null || address_lists.Count == 0)
+                return (result, null);
+    
+            var total = address_lists.Sum(l => l.KasPersons.Count);
+            var processed = 0;
+    
+            // Wir sammeln alle Personen + zählen, wie oft sie vorkommen
+            var allPersons = new List<(KasPerson person, int count)>();
+    
+            foreach (var list in address_lists)
+            foreach (var person in list.KasPersons)
             {
-                // Falls schon drin → Vorkommen erhöhen
-                var index = allPersons.IndexOf(existing);
-                allPersons[index] = (existing.person, existing.count + 1);
-            }
-            else
-            {
-                // Neu hinzufügen
-                allPersons.Add((person, 1));
-            }
-
-            processed++;
-            var percent = processed / (double)total * 100;
-            var logMessage =
-                $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
-
-            if (progress != null)
-            {
-                if (Dispatcher.UIThread.CheckAccess())
-                    progress.LogAction?.Invoke(logMessage);
+                // Prüfen, ob schon vorhanden
+                var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
+                if (existing.person != null)
+                {
+                    // Falls schon drin → Vorkommen erhöhen
+                    var index = allPersons.IndexOf(existing);
+                    allPersons[index] = (existing.person, existing.count + 1);
+                }
                 else
-                    Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                {
+                    // Neu hinzufügen
+                    allPersons.Add((person, 1));
+                }
+    
+                processed++;
+                var percent = processed / (double)total * 100;
+                var logMessage =
+                    $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
+    
+                if (progress != null)
+                {
+                    if (Dispatcher.UIThread.CheckAccess())
+                        progress.LogAction?.Invoke(logMessage);
+                    else
+                        Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
+                }
             }
+    
+            // Nur diejenigen übernehmen, die *genau einmal* vorkamen
+            foreach (var (person, count) in allPersons)
+                if (count == 1)
+                    result.KasPersons.Add(person);
+                else
+                    second_result.KasPersons.Add(person);
+    
+            if (return_unused == true) return (result, second_result);
+            return (result, null);
+        }
+        catch (Exception ex)
+        {
+            Logger.Log($"Error while performing symdiff-combining: {ex.Message}", Logger.LogType.Error);
         }
 
-        // Nur diejenigen übernehmen, die *genau einmal* vorkamen
-        foreach (var (person, count) in allPersons)
-            if (count == 1)
-                result.KasPersons.Add(person);
-            else
-                second_result.KasPersons.Add(person);
-
-        if (return_unused == true) return (result, second_result);
-        return (result, null);
+        return (null,null);
+        
     }
-
-
-    // private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
-    // {
-    //     foreach (var sec in second.KasPersons)
-    //     {
-    //         var is_new = true;
-    //         foreach (var fi in first.KasPersons)
-    //         {
-    //             if (fi.refsid == sec.refsid)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //
-    //             if (fi.name == sec.name &&
-    //                 fi.anrede == sec.anrede &&
-    //                 fi.anredzus == sec.anredzus &&
-    //                 fi.namezus == sec.namezus &&
-    //                 fi.titel == sec.titel &&
-    //                 fi.adel == sec.adel &&
-    //                 fi.strasse == sec.strasse &&
-    //                 fi.strasse2 == sec.strasse2 &&
-    //                 fi.vorname == sec.vorname &&
-    //                 fi.ort == sec.ort &&
-    //                 fi.land == sec.land &&
-    //                 fi.plz == sec.plz &&
-    //                 fi.pplz == sec.pplz &&
-    //                 fi.funktion == sec.funktion &&
-    //                 fi.funktion2 == sec.funktion2 &&
-    //                 fi.funktionad == sec.funktionad &&
-    //                 fi.abteilung == sec.abteilung &&
-    //                 fi.postfach == sec.postfach &&
-    //                 fi.name1 == sec.name1 &&
-    //                 fi.name2 == sec.name2 &&
-    //                 fi.name3 == sec.name3 &&
-    //                 fi.name4 == sec.name4 &&
-    //                 fi.name5 == sec.name5)
-    //             {
-    //                 is_new = false;
-    //                 break;
-    //             }
-    //         }
-    //
-    //         if (is_new) first.KasPersons.Add(sec);
-    //         var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
-    //         var percent = (num + (double)subperc) / total * 100;
-    //         await Dispatcher.UIThread.InvokeAsync(() =>
-    //         {
-    //             if (is_new)
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
-    //             else
-    //                 _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
-    //
-    //             _progress.ChangePercentage(percent);
-    //         });
-    //     }
-    //
-    //     return first;
-    // }
+    
 }
 
 public class Progress

Wiki/EditorWindow.axaml

@@ -2,16 +2,16 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="Logof_Client.Wiki.EditorWindow"
         Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
-    <Grid>
+    <Grid Margin="10,0,10,10">
         <Grid.RowDefinitions>
             <RowDefinition Height="50" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal">
+        <StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
             <Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
             <Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
             <Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
         </StackPanel>
-        <TextBox Grid.Row="1" x:Name="TbContent" />
+        <TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
     </Grid>
 </Window>

Wiki/EditorWindow.axaml.cs

@@ -52,7 +52,11 @@ public partial class EditorWindow : Window
     {
         var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
         if (result == MessageBoxResult.No) return;
-        File.Delete(filename);
+        try
+        {
+            File.Delete(filename);
+        } catch {}
+        
         MainWindow._instance.PopulateNavTree();
         Close();
     }