[feat:] (opt) delete original sets after merging

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

@@ -135,7 +135,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
@@ -150,6 +150,11 @@ public class Customer
         ID = highestID + 1;
     }
     
+    public override string ToString()
+    {
+        return name;
+    }
+
     public string name { get; set; } = "";
     public string description { get; set; } = "";
     public string sender_address { get; set; } = "";
@@ -158,11 +163,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

MainWindow.axaml

@@ -220,14 +220,18 @@
                                             </StackPanel>
                                             <Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
                                         </StackPanel>
-
                                     </Button>
                                 </StackPanel>
-                                <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+                                <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>
-                                <CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
+                                    <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">

MainWindow.axaml.cs

@@ -171,27 +171,6 @@ public partial class MainWindow : Window
         }
     }
 
-    private async void BtnChooseFile_OnClick(object? sender, RoutedEventArgs e)
-    {
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "KAS-CSV-Datei auswählen",
-            AllowMultiple = false,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Datei")
-                {
-                    Patterns = new[] { "*.csv" }
-                }
-            }
-        });
-
-        if (file == null) return;
-        //TbFilename.Text = file[0].Path.ToString();
-        filePath = file[0].Path;
-    }
-
     private void BtnCheck_OnClick(object? sender, RoutedEventArgs e)
     {
         MakeCalcManVisible();
@@ -201,7 +180,7 @@ public partial class MainWindow : Window
             return;
         }
 
-        StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
+        StartAddressCheck(((KasAddressList)LstCustomerAdressSets.SelectedItem).ID);
     }
 
     private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
@@ -218,41 +197,7 @@ public partial class MainWindow : Window
         GrdExportMarginOptions.IsVisible = false;
     }
 
-    private async void StartCombine(Uri path)
-    {
-        MakeCalcManVisible();
-        var addresses = await DataImport.ImportKasAddressList(path);
-        var progressWindow = new ProgressWindow();
-        var address_list = new List<KasAddressList> { addresses.Item2 };
     
-        var topLevel = GetTopLevel(this);
-        var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
-        {
-            Title = "Weitere KAS-CSV-Dateien auswählen",
-            AllowMultiple = true,
-            FileTypeFilter = new[]
-            {
-                new FilePickerFileType(".csv-Dateien")
-                {
-                    Patterns = new[] { "*.csv" }
-                    //Patterns = new[] { "*" }
-                }
-            }
-        });
-
-        if (file == null) return;
-
-        //filePath = file[0].Path;
-        foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
-
-        progressWindow.Show(_instance);
-
-        var processor = new CombineAddresses(progressWindow);
-        //var result = await processor.Perform(address_list);
-
-
-        progressWindow.Close();
-    }
 
     private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
     {
@@ -437,39 +382,7 @@ public partial class MainWindow : Window
         MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
     }
 
-    private async Task<string> OpenSettingsSaveAsDialog()
-    {
-        var settingsFileName = "KAS-Adress-Liste";
     
-        try
-        {
-            var filePicker = new SaveFileDialog
-            {
-                Title = "Datei speichern...",
-                InitialFileName = $"{settingsFileName}.csv",
-                DefaultExtension = ".csv",
-                Filters = new List<FileDialogFilter>
-                {
-                    new() { Name = "CSV-Datei", Extensions = { "csv" } }
-                }
-            };
-
-            var settingsSavePath = await filePicker.ShowAsync(this);
-            if (settingsSavePath == null)
-            {
-            }
-
-            return settingsSavePath;
-            //SettingsManager.Save(settingsSavePath);
-            //Logger.Log("Settings saved at " + settingsSavePath);
-        }
-        catch (Exception ex)
-        {
-            //Logger.Log("Saving file not successful: " + ex.Message, Logger.LogType.Error);
-            await MessageBox.Show(this, ex.Message, "Fehler beim Speichern der Datei");
-            return null;
-        }
-    }
 
     private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type, CombineAddresses.CombineType comb_type)
     {
@@ -478,7 +391,7 @@ public partial class MainWindow : Window
         progressWindow.Show(_instance);
 
         var processor = new CombineAddresses(progressWindow);
-        var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
+        var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked, CbMergeDeleteOld.IsChecked);
 
         if (result.Item1 != null)
             result.Item1.owner_id = owner_id;
@@ -518,7 +431,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.name = TbSettingsCustomerName.Text;
         //Settings.Save();
         //RefreshCustomerItems();
@@ -528,19 +441,19 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex < 0) return;
         Settings._instance.customers.current =
-            Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString());
-        foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
-            {
-                TbSettingsCustomerDescription.Text = customer.description;
-                TbSettingsCustomerName.Text = customer.name;
-                TbSettingsCustomerSenderAddress.Text = customer.sender_address;
-                TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
-                if (customer.patch != null)
-                    TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
+            ((Customer)LstSettingsCustomers.SelectedItems[0]);
+        //foreach (var customer in Settings._instance.customers.customers)
+            //if (customer.ID == Settings._instance.customers.current.ID)
+            //{
+                TbSettingsCustomerDescription.Text = Settings._instance.customers.current.description;
+                TbSettingsCustomerName.Text = Settings._instance.customers.current.name;
+                TbSettingsCustomerSenderAddress.Text = Settings._instance.customers.current.sender_address;
+                TbSettingsCustomerCsvSeparator.Text = Settings._instance.customers.current.separator.ToString();
+                if (Settings._instance.customers.current.patch != null)
+                    TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
                 else
                     TbSettingsCustomerPatchInfo.Text = "";
-            }
+            //}
     }
 
     private async void EditButton_Click(object? sender, RoutedEventArgs e)
