From fab14eb107facec8ea45ab16c9600ac80feb3752 Mon Sep 17 00:00:00 2001 From: Elias Fierke Date: Tue, 28 Apr 2026 11:00:26 +0200 Subject: [PATCH] [fix:] naming window for rest-set not visible if not necessary --- Tasks/CombineAddresses.cs | 75 ++++++--------------------------------- 1 file changed, 11 insertions(+), 64 deletions(-) diff --git a/Tasks/CombineAddresses.cs b/Tasks/CombineAddresses.cs index 324af2e..d160526 100644 --- a/Tasks/CombineAddresses.cs +++ b/Tasks/CombineAddresses.cs @@ -86,7 +86,9 @@ public class CombineAddresses 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)); + 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) { @@ -113,7 +115,9 @@ public class CombineAddresses Progress progress = null) { var result = new KasAddressList(await KasAddressList.GenerateName("union")); - var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false)); + 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); @@ -155,7 +159,8 @@ public class CombineAddresses 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)); + 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); @@ -202,7 +207,8 @@ public class CombineAddresses 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)); + 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); @@ -254,66 +260,7 @@ public class CombineAddresses if (return_unused == true) return (result, second_result); return (result, null); } - - - // private async Task 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