Compare commits
118 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b3ab21ae38 | |||
| 67d007bb31 | |||
| bf28ba1914 | |||
| 40630dee35 | |||
| c6baa6a187 | |||
| 557052bbc7 | |||
| 696d0f8fcb | |||
| 201b19cbb5 | |||
| d7d4b3b31b | |||
| 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 | |||
| 488830cdad | |||
| 52fbefb803 | |||
| c5aabc2a02 | |||
| 4a9f9a1ff0 | |||
| fab14eb107 | |||
| 2dcc1bd657 | |||
| 3767fece48 | |||
| 842608e96f | |||
| d9ee3e2fc9 | |||
| 80d1498cc7 | |||
| de2f453553 | |||
| 7e168c4d0f | |||
| 9becedbd97 | |||
| 16982c3d95 | |||
| 93771dd110 | |||
| 3e14731429 | |||
| df6c187a00 | |||
| 98b5198f6f | |||
| 1a6459d60b | |||
| 43e6c35beb | |||
| 9777c6b5a2 | |||
| 9ad378c800 | |||
| 5ccd4a4e99 | |||
| ac7b23cc28 | |||
| 16ed64dbf4 | |||
| cc48c0ae2c | |||
| ba640c602a | |||
| e8738a2eab | |||
| afbb4626a0 | |||
| ee83aca490 | |||
| b40ddfbf2e | |||
| 5172de332c | |||
| d478fd5129 | |||
| 5dcb44aa2a | |||
| ea31637bdb | |||
| 2c909820d3 | |||
| 96eb122ff8 | |||
| fed817a6dc | |||
| d5073465b2 | |||
| 10b0eb5bcd | |||
| 013bd4a070 | |||
| 2c4eb1fcef | |||
| 0395537a55 | |||
| 313cd58fc7 | |||
| 723722ba47 | |||
| 58964896ad | |||
| af1c3ff8cc | |||
| 48852e4505 | |||
| 60cde86efe | |||
| 67cfe10f5f | |||
| e186070f05 | |||
| d36314b724 | |||
| beed5decbf | |||
| 71859fa978 | |||
| f05470249a | |||
| f4918aa8ee | |||
| 4e1f08883a | |||
| 99b35c0aaf | |||
| aeb4092f28 | |||
| c760ef0936 | |||
| e750b4c757 | |||
| 3877d91af4 | |||
| 7af6444da2 | |||
| 4cfbcd0ab4 | |||
| b82473ada2 | |||
| 1cba67253a | |||
| 63c1559110 | |||
| b670ba11fa | |||
| 1ad57543d1 | |||
| 6cd4ea2df6 | |||
| 30e42afe35 | |||
| 70e127b2f0 | |||
| 7c73170b46 | |||
| 290f69e976 | |||
| 6ce08d7d4a | |||
| 86df6f6a63 | |||
| eae0568ae0 | |||
| 4ebd6bc407 | |||
| 2c22306fef | |||
| 174223ba9e | |||
| 8e5709c215 | |||
| b70bd5e324 |
-118
@@ -1,118 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
public class AddressPatch
|
|
||||||
{
|
|
||||||
public string refsid_is { get; set; } = "";
|
|
||||||
public string anrede_is { get; set; } = "";
|
|
||||||
public string titel_is { get; set; } = "";
|
|
||||||
public string vorname_is { get; set; } = "";
|
|
||||||
public string adel_is { get; set; } = "";
|
|
||||||
public string name_is { get; set; } = "";
|
|
||||||
public string namezus_is { get; set; } = "";
|
|
||||||
public string anredzus_is { get; set; } = "";
|
|
||||||
public string strasse_is { get; set; } = "";
|
|
||||||
public string strasse2_is { get; set; } = "";
|
|
||||||
public string plz_is { get; set; } = "";
|
|
||||||
public string ort_is { get; set; } = "";
|
|
||||||
public string land_is { get; set; } = "";
|
|
||||||
public string pplz_is { get; set; } = "";
|
|
||||||
public string postfach_is { get; set; } = "";
|
|
||||||
public string name1_is { get; set; } = "";
|
|
||||||
public string name2_is { get; set; } = "";
|
|
||||||
public string name3_is { get; set; } = "";
|
|
||||||
public string name4_is { get; set; } = "";
|
|
||||||
public string name5_is { get; set; } = "";
|
|
||||||
public string funktion_is { get; set; } = "";
|
|
||||||
public string funktion2_is { get; set; } = "";
|
|
||||||
public string abteilung_is { get; set; } = "";
|
|
||||||
public string funktionad_is { get; set; } = "";
|
|
||||||
|
|
||||||
public bool has_refsid { get; set; }
|
|
||||||
public bool has_anrede { get; set; }
|
|
||||||
public bool has_titel { get; set; }
|
|
||||||
public bool has_vorname { get; set; }
|
|
||||||
public bool has_adel { get; set; }
|
|
||||||
public bool has_name { get; set; }
|
|
||||||
public bool has_namezus { get; set; }
|
|
||||||
public bool has_anredzus { get; set; }
|
|
||||||
public bool has_strasse { get; set; }
|
|
||||||
public bool has_strasse2 { get; set; }
|
|
||||||
public bool has_plz { get; set; }
|
|
||||||
public bool has_ort { get; set; }
|
|
||||||
public bool has_land { get; set; }
|
|
||||||
public bool has_pplz { get; set; }
|
|
||||||
public bool has_postfach { get; set; }
|
|
||||||
public bool has_name1 { get; set; }
|
|
||||||
public bool has_name2 { get; set; }
|
|
||||||
public bool has_name3 { get; set; }
|
|
||||||
public bool has_name4 { get; set; }
|
|
||||||
public bool has_name5 { get; set; }
|
|
||||||
public bool has_funktion { get; set; }
|
|
||||||
public bool has_funktion2 { get; set; }
|
|
||||||
public bool has_abteilung { get; set; }
|
|
||||||
public bool has_funktionad { get; set; }
|
|
||||||
|
|
||||||
public static AddressPatch Import(Uri filename)
|
|
||||||
{
|
|
||||||
var patch = new AddressPatch();
|
|
||||||
|
|
||||||
// Alle Zeilen aus der Datei laden
|
|
||||||
var lines = File.ReadAllLines(filename.LocalPath);
|
|
||||||
|
|
||||||
// Alle Properties der Klasse (Strings und bools)
|
|
||||||
var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
|
||||||
|
|
||||||
// Nur die Properties, die mit _is enden (also die String-Werte)
|
|
||||||
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
|
||||||
|
|
||||||
foreach (var prop in stringProps)
|
|
||||||
{
|
|
||||||
// Beispiel: prop.Name = "name_is"
|
|
||||||
var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
|
|
||||||
|
|
||||||
// In der Datei wird nach "name:" gesucht (ohne _is)
|
|
||||||
var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
|
|
||||||
if (line != null)
|
|
||||||
{
|
|
||||||
// Wert extrahieren (alles nach dem Doppelpunkt)
|
|
||||||
var value = line.Substring(line.IndexOf(':') + 1).Trim();
|
|
||||||
|
|
||||||
// Wert im Patch-Objekt setzen
|
|
||||||
prop.SetValue(patch, value);
|
|
||||||
|
|
||||||
// Passendes has_ Feld aktivieren, z.B. "has_name"
|
|
||||||
var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
|
|
||||||
if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return patch;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public override string ToString()
|
|
||||||
{
|
|
||||||
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
|
||||||
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
|
||||||
|
|
||||||
var lines = new StringBuilder();
|
|
||||||
|
|
||||||
foreach (var prop in stringProps)
|
|
||||||
{
|
|
||||||
// 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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace Logof_Client;
|
|
||||||
|
|
||||||
public class CsvBuilder
|
|
||||||
{
|
|
||||||
private readonly string Header;
|
|
||||||
private readonly List<object> Instances;
|
|
||||||
private readonly KasAddressList KasAddressList;
|
|
||||||
|
|
||||||
public CsvBuilder(string header, List<object> instances)
|
|
||||||
{
|
|
||||||
Header = header;
|
|
||||||
Instances = instances;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CsvBuilder(string header, KasAddressList instances)
|
|
||||||
{
|
|
||||||
Header = header;
|
|
||||||
KasAddressList = instances;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string? BuildKas()
|
|
||||||
{
|
|
||||||
var result = new StringBuilder();
|
|
||||||
|
|
||||||
result.AppendLine(Header);
|
|
||||||
foreach (var l in KasAddressList.KasPersons)
|
|
||||||
|
|
||||||
result.AppendLine(
|
|
||||||
l.refsid + "," +
|
|
||||||
l.anrede + "," +
|
|
||||||
l.titel + "," +
|
|
||||||
l.vorname + "," +
|
|
||||||
l.adel + "," +
|
|
||||||
l.name + "," +
|
|
||||||
l.namezus + "," +
|
|
||||||
l.anredzus + "," +
|
|
||||||
l.strasse + "," +
|
|
||||||
l.strasse2 + "," +
|
|
||||||
l.plz + "," +
|
|
||||||
l.ort + "," +
|
|
||||||
l.land + "," +
|
|
||||||
l.pplz + "," +
|
|
||||||
l.postfach + "," +
|
|
||||||
l.name1 + "," +
|
|
||||||
l.name2 + "," +
|
|
||||||
l.name3 + "," +
|
|
||||||
l.name4 + "," +
|
|
||||||
l.name5 + "," +
|
|
||||||
l.funktion + "," +
|
|
||||||
l.funktion2 + "," +
|
|
||||||
l.abteilung + "," +
|
|
||||||
l.funktionad);
|
|
||||||
|
|
||||||
// weitere Cases
|
|
||||||
return result.ToString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-251
@@ -1,251 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
namespace Logof_Client;
|
|
||||||
|
|
||||||
public class DataImport
|
|
||||||
{
|
|
||||||
public static (bool, KasAddressList) ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
|
||||||
char separator = ',')
|
|
||||||
{
|
|
||||||
if (patch == null)
|
|
||||||
return ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
|
||||||
return ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static (bool, KasAddressList) ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
|
||||||
{
|
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
|
||||||
{
|
|
||||||
Console.WriteLine($"File not found: {pathToCsv}");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var reader = new StreamReader(pathToCsv.LocalPath);
|
|
||||||
var headerLine = reader.ReadLine();
|
|
||||||
if (headerLine == null)
|
|
||||||
{
|
|
||||||
Console.WriteLine("File is empty.");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
|
||||||
|
|
||||||
while (!reader.EndOfStream)
|
|
||||||
{
|
|
||||||
var line = reader.ReadLine();
|
|
||||||
if (string.IsNullOrWhiteSpace(line))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
|
|
||||||
|
|
||||||
if (parts.Length < 24)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Not enough columns in line: {line}");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var person = new KasPerson(
|
|
||||||
ParseInt(parts[0]),
|
|
||||||
parts[1],
|
|
||||||
parts[2],
|
|
||||||
parts[3],
|
|
||||||
parts[4],
|
|
||||||
parts[5],
|
|
||||||
parts[6],
|
|
||||||
parts[7],
|
|
||||||
parts[8],
|
|
||||||
parts[9],
|
|
||||||
parts[10],
|
|
||||||
parts[11],
|
|
||||||
parts[12],
|
|
||||||
parts[13],
|
|
||||||
parts[14],
|
|
||||||
parts[15],
|
|
||||||
parts[16],
|
|
||||||
parts[17],
|
|
||||||
parts[18],
|
|
||||||
parts[19],
|
|
||||||
parts[20],
|
|
||||||
parts[21],
|
|
||||||
parts[22],
|
|
||||||
parts[23]
|
|
||||||
);
|
|
||||||
imported.KasPersons.Add(person);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (true, imported);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static (bool, KasAddressList) ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
|
||||||
char separator)
|
|
||||||
{
|
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
|
||||||
{
|
|
||||||
Console.WriteLine($"File not found: {pathToCsv}");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
using var reader = new StreamReader(pathToCsv.LocalPath);
|
|
||||||
var headerLine = reader.ReadLine();
|
|
||||||
if (headerLine == null)
|
|
||||||
{
|
|
||||||
Console.WriteLine("File is empty.");
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
|
|
||||||
var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
|
|
||||||
|
|
||||||
var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
|
||||||
var patchType = typeof(AddressPatch);
|
|
||||||
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
|
||||||
|
|
||||||
var hasProperties = patchType.GetProperties(binding)
|
|
||||||
.Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
|
|
||||||
.ToArray();
|
|
||||||
|
|
||||||
var last_refsid = 1000000;
|
|
||||||
|
|
||||||
while (!reader.EndOfStream)
|
|
||||||
{
|
|
||||||
var line = reader.ReadLine();
|
|
||||||
if (string.IsNullOrWhiteSpace(line))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
|
|
||||||
|
|
||||||
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
|
||||||
|
|
||||||
var refsid_existing = false;
|
|
||||||
|
|
||||||
foreach (var hasProp in hasProperties)
|
|
||||||
{
|
|
||||||
var fieldName = hasProp.Name.Substring(4);
|
|
||||||
|
|
||||||
|
|
||||||
var hasObj = hasProp.GetValue(patch);
|
|
||||||
var has = hasObj is bool b && b;
|
|
||||||
|
|
||||||
var patchProp = patchType.GetProperty(fieldName + "_is", binding);
|
|
||||||
|
|
||||||
string desiredHeader = null;
|
|
||||||
if (has && patchProp != null)
|
|
||||||
desiredHeader = patchProp.GetValue(patch)?.ToString();
|
|
||||||
else
|
|
||||||
desiredHeader = fieldName;
|
|
||||||
|
|
||||||
var resolvedValue = "";
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(desiredHeader))
|
|
||||||
{
|
|
||||||
var idx = Array.FindIndex(headers,
|
|
||||||
h => string.Equals(h, desiredHeader, StringComparison.OrdinalIgnoreCase));
|
|
||||||
if (idx >= 0 && idx < parts.Length)
|
|
||||||
{
|
|
||||||
resolvedValue = parts[idx];
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var altIdx = Array.FindIndex(headers, h =>
|
|
||||||
string.Equals(h, fieldName, StringComparison.OrdinalIgnoreCase) ||
|
|
||||||
string.Equals(h, fieldName + "_is", StringComparison.OrdinalIgnoreCase));
|
|
||||||
|
|
||||||
if (altIdx >= 0 && altIdx < parts.Length)
|
|
||||||
resolvedValue = parts[altIdx];
|
|
||||||
else
|
|
||||||
resolvedValue = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fieldValues[fieldName] = resolvedValue ?? "";
|
|
||||||
}
|
|
||||||
|
|
||||||
string GetField(string name)
|
|
||||||
{
|
|
||||||
return fieldValues.TryGetValue(name, out var v) ? v : "";
|
|
||||||
}
|
|
||||||
|
|
||||||
var new_refsid = last_refsid;
|
|
||||||
if (!patch.has_refsid)
|
|
||||||
new_refsid = GenerateNewRefsid();
|
|
||||||
else
|
|
||||||
new_refsid = ParseInt(GetField("refsid"));
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var person = new KasPerson(
|
|
||||||
new_refsid,
|
|
||||||
GetField("anrede"),
|
|
||||||
GetField("titel"),
|
|
||||||
GetField("vorname"),
|
|
||||||
GetField("adel"),
|
|
||||||
GetField("name"),
|
|
||||||
GetField("namezus"),
|
|
||||||
GetField("anredzus"),
|
|
||||||
GetField("strasse"),
|
|
||||||
GetField("strasse2"),
|
|
||||||
GetField("plz"),
|
|
||||||
GetField("ort"),
|
|
||||||
GetField("land"),
|
|
||||||
GetField("pplz"),
|
|
||||||
GetField("postfach"),
|
|
||||||
GetField("name1"),
|
|
||||||
GetField("name2"),
|
|
||||||
GetField("name3"),
|
|
||||||
GetField("name4"),
|
|
||||||
GetField("name5"),
|
|
||||||
GetField("funktion"),
|
|
||||||
GetField("funktion2"),
|
|
||||||
GetField("abteilung"),
|
|
||||||
GetField("funktionad")
|
|
||||||
);
|
|
||||||
|
|
||||||
imported.KasPersons.Add(person);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
return (false, null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (true, imported);
|
|
||||||
|
|
||||||
int GenerateNewRefsid()
|
|
||||||
{
|
|
||||||
|
|
||||||
int biggest = last_refsid;
|
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
|
||||||
{
|
|
||||||
foreach (var address in set.KasPersons)
|
|
||||||
{
|
|
||||||
if (biggest < address.refsid)
|
|
||||||
{
|
|
||||||
biggest = address.refsid+1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
last_refsid = biggest+1;
|
|
||||||
return last_refsid;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private static int ParseInt(string input)
|
|
||||||
{
|
|
||||||
return int.TryParse(input, out var result) ? result : 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,12 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
|
|
||||||
public class KasAddressList //Address-Set
|
public class KasAddressList //Address-Set
|
||||||
{
|
{
|
||||||
public List<KasPersonError> errors = new();
|
//public List<KasPersonError> errors = new();
|
||||||
public List<KasPerson> KasPersons;
|
public List<KasPerson> KasPersons;
|
||||||
|
|
||||||
public KasAddressList(string name)
|
public KasAddressList(string name)
|
||||||
@@ -13,12 +14,9 @@ public class KasAddressList //Address-Set
|
|||||||
KasPersons = new List<KasPerson>();
|
KasPersons = new List<KasPerson>();
|
||||||
Name = name;
|
Name = name;
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
{
|
|
||||||
if (Name == set.Name)
|
if (Name == set.Name)
|
||||||
{
|
|
||||||
Name = name + "-new";
|
Name = name + "-new";
|
||||||
}
|
|
||||||
}
|
|
||||||
var highest = 0;
|
var highest = 0;
|
||||||
foreach (var k in Settings._instance.addressSets.addresses)
|
foreach (var k in Settings._instance.addressSets.addresses)
|
||||||
if (highest <= k.ID)
|
if (highest <= k.ID)
|
||||||
@@ -35,31 +33,47 @@ public class KasAddressList //Address-Set
|
|||||||
this.owner_id = owner_id;
|
this.owner_id = owner_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string GenerateName(string basic_type, bool? is_rest = false)
|
public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
|
||||||
{
|
{
|
||||||
|
string pre = "";
|
||||||
|
|
||||||
if (is_rest == true)
|
if (is_rest == true)
|
||||||
return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
|
return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
|
||||||
else
|
pre = basic_type + " - " + DateTime.Now.ToShortDateString();
|
||||||
return basic_type + " - " + DateTime.Now.ToShortDateString();
|
|
||||||
|
var result = await NamingWindow.Show(MainWindow._instance, pre);
|
||||||
|
return string.IsNullOrWhiteSpace(result) ? pre : result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void UpdateErrorList(List<(int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>)> errorList)
|
// public void UpdateErrorList(List<KasPersonError> errorList)
|
||||||
{
|
// {
|
||||||
errors.Clear();
|
// //errors.Clear();
|
||||||
foreach (var error in errorList) errors.Add(new KasPersonError(error));
|
// // foreach (KasPersonError err in errorList)
|
||||||
}
|
// // {
|
||||||
|
// //
|
||||||
|
// // }
|
||||||
|
// //foreach (var error in errorList) errors.Add(new KasPersonError(error));
|
||||||
|
// }
|
||||||
|
|
||||||
public static int GetIDByAddressSetListItem(string listItemName)
|
public static int GetIDByAddressSetListItem(string listItemName)
|
||||||
{
|
{
|
||||||
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
|
||||||
{
|
{
|
||||||
|
public KasPersonError PersonError = null;
|
||||||
|
|
||||||
public KasPerson()
|
public KasPerson()
|
||||||
{
|
{
|
||||||
|
id = GenerateNewID(0);
|
||||||
refsid = 0;
|
refsid = 0;
|
||||||
anrede = "";
|
anrede = "";
|
||||||
titel = "";
|
titel = "";
|
||||||
@@ -86,7 +100,7 @@ public class KasPerson
|
|||||||
funktionad = "";
|
funktionad = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
public KasPerson(int refsid,
|
public KasPerson(int id, int refsid,
|
||||||
string anrede,
|
string anrede,
|
||||||
string titel,
|
string titel,
|
||||||
string vorname,
|
string vorname,
|
||||||
@@ -111,6 +125,7 @@ public class KasPerson
|
|||||||
string abteilung,
|
string abteilung,
|
||||||
string funktionad)
|
string funktionad)
|
||||||
{
|
{
|
||||||
|
this.id = id;
|
||||||
this.refsid = refsid;
|
this.refsid = refsid;
|
||||||
this.anrede = anrede;
|
this.anrede = anrede;
|
||||||
this.titel = titel;
|
this.titel = titel;
|
||||||
@@ -137,6 +152,7 @@ public class KasPerson
|
|||||||
this.funktionad = funktionad;
|
this.funktionad = funktionad;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int id { get; set; }
|
||||||
public int refsid { get; set; }
|
public int refsid { get; set; }
|
||||||
public string anrede { get; set; }
|
public string anrede { get; set; }
|
||||||
public string titel { get; set; }
|
public string titel { get; set; }
|
||||||
@@ -161,41 +177,61 @@ public class KasPerson
|
|||||||
public string funktion2 { get; set; }
|
public string funktion2 { get; set; }
|
||||||
public string abteilung { get; set; }
|
public string abteilung { get; set; }
|
||||||
public string funktionad { get; set; }
|
public string funktionad { get; set; }
|
||||||
|
|
||||||
|
public static int GenerateNewID(int base_id)
|
||||||
|
{
|
||||||
|
//var newid = 100000 + base_id;
|
||||||
|
int highest = 0;
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
{
|
||||||
|
foreach (var add in set.KasPersons)
|
||||||
|
{
|
||||||
|
if(add.id >= highest) highest = add.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
|
||||||
{
|
{
|
||||||
public KasPersonError((int, List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
|
public KasPersonError((List<AddressCheck.ErrorTypes>, List<AddressCheck.WarningTypes>) single_result)
|
||||||
{
|
{
|
||||||
refsid = single_result.Item1;
|
//refsid = single_result.Item1;
|
||||||
errors = single_result.Item2;
|
errors = single_result.Item1;
|
||||||
warnings = single_result.Item3;
|
warnings = single_result.Item2;
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// foreach (var err in single_result.Item2) errors += err + ", ";
|
|
||||||
// errors = errors.Trim();
|
|
||||||
// errors = errors.TrimEnd(',');
|
|
||||||
// }
|
|
||||||
// catch
|
|
||||||
// {
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// try
|
|
||||||
// {
|
|
||||||
// if (single_result.Item3 != null)
|
|
||||||
// {
|
|
||||||
// foreach (var err in single_result.Item3) warnings += err + ", ";
|
|
||||||
// warnings = warnings.Trim();
|
|
||||||
// warnings = warnings.TrimEnd(',');
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// catch (Exception e)
|
|
||||||
// {
|
|
||||||
// Console.WriteLine(e.Message);
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int refsid { get; set; }
|
//public int refsid { get; set; }
|
||||||
public List<AddressCheck.ErrorTypes> errors { get; set; } = new();
|
public List<AddressCheck.ErrorTypes> errors { get; set; } = new();
|
||||||
public List<AddressCheck.WarningTypes> warnings { get; set; } = new();
|
public List<AddressCheck.WarningTypes> warnings { get; set; } = new();
|
||||||
|
|
||||||
|
public string GetString()
|
||||||
|
{
|
||||||
|
var output = "";
|
||||||
|
foreach (var error in errors) output += error + ", ";
|
||||||
|
|
||||||
|
foreach (var warning in warnings) output += warning + ", ";
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string ToString(KasPerson person)
|
||||||
|
{
|
||||||
|
return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class Settings
|
||||||
|
{
|
||||||
|
public static Settings _instance = new();
|
||||||
|
public AddressSets addressSets = new();
|
||||||
|
public Customers customers = new();
|
||||||
|
public PdfExportSettings pdfExport { get; set; } = new();
|
||||||
|
|
||||||
|
// public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
// "logofclient", "config.json");
|
||||||
|
|
||||||
|
public Settings()
|
||||||
|
{
|
||||||
|
_instance = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public static void Save()
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(Global._instance.config_path))
|
||||||
|
Directory.CreateDirectory(Global._instance.config_path);
|
||||||
|
// if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
|
|
||||||
|
var json = JsonConvert.SerializeObject(_instance);
|
||||||
|
File.WriteAllText(Path.Combine(Global._instance.config_path,"config.json"), json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Load()
|
||||||
|
{
|
||||||
|
//if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var contents = File.ReadAllText(Path.Combine(Global._instance.config_path, "config.json"));
|
||||||
|
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
||||||
|
MainWindow._instance.RefreshCustomerItems();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
|
|
||||||
|
_instance = new Settings();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class PdfExportSettings
|
||||||
|
{
|
||||||
|
public double cellPaddingTopMm { get; set; } = 5;
|
||||||
|
public double cellPaddingBottomMm { get; set; } = 5;
|
||||||
|
public double cellPaddingLeftMm { get; set; } = 5;
|
||||||
|
public double cellPaddingRightMm { get; set; } = 5;
|
||||||
|
|
||||||
|
public double pageMarginTopMm { get; set; } = 0;
|
||||||
|
public double pageMarginBottomMm { get; set; } = 0;
|
||||||
|
public double pageMarginLeftMm { get; set; } = 0;
|
||||||
|
public double pageMarginRightMm { get; set; } = 0;
|
||||||
|
|
||||||
|
public int rowsPerPage { get; set; } = 7;
|
||||||
|
public int columnsPerPage { get; set; } = 3;
|
||||||
|
|
||||||
|
public double fontSize { get; set; } = 9;
|
||||||
|
public double smallFontSize { get; set; } = 6;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Global
|
||||||
|
{
|
||||||
|
public static Global _instance;
|
||||||
|
|
||||||
|
public Global()
|
||||||
|
{
|
||||||
|
_instance = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string config_path { get; set; } = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient");
|
||||||
|
|
||||||
|
public void SetConfigPath(string path)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(path))
|
||||||
|
config_path = PathUtilities.NormalizeFileSystemPath(path);
|
||||||
|
}
|
||||||
|
public string wiki_storage_path { get; set; } = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient",
|
||||||
|
"wiki");
|
||||||
|
|
||||||
|
public List<Country> countries { get; set; } = new();
|
||||||
|
public string font_path { get; set; } = Path.Combine(AppContext.BaseDirectory, "assets", "fonts");
|
||||||
|
|
||||||
|
public static void Save()
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient")))
|
||||||
|
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient"));
|
||||||
|
var json = JsonConvert.SerializeObject(_instance, Formatting.Indented);
|
||||||
|
File.WriteAllText(
|
||||||
|
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
|
"global.config"), json);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void Load()
|
||||||
|
{
|
||||||
|
// if (!File.Exists(Path.Combine(
|
||||||
|
// Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
|
// "global.config")))
|
||||||
|
// File.Create(Path.Combine(
|
||||||
|
// Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
|
// "global.config"));
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var contents = File.ReadAllText(Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
|
"global.config"));
|
||||||
|
_instance = JsonConvert.DeserializeObject<Global>(contents) ?? new Global();
|
||||||
|
_instance.NormalizePaths();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
|
_instance = new Global();
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void NormalizePaths()
|
||||||
|
{
|
||||||
|
config_path = PathUtilities.NormalizeFileSystemPath(config_path);
|
||||||
|
wiki_storage_path = PathUtilities.NormalizeFileSystemPath(wiki_storage_path);
|
||||||
|
font_path = PathUtilities.NormalizeFileSystemPath(font_path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Customers
|
||||||
|
{
|
||||||
|
public List<Customer> customers = new();
|
||||||
|
public Customer current { get; set; } = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Customer
|
||||||
|
{
|
||||||
|
public Customer()
|
||||||
|
{
|
||||||
|
var highestID = 0;
|
||||||
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
|
if (customer.ID > highestID)
|
||||||
|
highestID = customer.ID;
|
||||||
|
|
||||||
|
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; } = "";
|
||||||
|
public AddressPatch patch { get; set; }
|
||||||
|
public char separator { get; set; } = ',';
|
||||||
|
public int ID { get; }
|
||||||
|
|
||||||
|
|
||||||
|
// public static int GetIDByCustomerListItem(string item_content)
|
||||||
|
// {
|
||||||
|
// var id = item_content.Split(" - ")[0];
|
||||||
|
// return int.Parse(id);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class AddressSets
|
||||||
|
{
|
||||||
|
public List<KasAddressList> addresses = new();
|
||||||
|
|
||||||
|
public KasAddressList GetAddressSetByID(int ID)
|
||||||
|
{
|
||||||
|
foreach (var i in addresses)
|
||||||
|
if (i.ID == ID)
|
||||||
|
return i;
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Country
|
||||||
|
{
|
||||||
|
public Country(string name, string translation, List<string> alternatives)
|
||||||
|
{
|
||||||
|
this.name = name;
|
||||||
|
this.translation = translation;
|
||||||
|
this.alternatives = alternatives;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Country(string name)
|
||||||
|
{
|
||||||
|
this.name = name;
|
||||||
|
translation = "";
|
||||||
|
alternatives = new List<string>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Country()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? name { get; set; }
|
||||||
|
public string translation { get; set; }
|
||||||
|
public List<string> alternatives { get; set; }
|
||||||
|
|
||||||
|
public static Country GetByName(string name)
|
||||||
|
{
|
||||||
|
foreach (var country in Global._instance.countries)
|
||||||
|
if (country.name == name)
|
||||||
|
return country;
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -19,8 +19,21 @@
|
|||||||
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
||||||
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
<PackageReference Include="ISO3166" Version="1.0.4"/>
|
||||||
<PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
|
<PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
|
||||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
|
||||||
|
<PackageReference Include="PdfSharp" Version="6.1.1"/>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="Markdig" Version="0.30.3"/>
|
||||||
|
<PackageReference Include="AvaloniaEdit" Version="0.10.12"/>
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="wiki\**\*.md">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -37,4 +50,12 @@
|
|||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="assets\fonts\**\*.*">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
|
||||||
|
<Folder Include="assets\fonts\"/>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+317
-48
@@ -28,7 +28,7 @@
|
|||||||
<Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" />
|
<Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
<Grid RowDefinitions="2*,*,*">
|
<Grid RowDefinitions="3*,80,2*">
|
||||||
<Grid ColumnDefinitions="*,*" Grid.Row="0">
|
<Grid ColumnDefinitions="*,*" Grid.Row="0">
|
||||||
<!-- Kunden -->
|
<!-- Kunden -->
|
||||||
<Grid Margin="30,30,10,30">
|
<Grid Margin="30,30,10,30">
|
||||||
@@ -67,7 +67,28 @@
|
|||||||
SelectionChanged="LstCustomerAdressSets_OnSelectionChanged"
|
SelectionChanged="LstCustomerAdressSets_OnSelectionChanged"
|
||||||
Background="AliceBlue"
|
Background="AliceBlue"
|
||||||
Margin="0,5,0,5"
|
Margin="0,5,0,5"
|
||||||
SelectionMode="Multiple,Toggle" />
|
SelectionMode="Multiple,Toggle">
|
||||||
|
<ListBox.ContextMenu>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem x:Name="MnIAdSetRename" Click="MnIAdSetRename_OnClick">
|
||||||
|
<MenuItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Pencil" Width="12" Height="12" Size="12" />
|
||||||
|
<Label Content="Umbenennen" VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</MenuItem.Header>
|
||||||
|
</MenuItem>
|
||||||
|
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
|
||||||
|
<MenuItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
||||||
|
<Label Content="Löschen" VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</MenuItem.Header>
|
||||||
|
</MenuItem>
|
||||||
|
</ContextMenu>
|
||||||
|
</ListBox.ContextMenu>
|
||||||
|
</ListBox>
|
||||||
|
|
||||||
<Button Grid.Row="2" HorizontalAlignment="Stretch" x:Name="BtnCustomerAddressSetImport"
|
<Button Grid.Row="2" HorizontalAlignment="Stretch" x:Name="BtnCustomerAddressSetImport"
|
||||||
Click="BtnCustomerAddressSetImport_OnClick">
|
Click="BtnCustomerAddressSetImport_OnClick">
|
||||||
@@ -78,23 +99,10 @@
|
|||||||
</Button>
|
</Button>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
<!-- <Grid Grid.Row="0"> -->
|
<!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
|
||||||
<!-- <StackPanel Orientation="Horizontal" VerticalAlignment="Center" -->
|
<StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
|
||||||
<!-- HorizontalAlignment="Center"> -->
|
|
||||||
<!-- <TextBox x:Name="TbFilename" Watermark="Dateipfad" Width="400" -->
|
|
||||||
<!-- VerticalContentAlignment="Center" /> -->
|
|
||||||
<!-- <Button x:Name="BtnChooseFile" Margin="10,0,0,0" Click="BtnChooseFile_OnClick"> -->
|
|
||||||
<!-- <StackPanel Orientation="Horizontal"> -->
|
|
||||||
<!-- <LucideIcon Kind="FolderOpen" Width="16" Height="16" Size="16" /> -->
|
|
||||||
<!-- <Label Content="Öffnen" VerticalContentAlignment="Center" /> -->
|
|
||||||
<!-- </StackPanel> -->
|
|
||||||
<!-- </Button> -->
|
|
||||||
<!-- </StackPanel> -->
|
|
||||||
<!-- </Grid> -->
|
|
||||||
<Grid Grid.ColumnDefinitions="*,*" Grid.Row="1">
|
|
||||||
<StackPanel Grid.Column="0" Width="250" Orientation="Vertical" HorizontalAlignment="Right"
|
|
||||||
Margin="0,0,5,0">
|
Margin="0,0,5,0">
|
||||||
<Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
|
<Button Width="250" HorizontalContentAlignment="Center"
|
||||||
Margin="0,0,0,10" IsEnabled="False"
|
Margin="0,0,0,10" IsEnabled="False"
|
||||||
x:Name="BtnCheck" Click="BtnCheck_OnClick">
|
x:Name="BtnCheck" Click="BtnCheck_OnClick">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -103,7 +111,7 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button HorizontalAlignment="Stretch" IsEnabled="False"
|
<Button Width="250" IsEnabled="False"
|
||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
Click="BtnCombine_OnClick" x:Name="BtnCombine"
|
Click="BtnCombine_OnClick" x:Name="BtnCombine"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
@@ -113,19 +121,7 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button HorizontalAlignment="Stretch" IsEnabled="False"
|
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnRepair"
|
|
||||||
Margin="0,0,0,10">
|
|
||||||
<StackPanel Orientation="Horizontal">
|
|
||||||
<LucideIcon Kind="Hammer" Width="36" Height="36" />
|
|
||||||
<Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
|
|
||||||
FontWeight="Bold" />
|
|
||||||
</StackPanel>
|
|
||||||
</Button>
|
|
||||||
</StackPanel>
|
|
||||||
<StackPanel Grid.Column="1" Width="250" Orientation="Vertical" HorizontalAlignment="Left"
|
|
||||||
Margin="5,0,0,0">
|
|
||||||
<Button HorizontalAlignment="Stretch" IsEnabled="False"
|
|
||||||
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">
|
||||||
@@ -134,7 +130,8 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button HorizontalAlignment="Stretch" IsEnabled="False"
|
<Button Width="250" IsEnabled="False"
|
||||||
|
Click="BtnGenerateLabels_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels"
|
HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -144,8 +141,17 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
<Button Width="250" IsEnabled="False"
|
||||||
|
HorizontalContentAlignment="Center" x:Name="BtnRepair"
|
||||||
|
Margin="0,0,0,10">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Hammer" Width="36" Height="36" />
|
||||||
|
<Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
|
||||||
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
<!-- </Grid> -->
|
||||||
<Grid Grid.Row="2" Margin="20" IsVisible="True" x:Name="GrdCalcMan">
|
<Grid Grid.Row="2" Margin="20" IsVisible="True" x:Name="GrdCalcMan">
|
||||||
<Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
<Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -160,10 +166,12 @@
|
|||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="SquaresUnite" Width="36" Height="36" />
|
<LucideIcon Kind="SquaresUnite" Width="36" Height="36" />
|
||||||
<Label Content="Vereinigung" VerticalContentAlignment="Center" FontSize="15"
|
<Label Content="Vereinigung" VerticalContentAlignment="Center"
|
||||||
|
FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Fügt Elemente beider Mengen in eine Menge zusammen"></Label>
|
<Label FontSize="9"
|
||||||
|
Content="Fügt Elemente beider Mengen in eine Menge zusammen" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button HorizontalAlignment="Stretch" MinWidth="240"
|
<Button HorizontalAlignment="Stretch" MinWidth="240"
|
||||||
@@ -177,7 +185,8 @@
|
|||||||
FontSize="15"
|
FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Überträgt nur doppelte Elemente in die neue Menge"></Label>
|
<Label FontSize="9"
|
||||||
|
Content="Überträgt nur doppelte Elemente in die neue Menge" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
@@ -192,7 +201,8 @@
|
|||||||
FontSize="15"
|
FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Elemente der ersten Menge ohne Elemente der zweiten Menge"></Label>
|
<Label FontSize="9"
|
||||||
|
Content="Elemente der ersten Menge ohne Elemente der zweiten Menge" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
@@ -203,16 +213,90 @@
|
|||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="SquaresExclude" Width="36" Height="36" />
|
<LucideIcon Kind="SquaresExclude" Width="36" Height="36" />
|
||||||
<Label Content="Symmetrische Differenz" VerticalContentAlignment="Center"
|
<Label Content="Symmetrische Differenz"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
FontSize="15"
|
FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind"></Label>
|
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
|
||||||
|
<StackPanel Orientation="Vertical" >
|
||||||
|
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
||||||
|
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
|
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
||||||
|
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeDeleteOld" IsChecked="False">Lösche ursprüngliche Sets</CheckBox>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="20">
|
||||||
|
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20">
|
||||||
|
<StackPanel Orientation="Vertical" Spacing="10">
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Content="Zellenabstand oben"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Content="Zellenabstand unten"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Content="Zellenabstand rechts"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Content="Zellenabstand links"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Content="Zeilen pro Seite"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Spalten pro Seite"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||||
|
<Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -241,6 +325,49 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
<TabItem IsEnabled="True">
|
||||||
|
<TabItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" />
|
||||||
|
<Label FontSize="20" Content="Wiki" VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TabItem.Header>
|
||||||
|
<Grid ColumnDefinitions="300,*">
|
||||||
|
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
||||||
|
<StackPanel>
|
||||||
|
<StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
|
||||||
|
<Button Content="+ Datei" x:Name="BtnWikiAddFile"
|
||||||
|
Click="BtnWikiAddFile_OnClick" />
|
||||||
|
<Button Content="+ Ordner" x:Name="BtnWikiAddFolder"
|
||||||
|
Click="BtnWikiAddFolder_OnClick" />
|
||||||
|
</StackPanel>
|
||||||
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
|
<TreeView Name="NavTree" Margin="10" />
|
||||||
|
</ScrollViewer>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
|
||||||
|
<Grid Grid.Column="1">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<StackPanel Orientation="Horizontal" Margin="8" Grid.Row="0">
|
||||||
|
<Button Name="EditButton" Content="Edit" HorizontalContentAlignment="Center"
|
||||||
|
IsEnabled="False" Width="80" Margin="0,0,8,0" />
|
||||||
|
<Button Name="OpenFolderButton" HorizontalContentAlignment="Center"
|
||||||
|
Content="Open Folder" Width="100" />
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<Border Grid.Row="1" Margin="8" BorderBrush="#DDD" BorderThickness="1" CornerRadius="4">
|
||||||
|
<ScrollViewer>
|
||||||
|
<StackPanel Name="PreviewPanel" Margin="8" />
|
||||||
|
</ScrollViewer>
|
||||||
|
</Border>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
<TabItem IsEnabled="True">
|
<TabItem IsEnabled="True">
|
||||||
<TabItem.Header>
|
<TabItem.Header>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -256,13 +383,14 @@
|
|||||||
<Label FontSize="16" Content="Global" VerticalContentAlignment="Center" />
|
<Label FontSize="16" Content="Global" VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical" Spacing="10">
|
||||||
<Grid ColumnDefinitions="400,*">
|
<Grid ColumnDefinitions="400,*">
|
||||||
<Label Grid.Column="0">config-Datei</Label>
|
<Label Grid.Column="0">config-Datei</Label>
|
||||||
<StackPanel Grid.Column="1" Orientation="Horizontal" Spacing="5">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||||
Watermark="/home/username/.config/logofclient/config.json" />
|
Watermark="/home/username/.config/logofclient/" />
|
||||||
<Button>
|
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="File" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="File" Width="16" Height="16" Size="16" />
|
||||||
@@ -271,6 +399,41 @@
|
|||||||
</Button.Content>
|
</Button.Content>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="400,*">
|
||||||
|
<Label Grid.Column="0">Wiki-Pfad</Label>
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
|
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
||||||
|
Watermark="/home/username/.config/logofclient/wiki" />
|
||||||
|
<Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
|
||||||
|
<Button.Content>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||||
|
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button.Content>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="400,*">
|
||||||
|
<Label Grid.Column="0">Font-Pfad</Label>
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
|
<TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch"
|
||||||
|
Watermark="[App-Direcotry]/assets/fonts/" />
|
||||||
|
<Button IsEnabled="True" x:Name="BtnFontPath" HorizontalAlignment="Right">
|
||||||
|
<Button.Content>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||||
|
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button.Content>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
@@ -316,11 +479,26 @@
|
|||||||
x:Name="TbSettingsCustomerDescription" />
|
x:Name="TbSettingsCustomerDescription" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*">
|
||||||
|
<Label Content="Absenderadresse" />
|
||||||
|
<TextBox Grid.Column="1" Watermark="Absenderadresse"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||||
|
x:Name="TbSettingsCustomerSenderAddress" />
|
||||||
|
</Grid>
|
||||||
|
<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" />
|
||||||
@@ -347,7 +525,7 @@
|
|||||||
VerticalContentAlignment="Center" />
|
VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Background="#99963434" HorizontalAlignment="Stretch"
|
<Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
|
||||||
HorizontalContentAlignment="Center">
|
HorizontalContentAlignment="Center">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
|
||||||
@@ -357,6 +535,97 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
|
<TabItem>
|
||||||
|
<TabItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Globe" Width="16" Height="16" Size="16" />
|
||||||
|
<Label FontSize="16" Content="Länder" VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</TabItem.Header>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Grid Grid.Column="0" Margin="5">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<ListBox x:Name="CountryList" Grid.Row="0"
|
||||||
|
SelectionChanged="CountryList_OnSelectionChanged" />
|
||||||
|
|
||||||
|
<Grid Grid.Row="1" ColumnDefinitions="*,250" Margin="0,5,0,0">
|
||||||
|
<TextBox x:Name="TbSettingsNewCountry" />
|
||||||
|
<Button Grid.Column="1" x:Name="BtnSettingsNewCountry"
|
||||||
|
HorizontalAlignment="Stretch" Click="BtnSettingsNewCountry_OnClick"
|
||||||
|
HorizontalContentAlignment="Center" Content="+ Hinzufügen"
|
||||||
|
Margin="5,0,0,0" />
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid Grid.Column="1" Margin="5">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,5"
|
||||||
|
HorizontalAlignment="Right">
|
||||||
|
<Button x:Name="BtnSettingsInsertDefaultCountries"
|
||||||
|
Content="Standard-Länder laden (Englisch)"
|
||||||
|
Click="BtnSettingsInsertDefaultCountries_OnClick" />
|
||||||
|
|
||||||
|
</StackPanel>
|
||||||
|
|
||||||
|
<Grid Grid.Row="1" ColumnDefinitions="300,*" Margin="0,0,0,5">
|
||||||
|
<TextBlock Text="Name:" VerticalAlignment="Center" />
|
||||||
|
<TextBox Grid.Column="1" x:Name="TbSettingsCountryName"
|
||||||
|
TextChanged="TbSettingsCountryName_OnTextChanged" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid ColumnDefinitions="300,*" Margin="0,0,0,5" Grid.Row="2">
|
||||||
|
<TextBlock Text="Übersetzung:" VerticalAlignment="Center" />
|
||||||
|
<TextBox Grid.Column="1" x:Name="TbSettingsCountryTranslation"
|
||||||
|
TextChanged="TbSettingsCountryTranslation_OnTextChanged" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Grid Grid.Row="3">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
<RowDefinition Height="Auto" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
|
|
||||||
|
<ListBox Grid.Row="0" x:Name="LbSettingsAlternatives" SelectionMode="Multiple" />
|
||||||
|
|
||||||
|
<Grid Grid.Row="1" ColumnDefinitions="*,200" Margin="0,5,0,0">
|
||||||
|
<TextBox x:Name="TbSettingsNewCountryAlternative"
|
||||||
|
Watermark="Kürzel/Alternative" />
|
||||||
|
<Button Grid.Column="1" x:Name="BtnSettingsNewCountryAlternative"
|
||||||
|
Content="+ Hinzufügen" Margin="5 0 0 0"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
Click="BtnSettingsNewCountryAlternative_OnClick"
|
||||||
|
HorizontalAlignment="Stretch" />
|
||||||
|
</Grid>
|
||||||
|
|
||||||
|
<Button x:Name="BtnSettingsRemoveSelectedAlternatives" Grid.Row="2"
|
||||||
|
Content="Ausgewählte Entfernen" Background="#99963434"
|
||||||
|
HorizontalContentAlignment="Center"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Click="BtnSettingsRemoveSelectedAlternatives_OnClick"
|
||||||
|
Margin="0,5,0,0" />
|
||||||
|
|
||||||
|
<Button Grid.Row="3"
|
||||||
|
Content="Land Entfernen" Background="#99963434"
|
||||||
|
HorizontalContentAlignment="Center" x:Name="BtnSettingsRemoveCountry"
|
||||||
|
HorizontalAlignment="Stretch" Click="BtnSettingsRemoveCountry_OnClick"
|
||||||
|
Margin="0,5,0,0" />
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
</TabControl>
|
</TabControl>
|
||||||
|
|||||||
+835
-152
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,19 @@
|
|||||||
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||||
|
x:Class="Logof_Client.NamingWindow"
|
||||||
|
Title="NamingWindow">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
|
<TextBlock Name="Text" Margin="10" TextWrapping="Wrap" />
|
||||||
|
<TextBox Name="Input" Margin="10" />
|
||||||
|
<StackPanel HorizontalAlignment="Right" Margin="5" Orientation="Horizontal" Name="Buttons">
|
||||||
|
<StackPanel.Styles>
|
||||||
|
<Style Selector="Button">
|
||||||
|
<Setter Property="Margin" Value="5" />
|
||||||
|
</Style>
|
||||||
|
</StackPanel.Styles>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
using System;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public partial class NamingWindow : Window
|
||||||
|
{
|
||||||
|
public NamingWindow()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Task<string> Show(Window parent, string input = "", string info = "Bitte geben Sie einen Namen ein:")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var wind = new NamingWindow
|
||||||
|
{
|
||||||
|
Title = "Name eingeben"
|
||||||
|
};
|
||||||
|
wind.FindControl<TextBlock>("Text").Text = info;
|
||||||
|
var buttonPanel = wind.FindControl<StackPanel>("Buttons");
|
||||||
|
var inputBox = wind.FindControl<TextBox>("Input");
|
||||||
|
|
||||||
|
inputBox.Text = input;
|
||||||
|
string res = null;
|
||||||
|
|
||||||
|
void AddButton(string caption)
|
||||||
|
{
|
||||||
|
var btn = new Button { Content = caption };
|
||||||
|
btn.Click += (_, __) =>
|
||||||
|
{
|
||||||
|
res = inputBox.Text;
|
||||||
|
wind.Close();
|
||||||
|
};
|
||||||
|
buttonPanel.Children.Add(btn);
|
||||||
|
}
|
||||||
|
|
||||||
|
AddButton("Ok");
|
||||||
|
|
||||||
|
|
||||||
|
var tcs = new TaskCompletionSource<string>();
|
||||||
|
wind.Closed += delegate { tcs.TrySetResult(res); };
|
||||||
|
if (parent != null)
|
||||||
|
wind.ShowDialog(parent);
|
||||||
|
else wind.Show();
|
||||||
|
wind.Focus();
|
||||||
|
|
||||||
|
return tcs.Task;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
|
||||||
|
return Task.FromResult<string>(null!);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
|
mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
|
||||||
Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico"
|
Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||||
x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
|
x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
|
||||||
<Grid>
|
<Grid>
|
||||||
<!-- <ScrollViewer x:Name="ScvLog"> -->
|
<!-- <ScrollViewer x:Name="ScvLog"> -->
|
||||||
|
|||||||
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# Logofclient
|
||||||
|
Free and open source software suite to manage customers, prices, employees, etc.
|
||||||
|
|
||||||
|
## Bugs
|
||||||
|
Please report any bugs you find to fierke@mypapertown.de, thank you!
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
Feel free to contribute to this project using your MyPaperCloud-Account (request it via fierke@mypapertown.de) or a local git.mypapercloud.de-Account you are able to create.
|
||||||
+8
-3
@@ -12,13 +12,18 @@
|
|||||||
x:Name="LblResultCount" />
|
x:Name="LblResultCount" />
|
||||||
<StackPanel x:Name="StpFilterOptions" Orientation="Vertical" HorizontalAlignment="Stretch"
|
<StackPanel x:Name="StpFilterOptions" Orientation="Vertical" HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch" Margin="10,80,10,0" />
|
VerticalAlignment="Stretch" Margin="10,80,10,0" />
|
||||||
<!-- <Button x:Name="BtnUpdateFilter" Content="Aktualisieren" HorizontalAlignment="Stretch" -->
|
<Button Content="Filter anwenden" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
|
||||||
<!-- VerticalAlignment="Bottom" Margin="10,0,10,10" Click="BtnUpdateFilter_OnClick" /> -->
|
x:Name="BtnExecuteFilter" Click="BtnExecuteFilter_OnClick"
|
||||||
|
Margin="10,10,10,50" />
|
||||||
<Button Content="Ausgewählte Anzeigen" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
|
<Button Content="Ausgewählte Anzeigen" HorizontalAlignment="Stretch" VerticalAlignment="Bottom"
|
||||||
x:Name="BtnShowSelected" Click="BtnShowSelected_OnClick"
|
x:Name="BtnShowSelected" Click="BtnShowSelected_OnClick"
|
||||||
Margin="10,10,10,10" />
|
Margin="10,10,10,10" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<DataGrid x:Name="DgResult" Grid.Column="1" AutoGenerateColumns="True" />
|
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
|
<!-- <TextBlock x:Name="TbResults"></TextBlock> -->
|
||||||
|
<ListBox x:Name="LbResults"></ListBox>
|
||||||
|
<!-- <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" /> -->
|
||||||
|
</ScrollViewer>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
+149
-45
@@ -1,9 +1,11 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Interactivity;
|
using Avalonia.Interactivity;
|
||||||
using Avalonia.Layout;
|
using Avalonia.Layout;
|
||||||
|
using Avalonia.Media;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
|
|
||||||
@@ -11,10 +13,10 @@ public partial class ResultWindow : Window
|
|||||||
{
|
{
|
||||||
public List<CheckBox> errortypecheckboxes = new();
|
public List<CheckBox> errortypecheckboxes = new();
|
||||||
public KasAddressList ur_addresses = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
|
public KasAddressList ur_addresses = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
|
||||||
public List<KasPersonError> ur_result;
|
public List<KasPerson> ur_result;
|
||||||
public List<CheckBox> warningtypecheckboxes = new();
|
public List<CheckBox> warningtypecheckboxes = new();
|
||||||
|
|
||||||
public ResultWindow(List<KasPersonError> result,
|
public ResultWindow(List<KasPerson> result,
|
||||||
int addressSetID)
|
int addressSetID)
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
@@ -24,18 +26,67 @@ public partial class ResultWindow : Window
|
|||||||
//ViewSingle(200552426);
|
//ViewSingle(200552426);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void GenerateView(List<KasPersonError> result)
|
private void GenerateView(List<KasPerson> result)
|
||||||
{
|
{
|
||||||
// var errors = new List<KasPersonError>();
|
try
|
||||||
//foreach (var single_result in result) errors.Add(single_result);
|
{
|
||||||
LblResultCount.Content = $"{result.Count}/{ur_result.Count} Ergebnisse";
|
|
||||||
DgResult.ItemsSource = result;
|
|
||||||
|
// Filter to only show persons with errors
|
||||||
|
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
||||||
|
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
|
// 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 void ViewSingle(int refsid)
|
private Grid CreatePersonGrid(KasPerson person)
|
||||||
|
{
|
||||||
|
var grid = new Grid
|
||||||
|
{
|
||||||
|
ColumnDefinitions = ColumnDefinitions.Parse("100,*,100,*,100,*"),
|
||||||
|
RowDefinitions = RowDefinitions.Parse("Auto"),
|
||||||
|
Margin = new Thickness(0, 5, 0, 5),
|
||||||
|
Background = new SolidColorBrush(Color.Parse("#F0F0F0"))
|
||||||
|
};
|
||||||
|
|
||||||
|
// ID
|
||||||
|
grid.Children.Add(new TextBlock
|
||||||
|
{
|
||||||
|
Text = "id: ",
|
||||||
|
FontWeight = FontWeight.Bold, Margin = new Thickness(5)
|
||||||
|
});
|
||||||
|
grid.Children.Add(new TextBlock { Text = person.id.ToString(), Margin = new Thickness(5) });
|
||||||
|
Grid.SetColumn(grid.Children[1], 1);
|
||||||
|
|
||||||
|
// PLZ
|
||||||
|
grid.Children.Add(new TextBlock { Text = "plz:", FontWeight = FontWeight.Bold, Margin = new Thickness(5) });
|
||||||
|
Grid.SetColumn(grid.Children[2], 2);
|
||||||
|
grid.Children.Add(new TextBlock { Text = person.plz, Margin = new Thickness(5) });
|
||||||
|
Grid.SetColumn(grid.Children[3], 3);
|
||||||
|
|
||||||
|
// PPLZ
|
||||||
|
grid.Children.Add(new TextBlock { Text = "errors:", FontWeight = FontWeight.Bold, Margin = new Thickness(5) });
|
||||||
|
Grid.SetColumn(grid.Children[4], 4);
|
||||||
|
grid.Children.Add(new TextBlock { Text = person.PersonError.GetString(), Margin = new Thickness(5) });
|
||||||
|
Grid.SetColumn(grid.Children[5], 5);
|
||||||
|
|
||||||
|
return grid;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void ViewSingle(int id)
|
||||||
{
|
{
|
||||||
foreach (var result in ur_addresses.KasPersons)
|
foreach (var result in ur_addresses.KasPersons)
|
||||||
if (result.refsid == refsid)
|
if (result.id == id)
|
||||||
{
|
{
|
||||||
var wind = new Window();
|
var wind = new Window();
|
||||||
var stp = new StackPanel();
|
var stp = new StackPanel();
|
||||||
@@ -44,8 +95,8 @@ public partial class ResultWindow : Window
|
|||||||
var tb = new TextBlock();
|
var tb = new TextBlock();
|
||||||
var tb2 = new TextBlock();
|
var tb2 = new TextBlock();
|
||||||
tb.Text =
|
tb.Text =
|
||||||
"refsid:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
|
"id:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
|
||||||
tb2.Text = result.refsid + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
|
tb2.Text = result.id + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
|
||||||
result.adel + "\n" + result.name + "\n" + result.namezus + "\n" + result.anredzus + "\n" +
|
result.adel + "\n" + result.name + "\n" + result.namezus + "\n" + result.anredzus + "\n" +
|
||||||
result.strasse + "\n" + result.strasse2 + "\n" + result.plz + "\n" + result.ort + "\n" +
|
result.strasse + "\n" + result.strasse2 + "\n" + result.plz + "\n" + result.ort + "\n" +
|
||||||
result.land + "\n" + result.pplz + "\n" + result.postfach + "\n" + result.name1 + "\n" +
|
result.land + "\n" + result.pplz + "\n" + result.postfach + "\n" + result.name1 + "\n" +
|
||||||
@@ -62,18 +113,22 @@ public partial class ResultWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Load(List<KasPersonError> result)
|
private void Load(List<KasPerson> result)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var knownErrors = new List<AddressCheck.ErrorTypes>();
|
var knownErrors = new List<AddressCheck.ErrorTypes>();
|
||||||
var knownWarnings = new List<AddressCheck.WarningTypes>();
|
var knownWarnings = new List<AddressCheck.WarningTypes>();
|
||||||
|
|
||||||
foreach (var single_result in result)
|
foreach (var person in result)
|
||||||
{
|
{
|
||||||
foreach (var errtyp in single_result.errors)
|
if (person.PersonError == null) continue;
|
||||||
|
|
||||||
|
foreach (var errtyp in person.PersonError.errors)
|
||||||
if (!knownErrors.Contains(errtyp))
|
if (!knownErrors.Contains(errtyp))
|
||||||
knownErrors.Add(errtyp);
|
knownErrors.Add(errtyp);
|
||||||
|
|
||||||
foreach (var wartyp in single_result.warnings)
|
foreach (var wartyp in person.PersonError.warnings)
|
||||||
if (!knownWarnings.Contains(wartyp))
|
if (!knownWarnings.Contains(wartyp))
|
||||||
knownWarnings.Add(wartyp);
|
knownWarnings.Add(wartyp);
|
||||||
}
|
}
|
||||||
@@ -84,7 +139,7 @@ public partial class ResultWindow : Window
|
|||||||
var cb = new CheckBox();
|
var cb = new CheckBox();
|
||||||
cb.IsChecked = true;
|
cb.IsChecked = true;
|
||||||
cb.Content = errtype.ToString();
|
cb.Content = errtype.ToString();
|
||||||
cb.Click += (sender, e) => UpdateFilter();
|
//cb.Click += (sender, e) => UpdateFilter();
|
||||||
errortypecheckboxes.Add(cb);
|
errortypecheckboxes.Add(cb);
|
||||||
StpFilterOptions.Children.Add(cb);
|
StpFilterOptions.Children.Add(cb);
|
||||||
}
|
}
|
||||||
@@ -94,13 +149,19 @@ public partial class ResultWindow : Window
|
|||||||
var cb = new CheckBox();
|
var cb = new CheckBox();
|
||||||
cb.IsChecked = true;
|
cb.IsChecked = true;
|
||||||
cb.Content = wartype.ToString();
|
cb.Content = wartype.ToString();
|
||||||
cb.Click += (sender, e) => UpdateFilter();
|
//cb.Click += (sender, e) => UpdateFilter();
|
||||||
warningtypecheckboxes.Add(cb);
|
warningtypecheckboxes.Add(cb);
|
||||||
StpFilterOptions.Children.Add(cb);
|
StpFilterOptions.Children.Add(cb);
|
||||||
}
|
}
|
||||||
|
|
||||||
GenerateView(result);
|
GenerateView(result);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnUpdateFilter_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -108,49 +169,92 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
private void UpdateFilter()
|
private void UpdateFilter()
|
||||||
{
|
{
|
||||||
var temp_result = new List<KasPersonError>();
|
try
|
||||||
var checked_types = new List<AddressCheck.ErrorTypes>();
|
{
|
||||||
var checked_types_war = new List<AddressCheck.WarningTypes>();
|
var temp_result = new List<KasPerson>();
|
||||||
|
|
||||||
|
var checkedErrors = new HashSet<AddressCheck.ErrorTypes>();
|
||||||
|
var checkedWarnings = new HashSet<AddressCheck.WarningTypes>();
|
||||||
|
|
||||||
|
// safer parsing: use TryParse and trim the Content string
|
||||||
foreach (var cb in errortypecheckboxes)
|
foreach (var cb in errortypecheckboxes)
|
||||||
if (cb.IsChecked == true)
|
if (cb.IsChecked == true)
|
||||||
checked_types.Add(
|
{
|
||||||
(AddressCheck.ErrorTypes)Enum.Parse(typeof(AddressCheck.ErrorTypes), cb.Content.ToString()));
|
var s = cb.Content?.ToString()?.Trim();
|
||||||
|
if (!string.IsNullOrEmpty(s) &&
|
||||||
|
Enum.TryParse<AddressCheck.ErrorTypes>(s, true, out var et))
|
||||||
|
checkedErrors.Add(et);
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var cb in warningtypecheckboxes)
|
foreach (var cb in warningtypecheckboxes)
|
||||||
if (cb.IsChecked == true)
|
if (cb.IsChecked == true)
|
||||||
checked_types_war.Add(
|
|
||||||
(AddressCheck.WarningTypes)Enum.Parse(typeof(AddressCheck.WarningTypes), cb.Content.ToString()));
|
|
||||||
|
|
||||||
foreach (var sres in ur_result)
|
|
||||||
{
|
{
|
||||||
foreach (var err in sres.errors)
|
var s = cb.Content?.ToString()?.Trim();
|
||||||
if (checked_types.Contains(err) && !temp_result.Contains(sres))
|
if (!string.IsNullOrEmpty(s) &&
|
||||||
temp_result.Add(sres);
|
Enum.TryParse<AddressCheck.WarningTypes>(s, true, out var wt))
|
||||||
|
checkedWarnings.Add(wt);
|
||||||
foreach (var war in sres.warnings)
|
|
||||||
if (checked_types_war.Contains(war) && !temp_result.Contains(sres))
|
|
||||||
temp_result.Add(sres);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If no checkboxes are selected, show all persons with errors (default behavior)
|
||||||
|
if (checkedErrors.Count == 0 && checkedWarnings.Count == 0)
|
||||||
|
temp_result = ur_result.Where(p => p.PersonError != null).ToList();
|
||||||
|
else
|
||||||
|
foreach (var person in ur_result)
|
||||||
|
{
|
||||||
|
if (person.PersonError == null) continue;
|
||||||
|
|
||||||
//var errors = new List<KasPersonError>();
|
var personErrors = person.PersonError.errors ?? Enumerable.Empty<AddressCheck.ErrorTypes>();
|
||||||
//foreach (var single_result in temp_result) errors.Add(new KasPersonError(single_result));
|
var personWarnings = person.PersonError.warnings ?? Enumerable.Empty<AddressCheck.WarningTypes>();
|
||||||
|
|
||||||
|
var matchesError = false;
|
||||||
|
var matchesWarning = false;
|
||||||
|
|
||||||
|
// only test errors if the user selected error-types
|
||||||
|
if (checkedErrors.Count > 0)
|
||||||
|
matchesError = personErrors.Any(err => checkedErrors.Contains(err));
|
||||||
|
|
||||||
|
// only test warnings if the user selected warning-types
|
||||||
|
if (checkedWarnings.Count > 0)
|
||||||
|
matchesWarning = personWarnings.Any(war => checkedWarnings.Contains(war));
|
||||||
|
|
||||||
|
// If at least one category matches (OR across categories), include person
|
||||||
|
if ((matchesError || matchesWarning) && !temp_result.Contains(person))
|
||||||
|
temp_result.Add(person);
|
||||||
|
}
|
||||||
|
|
||||||
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
||||||
DgResult.ItemsSource = temp_result;
|
|
||||||
|
LbResults.Items.Clear();
|
||||||
|
foreach (var person in temp_result) LbResults.Items.Add(person.PersonError.ToString(person));
|
||||||
|
// TbResults.Text = "";
|
||||||
|
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
|
||||||
|
// StkResults.Children.Clear();
|
||||||
|
// foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
||||||
|
} catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log("Error while updating filter: " + ex.Message, Logger.LogType.Warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private void BtnShowSelected_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnShowSelected_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
foreach (var selected in DgResult.SelectedItems)
|
// foreach (var selected in DgResult.SelectedItems)
|
||||||
try
|
// try
|
||||||
|
// {
|
||||||
|
// var _asKas = (KasPerson)selected;
|
||||||
|
// ViewSingle(_asKas.id);
|
||||||
|
// }
|
||||||
|
// catch (Exception ex)
|
||||||
|
// {
|
||||||
|
// Console.WriteLine(ex.Message);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnExecuteFilter_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var _asKas = (KasPersonError)selected;
|
Console.WriteLine("Updating filter...");
|
||||||
ViewSingle(_asKas.refsid);
|
UpdateFilter();
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-147
@@ -1,147 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace Logof_Client;
|
|
||||||
|
|
||||||
public class Settings
|
|
||||||
{
|
|
||||||
public static Settings _instance = new();
|
|
||||||
public AddressSets addressSets = new();
|
|
||||||
public Customers customers = new();
|
|
||||||
|
|
||||||
public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"logofclient", "config.json");
|
|
||||||
|
|
||||||
public Settings()
|
|
||||||
{
|
|
||||||
_instance = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
public static void Save()
|
|
||||||
{
|
|
||||||
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"logofclient")))
|
|
||||||
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"logofclient"));
|
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
|
||||||
|
|
||||||
var json = JsonConvert.SerializeObject(_instance);
|
|
||||||
File.WriteAllText(_instance.settingsPath, json);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Load()
|
|
||||||
{
|
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var contents = File.ReadAllText(_instance.settingsPath);
|
|
||||||
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
|
||||||
MainWindow._instance.RefreshCustomerItems();
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading settings. Generating new...");
|
|
||||||
_instance = new Settings();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Global
|
|
||||||
{
|
|
||||||
public static Global _instance;
|
|
||||||
|
|
||||||
public Global()
|
|
||||||
{
|
|
||||||
_instance = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string config_path { get; set; } = "";
|
|
||||||
|
|
||||||
public static void Save()
|
|
||||||
{
|
|
||||||
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"logofclient")))
|
|
||||||
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
|
||||||
"logofclient"));
|
|
||||||
var json = JsonConvert.SerializeObject(_instance, Formatting.Indented);
|
|
||||||
File.WriteAllText(
|
|
||||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
|
||||||
"global.config"), json);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void Load()
|
|
||||||
{
|
|
||||||
// if (!File.Exists(Path.Combine(
|
|
||||||
// Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
|
||||||
// "global.config")))
|
|
||||||
// File.Create(Path.Combine(
|
|
||||||
// Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
|
||||||
// "global.config"));
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var contents = File.ReadAllText(Path.Combine(
|
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
|
||||||
"global.config"));
|
|
||||||
_instance = JsonConvert.DeserializeObject<Global>(contents);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.Message);
|
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading global settings. Generating new...");
|
|
||||||
_instance = new Global();
|
|
||||||
Save();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Customers
|
|
||||||
{
|
|
||||||
public List<Customer> customers = new();
|
|
||||||
public int current { get; set; } = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Customer
|
|
||||||
{
|
|
||||||
public Customer()
|
|
||||||
{
|
|
||||||
var highestID = 0;
|
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
|
||||||
if (customer.ID > highestID)
|
|
||||||
highestID = customer.ID;
|
|
||||||
|
|
||||||
ID = highestID + 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string name { get; set; } = "";
|
|
||||||
public string description { get; set; } = "";
|
|
||||||
public AddressPatch patch { get; set; }
|
|
||||||
public char separator { get; set; } = ',';
|
|
||||||
public int ID { get; }
|
|
||||||
|
|
||||||
public static int GetIDByCustomerListItem(string item_content)
|
|
||||||
{
|
|
||||||
var id = item_content.Split(" - ")[0];
|
|
||||||
return int.Parse(id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class AddressSets
|
|
||||||
{
|
|
||||||
public List<KasAddressList> addresses = new();
|
|
||||||
|
|
||||||
public KasAddressList GetAddressSetByID(int ID)
|
|
||||||
{
|
|
||||||
foreach (var i in addresses)
|
|
||||||
if (i.ID == ID)
|
|
||||||
return i;
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+37
-10
@@ -1,4 +1,6 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia.Threading;
|
using Avalonia.Threading;
|
||||||
@@ -35,12 +37,22 @@ public class AddressCheck
|
|||||||
_progress = progressWindow;
|
_progress = progressWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<KasPersonError>> Perform(int id)
|
public async Task<List<KasPerson>> Perform(int id)
|
||||||
{
|
{
|
||||||
foreach (var adset in Settings._instance.addressSets.addresses)
|
try
|
||||||
if (adset.ID == id)
|
|
||||||
{
|
{
|
||||||
var failed_refsids = new List<KasPersonError>();
|
// 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 total = adset.KasPersons.Count;
|
||||||
var current = 0;
|
var current = 0;
|
||||||
|
|
||||||
@@ -92,7 +104,6 @@ public class AddressCheck
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!AddressCreator.CheckPLZ(person.pplz, person.land))
|
if (!AddressCreator.CheckPLZ(person.pplz, person.land))
|
||||||
{
|
{
|
||||||
hasFaults = true;
|
hasFaults = true;
|
||||||
@@ -224,9 +235,14 @@ public class AddressCheck
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (hasFaults)
|
if (hasFaults)
|
||||||
lock (failed_refsids)
|
lock (Settings._instance.addressSets.addresses)
|
||||||
{
|
{
|
||||||
failed_refsids.Add(new KasPersonError((person.refsid, errors, warnings)));
|
// Directly set PersonError in the address set
|
||||||
|
var person_index = adset.KasPersons.IndexOf(person);
|
||||||
|
if (person_index >= 0)
|
||||||
|
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index]
|
||||||
|
.PersonError =
|
||||||
|
new KasPersonError((errors, warnings));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fortschritt aktualisieren
|
// Fortschritt aktualisieren
|
||||||
@@ -235,17 +251,28 @@ public class AddressCheck
|
|||||||
await Dispatcher.UIThread.InvokeAsync(() =>
|
await Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
if (hasFaults)
|
if (hasFaults)
|
||||||
_progress.AddToLog($"Person mit refsid {person.refsid} ist fehlerhaft");
|
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
|
||||||
|
Convert.ToInt32(percent).ToString());
|
||||||
|
|
||||||
_progress.ChangePercentage(percent);
|
_progress.ChangePercentage(percent);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
adset.errors = failed_refsids;
|
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
return failed_refsids;
|
|
||||||
|
// Return only the persons with errors from the address set
|
||||||
|
return Settings._instance.addressSets.addresses[adset_index].KasPersons
|
||||||
|
.Where(p => p.PersonError != null)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address check: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
+173
-101
@@ -1,59 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.InteropServices.JavaScript;
|
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
|
|
||||||
public static class AddressCreator
|
public static class AddressCreator
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="refsid">KasPerson-ID</param>
|
|
||||||
/// <returns>A markdown string with the address that is maximum seven lines long</returns>
|
|
||||||
public static string? CreateFinalMarkdownString2(int refsid)
|
|
||||||
{
|
|
||||||
// Maximum seven lines of information
|
|
||||||
|
|
||||||
// find the address
|
|
||||||
KasPerson address = new KasPerson();
|
|
||||||
string string_address = "";
|
|
||||||
int address_line_count = 0;
|
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
|
||||||
{
|
|
||||||
var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
|
|
||||||
if (temp != null) break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// no address found
|
|
||||||
if (address == null)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// let's get started: the name (and anrede), block-line-count: 1
|
|
||||||
if (!string.IsNullOrEmpty(address.anrede))
|
|
||||||
{
|
|
||||||
if(address.anrede == "Herr") string_address += "Herrn";
|
|
||||||
else string_address += address.anrede;
|
|
||||||
address_line_count++;
|
|
||||||
}
|
|
||||||
if (!string.IsNullOrEmpty(address.name) && !string.IsNullOrEmpty(address.vorname))
|
|
||||||
{
|
|
||||||
string_address += " " + address.vorname + " " + address.name;
|
|
||||||
} else if (!string.IsNullOrEmpty(address.name))
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
else // Anrede but no name? to the trash!
|
|
||||||
{
|
|
||||||
string_address = "";
|
|
||||||
address_line_count = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Hier könnte eine\nAdresse stehen";
|
|
||||||
}
|
|
||||||
|
|
||||||
//+++ Aufbau +++
|
//+++ Aufbau +++
|
||||||
//
|
//
|
||||||
// Von unten anfangen, max. 7 Zeilen
|
// Von unten anfangen, max. 7 Zeilen
|
||||||
@@ -85,36 +36,69 @@ public static class AddressCreator
|
|||||||
// Auswurf PDF mit PvSt.
|
// Auswurf PDF mit PvSt.
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates max-seven-lines-long markdown address-string. Analyzes the KasPerson-Instance to find the best result.
|
/// Creates max-seven-lines-long Markdown address-string. Analyzes the KasPerson-Instance to find the best result.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="refsid">KasPerson-ID</param>
|
/// <param name="refsid">KasPerson-ID</param>
|
||||||
/// <returns>A markdown string with the address that is maximum seven lines long</returns>
|
/// <returns>A Markdown string with the address that is maximum seven lines long</returns>
|
||||||
public static string? CreateFinalMarkdownString(int refsid)
|
public static string? CreateFinalMarkdownString(int id)
|
||||||
{
|
{
|
||||||
// Maximum seven lines of information
|
// Maximum seven lines of information
|
||||||
|
try
|
||||||
|
{
|
||||||
// find the address
|
// find the address
|
||||||
KasPerson address = new KasPerson();
|
KasPerson? address = null;
|
||||||
string string_address = "";
|
var string_address = "";
|
||||||
int address_line_count = 0;
|
var address_line_count = 0;
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
{
|
{
|
||||||
var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
|
var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
|
||||||
if (temp != null) break;
|
if (temp != null)
|
||||||
|
{
|
||||||
|
address = temp;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// no address found
|
// no address found
|
||||||
if (address == null)
|
if (address == null) return null;
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// let's get started: we start from the bottom
|
// let's get started: we start from the bottom
|
||||||
// if the country is not germany, set it
|
// if the country is not Germany, set it; try to map via Global countries alternatives -> translation
|
||||||
// LAND: GER oder DE
|
var trimmedLand = (address.land ?? "").Trim();
|
||||||
if (address.land.ToLower().Trim() != "germany" && address.land.ToLower().Trim() != "ger" && address.land.ToLower().Trim() != "" && address.land.ToLower().Trim() != "de" && address.land.ToLower().Trim() != "deutschland")
|
var trimmedLowerLand = trimmedLand.ToLower();
|
||||||
|
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
|
||||||
|
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
|
||||||
|
trimmedLowerLand == "deutschland";
|
||||||
|
|
||||||
|
if (!isGermany)
|
||||||
{
|
{
|
||||||
string_address = "**" + address.land.Trim() + "**"; // Needs to be bold
|
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();
|
||||||
|
if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
countryToShow = string.IsNullOrWhiteSpace(country.translation)
|
||||||
|
? country.name
|
||||||
|
: country.translation;
|
||||||
|
goto CountryFound;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// ignore malformed alternative
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CountryFound:
|
||||||
|
string_address = "**" + countryToShow + "**"; // Needs to be bold
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -125,52 +109,129 @@ public static class AddressCreator
|
|||||||
address_line_count++;
|
address_line_count++;
|
||||||
if (!string.IsNullOrWhiteSpace(address.postfach))
|
if (!string.IsNullOrWhiteSpace(address.postfach))
|
||||||
{
|
{
|
||||||
string_address = address.postfach.Trim() + "\n" + string_address;
|
string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
}
|
}
|
||||||
else
|
else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
|
||||||
{
|
{
|
||||||
string_address = address.strasse.Trim() + "\n" + string_address;
|
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(address.anredzus))
|
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||||
|
address.adel, address.name, address.namezus);
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(nameline))
|
||||||
{
|
{
|
||||||
string_address = address.anredzus.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
|
string_address = nameline + "\n" + string_address;
|
||||||
address_line_count++;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string_address = address.anrede.Trim() + " " + address.titel.Trim()+ " " + address.vorname.Trim()+ " " + address.adel.Trim() + " " + address.name.Trim()+ " (" + address.namezus.Trim() + ")\n" + string_address;
|
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
string[] nameattribs = new[] { address.name1, address.name2, address.name3, address.name4, address.name5 };
|
// REIHENFOLGE
|
||||||
|
var nameattribs = new[]
|
||||||
|
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
|
||||||
|
|
||||||
for (int i = 0; i < nameattribs.Length-1; i++)
|
var names = "";
|
||||||
{
|
for (var i = 0; i < nameattribs.Length; i++)
|
||||||
if (address_line_count < 7)
|
try
|
||||||
{
|
{
|
||||||
|
if (address_line_count >= 7) break;
|
||||||
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
||||||
{
|
{
|
||||||
string_address += nameattribs[i] + "\n" + string_address;
|
names += "\n" + nameattribs[i];
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else break;
|
catch
|
||||||
|
{
|
||||||
|
Console.WriteLine("ERROR 15821");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
string_address = names + "\n" + string_address;
|
||||||
} // Alternative B: plz valid and city existing
|
} // Alternative B: plz valid and city existing
|
||||||
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
||||||
{
|
{
|
||||||
|
string_address = address.plz + " " + address.ort + "\n" + string_address;
|
||||||
}
|
address_line_count++;
|
||||||
else // Error-Handling?
|
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++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return string_address;
|
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||||
return "Hier könnte eine\nAdresse stehen";
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
||||||
|
string name, string namezus)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(anredezus))
|
||||||
|
return string.Join(" ",
|
||||||
|
new[] { anredezus, titel, vorname, adel, name }
|
||||||
|
.Where(s => !string.IsNullOrWhiteSpace(s))
|
||||||
|
)
|
||||||
|
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||||
|
|
||||||
|
// else
|
||||||
|
return string.Join(" ",
|
||||||
|
new[] { anrede, titel, vorname, adel, name }
|
||||||
|
.Where(s => !string.IsNullOrWhiteSpace(s))
|
||||||
|
)
|
||||||
|
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address name line creation: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -181,28 +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 (plz == null) return false;
|
|
||||||
if (land.ToLower().Trim() != "germany" && land.ToLower().Trim() != "ger" && land.ToLower().Trim() != "" && land.ToLower().Trim() != "de" && land.ToLower().Trim() != "deutschland")
|
|
||||||
{
|
|
||||||
// if country is not germany... how should we check for a valid plz?
|
|
||||||
|
|
||||||
// temporarily accept all of them
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
int iplz = Convert.ToInt32(plz);
|
if (string.IsNullOrWhiteSpace(plz)) return false;
|
||||||
if (iplz > 999999 || iplz < 10000)
|
|
||||||
|
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;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// For non-German countries, accept any non-empty postal code
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
} catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
return false;
|
Logger.Log($"Error while performing address plz check: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text;
|
||||||
|
using Logof_Client;
|
||||||
|
|
||||||
|
public class AddressPatch
|
||||||
|
{
|
||||||
|
public string refsid_is { get; set; } = "";
|
||||||
|
public string anrede_is { get; set; } = "";
|
||||||
|
public string titel_is { get; set; } = "";
|
||||||
|
public string vorname_is { get; set; } = "";
|
||||||
|
public string adel_is { get; set; } = "";
|
||||||
|
public string name_is { get; set; } = "";
|
||||||
|
public string namezus_is { get; set; } = "";
|
||||||
|
public string anredzus_is { get; set; } = "";
|
||||||
|
public string strasse_is { get; set; } = "";
|
||||||
|
public string strasse2_is { get; set; } = "";
|
||||||
|
public string plz_is { get; set; } = "";
|
||||||
|
public string ort_is { get; set; } = "";
|
||||||
|
public string land_is { get; set; } = "";
|
||||||
|
public string pplz_is { get; set; } = "";
|
||||||
|
public string postfach_is { get; set; } = "";
|
||||||
|
public string name1_is { get; set; } = "";
|
||||||
|
public string name2_is { get; set; } = "";
|
||||||
|
public string name3_is { get; set; } = "";
|
||||||
|
public string name4_is { get; set; } = "";
|
||||||
|
public string name5_is { get; set; } = "";
|
||||||
|
public string funktion_is { get; set; } = "";
|
||||||
|
public string funktion2_is { get; set; } = "";
|
||||||
|
public string abteilung_is { get; set; } = "";
|
||||||
|
public string funktionad_is { get; set; } = "";
|
||||||
|
|
||||||
|
public bool has_refsid { get; set; }
|
||||||
|
public bool has_anrede { get; set; }
|
||||||
|
public bool has_titel { get; set; }
|
||||||
|
public bool has_vorname { get; set; }
|
||||||
|
public bool has_adel { get; set; }
|
||||||
|
public bool has_name { get; set; }
|
||||||
|
public bool has_namezus { get; set; }
|
||||||
|
public bool has_anredzus { get; set; }
|
||||||
|
public bool has_strasse { get; set; }
|
||||||
|
public bool has_strasse2 { get; set; }
|
||||||
|
public bool has_plz { get; set; }
|
||||||
|
public bool has_ort { get; set; }
|
||||||
|
public bool has_land { get; set; }
|
||||||
|
public bool has_pplz { get; set; }
|
||||||
|
public bool has_postfach { get; set; }
|
||||||
|
public bool has_name1 { get; set; }
|
||||||
|
public bool has_name2 { get; set; }
|
||||||
|
public bool has_name3 { get; set; }
|
||||||
|
public bool has_name4 { get; set; }
|
||||||
|
public bool has_name5 { get; set; }
|
||||||
|
public bool has_funktion { get; set; }
|
||||||
|
public bool has_funktion2 { get; set; }
|
||||||
|
public bool has_abteilung { get; set; }
|
||||||
|
public bool has_funktionad { get; set; }
|
||||||
|
|
||||||
|
public static AddressPatch Import(Uri filename)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var patch = new AddressPatch();
|
||||||
|
|
||||||
|
// Alle Zeilen aus der Datei laden
|
||||||
|
var lines = File.ReadAllLines(filename.LocalPath);
|
||||||
|
|
||||||
|
// Alle Properties der Klasse (Strings und bools)
|
||||||
|
var properties = typeof(AddressPatch).GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
||||||
|
|
||||||
|
// Nur die Properties, die mit _is enden (also die String-Werte)
|
||||||
|
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
||||||
|
|
||||||
|
foreach (var prop in stringProps)
|
||||||
|
{
|
||||||
|
// Beispiel: prop.Name = "name_is"
|
||||||
|
var baseName = prop.Name.Substring(0, prop.Name.Length - 3); // "name"
|
||||||
|
|
||||||
|
// In der Datei wird nach "name:" gesucht (ohne _is)
|
||||||
|
var line = lines.FirstOrDefault(l => l.StartsWith(baseName + ":"));
|
||||||
|
if (line != null)
|
||||||
|
{
|
||||||
|
// Wert extrahieren (alles nach dem Doppelpunkt)
|
||||||
|
var value = line.Substring(line.IndexOf(':') + 1).Trim();
|
||||||
|
|
||||||
|
// Wert im Patch-Objekt setzen
|
||||||
|
prop.SetValue(patch, value);
|
||||||
|
|
||||||
|
// Passendes has_ Feld aktivieren, z.B. "has_name"
|
||||||
|
var hasProp = properties.FirstOrDefault(p => p.Name == "has_" + baseName);
|
||||||
|
if (hasProp != null && hasProp.PropertyType == typeof(bool)) hasProp.SetValue(patch, true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return patch;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing address patch: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
||||||
|
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
||||||
|
|
||||||
|
var lines = new StringBuilder();
|
||||||
|
|
||||||
|
foreach (var prop in stringProps)
|
||||||
|
{
|
||||||
|
// passendes has_ Feld
|
||||||
|
var hasProp =
|
||||||
|
properties.FirstOrDefault(p => p.Name == "has_" + prop.Name.Substring(0, prop.Name.Length - 3));
|
||||||
|
if (hasProp != null && (bool)hasProp.GetValue(this))
|
||||||
|
{
|
||||||
|
var value = (string)prop.GetValue(this);
|
||||||
|
lines.AppendLine($"{prop.Name} => {value}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return lines.ToString().TrimEnd();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while parsing: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return "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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
+127
-113
@@ -16,39 +16,58 @@ public class CombineAddresses
|
|||||||
_progress = progressWindow;
|
_progress = progressWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList,KasAddressList)> Perform(List<KasAddressList> address_lists, string type, bool? exportUnused)
|
public enum CombineType
|
||||||
{
|
{
|
||||||
var res = await Task.Run(async () =>
|
refsid,
|
||||||
|
final_adress,
|
||||||
|
none
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
|
bool? exportUnused, bool? deleteOld)
|
||||||
{
|
{
|
||||||
if (type == "difference") return Difference(address_lists, exportUnused);
|
try
|
||||||
if (type == "union") return Union(address_lists, exportUnused);
|
{
|
||||||
if (type == "intersection") return Intersection(address_lists, exportUnused);
|
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||||
if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
|
|
||||||
|
|
||||||
return null;
|
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 res.Result;
|
|
||||||
|
|
||||||
|
|
||||||
// KasAddressList result = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
|
|
||||||
// await Task.Run(async () =>
|
|
||||||
// {
|
|
||||||
// for (var i = 0; i < address_lists.Count; i++)
|
|
||||||
// if (i == 0)
|
|
||||||
// lock (result)
|
|
||||||
// {
|
|
||||||
// result = address_lists[i];
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// lock (result)
|
|
||||||
// {
|
|
||||||
// result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// return result;
|
|
||||||
return (null,null);
|
return (null,null);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
|
bool? exportUnused)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
|
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||||
|
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
||||||
|
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
||||||
|
return (null, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while executing address combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -59,10 +78,13 @@ public class CombineAddresses
|
|||||||
/// <param name="second">Second address to compare</param>
|
/// <param name="second">Second address to compare</param>
|
||||||
/// <param name="only_refsid">If true, only a refsid-check will be done</param>
|
/// <param name="only_refsid">If true, only a refsid-check will be done</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
|
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
||||||
{
|
{
|
||||||
if (first.refsid == second.refsid) return true;
|
|
||||||
if (!only_refsid)
|
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
||||||
|
if(comb_type == CombineType.refsid)
|
||||||
|
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
||||||
|
if (comb_type == CombineType.final_adress)
|
||||||
if (first.name == second.name &&
|
if (first.name == second.name &&
|
||||||
first.anrede == second.anrede &&
|
first.anrede == second.anrede &&
|
||||||
first.anredzus == second.anredzus &&
|
first.anredzus == second.anredzus &&
|
||||||
@@ -91,11 +113,14 @@ public class CombineAddresses
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList,KasAddressList)> Difference(List<KasAddressList> address_lists, bool? return_unused,
|
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
|
bool? return_unused,
|
||||||
Progress? progress = null)
|
Progress? progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (new KasAddressList(KasAddressList.GenerateName("difference")),null);
|
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
|
||||||
|
|
||||||
progress ??= new Progress
|
progress ??= new Progress
|
||||||
{
|
{
|
||||||
@@ -107,12 +132,14 @@ public class CombineAddresses
|
|||||||
var restUnion = new List<KasPerson>();
|
var restUnion = new List<KasPerson>();
|
||||||
for (var i = 1; i < address_lists.Count; i++)
|
for (var i = 1; i < address_lists.Count; i++)
|
||||||
restUnion.AddRange(address_lists[i].KasPersons);
|
restUnion.AddRange(address_lists[i].KasPersons);
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
|
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)
|
foreach (var person in address_lists[0].KasPersons)
|
||||||
{
|
{
|
||||||
var isDouble = restUnion.Any(p => CompareAddresses(person, p));
|
var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
|
||||||
if (!isDouble)
|
if (!isDouble)
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
else
|
else
|
||||||
@@ -122,18 +149,32 @@ public class CombineAddresses
|
|||||||
progress.Increment();
|
progress.Increment();
|
||||||
if (progress.LogAction == null) continue;
|
if (progress.LogAction == null) continue;
|
||||||
var logMessage =
|
var logMessage =
|
||||||
$"Person mit refsid {person.refsid} verglichen mit {restUnion.Count} Personen des Restes.";
|
$"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
|
||||||
await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
|
await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
else return (result, null);
|
return (result, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing difference-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<(KasAddressList,KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
|
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
|
||||||
|
Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("union"));
|
try
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
|
{
|
||||||
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true)
|
||||||
|
second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -144,7 +185,7 @@ public class CombineAddresses
|
|||||||
foreach (var list in address_lists)
|
foreach (var list in address_lists)
|
||||||
foreach (var person in list.KasPersons)
|
foreach (var person in list.KasPersons)
|
||||||
{
|
{
|
||||||
if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
|
if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
else
|
else
|
||||||
second_result.KasPersons.Add(person);
|
second_result.KasPersons.Add(person);
|
||||||
@@ -152,7 +193,7 @@ public class CombineAddresses
|
|||||||
processed++;
|
processed++;
|
||||||
var percent = processed / (double)total * 100;
|
var percent = processed / (double)total * 100;
|
||||||
var logMessage =
|
var logMessage =
|
||||||
$"{percent:F1}%: Person mit {person.refsid} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
|
$"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
|
||||||
|
|
||||||
if (progress == null) continue;
|
if (progress == null) continue;
|
||||||
if (Dispatcher.UIThread.CheckAccess())
|
if (Dispatcher.UIThread.CheckAccess())
|
||||||
@@ -162,7 +203,15 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
else return (result, null);
|
return (result, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing union-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -171,10 +220,14 @@ public class CombineAddresses
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList,KasAddressList)> Intersection(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("intersection"));
|
try
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
|
{
|
||||||
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -190,7 +243,7 @@ public class CombineAddresses
|
|||||||
{
|
{
|
||||||
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
||||||
var isInAll = otherLists.All(list =>
|
var isInAll = otherLists.All(list =>
|
||||||
list.KasPersons.Any(existing => CompareAddresses(existing, person)));
|
list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
|
||||||
|
|
||||||
if (isInAll)
|
if (isInAll)
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
@@ -200,7 +253,7 @@ public class CombineAddresses
|
|||||||
processed++;
|
processed++;
|
||||||
var percent = processed / (double)total * 100;
|
var percent = processed / (double)total * 100;
|
||||||
var logMessage =
|
var logMessage =
|
||||||
$"{percent:F1}%: Person mit {person.refsid} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
|
$"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
|
||||||
|
|
||||||
// Sicher und nicht blockierend loggen
|
// Sicher und nicht blockierend loggen
|
||||||
if (progress != null)
|
if (progress != null)
|
||||||
@@ -213,14 +266,26 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
else return (result, null);
|
return (result, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing intersection-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<(KasAddressList,KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference"));
|
try
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
|
{
|
||||||
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -235,7 +300,7 @@ public class CombineAddresses
|
|||||||
foreach (var person in list.KasPersons)
|
foreach (var person in list.KasPersons)
|
||||||
{
|
{
|
||||||
// Prüfen, ob schon vorhanden
|
// Prüfen, ob schon vorhanden
|
||||||
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
|
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
|
||||||
if (existing.person != null)
|
if (existing.person != null)
|
||||||
{
|
{
|
||||||
// Falls schon drin → Vorkommen erhöhen
|
// Falls schon drin → Vorkommen erhöhen
|
||||||
@@ -251,7 +316,7 @@ public class CombineAddresses
|
|||||||
processed++;
|
processed++;
|
||||||
var percent = processed / (double)total * 100;
|
var percent = processed / (double)total * 100;
|
||||||
var logMessage =
|
var logMessage =
|
||||||
$"{percent:F1}%: Person mit {person.refsid} verarbeitet (Zwischengröße {allPersons.Count})";
|
$"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
|
||||||
|
|
||||||
if (progress != null)
|
if (progress != null)
|
||||||
{
|
{
|
||||||
@@ -270,68 +335,17 @@ public class CombineAddresses
|
|||||||
second_result.KasPersons.Add(person);
|
second_result.KasPersons.Add(person);
|
||||||
|
|
||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
else return (result, null);
|
return (result, null);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing symdiff-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
|
|
||||||
// {
|
|
||||||
// foreach (var sec in second.KasPersons)
|
|
||||||
// {
|
|
||||||
// var is_new = true;
|
|
||||||
// foreach (var fi in first.KasPersons)
|
|
||||||
// {
|
|
||||||
// if (fi.refsid == sec.refsid)
|
|
||||||
// {
|
|
||||||
// is_new = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (fi.name == sec.name &&
|
|
||||||
// fi.anrede == sec.anrede &&
|
|
||||||
// fi.anredzus == sec.anredzus &&
|
|
||||||
// fi.namezus == sec.namezus &&
|
|
||||||
// fi.titel == sec.titel &&
|
|
||||||
// fi.adel == sec.adel &&
|
|
||||||
// fi.strasse == sec.strasse &&
|
|
||||||
// fi.strasse2 == sec.strasse2 &&
|
|
||||||
// fi.vorname == sec.vorname &&
|
|
||||||
// fi.ort == sec.ort &&
|
|
||||||
// fi.land == sec.land &&
|
|
||||||
// fi.plz == sec.plz &&
|
|
||||||
// fi.pplz == sec.pplz &&
|
|
||||||
// fi.funktion == sec.funktion &&
|
|
||||||
// fi.funktion2 == sec.funktion2 &&
|
|
||||||
// fi.funktionad == sec.funktionad &&
|
|
||||||
// fi.abteilung == sec.abteilung &&
|
|
||||||
// fi.postfach == sec.postfach &&
|
|
||||||
// fi.name1 == sec.name1 &&
|
|
||||||
// fi.name2 == sec.name2 &&
|
|
||||||
// fi.name3 == sec.name3 &&
|
|
||||||
// fi.name4 == sec.name4 &&
|
|
||||||
// fi.name5 == sec.name5)
|
|
||||||
// {
|
|
||||||
// is_new = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (is_new) first.KasPersons.Add(sec);
|
|
||||||
// var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
|
|
||||||
// var percent = (num + (double)subperc) / total * 100;
|
|
||||||
// await Dispatcher.UIThread.InvokeAsync(() =>
|
|
||||||
// {
|
|
||||||
// if (is_new)
|
|
||||||
// _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
|
|
||||||
// else
|
|
||||||
// _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
|
|
||||||
//
|
|
||||||
// _progress.ChangePercentage(percent);
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return first;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Progress
|
public class Progress
|
||||||
|
|||||||
@@ -0,0 +1,86 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class CsvBuilder
|
||||||
|
{
|
||||||
|
private readonly string Header;
|
||||||
|
private readonly List<object> Instances;
|
||||||
|
private readonly KasAddressList KasAddressList;
|
||||||
|
private readonly char Separator;
|
||||||
|
|
||||||
|
public CsvBuilder(string header, List<object> instances, char separator = ',')
|
||||||
|
{
|
||||||
|
Header = header;
|
||||||
|
Instances = instances;
|
||||||
|
Separator = separator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CsvBuilder(string header, KasAddressList instances, char separator = ',')
|
||||||
|
{
|
||||||
|
Header = header;
|
||||||
|
KasAddressList = instances;
|
||||||
|
Separator = separator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? BuildKas()
|
||||||
|
{
|
||||||
|
var result = new StringBuilder();
|
||||||
|
|
||||||
|
result.AppendLine(Header);
|
||||||
|
foreach (var l in KasAddressList.KasPersons)
|
||||||
|
result.AppendLine(string.Join(Separator, new[]
|
||||||
|
{
|
||||||
|
EscapeCsvField(l.refsid.ToString()),
|
||||||
|
EscapeCsvField(l.anrede),
|
||||||
|
EscapeCsvField(l.titel),
|
||||||
|
EscapeCsvField(l.vorname),
|
||||||
|
EscapeCsvField(l.adel),
|
||||||
|
EscapeCsvField(l.name),
|
||||||
|
EscapeCsvField(l.namezus),
|
||||||
|
EscapeCsvField(l.anredzus),
|
||||||
|
EscapeCsvField(l.strasse),
|
||||||
|
EscapeCsvField(l.strasse2),
|
||||||
|
EscapeCsvField(l.plz),
|
||||||
|
EscapeCsvField(l.ort),
|
||||||
|
EscapeCsvField(l.land),
|
||||||
|
EscapeCsvField(l.pplz),
|
||||||
|
EscapeCsvField(l.postfach),
|
||||||
|
EscapeCsvField(l.name1),
|
||||||
|
EscapeCsvField(l.name2),
|
||||||
|
EscapeCsvField(l.name3),
|
||||||
|
EscapeCsvField(l.name4),
|
||||||
|
EscapeCsvField(l.name5),
|
||||||
|
EscapeCsvField(l.funktion),
|
||||||
|
EscapeCsvField(l.funktion2),
|
||||||
|
EscapeCsvField(l.abteilung),
|
||||||
|
EscapeCsvField(l.funktionad)
|
||||||
|
}));
|
||||||
|
|
||||||
|
// weitere Cases
|
||||||
|
return result.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private string EscapeCsvField(string? value)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var field = value ?? string.Empty;
|
||||||
|
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
||||||
|
if (!mustQuote)
|
||||||
|
return field;
|
||||||
|
|
||||||
|
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while escapting csv field: {ex.Message}",Logger.LogType.Warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,310 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reflection;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class DataImport
|
||||||
|
{
|
||||||
|
public static async Task<(bool, KasAddressList)> ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
||||||
|
char separator = ',')
|
||||||
|
{
|
||||||
|
if (patch == null)
|
||||||
|
return await ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
||||||
|
return await ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
|
{
|
||||||
|
Console.WriteLine($"File not found: {pathToCsv}");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
using var reader = new StreamReader(pathToCsv.LocalPath);
|
||||||
|
var headerLine = reader.ReadLine();
|
||||||
|
if (headerLine == null)
|
||||||
|
{
|
||||||
|
Console.WriteLine("File is empty.");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var imported = new KasAddressList(
|
||||||
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
|
|
||||||
|
while (!reader.EndOfStream)
|
||||||
|
{
|
||||||
|
var line = reader.ReadLine();
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
|
if (parts.Length < 24)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Not enough columns in line: {line}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
|
||||||
|
ParseInt(parts[0]),
|
||||||
|
parts[1],
|
||||||
|
parts[2],
|
||||||
|
parts[3],
|
||||||
|
parts[4],
|
||||||
|
parts[5],
|
||||||
|
parts[6],
|
||||||
|
parts[7],
|
||||||
|
parts[8],
|
||||||
|
parts[9],
|
||||||
|
parts[10],
|
||||||
|
parts[11],
|
||||||
|
parts[12],
|
||||||
|
parts[13],
|
||||||
|
parts[14],
|
||||||
|
parts[15],
|
||||||
|
parts[16],
|
||||||
|
parts[17],
|
||||||
|
parts[18],
|
||||||
|
parts[19],
|
||||||
|
parts[20],
|
||||||
|
parts[21],
|
||||||
|
parts[22],
|
||||||
|
parts[23]
|
||||||
|
);
|
||||||
|
imported.KasPersons.Add(person);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating new kas person (import): {ex.Message}",Logger.LogType.Error);
|
||||||
|
Console.WriteLine(ex.StackTrace);
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (true, imported);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing kas address list without patch: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||||
|
char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
|
{
|
||||||
|
Console.WriteLine($"File not found: {pathToCsv}");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
using var reader = new StreamReader(pathToCsv.LocalPath);
|
||||||
|
var headerLine = reader.ReadLine();
|
||||||
|
if (headerLine == null)
|
||||||
|
{
|
||||||
|
Console.WriteLine("File is empty.");
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
var headers = ParseCsvLine(headerLine, separator);
|
||||||
|
|
||||||
|
var imported = new KasAddressList(
|
||||||
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
|
var patchType = typeof(AddressPatch);
|
||||||
|
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
||||||
|
|
||||||
|
var hasProperties = patchType.GetProperties(binding)
|
||||||
|
.Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
|
||||||
|
.ToArray();
|
||||||
|
|
||||||
|
//var last_refsid = 1000000;
|
||||||
|
|
||||||
|
while (!reader.EndOfStream)
|
||||||
|
{
|
||||||
|
var line = reader.ReadLine();
|
||||||
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
|
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
//var refsid_existing = false;
|
||||||
|
|
||||||
|
foreach (var hasProp in hasProperties)
|
||||||
|
{
|
||||||
|
var fieldName = hasProp.Name.Substring(4);
|
||||||
|
|
||||||
|
|
||||||
|
var hasObj = hasProp.GetValue(patch);
|
||||||
|
var has = hasObj is bool b && b;
|
||||||
|
|
||||||
|
var patchProp = patchType.GetProperty(fieldName + "_is", binding);
|
||||||
|
|
||||||
|
string desiredHeader = null;
|
||||||
|
if (has && patchProp != null)
|
||||||
|
desiredHeader = patchProp.GetValue(patch)?.ToString();
|
||||||
|
else
|
||||||
|
desiredHeader = fieldName;
|
||||||
|
|
||||||
|
var resolvedValue = "";
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(desiredHeader))
|
||||||
|
{
|
||||||
|
var idx = Array.FindIndex(headers,
|
||||||
|
h => string.Equals(h, desiredHeader, StringComparison.OrdinalIgnoreCase));
|
||||||
|
if (idx >= 0 && idx < parts.Length)
|
||||||
|
{
|
||||||
|
resolvedValue = parts[idx];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
var altIdx = Array.FindIndex(headers, h =>
|
||||||
|
string.Equals(h, fieldName, StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
string.Equals(h, fieldName + "_is", StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
|
if (altIdx >= 0 && altIdx < parts.Length)
|
||||||
|
resolvedValue = parts[altIdx];
|
||||||
|
else
|
||||||
|
resolvedValue = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fieldValues[fieldName] = resolvedValue ?? "";
|
||||||
|
}
|
||||||
|
|
||||||
|
string GetField(string name)
|
||||||
|
{
|
||||||
|
return fieldValues.TryGetValue(name, out var v) ? v : "";
|
||||||
|
}
|
||||||
|
|
||||||
|
var refsid = 0;
|
||||||
|
if (patch.has_refsid)
|
||||||
|
refsid = ParseInt(GetField("refsid"));
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
|
||||||
|
GetField("anrede"),
|
||||||
|
GetField("titel"),
|
||||||
|
GetField("vorname"),
|
||||||
|
GetField("adel"),
|
||||||
|
GetField("name"),
|
||||||
|
GetField("namezus"),
|
||||||
|
GetField("anredzus"),
|
||||||
|
GetField("strasse"),
|
||||||
|
GetField("strasse2"),
|
||||||
|
GetField("plz"),
|
||||||
|
GetField("ort"),
|
||||||
|
GetField("land"),
|
||||||
|
GetField("pplz"),
|
||||||
|
GetField("postfach"),
|
||||||
|
GetField("name1"),
|
||||||
|
GetField("name2"),
|
||||||
|
GetField("name3"),
|
||||||
|
GetField("name4"),
|
||||||
|
GetField("name5"),
|
||||||
|
GetField("funktion"),
|
||||||
|
GetField("funktion2"),
|
||||||
|
GetField("abteilung"),
|
||||||
|
GetField("funktionad")
|
||||||
|
);
|
||||||
|
|
||||||
|
imported.KasPersons.Add(person);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating kas person (import, patch): {ex.Message}",Logger.LogType.Error);
|
||||||
|
Console.WriteLine(ex.StackTrace);
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (true, imported);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing kas address list with patch: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// int GenerateNewRefsid()
|
||||||
|
// {
|
||||||
|
// var biggest = last_refsid;
|
||||||
|
// foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
// foreach (var address in set.KasPersons)
|
||||||
|
// if (biggest < address.id)
|
||||||
|
// biggest = address.id + 1;
|
||||||
|
//
|
||||||
|
// last_refsid = biggest + 1;
|
||||||
|
// return last_refsid;
|
||||||
|
// }
|
||||||
|
return (false, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private static int ParseInt(string input)
|
||||||
|
{
|
||||||
|
return int.TryParse(input, out var result) ? result : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string[] ParseCsvLine(string line, char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var fields = new List<string>();
|
||||||
|
var current = new StringBuilder();
|
||||||
|
var inQuotes = false;
|
||||||
|
|
||||||
|
for (var i = 0; i < line.Length; i++)
|
||||||
|
{
|
||||||
|
var c = line[i];
|
||||||
|
|
||||||
|
if (c == '"')
|
||||||
|
{
|
||||||
|
if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
|
||||||
|
{
|
||||||
|
current.Append('"');
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
inQuotes = !inQuotes;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c == separator && !inQuotes)
|
||||||
|
{
|
||||||
|
fields.Add(current.ToString().Trim());
|
||||||
|
current.Clear();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
current.Append(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
fields.Add(current.ToString().Trim());
|
||||||
|
return fields.ToArray();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while persing csv line: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,483 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using PdfSharp;
|
||||||
|
using PdfSharp.Drawing;
|
||||||
|
using PdfSharp.Fonts;
|
||||||
|
using PdfSharp.Pdf;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class PdfBuilder
|
||||||
|
{
|
||||||
|
private readonly PdfExportSettings _settings;
|
||||||
|
private readonly XFont _boldFont;
|
||||||
|
private readonly XFont _regularFont;
|
||||||
|
private readonly XFont _smallFont;
|
||||||
|
|
||||||
|
public PdfBuilder(PdfExportSettings? settings = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
EnsureFontResolverRegistered();
|
||||||
|
_settings = settings ?? new PdfExportSettings();
|
||||||
|
|
||||||
|
// Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
|
||||||
|
var chosenFamily = "Arial";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (Directory.Exists(Global._instance.font_path))
|
||||||
|
{
|
||||||
|
var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
|
||||||
|
if (!string.IsNullOrEmpty(first))
|
||||||
|
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while searching for fonts: {ex.Message}",Logger.LogType.Error);
|
||||||
|
chosenFamily = "Arial";
|
||||||
|
}
|
||||||
|
|
||||||
|
_boldFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Bold);
|
||||||
|
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
||||||
|
_smallFont = new XFont(chosenFamily, _settings.smallFontSize, XFontStyleEx.Regular);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while font resolving: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void EnsureFontResolverRegistered()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (GlobalFontSettings.FontResolver != null) return;
|
||||||
|
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||||
|
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while ensuring font resolver register state: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string StripStyleSuffix(string name)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(name)) return name;
|
||||||
|
var idx = name.IndexOf('-');
|
||||||
|
if (idx < 0) idx = name.IndexOf('_');
|
||||||
|
if (idx > 0)
|
||||||
|
return name.Substring(0, idx);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while stripping style suffix: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a PDF document with address stickers from an AddressSet with a placeholder in the first cell.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="addressSetId">The ID of the AddressSet to use</param>
|
||||||
|
/// <param name="placeholderText">Text for the first cell (top-left)</param>
|
||||||
|
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||||
|
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
||||||
|
string outputPath)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// Find the AddressSet by ID
|
||||||
|
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
||||||
|
if (addressSet == null)
|
||||||
|
throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
|
||||||
|
|
||||||
|
if (addressSet.KasPersons == null || addressSet.KasPersons.Count == 0)
|
||||||
|
throw new ArgumentException($"AddressSet with ID {addressSetId} contains no addresses");
|
||||||
|
|
||||||
|
// Generate markdown addresses from all KasPersons in the set
|
||||||
|
//var addresses = new string?[addressSet.KasPersons.Count];
|
||||||
|
var addresses = new List<string>();
|
||||||
|
|
||||||
|
// find customer (owner) to include sender_address
|
||||||
|
string senderLine = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var owner = Settings._instance.customers.customers.FirstOrDefault(c => c.ID == addressSet.owner_id);
|
||||||
|
if (owner != null && !string.IsNullOrWhiteSpace(owner.sender_address))
|
||||||
|
senderLine = "<font6>" + owner.sender_address.Replace("\n", " ").Trim() + "</font6>\n";
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
senderLine = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < addressSet.KasPersons.Count; i++)
|
||||||
|
{
|
||||||
|
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
|
||||||
|
if (string.IsNullOrWhiteSpace(addr)) continue;
|
||||||
|
if (!string.IsNullOrEmpty(senderLine))
|
||||||
|
addresses.Add(senderLine + (addr ?? ""));
|
||||||
|
else
|
||||||
|
addresses.Add(addr);
|
||||||
|
}
|
||||||
|
|
||||||
|
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating address label pdf from address set with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Creates a PDF document with a single placeholder cell for other information.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="addresses">Array of addresses</param>
|
||||||
|
/// <param name="placeholderText">Text for the first cell (top-left)</param>
|
||||||
|
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||||
|
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (addresses == null || addresses.Count == 0)
|
||||||
|
throw new ArgumentException("Addresses array cannot be null or empty");
|
||||||
|
|
||||||
|
var document = new PdfDocument();
|
||||||
|
|
||||||
|
var addressIndex = 0;
|
||||||
|
var isFirstCell = true;
|
||||||
|
|
||||||
|
while (addressIndex < addresses.Count || isFirstCell)
|
||||||
|
{
|
||||||
|
var page = document.AddPage();
|
||||||
|
page.Size = PageSize.A4;
|
||||||
|
|
||||||
|
using (var gfx = XGraphics.FromPdfPage(page))
|
||||||
|
{
|
||||||
|
DrawPageWithPlaceholder(gfx, addresses, ref addressIndex, ref isFirstCell, placeholderText);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.Save(outputPath);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating address label pdf with placeholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
|
||||||
|
{
|
||||||
|
for (var row = 0; row < _settings.rowsPerPage; row++)
|
||||||
|
{
|
||||||
|
for (var col = 0; col < _settings.columnsPerPage; col++)
|
||||||
|
{
|
||||||
|
if (addressIndex >= addresses.Count) break;
|
||||||
|
|
||||||
|
var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
|
||||||
|
var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
|
||||||
|
|
||||||
|
DrawCell(gfx, x, y, addresses[addressIndex]);
|
||||||
|
addressIndex++;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (addressIndex >= addresses.Count) break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
||||||
|
ref bool isFirstCell, string placeholderText)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
for (var row = 0; row < _settings.rowsPerPage; row++)
|
||||||
|
for (var col = 0; col < _settings.columnsPerPage; col++)
|
||||||
|
{
|
||||||
|
var x = MmToPoints(_settings.pageMarginLeftMm + col * GetCellWidthMm());
|
||||||
|
var y = MmToPoints(_settings.pageMarginTopMm + row * GetCellHeightMm());
|
||||||
|
|
||||||
|
// First cell: placeholder
|
||||||
|
if (isFirstCell)
|
||||||
|
{
|
||||||
|
DrawCell(gfx, x, y, placeholderText);
|
||||||
|
isFirstCell = false;
|
||||||
|
}
|
||||||
|
else if (addressIndex < addresses.Count)
|
||||||
|
{
|
||||||
|
DrawCell(gfx, x, y, addresses[addressIndex]);
|
||||||
|
addressIndex++;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DrawEmptyCell(gfx, x, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing page with placholder: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawCell(XGraphics gfx, double x, double y, string? address)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
|
|
||||||
|
// Draw cell border
|
||||||
|
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||||
|
gfx.DrawRectangle(XPens.Black, rect);
|
||||||
|
|
||||||
|
// Draw address content if available
|
||||||
|
if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing cell: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawEmptyCell(XGraphics gfx, double x, double y)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
|
|
||||||
|
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||||
|
gfx.DrawRectangle(XPens.Black, rect);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing empty cell: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
||||||
|
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
||||||
|
var paddingTopPoints = MmToPoints(_settings.cellPaddingTopMm);
|
||||||
|
var paddingBottomPoints = MmToPoints(_settings.cellPaddingBottomMm);
|
||||||
|
|
||||||
|
var maxWidth = Math.Max(0, cellWidth - paddingLeftPoints - paddingRightPoints);
|
||||||
|
|
||||||
|
// Split text by newlines and remove empty trailing lines
|
||||||
|
var rawLines = text.Split(new[] { "\n" }, StringSplitOptions.None);
|
||||||
|
var lines = rawLines.Where(l => l != null).ToArray();
|
||||||
|
|
||||||
|
// Use a conservative line height in points
|
||||||
|
var lineHeight = _regularFont.Size * 1.2;
|
||||||
|
|
||||||
|
// Calculate total height of the text block
|
||||||
|
var totalHeight = lines.Length * lineHeight;
|
||||||
|
|
||||||
|
// Start drawing from the top of the cell (align addresses to top)
|
||||||
|
var startY = y + paddingTopPoints;
|
||||||
|
|
||||||
|
var currentY = startY;
|
||||||
|
|
||||||
|
foreach (var line in lines)
|
||||||
|
{
|
||||||
|
// Stop if we've reached the top boundary
|
||||||
|
if (currentY + lineHeight > y + cellHeight - paddingBottomPoints + 0.001)
|
||||||
|
break;
|
||||||
|
|
||||||
|
// Parse and draw the line with markdown support
|
||||||
|
DrawLineWithMarkdown(gfx, line, x + paddingLeftPoints, currentY, maxWidth);
|
||||||
|
currentY += lineHeight;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing markdown text: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(line)) return;
|
||||||
|
var currentX = x;
|
||||||
|
var i = 0;
|
||||||
|
|
||||||
|
while (i < line.Length)
|
||||||
|
{
|
||||||
|
if (currentX - x >= maxWidth)
|
||||||
|
break;
|
||||||
|
|
||||||
|
var remainingWidth = maxWidth - (currentX - x);
|
||||||
|
|
||||||
|
// Check for small-font tag <font6> ... </font6>
|
||||||
|
if (i <= line.Length - 7 && line.Substring(i, 7) == "<font6>")
|
||||||
|
{
|
||||||
|
var endTag = line.IndexOf("</font6>", i + 7, StringComparison.Ordinal);
|
||||||
|
if (endTag != -1)
|
||||||
|
{
|
||||||
|
var inner = line.Substring(i + 7, endTag - (i + 7));
|
||||||
|
if (!string.IsNullOrEmpty(inner))
|
||||||
|
{
|
||||||
|
var measuredSmall = gfx.MeasureString(inner, _smallFont);
|
||||||
|
|
||||||
|
if (measuredSmall.Width > remainingWidth)
|
||||||
|
{
|
||||||
|
inner = TruncateTextToWidth(gfx, inner, _smallFont, remainingWidth);
|
||||||
|
measuredSmall = gfx.MeasureString(inner, _smallFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx.DrawString(inner, _smallFont, XBrushes.Black,
|
||||||
|
new XRect(currentX, y, remainingWidth, _smallFont.Size * 1.2),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
currentX += measuredSmall.Width;
|
||||||
|
}
|
||||||
|
|
||||||
|
i = endTag + 8; // move past </font6>
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check for bold marker (**)
|
||||||
|
if (i < line.Length - 1 && line[i] == '*' && line[i + 1] == '*')
|
||||||
|
{
|
||||||
|
// Find closing **
|
||||||
|
var endIndex = line.IndexOf("**", i + 2, StringComparison.Ordinal);
|
||||||
|
if (endIndex != -1)
|
||||||
|
{
|
||||||
|
var boldText = line.Substring(i + 2, endIndex - (i + 2));
|
||||||
|
var measured = gfx.MeasureString(boldText, _boldFont);
|
||||||
|
|
||||||
|
if (measured.Width > remainingWidth)
|
||||||
|
{
|
||||||
|
boldText = TruncateTextToWidth(gfx, boldText, _boldFont, remainingWidth);
|
||||||
|
measured = gfx.MeasureString(boldText, _boldFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw bold text and measure width accurately
|
||||||
|
gfx.DrawString(boldText, _boldFont, XBrushes.Black,
|
||||||
|
new XRect(currentX, y, remainingWidth, _boldFont.Size * 1.2),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
currentX += measured.Width;
|
||||||
|
i = endIndex + 2;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Regular text until next ** or end of line
|
||||||
|
var nextBoldIndex = line.IndexOf("**", i, StringComparison.Ordinal);
|
||||||
|
var textEnd = nextBoldIndex == -1 ? line.Length : nextBoldIndex;
|
||||||
|
var regularText = line.Substring(i, textEnd - i);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(regularText))
|
||||||
|
{
|
||||||
|
var measured = gfx.MeasureString(regularText, _regularFont);
|
||||||
|
|
||||||
|
if (measured.Width > remainingWidth)
|
||||||
|
{
|
||||||
|
regularText = TruncateTextToWidth(gfx, regularText, _regularFont, remainingWidth);
|
||||||
|
measured = gfx.MeasureString(regularText, _regularFont);
|
||||||
|
}
|
||||||
|
|
||||||
|
gfx.DrawString(regularText, _regularFont, XBrushes.Black,
|
||||||
|
new XRect(currentX, y, remainingWidth, _regularFont.Size * 1.2), XStringFormats.TopLeft);
|
||||||
|
currentX += measured.Width;
|
||||||
|
}
|
||||||
|
|
||||||
|
i = textEnd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while drawing markdown line: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(text))
|
||||||
|
return text;
|
||||||
|
|
||||||
|
for (var len = text.Length; len > 0; len--)
|
||||||
|
{
|
||||||
|
var truncated = text.Substring(0, len);
|
||||||
|
var measured = gfx.MeasureString(truncated, font);
|
||||||
|
if (measured.Width <= maxWidth)
|
||||||
|
return truncated;
|
||||||
|
}
|
||||||
|
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while truncating text to width: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Converts millimeters to points (1 mm = 2.834645669 points)
|
||||||
|
/// </summary>
|
||||||
|
private double MmToPoints(double mm)
|
||||||
|
{
|
||||||
|
return mm * 2.834645669;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double GetCellWidthMm()
|
||||||
|
{
|
||||||
|
var availableWidthMm = 210d - _settings.pageMarginLeftMm - _settings.pageMarginRightMm;
|
||||||
|
return availableWidthMm / _settings.columnsPerPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
private double GetCellHeightMm()
|
||||||
|
{
|
||||||
|
var availableHeightMm = 297d - _settings.pageMarginTopMm - _settings.pageMarginBottomMm;
|
||||||
|
return availableHeightMm / _settings.rowsPerPage;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configuration methods to allow customization
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the cell dimensions in millimeters
|
||||||
|
/// </summary>
|
||||||
|
public void SetCellDimensions(double width, double height)
|
||||||
|
{
|
||||||
|
if (width <= 0 || height <= 0)
|
||||||
|
throw new ArgumentException("Cell dimensions must be positive");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets the page margins in millimeters
|
||||||
|
/// </summary>
|
||||||
|
public void SetMargins(double left, double top, double right, double bottom)
|
||||||
|
{
|
||||||
|
if (left < 0 || top < 0 || right < 0 || bottom < 0)
|
||||||
|
throw new ArgumentException("Margins cannot be negative");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using PdfSharp.Fonts;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class StableFontResolver : IFontResolver
|
||||||
|
{
|
||||||
|
// family -> style -> bytes
|
||||||
|
private readonly Dictionary<string, Dictionary<string, byte[]>> _families = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
private readonly List<string> _orderedFamilies = new();
|
||||||
|
|
||||||
|
public StableFontResolver(string fontsDirectory)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(fontsDirectory)) return;
|
||||||
|
if (!Directory.Exists(fontsDirectory)) return;
|
||||||
|
|
||||||
|
var files = Directory.EnumerateFiles(fontsDirectory, "*.ttf");
|
||||||
|
foreach (var f in files)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var baseName = Path.GetFileNameWithoutExtension(f);
|
||||||
|
if (string.IsNullOrEmpty(baseName)) continue;
|
||||||
|
|
||||||
|
// Try to split family and style by hyphen or underscore
|
||||||
|
var family = baseName;
|
||||||
|
var style = "Regular";
|
||||||
|
|
||||||
|
var idx = baseName.IndexOf('-');
|
||||||
|
if (idx < 0) idx = baseName.IndexOf('_');
|
||||||
|
if (idx > 0)
|
||||||
|
{
|
||||||
|
family = baseName.Substring(0, idx);
|
||||||
|
style = baseName.Substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize common style names
|
||||||
|
style = NormalizeStyle(style);
|
||||||
|
|
||||||
|
var data = File.ReadAllBytes(f);
|
||||||
|
if (data == null || data.Length == 0) continue;
|
||||||
|
|
||||||
|
if (!_families.TryGetValue(family, out var dict))
|
||||||
|
{
|
||||||
|
dict = new Dictionary<string, byte[]>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
_families[family] = dict;
|
||||||
|
_orderedFamilies.Add(family);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dict.ContainsKey(style))
|
||||||
|
dict[style] = data;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// ignore individual font load errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while initializing FontResolver: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string NormalizeStyle(string s)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||||
|
s = s.ToLowerInvariant();
|
||||||
|
if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
|
||||||
|
if (s.Contains("bold")) return "Bold";
|
||||||
|
if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
|
||||||
|
if (s.Contains("regular") || s == "r") return "Regular";
|
||||||
|
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while normalizing style: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// If requested family exists, pick corresponding style if available
|
||||||
|
string familyToUse = null;
|
||||||
|
if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
|
||||||
|
familyToUse = familyName;
|
||||||
|
|
||||||
|
if (familyToUse == null && _orderedFamilies.Count > 0)
|
||||||
|
familyToUse = _orderedFamilies[0];
|
||||||
|
|
||||||
|
if (familyToUse == null)
|
||||||
|
return new FontResolverInfo("Arial");
|
||||||
|
|
||||||
|
var style = "Regular";
|
||||||
|
if (isBold && isItalic) style = "BoldItalic";
|
||||||
|
else if (isBold) style = "Bold";
|
||||||
|
else if (isItalic) style = "Italic";
|
||||||
|
|
||||||
|
// Face name format: Family#Style
|
||||||
|
return new FontResolverInfo($"{familyToUse}#{style}");
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while resolving typeface: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] GetFont(string faceName)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(faceName)) return null;
|
||||||
|
|
||||||
|
// faceName expected as "Family#Style" or just "Family"
|
||||||
|
var family = faceName;
|
||||||
|
var style = "Regular";
|
||||||
|
var idx = faceName.IndexOf('#');
|
||||||
|
if (idx >= 0)
|
||||||
|
{
|
||||||
|
family = faceName.Substring(0, idx);
|
||||||
|
style = faceName.Substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
style = NormalizeStyle(style);
|
||||||
|
|
||||||
|
if (_families.TryGetValue(family, out var dict))
|
||||||
|
{
|
||||||
|
// Try exact style
|
||||||
|
if (dict.TryGetValue(style, out var data)) return data;
|
||||||
|
|
||||||
|
// Fallback order
|
||||||
|
if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Bold", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Italic", out data)) return data;
|
||||||
|
|
||||||
|
// Any available
|
||||||
|
foreach (var kv in dict) return kv.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while getting font: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
x:Class="Logof_Client.Wiki.EditorWindow"
|
||||||
|
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
||||||
|
<Grid Margin="10,0,10,10">
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="50" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
|
||||||
|
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
||||||
|
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
||||||
|
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
||||||
|
</StackPanel>
|
||||||
|
<TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
|
||||||
|
</Grid>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Interactivity;
|
||||||
|
|
||||||
|
namespace Logof_Client.Wiki;
|
||||||
|
|
||||||
|
public partial class EditorWindow : Window
|
||||||
|
{
|
||||||
|
public string filename = "";
|
||||||
|
|
||||||
|
public EditorWindow(string filename = "")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
this.filename = PathUtilities.NormalizeFileSystemPath(filename);
|
||||||
|
if (!string.IsNullOrWhiteSpace(this.filename) && File.Exists(this.filename))
|
||||||
|
{
|
||||||
|
var content = TbContent;
|
||||||
|
if (content != null) content.Text = File.ReadAllText(this.filename);
|
||||||
|
Title = "Wiki Editor - " + filename;
|
||||||
|
}
|
||||||
|
else if (!string.IsNullOrWhiteSpace(this.filename))
|
||||||
|
{
|
||||||
|
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.WriteAllText(filename, TbContent.Text);
|
||||||
|
MainWindow._instance.PopulateNavTree();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(null,
|
||||||
|
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
||||||
|
ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
MessageBox.Show(null,
|
||||||
|
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " +
|
||||||
|
PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path),
|
||||||
|
"Fehler");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void BtnDelete_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
||||||
|
if (result == MessageBoxResult.No) return;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.Delete(filename);
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
MainWindow._instance.PopulateNavTree();
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Media;
|
||||||
|
using Markdig;
|
||||||
|
using Markdig.Syntax;
|
||||||
|
using Markdig.Syntax.Inlines;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace Logof_Client.Wiki;
|
||||||
|
|
||||||
|
public static class MarkdownRenderer
|
||||||
|
{
|
||||||
|
public static Control Render(string markdown)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var panel = new StackPanel { Spacing = 6 };
|
||||||
|
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||||
|
|
||||||
|
var doc = Markdown.Parse(markdown);
|
||||||
|
|
||||||
|
foreach (var block in doc)
|
||||||
|
{
|
||||||
|
switch (block)
|
||||||
|
{
|
||||||
|
case HeadingBlock hb:
|
||||||
|
{
|
||||||
|
var text = GetInlineText(hb.Inline);
|
||||||
|
var tb = new TextBlock
|
||||||
|
{
|
||||||
|
Text = text,
|
||||||
|
FontWeight = FontWeight.Bold,
|
||||||
|
Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
||||||
|
};
|
||||||
|
tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
||||||
|
panel.Children.Add(tb);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case ParagraphBlock pb:
|
||||||
|
{
|
||||||
|
var text = GetInlineText(pb.Inline);
|
||||||
|
var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
||||||
|
panel.Children.Add(tb);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case FencedCodeBlock cb:
|
||||||
|
{
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
foreach (var line in cb.Lines.Lines)
|
||||||
|
{
|
||||||
|
sb.Append(line.ToString());
|
||||||
|
}
|
||||||
|
var codeBox = new TextBox
|
||||||
|
{
|
||||||
|
Text = sb.ToString(),
|
||||||
|
FontFamily = "Consolas, monospace",
|
||||||
|
IsReadOnly = true,
|
||||||
|
AcceptsReturn = true
|
||||||
|
};
|
||||||
|
panel.Children.Add(codeBox);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case ListBlock lb:
|
||||||
|
{
|
||||||
|
var sp = new StackPanel { Spacing = 2 };
|
||||||
|
var number = 1;
|
||||||
|
foreach (var item in lb)
|
||||||
|
{
|
||||||
|
if (item is ListItemBlock lib)
|
||||||
|
{
|
||||||
|
var itemText = new StringBuilder();
|
||||||
|
foreach (var sub in lib)
|
||||||
|
{
|
||||||
|
if (sub is ParagraphBlock pp)
|
||||||
|
itemText.Append(GetInlineText(pp.Inline));
|
||||||
|
}
|
||||||
|
var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
||||||
|
sp.Children.Add(tb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
panel.Children.Add(sp);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
{
|
||||||
|
// fallback: raw text
|
||||||
|
panel.Children.Add(new TextBlock { Text = block.ToString() });
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return panel;
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
return new Panel();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetInlineText(ContainerInline? container)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (container == null) return string.Empty;
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
foreach (var inline in container)
|
||||||
|
{
|
||||||
|
switch (inline)
|
||||||
|
{
|
||||||
|
case LiteralInline li:
|
||||||
|
sb.Append(li.Content.ToString());
|
||||||
|
break;
|
||||||
|
case EmphasisInline ei:
|
||||||
|
sb.Append(GetInlineText(ei));
|
||||||
|
break;
|
||||||
|
case CodeInline ci:
|
||||||
|
sb.Append(ci.Content);
|
||||||
|
break;
|
||||||
|
case LinkInline li:
|
||||||
|
sb.Append(GetInlineText(li));
|
||||||
|
break;
|
||||||
|
case LineBreakInline:
|
||||||
|
sb.Append("\n");
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
sb.Append(inline.ToString());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.ToString();
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
using System.Collections.ObjectModel;
|
||||||
|
|
||||||
|
namespace Logof_Client.Wiki;
|
||||||
|
|
||||||
|
public class WikiItem
|
||||||
|
{
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string Path { get; set; }
|
||||||
|
public bool IsFolder { get; set; }
|
||||||
|
public ObservableCollection<WikiItem> Children { get; } = new();
|
||||||
|
|
||||||
|
public override string ToString() => Name;
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace Logof_Client.Wiki;
|
||||||
|
|
||||||
|
public class WikiService
|
||||||
|
{
|
||||||
|
public WikiService(string wikiRoot = null)
|
||||||
|
{
|
||||||
|
// prefer global wiki storage path if configured
|
||||||
|
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||||
|
{
|
||||||
|
var cfg = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
|
WikiRootFullPath = Path.IsPathRooted(cfg)
|
||||||
|
? cfg
|
||||||
|
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
||||||
|
WikiRoot = WikiRootFullPath;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (wikiRoot == null)
|
||||||
|
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient",
|
||||||
|
"wiki");
|
||||||
|
wikiRoot = PathUtilities.NormalizeFileSystemPath(wikiRoot);
|
||||||
|
WikiRoot = wikiRoot;
|
||||||
|
WikiRootFullPath = Path.IsPathRooted(wikiRoot)
|
||||||
|
? wikiRoot
|
||||||
|
: Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string WikiRoot { get; }
|
||||||
|
public string WikiRootFullPath { get; }
|
||||||
|
|
||||||
|
public List<WikiItem> GetRootItems()
|
||||||
|
{
|
||||||
|
var list = new List<WikiItem>();
|
||||||
|
|
||||||
|
if (!Directory.Exists(WikiRootFullPath)) return list;
|
||||||
|
|
||||||
|
var dirInfo = new DirectoryInfo(WikiRootFullPath);
|
||||||
|
|
||||||
|
// Add folders
|
||||||
|
foreach (var dir in dirInfo.GetDirectories()) list.Add(BuildFolderItem(dir));
|
||||||
|
|
||||||
|
// Add files in root
|
||||||
|
foreach (var file in dirInfo.GetFiles("*.md"))
|
||||||
|
list.Add(new WikiItem { Name = file.Name, Path = file.FullName, IsFolder = false });
|
||||||
|
|
||||||
|
return list.OrderBy(i => i.IsFolder ? 0 : 1).ToList();
|
||||||
|
}
|
||||||
|
|
||||||
|
private WikiItem BuildFolderItem(DirectoryInfo dir)
|
||||||
|
{
|
||||||
|
var node = new WikiItem { Name = dir.Name, Path = dir.FullName, IsFolder = true };
|
||||||
|
|
||||||
|
foreach (var subdir in dir.GetDirectories()) node.Children.Add(BuildFolderItem(subdir));
|
||||||
|
|
||||||
|
foreach (var file in dir.GetFiles("*.md"))
|
||||||
|
node.Children.Add(new WikiItem { Name = file.Name, Path = file.FullName, IsFolder = false });
|
||||||
|
|
||||||
|
return node;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<string?> LoadFileContentAsync(string path)
|
||||||
|
{
|
||||||
|
if (!File.Exists(path)) return Task.FromResult<string?>(null);
|
||||||
|
return File.ReadAllTextAsync(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,157 +0,0 @@
|
|||||||
\documentclass[a4paper]{article}
|
|
||||||
\usepackage{graphicx}
|
|
||||||
\usepackage[left=3cm,right=3cm,top=3cm, bottom=3cm]{geometry}
|
|
||||||
\usepackage{amsmath}
|
|
||||||
\usepackage{amssymb}
|
|
||||||
\usepackage[headsepline, footsepline]{scrlayer-scrpage}
|
|
||||||
\usepackage{enumerate}
|
|
||||||
\usepackage{dsfont}
|
|
||||||
\usepackage[]{mathtools}
|
|
||||||
\usepackage[]{mathbbol}
|
|
||||||
\usepackage{multicol}
|
|
||||||
\usepackage{enumitem}
|
|
||||||
\usepackage[hidelinks]{hyperref}
|
|
||||||
\usepackage[]{circuitikz}
|
|
||||||
\usepackage{tcolorbox} % Für schöne Boxen
|
|
||||||
\usetikzlibrary{circuits.logic.IEC}
|
|
||||||
\usepackage{tikz}
|
|
||||||
\usepackage{tkz-graph}
|
|
||||||
\usepackage{listings}
|
|
||||||
\usepackage{xcolor}
|
|
||||||
|
|
||||||
\setlist{itemsep=0.3em, topsep=0.5em, parsep=0pt}
|
|
||||||
|
|
||||||
\newcommand{\bpf}[1]{%
|
|
||||||
\par\vspace{0.8\baselineskip}% Abstand vor der Überschrift
|
|
||||||
\noindent\textbf{#1}% Fettgedruckte Überschrift
|
|
||||||
\par\vspace{0.3\baselineskip}% Abstand nach der Überschrift
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\renewcommand{\contentsname}{Inhaltsverzeichnis}
|
|
||||||
\renewcommand{\figurename}{Grafik}
|
|
||||||
\renewcommand{\partname}{Teil}
|
|
||||||
\renewcommand{\epsilon}{\varepsilon}
|
|
||||||
|
|
||||||
\definecolor{darkgrey}{HTML}{232327}
|
|
||||||
|
|
||||||
% Zählerdefinition mit AUTOMATISCHEM SUBSECTION-RESET
|
|
||||||
\newcounter{commoncounter}[subsection]
|
|
||||||
\renewcommand{\thecommoncounter}{\thesubsection.\arabic{commoncounter}}
|
|
||||||
|
|
||||||
% Zähler direkt bei Dokumentstart initialisieren
|
|
||||||
\AtBeginDocument{\setcounter{commoncounter}{0}}
|
|
||||||
|
|
||||||
% BOX-DEFINITIONEN mit korrigierter Zählerlogik
|
|
||||||
\newtcolorbox{definitionbox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Definition \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!darkgrey,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
\newtcolorbox{examplebox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Beispiel \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!orange,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
\newtcolorbox{satzbox}[1][]{
|
|
||||||
before title={\refstepcounter{commoncounter}}, % KRITISCH: vor dem Titel!
|
|
||||||
title={Satz \thecommoncounter: #1},
|
|
||||||
colback=white,
|
|
||||||
colframe=white!75!blue,
|
|
||||||
fonttitle=\bfseries,
|
|
||||||
boxrule=0.6mm,
|
|
||||||
coltitle=black,
|
|
||||||
rounded corners,
|
|
||||||
before skip=10pt,
|
|
||||||
after skip=10pt
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\definecolor{codegreen}{rgb}{0,0.6,0}
|
|
||||||
\definecolor{codeblue}{rgb}{0,0,0.8}
|
|
||||||
\definecolor{codered}{rgb}{0.8,0,0}
|
|
||||||
\definecolor{lightgray}{rgb}{0.95,0.95,0.95}
|
|
||||||
|
|
||||||
\lstdefinestyle{CSharpStyle}{
|
|
||||||
language=Python,
|
|
||||||
basicstyle=\ttfamily\small, % Monospace-Schrift
|
|
||||||
keywordstyle=\color{blue}\bfseries, % Schlüsselwörter fett und blau
|
|
||||||
stringstyle=\color{red}, % Strings rot
|
|
||||||
commentstyle=\color{codegreen}, % Kommentare grün
|
|
||||||
backgroundcolor=\color{lightgray}, % Hintergrundfarbe
|
|
||||||
numbers=left, % Zeilennummern links
|
|
||||||
numbersep=10px, % Abstand zwischen Zeilennummern und Code
|
|
||||||
numberstyle=\color{gray}\texttt,
|
|
||||||
stepnumber=1, % Zeilennummerierung Schrittweite 1
|
|
||||||
frame=single, % Rahmen um den Code
|
|
||||||
tabsize=4, % Tabulatorgröße
|
|
||||||
breaklines=true, % Zeilenumbruch aktivieren
|
|
||||||
captionpos=none,
|
|
||||||
showstringspaces=false,
|
|
||||||
xleftmargin=15pt, % Linker Rand für den Code (verschiebt alles nach rechts)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
% Umgebung für Listings mit Titel und Zähler
|
|
||||||
\newenvironment{codeexample}[1][]{
|
|
||||||
\refstepcounter{commoncounter} % Zähler erhöhen
|
|
||||||
\lstset{
|
|
||||||
style=CSharpStyle,
|
|
||||||
caption={Listing \thecommoncounter: #1}, % Titel mit Zähler
|
|
||||||
label={listing:\thecommoncounter}
|
|
||||||
}
|
|
||||||
}{}
|
|
||||||
|
|
||||||
|
|
||||||
\setlength{\parindent}{0pt}
|
|
||||||
|
|
||||||
\title{\includegraphics[width=0.3\textwidth]{../assets/icon.png}\vspace{15pt}\\Logof Client\\
|
|
||||||
Handbuch}
|
|
||||||
\author{Elias Fierke}
|
|
||||||
\pagestyle{scrheadings}
|
|
||||||
\date{Oktober 2025}
|
|
||||||
\begin{document}
|
|
||||||
|
|
||||||
\ohead{Oktober 2025}
|
|
||||||
\ofoot{Seite {\pagemark} von \pageref{LastPage}}
|
|
||||||
\ihead{Logof Client Handbuch}
|
|
||||||
\maketitle
|
|
||||||
|
|
||||||
|
|
||||||
\tableofcontents
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Einführung}
|
|
||||||
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Installation}
|
|
||||||
|
|
||||||
\newpage
|
|
||||||
\part{Adress-Verwaltung}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
\label{LastPage}
|
|
||||||
\end{document}
|
|
||||||
Reference in New Issue
Block a user