@@ -573,8 +486,8 @@ public partial class MainWindow : Window
         LstSettingsCustomers.Items.Clear();
         foreach (var customer in Settings._instance.customers.customers)
         {
-            LstCustomers.Items.Add(customer.ID + " - " + customer.name);
-            LstSettingsCustomers.Items.Add(customer.ID + " - " + customer.name);
+            LstCustomers.Items.Add(customer);
+            LstSettingsCustomers.Items.Add(customer);
         }
 
         try
@@ -590,7 +503,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.description = TbSettingsCustomerDescription.Text;
         //Settings.Save();
     }
@@ -605,7 +518,7 @@ public partial class MainWindow : Window
     {
         MakeCalcManVisible();
         if (LstCustomers.SelectedItems == null || LstCustomers.SelectedIndex == -1) return;
-        var customer_id = int.Parse(LstCustomers.SelectedItem.ToString().Split(" - ")[0]);
+        var customer_id = ((Customer)LstCustomers.SelectedItem).ID;
         RefreshAddressSetListItems(customer_id);
     }
 
@@ -630,7 +543,7 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString()))
+            if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
             {
                 if (customer.patch == null)
                 {
@@ -685,7 +598,7 @@ public partial class MainWindow : Window
         foreach (var k in Settings._instance.addressSets.addresses)
         foreach (var customer in Settings._instance.customers.customers)
             if (customer.ID == k.owner_id && customer.ID == customer_id)
-                LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + " (" + k.KasPersons.Count + " Einträge)");
+                LstCustomerAdressSets.Items.Add(k);
     }
 
     private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
@@ -732,7 +645,7 @@ public partial class MainWindow : Window
         var selected_path = paths[0].Path;
 
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString()))
+            if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
                 customer.patch = AddressPatch.Import(selected_path);
 
 
@@ -746,7 +659,7 @@ public partial class MainWindow : Window
             ? TbSettingsCustomerCsvSeparator.Text
             : ",";
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 try
                 {
                     customer.separator = Convert.ToChar(sep);
@@ -765,11 +678,10 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference", GetCombiningTyp());
+            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
         }
         catch
         {
@@ -781,11 +693,10 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
-            StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union", GetCombiningTyp());
+            StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
         }
         catch
         {
@@ -798,8 +709,7 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
         try
         {
             StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
@@ -827,8 +737,7 @@ public partial class MainWindow : Window
     {
         var list = new List<KasAddressList>();
         foreach (var item in LstCustomerAdressSets.SelectedItems)
-            list.Add(Settings._instance.addressSets.GetAddressSetByID(
-                Convert.ToInt32(item.ToString().Split(" - ")[0])));
+            list.Add((KasAddressList)item);
 
         StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
     }
@@ -856,8 +765,8 @@ public partial class MainWindow : Window
         {
             var builder = new PdfBuilder(Settings._instance.pdfExport);
 
-            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
-                Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
+            builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
+                    (KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
                 "Company Logo/Info",
                 filePath
             );
@@ -950,7 +859,7 @@ public partial class MainWindow : Window
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
         foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
+            if (customer.ID == Settings._instance.customers.current.ID)
                 customer.sender_address = TbSettingsCustomerSenderAddress.Text;
     }
 
@@ -1147,7 +1056,7 @@ public partial class MainWindow : Window
                 {
                     var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
                         .ToString());
-                    var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
+                    var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
                     foreach (var set in Settings._instance.addressSets.addresses)
                         if (set.ID == id)
                         {
@@ -1167,12 +1076,9 @@ public partial class MainWindow : Window
     private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
     {
         if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
-        foreach (var customer in Settings._instance.customers.customers)
-            if (customer.ID == Settings._instance.customers.current)
         try
         {
-                    Settings._instance.customers.customers.Remove(customer);
-                    break;
+            Settings._instance.customers.customers.Remove((Customer)LstSettingsCustomers.SelectedItem);
         }
         catch (Exception ex)
         {

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

@@ -32,8 +32,12 @@ public partial class ResultWindow : Window
         var result_with_errors = result.Where(p => p.PersonError != null).ToList();
         LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
 
-        StkResults.Children.Clear();
-        foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
+        // 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));
     }
 
     private Grid CreatePersonGrid(KasPerson person)
@@ -201,8 +205,12 @@ 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));
     }
 
 

Tasks/AddressCheck.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -247,7 +248,7 @@ public class AddressCheck
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
                     if (hasFaults)
-                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
+                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft", Convert.ToInt32(percent).ToString());
 
                     _progress.ChangePercentage(percent);
                 });

Tasks/CombineAddresses.cs

@@ -24,13 +24,29 @@ public class CombineAddresses
     }
 
     public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
+        bool? exportUnused, bool? deleteOld)
+    {
+        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;
+
+    }
+
+    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, 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);
     }