Compare commits
27 Commits
v0.8.1
..
fa10b5c7d0
| Author | SHA1 | Date | |
|---|---|---|---|
| fa10b5c7d0 | |||
| 85685d95bb | |||
| 8a42f8dc7d | |||
| cdc4fb70cd | |||
| 10dfd1e080 | |||
| 4b98f53881 | |||
| 5f79df55d2 | |||
| 2d33326bab | |||
| b48652910e | |||
| a74a97559b | |||
| b5b6dc8de7 | |||
| 6dfab5e73a | |||
| 6f03a26c29 | |||
| 7c81920e84 | |||
| d337f94851 | |||
| 1922b30ada | |||
| 68541621d9 | |||
| 474b628f0b | |||
| 7fe45ce4e3 | |||
| a46539c3cc | |||
| 72a5630db1 | |||
| 7697edac5e | |||
| 028b9793db | |||
| 2c5f2ed48b | |||
| f0598a39ec | |||
| f9e419d573 | |||
| 56233e6f5c |
@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
|
|||||||
var id = listItemName.Split(" - ")[0];
|
var id = listItemName.Split(" - ")[0];
|
||||||
return int.Parse(id);
|
return int.Parse(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return Name + " (" + KasPersons.Count + " Einträge)";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPerson
|
public class KasPerson
|
||||||
@@ -188,6 +193,18 @@ public class KasPerson
|
|||||||
|
|
||||||
return highest + base_id + 1;
|
return highest + base_id + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
if (refsid != null && refsid != 0)
|
||||||
|
{
|
||||||
|
return refsid + " - " + name;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return id + " - " + name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPersonError
|
public class KasPersonError
|
||||||
@@ -212,4 +229,9 @@ public class KasPersonError
|
|||||||
|
|
||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ToString(KasPerson person)
|
||||||
|
{
|
||||||
|
return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+14
-12
@@ -45,9 +45,8 @@ public class Settings
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine(ex.Message);
|
Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading settings. Generating new...");
|
|
||||||
_instance = new Settings();
|
_instance = new Settings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,9 +122,7 @@ public class Global
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine(ex.Message);
|
Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading global settings. Generating new...");
|
|
||||||
_instance = new Global();
|
_instance = new Global();
|
||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
@@ -135,7 +132,7 @@ public class Global
|
|||||||
public class Customers
|
public class Customers
|
||||||
{
|
{
|
||||||
public List<Customer> customers = new();
|
public List<Customer> customers = new();
|
||||||
public int current { get; set; } = 0;
|
public Customer current { get; set; } = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Customer
|
public class Customer
|
||||||
@@ -149,6 +146,11 @@ public class Customer
|
|||||||
|
|
||||||
ID = highestID + 1;
|
ID = highestID + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
public string name { get; set; } = "";
|
public string name { get; set; } = "";
|
||||||
public string description { get; set; } = "";
|
public string description { get; set; } = "";
|
||||||
@@ -158,11 +160,11 @@ public class Customer
|
|||||||
public int ID { get; }
|
public int ID { get; }
|
||||||
|
|
||||||
|
|
||||||
public static int GetIDByCustomerListItem(string item_content)
|
// public static int GetIDByCustomerListItem(string item_content)
|
||||||
{
|
// {
|
||||||
var id = item_content.Split(" - ")[0];
|
// var id = item_content.Split(" - ")[0];
|
||||||
return int.Parse(id);
|
// return int.Parse(id);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class AddressSets
|
public class AddressSets
|
||||||
|
|||||||
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
+20
-8
@@ -121,7 +121,7 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -220,14 +220,18 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
|
||||||
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
<StackPanel Orientation="Vertical" >
|
||||||
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
<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>
|
||||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||||
@@ -481,12 +485,20 @@
|
|||||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerSenderAddress" />
|
x:Name="TbSettingsCustomerSenderAddress" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*,Auto">
|
||||||
<Label Content="CSV-Trennzeichen" />
|
<Label Content="CSV-Trennzeichen" />
|
||||||
<TextBox Grid.Column="1" Watermark=","
|
<TextBox Grid.Column="1" Watermark=","
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||||
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerCsvSeparator" />
|
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>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*">
|
||||||
<Label Content="Address-Patch-Info" />
|
<Label Content="Address-Patch-Info" />
|
||||||
|
|||||||
+362
-319
File diff suppressed because it is too large
Load Diff
@@ -52,7 +52,7 @@ public partial class NamingWindow : Window
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
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!);
|
return Task.FromResult<string>(null!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ public partial class ProgressWindow : Window
|
|||||||
PbProgress.Value = percentage;
|
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();
|
//ScvLog.ScrollToEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-1
@@ -20,7 +20,9 @@
|
|||||||
Margin="10,10,10,10" />
|
Margin="10,10,10,10" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<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>
|
</ScrollViewer>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
+72
-40
@@ -28,12 +28,25 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
private void GenerateView(List<KasPerson> result)
|
private void GenerateView(List<KasPerson> result)
|
||||||
{
|
{
|
||||||
// Filter to only show persons with errors
|
try
|
||||||
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));
|
// 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)
|
private Grid CreatePersonGrid(KasPerson person)
|
||||||
@@ -102,44 +115,52 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
private void Load(List<KasPerson> result)
|
private void Load(List<KasPerson> result)
|
||||||
{
|
{
|
||||||
var knownErrors = new List<AddressCheck.ErrorTypes>();
|
try
|
||||||
var knownWarnings = new List<AddressCheck.WarningTypes>();
|
|
||||||
|
|
||||||
foreach (var person in result)
|
|
||||||
{
|
{
|
||||||
if (person.PersonError == null) continue;
|
var knownErrors = new List<AddressCheck.ErrorTypes>();
|
||||||
|
var knownWarnings = new List<AddressCheck.WarningTypes>();
|
||||||
|
|
||||||
foreach (var errtyp in person.PersonError.errors)
|
foreach (var person in result)
|
||||||
if (!knownErrors.Contains(errtyp))
|
{
|
||||||
knownErrors.Add(errtyp);
|
if (person.PersonError == null) continue;
|
||||||
|
|
||||||
foreach (var wartyp in person.PersonError.warnings)
|
foreach (var errtyp in person.PersonError.errors)
|
||||||
if (!knownWarnings.Contains(wartyp))
|
if (!knownErrors.Contains(errtyp))
|
||||||
knownWarnings.Add(wartyp);
|
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);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
|
||||||
foreach (var errtype in knownErrors)
|
|
||||||
{
|
{
|
||||||
var cb = new CheckBox();
|
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -148,7 +169,9 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
private void UpdateFilter()
|
private void UpdateFilter()
|
||||||
{
|
{
|
||||||
var temp_result = new List<KasPerson>();
|
try
|
||||||
|
{
|
||||||
|
var temp_result = new List<KasPerson>();
|
||||||
|
|
||||||
var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
|
var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
|
||||||
var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
|
var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
|
||||||
@@ -201,8 +224,17 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
StkResults.Children.Clear();
|
LbResults.Items.Clear();
|
||||||
foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+210
-196
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@@ -38,227 +39,240 @@ public class AddressCheck
|
|||||||
|
|
||||||
public async Task<List<KasPerson>> Perform(int id)
|
public async Task<List<KasPerson>> Perform(int id)
|
||||||
{
|
{
|
||||||
// Find the index of the address set with the given id
|
try
|
||||||
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 () =>
|
|
||||||
{
|
{
|
||||||
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>();
|
foreach (var person in adset.KasPersons)
|
||||||
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;
|
var errors = new List<ErrorTypes>();
|
||||||
warnings.Add(WarningTypes.NoPLZ);
|
var warnings = new List<WarningTypes>();
|
||||||
}
|
var hasFaults = false;
|
||||||
else
|
|
||||||
{
|
var address_component_count = 2; // cause anrede and name are first
|
||||||
if (!AddressCreator.CheckPLZ(person.plz, person.land))
|
|
||||||
|
// PLZ-Prüfung
|
||||||
|
if (person.plz == "" || person.plz == null)
|
||||||
{
|
{
|
||||||
hasFaults = true;
|
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
|
// PPLZ-Prüfung
|
||||||
if (person.pplz == "" || person.pplz == null)
|
if (person.pplz == "" || person.pplz == null)
|
||||||
{
|
|
||||||
hasFaults = true;
|
|
||||||
warnings.Add(WarningTypes.NoPPLZ);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (!AddressCreator.CheckPLZ(person.pplz, person.land))
|
|
||||||
{
|
{
|
||||||
hasFaults = true;
|
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)) ||
|
if (warnings.Contains(WarningTypes.NoPLZ) && warnings.Contains(WarningTypes.NoPPLZ))
|
||||||
// (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
|
|
||||||
{
|
{
|
||||||
hasFaults = true;
|
hasFaults = true;
|
||||||
warnings.Add(WarningTypes.DoubledRefsid);
|
errors.Add(ErrorTypes.NoPLZorPPLZ);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (person.name == person2.name &&
|
// Ort-Prüfung
|
||||||
person.strasse == person2.strasse &&
|
if (string.IsNullOrWhiteSpace(person.ort))
|
||||||
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;
|
hasFaults = true;
|
||||||
errors.Add(ErrorTypes.MayBeSameAddress);
|
warnings.Add(WarningTypes.NoCity);
|
||||||
}
|
}
|
||||||
}
|
else
|
||||||
|
|
||||||
// Adressen-Länge
|
|
||||||
if (address_component_count > 10)
|
|
||||||
{
|
|
||||||
hasFaults = true;
|
|
||||||
warnings.Add(WarningTypes.FullAddressTooLong);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasFaults)
|
|
||||||
lock (Settings._instance.addressSets.addresses)
|
|
||||||
{
|
{
|
||||||
// Directly set PersonError in the address set
|
address_component_count++;
|
||||||
var person_index = adset.KasPersons.IndexOf(person);
|
}
|
||||||
if (person_index >= 0)
|
|
||||||
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index].PersonError =
|
// Street-Number
|
||||||
new KasPersonError((errors, warnings));
|
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)
|
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
|
Settings.Save();
|
||||||
return Settings._instance.addressSets.addresses[adset_index].KasPersons
|
|
||||||
.Where(p => p.PersonError != null)
|
// Return only the persons with errors from the address set
|
||||||
.ToList();
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+203
-175
@@ -43,177 +43,195 @@ public static class AddressCreator
|
|||||||
public static string? CreateFinalMarkdownString(int id)
|
public static string? CreateFinalMarkdownString(int id)
|
||||||
{
|
{
|
||||||
// Maximum seven lines of information
|
// Maximum seven lines of information
|
||||||
|
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);
|
// find the address
|
||||||
if (temp != null)
|
KasPerson? address = null;
|
||||||
{
|
var string_address = "";
|
||||||
address = temp;
|
var address_line_count = 0;
|
||||||
break;
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
}
|
{
|
||||||
}
|
var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
|
||||||
|
if (temp != null)
|
||||||
// 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
|
|
||||||
{
|
{
|
||||||
var alt = (country.alternatives[ai] ?? "").Trim();
|
address = temp;
|
||||||
if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
|
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)
|
var country = Global._instance.countries[ci];
|
||||||
? country.name
|
for (var ai = 0; ai < country.alternatives.Count; ai++)
|
||||||
: country.translation;
|
try
|
||||||
goto CountryFound;
|
{
|
||||||
|
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++;
|
||||||
}
|
}
|
||||||
}
|
else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
|
||||||
|
{
|
||||||
CountryFound:
|
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||||
string_address = "**" + countryToShow + "**"; // Needs to be bold
|
address_line_count++;
|
||||||
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;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
||||||
string name, string namezus)
|
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(" ",
|
return string.Join(" ",
|
||||||
new[] { anredezus, titel, vorname, adel, name }
|
new[] { anrede, titel, vorname, adel, name }
|
||||||
.Where(s => !string.IsNullOrWhiteSpace(s))
|
.Where(s => !string.IsNullOrWhiteSpace(s))
|
||||||
)
|
)
|
||||||
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address name line creation: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
// else
|
return null;
|
||||||
return string.Join(" ",
|
|
||||||
new[] { anrede, titel, vorname, adel, name }
|
|
||||||
.Where(s => !string.IsNullOrWhiteSpace(s))
|
|
||||||
)
|
|
||||||
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -224,29 +242,39 @@ public static class AddressCreator
|
|||||||
/// <returns>true or faslse, depending on result :+1:</returns>
|
/// <returns>true or faslse, depending on result :+1:</returns>
|
||||||
public static bool CheckPLZ(string plz, string land)
|
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();
|
return false;
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+67
-45
@@ -3,6 +3,7 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Logof_Client;
|
||||||
|
|
||||||
public class AddressPatch
|
public class AddressPatch
|
||||||
{
|
{
|
||||||
@@ -58,61 +59,82 @@ public class AddressPatch
|
|||||||
|
|
||||||
public static AddressPatch Import(Uri filename)
|
public static AddressPatch Import(Uri filename)
|
||||||
{
|
{
|
||||||
var patch = new AddressPatch();
|
try
|
||||||
|
|
||||||
// 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 patch = new AddressPatch();
|
||||||
var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
|
|
||||||
|
// Alle Zeilen aus der Datei laden
|
||||||
// In der Datei wird nach "name:" gesucht (ohne _is)
|
var lines = File.ReadAllLines(filename.LocalPath);
|
||||||
var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
|
|
||||||
if (line != null)
|
// Alle Properties der Klasse (Strings und bools)
|
||||||
{
|
var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
||||||
// Wert extrahieren (alles nach dem Doppelpunkt)
|
|
||||||
var value = line.Substring(line.IndexOf(':') + 1).Trim();
|
// Nur die Properties, die mit _is enden (also die String-Werte)
|
||||||
|
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
||||||
// Wert im Patch-Objekt setzen
|
|
||||||
prop.SetValue(patch, value);
|
foreach (var prop in stringProps)
|
||||||
|
{
|
||||||
// Passendes has_ Feld aktivieren, z.B. "has_name"
|
// Beispiel: prop.Name = "name_is"
|
||||||
var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
|
var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
|
||||||
if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
|
|
||||||
}
|
// 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()
|
public override string ToString()
|
||||||
{
|
{
|
||||||
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
try
|
||||||
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 properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
||||||
var hasProp =
|
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
||||||
properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
|
|
||||||
if (hasProp != null && (bool)hasProp.GetValue(this))
|
var lines = new StringBuilder();
|
||||||
{
|
|
||||||
var value = (string)prop.GetValue(this);
|
foreach (var prop in stringProps)
|
||||||
lines.AppendLine($"{prop.Name} => {value}");
|
{
|
||||||
}
|
// 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";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+11
-9
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
@@ -9,15 +10,16 @@ public class AddressRepair(ProgressWindow progressWindow)
|
|||||||
public KasAddressList Perform(KasAddressList all_addresses,
|
public KasAddressList Perform(KasAddressList all_addresses,
|
||||||
List<(int, List<AddressCheck.ErrorTypes>)> failed_addresses)
|
List<(int, List<AddressCheck.ErrorTypes>)> failed_addresses)
|
||||||
{
|
{
|
||||||
// foreach (var k in all_addresses.KasPersons)
|
try
|
||||||
// foreach (var p in failed_addresses)
|
{
|
||||||
// {
|
|
||||||
// if (k.refsid != p.Item1) continue;
|
}
|
||||||
//
|
catch (Exception ex)
|
||||||
// if (p.Item1.Contains(AddressCheck.WarningTypes.DoubledRefsid))
|
{
|
||||||
// {
|
Logger.Log($"Error while performing address repair: {ex.Message}", Logger.LogType.Error);
|
||||||
// }
|
}
|
||||||
// }
|
|
||||||
|
return null;
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
+227
-150
@@ -24,14 +24,50 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_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)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
try
|
||||||
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
{
|
||||||
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
if (type == "symdiff") return await SymmetricDifference(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);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -44,6 +80,7 @@ public class CombineAddresses
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
||||||
{
|
{
|
||||||
|
|
||||||
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
||||||
if(comb_type == CombineType.refsid)
|
if(comb_type == CombineType.refsid)
|
||||||
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
||||||
@@ -80,81 +117,101 @@ public class CombineAddresses
|
|||||||
bool? return_unused,
|
bool? return_unused,
|
||||||
Progress? progress = null)
|
Progress? progress = null)
|
||||||
{
|
{
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
try
|
||||||
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
|
|
||||||
|
|
||||||
progress ??= new Progress
|
|
||||||
{
|
{
|
||||||
TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
ComparedPersons = 0
|
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
|
||||||
};
|
|
||||||
|
progress ??= new Progress
|
||||||
// Vereinigung aller Listen außer der ersten
|
{
|
||||||
var restUnion = new List<KasPerson>();
|
TotalPersons = address_lists.Sum(l => l.KasPersons.Count),
|
||||||
for (var i = 1; i < address_lists.Count; i++)
|
ComparedPersons = 0
|
||||||
restUnion.AddRange(address_lists[i].KasPersons);
|
};
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
|
|
||||||
var second_result = new KasAddressList("none");
|
// Vereinigung aller Listen außer der ersten
|
||||||
if(return_unused == true)
|
var restUnion = new List<KasPerson>();
|
||||||
second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
|
for (var i = 1; i < address_lists.Count; i++)
|
||||||
|
restUnion.AddRange(address_lists[i].KasPersons);
|
||||||
foreach (var person in address_lists[0].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, comb_type));
|
Logger.Log($"Error while performing difference-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
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 (null,null);
|
||||||
return (result, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
|
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
|
||||||
Progress progress = null)
|
Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
try
|
||||||
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)))
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
result.KasPersons.Add(person);
|
var second_result = new KasAddressList("none");
|
||||||
else
|
if(return_unused == true)
|
||||||
second_result.KasPersons.Add(person);
|
second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
||||||
|
|
||||||
processed++;
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
var percent = processed / (double)total * 100;
|
return (result, null);
|
||||||
var logMessage =
|
|
||||||
$"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
|
var total = address_lists.Sum(l => l.KasPersons.Count);
|
||||||
|
var processed = 0;
|
||||||
if (progress == null) continue;
|
|
||||||
if (Dispatcher.UIThread.CheckAccess())
|
foreach (var list in address_lists)
|
||||||
progress.LogAction?.Invoke(logMessage);
|
foreach (var person in list.KasPersons)
|
||||||
else
|
{
|
||||||
Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
|
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 (null,null);
|
||||||
return (result, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -166,107 +223,127 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
try
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
var isInAll = otherLists.All(list =>
|
var second_result = new KasAddressList("none");
|
||||||
list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
|
if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
||||||
|
|
||||||
if (isInAll)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
result.KasPersons.Add(person);
|
return (result, null);
|
||||||
else
|
|
||||||
second_result.KasPersons.Add(person);
|
// Nur die erste Liste als Ausgangspunkt verwenden
|
||||||
|
var baseList = address_lists[0];
|
||||||
processed++;
|
var otherLists = address_lists.Skip(1).ToList();
|
||||||
var percent = processed / (double)total * 100;
|
|
||||||
var logMessage =
|
var total = baseList.KasPersons.Count;
|
||||||
$"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
|
var processed = 0;
|
||||||
|
|
||||||
// Sicher und nicht blockierend loggen
|
foreach (var person in baseList.KasPersons)
|
||||||
if (progress != null)
|
|
||||||
{
|
{
|
||||||
if (Dispatcher.UIThread.CheckAccess())
|
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
||||||
progress.LogAction?.Invoke(logMessage);
|
var isInAll = otherLists.All(list =>
|
||||||
|
list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
|
||||||
|
|
||||||
|
if (isInAll)
|
||||||
|
result.KasPersons.Add(person);
|
||||||
else
|
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 (null,null);
|
||||||
return (result, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
try
|
||||||
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)
|
|
||||||
{
|
{
|
||||||
// Prüfen, ob schon vorhanden
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
|
var second_result = new KasAddressList("none");
|
||||||
if (existing.person != null)
|
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
|
// Prüfen, ob schon vorhanden
|
||||||
var index = allPersons.IndexOf(existing);
|
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
|
||||||
allPersons[index] = (existing.person, existing.count + 1);
|
if (existing.person != null)
|
||||||
}
|
{
|
||||||
else
|
// Falls schon drin → Vorkommen erhöhen
|
||||||
{
|
var index = allPersons.IndexOf(existing);
|
||||||
// Neu hinzufügen
|
allPersons[index] = (existing.person, existing.count + 1);
|
||||||
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
|
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
|
return (null,null);
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user