Compare commits
92 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1f73238216 | |||
| 1d0876fa40 | |||
| db6624e5bc | |||
| f8aab88a04 | |||
| 4d71fb21ea | |||
| fd1cf6c3e3 | |||
| 9bbda4e2b9 | |||
| 097e0c175b | |||
| 1491f60791 | |||
| 1ce0e2de8d | |||
| e62861a25b | |||
| e3cdb61932 | |||
| a2d0b72899 | |||
| acaf0856ed | |||
| 2da822e0e7 | |||
| a4c7132756 | |||
| c32cd44184 | |||
| af3f8234c0 | |||
| 516ca58740 | |||
| c140a20549 | |||
| ac717c5345 | |||
| 1b200ee41e | |||
| 0750c51448 | |||
| 5a47fedcf0 | |||
| b22d33dc97 | |||
| 8b740304f6 | |||
| 57b4ac5001 | |||
| 1580d30d72 | |||
| 0dacaf19b9 | |||
| 75b6b1dc4d | |||
| 1161a437c4 | |||
| 605ba95848 | |||
| eb38bafd23 | |||
| e2d5ae2a70 | |||
| 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 | |||
| 6c1d0e7a70 | |||
| a72722745b | |||
| bd565960ba | |||
| 58fed451a1 | |||
| ddea77bf3f | |||
| 0e4da1b150 | |||
| 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 |
@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
|
|||||||
var id = listItemName.Split(" - ")[0];
|
var id = listItemName.Split(" - ")[0];
|
||||||
return int.Parse(id);
|
return int.Parse(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return Name + " (" + KasPersons.Count + " Einträge)";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPerson
|
public class KasPerson
|
||||||
@@ -173,6 +178,34 @@ public class KasPerson
|
|||||||
public string abteilung { get; set; }
|
public string abteilung { get; set; }
|
||||||
public string funktionad { get; set; }
|
public string funktionad { get; set; }
|
||||||
|
|
||||||
|
public string used_plz { get; set; } = "";
|
||||||
|
|
||||||
|
public bool IsGermany()
|
||||||
|
{
|
||||||
|
var trimmedLand = (land ?? "").Trim();
|
||||||
|
var trimmedLowerLand = trimmedLand.ToLower();
|
||||||
|
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
|
||||||
|
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
|
||||||
|
trimmedLowerLand == "deutschland";
|
||||||
|
|
||||||
|
return isGermany;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void SetUsedPLZ(int id, string plz)
|
||||||
|
{
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
{
|
||||||
|
foreach (var add in set.KasPersons)
|
||||||
|
{
|
||||||
|
if (add.id == id)
|
||||||
|
{
|
||||||
|
add.used_plz = plz;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static int GenerateNewID(int base_id)
|
public static int GenerateNewID(int base_id)
|
||||||
{
|
{
|
||||||
//var newid = 100000 + base_id;
|
//var newid = 100000 + base_id;
|
||||||
@@ -188,6 +221,18 @@ public class KasPerson
|
|||||||
|
|
||||||
return highest + base_id + 1;
|
return highest + base_id + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
if (refsid != null && refsid != 0)
|
||||||
|
{
|
||||||
|
return refsid + " - " + name;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return id + " - " + name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPersonError
|
public class KasPersonError
|
||||||
@@ -212,4 +257,9 @@ public class KasPersonError
|
|||||||
|
|
||||||
return output;
|
return output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string ToString(KasPerson person)
|
||||||
|
{
|
||||||
|
return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+52
-24
@@ -12,8 +12,8 @@ public class Settings
|
|||||||
public Customers customers = new();
|
public Customers customers = new();
|
||||||
public PdfExportSettings pdfExport { get; set; } = new();
|
public PdfExportSettings pdfExport { get; set; } = new();
|
||||||
|
|
||||||
public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
// public string settingsPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient", "config.json");
|
// "logofclient", "config.json");
|
||||||
|
|
||||||
public Settings()
|
public Settings()
|
||||||
{
|
{
|
||||||
@@ -23,31 +23,28 @@ public class Settings
|
|||||||
|
|
||||||
public static void Save()
|
public static void Save()
|
||||||
{
|
{
|
||||||
if (!Directory.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
if (!Directory.Exists(Global._instance.config_path) && !File.Exists((Global._instance.config_path)))
|
||||||
"logofclient")))
|
Directory.CreateDirectory(Global._instance.config_path);
|
||||||
Directory.CreateDirectory(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
// if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
"logofclient"));
|
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
|
||||||
|
|
||||||
var json = JsonConvert.SerializeObject(_instance);
|
var json = JsonConvert.SerializeObject(_instance);
|
||||||
File.WriteAllText(_instance.settingsPath, json);
|
File.WriteAllText(Path.Combine(Global._instance.config_path,"config.json"), json);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void Load()
|
public static void Load()
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
//if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var contents = File.ReadAllText(_instance.settingsPath);
|
var contents = File.ReadAllText(Path.Combine(Global._instance.config_path, "config.json"));
|
||||||
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
_instance = JsonConvert.DeserializeObject<Settings>(contents);
|
||||||
MainWindow._instance.RefreshCustomerItems();
|
MainWindow._instance.RefreshCustomerItems();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine(ex.Message);
|
Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading settings. Generating new...");
|
|
||||||
_instance = new Settings();
|
_instance = new Settings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -70,6 +67,9 @@ public class PdfExportSettings
|
|||||||
|
|
||||||
public double fontSize { get; set; } = 9;
|
public double fontSize { get; set; } = 9;
|
||||||
public double smallFontSize { get; set; } = 6;
|
public double smallFontSize { get; set; } = 6;
|
||||||
|
public bool exportRunningSheets { get; set; } = true;
|
||||||
|
public int rsNumGrouped { get; set; } = 25;
|
||||||
|
public int rsPlzStartpoint { get; set; } = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Global
|
public class Global
|
||||||
@@ -83,9 +83,13 @@ public class Global
|
|||||||
|
|
||||||
public string config_path { get; set; } = Path.Combine(
|
public string config_path { get; set; } = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient");
|
||||||
"config.json");
|
|
||||||
|
|
||||||
|
public void SetConfigPath(string path)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(path))
|
||||||
|
config_path = PathUtilities.NormalizeFileSystemPath(path);
|
||||||
|
}
|
||||||
public string wiki_storage_path { get; set; } = Path.Combine(
|
public string wiki_storage_path { get; set; } = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient",
|
||||||
@@ -119,23 +123,29 @@ public class Global
|
|||||||
var contents = File.ReadAllText(Path.Combine(
|
var contents = File.ReadAllText(Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "logofclient",
|
||||||
"global.config"));
|
"global.config"));
|
||||||
_instance = JsonConvert.DeserializeObject<Global>(contents);
|
_instance = JsonConvert.DeserializeObject<Global>(contents) ?? new Global();
|
||||||
|
_instance.NormalizePaths();
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine(ex.Message);
|
Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
|
||||||
Console.WriteLine(ex.StackTrace);
|
|
||||||
Console.WriteLine("Error while reading global settings. Generating new...");
|
|
||||||
_instance = new Global();
|
_instance = new Global();
|
||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 class Customers
|
||||||
{
|
{
|
||||||
public List<Customer> customers = new();
|
public List<Customer> customers = new();
|
||||||
public int current { get; set; } = 0;
|
public Customer current { get; set; } = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Customer
|
public class Customer
|
||||||
@@ -150,6 +160,11 @@ public class Customer
|
|||||||
ID = highestID + 1;
|
ID = highestID + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
public string name { get; set; } = "";
|
public string name { get; set; } = "";
|
||||||
public string description { get; set; } = "";
|
public string description { get; set; } = "";
|
||||||
public string sender_address { get; set; } = "";
|
public string sender_address { get; set; } = "";
|
||||||
@@ -157,12 +172,25 @@ public class Customer
|
|||||||
public char separator { get; set; } = ',';
|
public char separator { get; set; } = ',';
|
||||||
public int ID { get; }
|
public int ID { get; }
|
||||||
|
|
||||||
|
public static Customer GetCustomerByID(int id)
|
||||||
public static int GetIDByCustomerListItem(string item_content)
|
|
||||||
{
|
{
|
||||||
var id = item_content.Split(" - ")[0];
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
return int.Parse(id);
|
{
|
||||||
|
if (id == customer.ID)
|
||||||
|
{
|
||||||
|
return customer;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// public static int GetIDByCustomerListItem(string item_content)
|
||||||
|
// {
|
||||||
|
// var id = item_content.Split(" - ")[0];
|
||||||
|
// return int.Parse(id);
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class AddressSets
|
public class AddressSets
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public static class Logger
|
||||||
|
{
|
||||||
|
public static void Log(string text, LogType logType = LogType.Info)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string config_path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient");
|
||||||
|
if (!Directory.Exists(config_path))
|
||||||
|
Directory.CreateDirectory(config_path);
|
||||||
|
|
||||||
|
string log_path = Path.Combine(config_path, $"log-{DateTime.Now:dd-MM-yy}.log");
|
||||||
|
if(!File.Exists(log_path))
|
||||||
|
File.Create(log_path).Close();
|
||||||
|
|
||||||
|
string line = $"[{DateTime.Now:dd.MM.yyyy - hh:mm:ss}]: ({logType.ToString()}) {text}";
|
||||||
|
Console.WriteLine(line);
|
||||||
|
|
||||||
|
File.AppendAllLines(log_path, [line]);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine(ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum LogType
|
||||||
|
{
|
||||||
|
Error,
|
||||||
|
Warning,
|
||||||
|
Info
|
||||||
|
}
|
||||||
|
}
|
||||||
+16
-15
@@ -9,25 +9,26 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia" Version="11.3.2"/>
|
<PackageReference Include="Avalonia" Version="11.3.2" />
|
||||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2"/>
|
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
|
||||||
<PackageReference Include="Avalonia.Desktop" Version="11.3.2"/>
|
<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2"/>
|
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
|
||||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2"/>
|
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
|
||||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||||
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
|
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
|
||||||
<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="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="Markdown.Avalonia" Version="11.0.3" />
|
||||||
<PackageReference Include="PdfSharp" Version="6.1.1"/>
|
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||||
|
<PackageReference Include="PdfSharp" Version="6.1.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Markdig" Version="0.30.3"/>
|
<PackageReference Include="Markdig" Version="0.30.3" />
|
||||||
<PackageReference Include="AvaloniaEdit" Version="0.10.12"/>
|
<PackageReference Include="AvaloniaEdit" Version="0.10.12" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -37,15 +38,15 @@
|
|||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Remove="assets\icon.ico"/>
|
<None Remove="assets\icon.ico" />
|
||||||
<AvaloniaResource Include="assets\icon.ico">
|
<AvaloniaResource Include="assets\icon.ico">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
<None Remove="assets\calc_man.png"/>
|
<None Remove="assets\calc_man.png" />
|
||||||
<AvaloniaResource Include="assets\calc_man.png">
|
<AvaloniaResource Include="assets\calc_man.png">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
<None Remove="assets\loading.mp4"/>
|
<None Remove="assets\loading.mp4" />
|
||||||
<AvaloniaResource Include="assets\loading.mp4">
|
<AvaloniaResource Include="assets\loading.mp4">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
@@ -56,6 +57,6 @@
|
|||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
||||||
<Folder Include="assets\fonts\"/>
|
<Folder Include="assets\fonts\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+104
-51
@@ -2,6 +2,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
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"
|
||||||
|
xmlns:md="https://github.com/whistyun/Markdown.Avalonia"
|
||||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||||
MinWidth="1000" MinHeight="600" IsVisible="False"
|
MinWidth="1000" MinHeight="600" IsVisible="False"
|
||||||
x:Class="Logof_Client.MainWindow" WindowState="Maximized" Icon="assets/icon.ico"
|
x:Class="Logof_Client.MainWindow" WindowState="Maximized" Icon="assets/icon.ico"
|
||||||
@@ -78,7 +79,7 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</MenuItem.Header>
|
</MenuItem.Header>
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
|
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
|
||||||
<MenuItem.Header>
|
<MenuItem.Header>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
||||||
@@ -103,52 +104,67 @@
|
|||||||
<StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
|
<StackPanel Grid.Row="1" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
|
||||||
Margin="0,0,5,0">
|
Margin="0,0,5,0">
|
||||||
<Button Width="250" HorizontalContentAlignment="Center"
|
<Button Width="250" HorizontalContentAlignment="Center"
|
||||||
Margin="0,0,0,10" IsEnabled="False"
|
Margin="0,0,0,10" IsEnabled="False" VerticalAlignment="Stretch"
|
||||||
x:Name="BtnCheck" Click="BtnCheck_OnClick">
|
x:Name="BtnCheck" Click="BtnCheck_OnClick">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="SpellCheck" Width="36" Height="36" />
|
<LucideIcon Kind="SpellCheck" Width="36" Height="36" />
|
||||||
<Label Content="Prüfen" VerticalContentAlignment="Center" FontSize="15"
|
<Label Content="Prüfen" VerticalContentAlignment="Center" FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Prüft alle Adressen auf Fehler." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
|
||||||
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False"
|
||||||
HorizontalContentAlignment="Center"
|
HorizontalContentAlignment="Center"
|
||||||
Click="BtnCombine_OnClick" x:Name="BtnCombine"
|
Click="BtnCombine_OnClick" x:Name="BtnCombine" VerticalAlignment="Stretch"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Combine" Width="36" Height="36" />
|
<LucideIcon Kind="Combine" Width="36" Height="36" />
|
||||||
<Label Content="Zusammenführen" VerticalContentAlignment="Center" FontSize="15"
|
<Label Content="Zusammenführen" VerticalContentAlignment="Center" FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Führt mehrere Adress-Sets auf verschiedene Art und Weise zusammen." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
|
||||||
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
HorizontalContentAlignment="Center" x:Name="BtnShorten" VerticalAlignment="Stretch"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="ListX" Width="36" Height="36" />
|
<LucideIcon Kind="ListX" Width="36" Height="36" />
|
||||||
<Label Content="Kürzen" VerticalContentAlignment="Center" FontSize="15"
|
<Label Content="Kürzen" VerticalContentAlignment="Center" FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Entfernt alle Fehlerhaften Adressen (ggf. bitte vorher Reparieren). Setzt Prüfung voraus." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
|
||||||
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False"
|
||||||
Click="BtnGenerateLabels_OnClick"
|
Click="BtnGenerateLabels_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels"
|
HorizontalContentAlignment="Center" x:Name="BtnGenerateLabels" VerticalAlignment="Stretch"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Tags" Width="36" Height="36" />
|
<LucideIcon Kind="Tags" Width="36" Height="36" />
|
||||||
<Label Content="Etiketten generieren" VerticalContentAlignment="Center"
|
<Label Content="Etiketten generieren" VerticalContentAlignment="Center"
|
||||||
FontSize="15"
|
FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Generiert Versandetiketten und Bundleitzettel" HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
|
||||||
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnRepair"
|
HorizontalContentAlignment="Center" x:Name="BtnRepair" VerticalAlignment="Stretch"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Hammer" Width="36" Height="36" />
|
<LucideIcon Kind="Hammer" Width="36" Height="36" />
|
||||||
<Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
|
<Label Content="Reparieren" VerticalContentAlignment="Center" FontSize="15"
|
||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Versucht, verschiedene Adressaspekte zu reparieren. Setzt Prüfung voraus." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
|
||||||
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<!-- </Grid> -->
|
<!-- </Grid> -->
|
||||||
@@ -220,10 +236,18 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<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>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||||
@@ -246,6 +270,7 @@
|
|||||||
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
<CheckBox Content="Laufzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
||||||
@@ -265,6 +290,10 @@
|
|||||||
<Label Content="Zellenabstand links"></Label>
|
<Label Content="Zellenabstand links"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Anzahl gruppierter Sendungen"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzcount" Minimum="1" Maximum="10000" Value="25"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
||||||
@@ -284,6 +313,10 @@
|
|||||||
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="*,*">
|
||||||
|
<Label Grid.Column="0" Content="Gruppierpunkt"></Label>
|
||||||
|
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzStartpoint" Minimum="1" Maximum="10" Value="2"></NumericUpDown>
|
||||||
|
</Grid>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||||
@@ -326,13 +359,31 @@
|
|||||||
</TabItem.Header>
|
</TabItem.Header>
|
||||||
<Grid ColumnDefinitions="300,*">
|
<Grid ColumnDefinitions="300,*">
|
||||||
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
||||||
<StackPanel>
|
<Grid RowDefinitions="Auto,*">
|
||||||
<Button Content="+ Hinzufügen" Margin="10" x:Name="BtnWikiAddFile"
|
<StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
|
||||||
Click="BtnWikiAddFile_OnClick" />
|
<Button x:Name="BtnWikiAddFile"
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
Click="BtnWikiAddFile_OnClick">
|
||||||
<TreeView Name="NavTree" Margin="10" />
|
<StackPanel Orientation="Horizontal">
|
||||||
</ScrollViewer>
|
<LucideIcon Kind="Plus" Width="24" Height="24" />
|
||||||
|
<LucideIcon Kind="File" Width="24" Height="24" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
<Button x:Name="BtnWikiAddFolder"
|
||||||
|
Click="BtnWikiAddFolder_OnClick" >
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Plus" Width="24" Height="24" />
|
||||||
|
<LucideIcon Kind="Folder" Width="24" Height="24" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button>
|
||||||
|
<Button Click="BtnReloadWiki_OnClick" x:Name="BtnReloadWiki">
|
||||||
|
<LucideIcon Kind="RefreshCcw" Width="24" Height="24" />
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
<TreeView Grid.Row="1" Name="NavTree"
|
||||||
|
Margin="10"
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
VerticalAlignment="Stretch" />
|
||||||
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
<Grid Grid.Column="1">
|
<Grid Grid.Column="1">
|
||||||
@@ -349,9 +400,7 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<Border Grid.Row="1" Margin="8" BorderBrush="#DDD" BorderThickness="1" CornerRadius="4">
|
<Border Grid.Row="1" Margin="8" BorderBrush="#DDD" BorderThickness="1" CornerRadius="4">
|
||||||
<ScrollViewer>
|
<md:MarkdownScrollViewer x:Name="MsvWikiView"/>
|
||||||
<StackPanel Name="PreviewPanel" Margin="8" />
|
|
||||||
</ScrollViewer>
|
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -374,28 +423,25 @@
|
|||||||
<StackPanel Orientation="Vertical" Spacing="10">
|
<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="Vertical" Spacing="5">
|
<Grid Grid.Column="1" ColumnDefinitions="*,150">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch" TextChanged="Tb_OnTextChanged"
|
||||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
Watermark="/home/username/.config/logofclient/" />
|
||||||
Watermark="/home/username/.config/logofclient/config.json" />
|
<Button Grid.Column="1" Margin="5,0,0,0" x:Name="BtnConfigPath" HorizontalAlignment="Stretch">
|
||||||
<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="Folder" Width="16" Height="16" Size="16" />
|
||||||
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button.Content>
|
</Button.Content>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</Grid>
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="400,*">
|
<Grid ColumnDefinitions="400,*">
|
||||||
<Label Grid.Column="0">Wiki-Pfad</Label>
|
<Label Grid.Column="0">Wiki-Pfad</Label>
|
||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
<Grid Grid.Column="1" ColumnDefinitions="*,150">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch" TextChanged="Tb_OnTextChanged"
|
||||||
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
|
||||||
Watermark="/home/username/.config/logofclient/wiki" />
|
Watermark="/home/username/.config/logofclient/wiki" />
|
||||||
<Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
|
<Button Grid.Column="1" Margin="5,0,0,0" IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Stretch">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||||
@@ -403,26 +449,25 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button.Content>
|
</Button.Content>
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
</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>
|
||||||
|
<!-- <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" TextChanged="Tb_OnTextChanged" -->
|
||||||
|
<!-- 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> -->
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</TabItem>
|
</TabItem>
|
||||||
<TabItem>
|
<TabItem>
|
||||||
@@ -473,12 +518,20 @@
|
|||||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerSenderAddress" />
|
x:Name="TbSettingsCustomerSenderAddress" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*,Auto" x:Name="GrdCSVDividerButtonsAndTb">
|
||||||
<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" />
|
||||||
@@ -505,7 +558,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" />
|
||||||
|
|||||||
+493
-202
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
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" SizeToContent="WidthAndHeight"
|
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen"
|
||||||
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
||||||
Title="MessageBox">
|
Title="MessageBox">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
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" SizeToContent="WidthAndHeight"
|
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||||
x:Class="Logof_Client.NamingWindow"
|
x:Class="Logof_Client.NamingWindow"
|
||||||
Title="NamingWindow">
|
Title="NamingWindow">
|
||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
|
||||||
@@ -45,12 +46,13 @@ public partial class NamingWindow : Window
|
|||||||
if (parent != null)
|
if (parent != null)
|
||||||
wind.ShowDialog(parent);
|
wind.ShowDialog(parent);
|
||||||
else wind.Show();
|
else wind.Show();
|
||||||
|
wind.Focus();
|
||||||
|
|
||||||
return tcs.Task;
|
return tcs.Task;
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while showing naming window: " + ex.Message);
|
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
|
||||||
return Task.FromResult<string>(null!);
|
return Task.FromResult<string>(null!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
using System;
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public static class PathUtilities
|
||||||
|
{
|
||||||
|
private static readonly char[] WindowsInvalidFileNameChars =
|
||||||
|
{
|
||||||
|
'<', '>', ':', '"', '/', '\\', '|', '?', '*'
|
||||||
|
};
|
||||||
|
|
||||||
|
private static readonly string[] WindowsReservedFileNames =
|
||||||
|
{
|
||||||
|
"CON", "PRN", "AUX", "NUL",
|
||||||
|
"COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9",
|
||||||
|
"LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static string NormalizeFileSystemPath(string path)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(path)) return path;
|
||||||
|
|
||||||
|
if (Uri.TryCreate(path, UriKind.Absolute, out var uri) && uri.IsFile)
|
||||||
|
return uri.LocalPath;
|
||||||
|
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string NormalizeFileSystemPath(Uri path)
|
||||||
|
{
|
||||||
|
return path.IsFile ? path.LocalPath : path.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool HasInvalidFileNameChars(string fileName)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(fileName)) return true;
|
||||||
|
if (fileName.EndsWith(' ') || fileName.EndsWith('.')) return true;
|
||||||
|
if (fileName.IndexOfAny(Path.GetInvalidFileNameChars()) >= 0) return true;
|
||||||
|
if (fileName.IndexOfAny(WindowsInvalidFileNameChars) >= 0) return true;
|
||||||
|
|
||||||
|
var nameWithoutExtension = Path.GetFileNameWithoutExtension(fileName);
|
||||||
|
foreach (var reservedName in WindowsReservedFileNames)
|
||||||
|
{
|
||||||
|
if (string.Equals(fileName, reservedName, StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
string.Equals(nameWithoutExtension, reservedName, StringComparison.OrdinalIgnoreCase))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var c in fileName)
|
||||||
|
{
|
||||||
|
if (char.IsControl(c)) return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-1
@@ -20,7 +20,9 @@
|
|||||||
Margin="10,10,10,10" />
|
Margin="10,10,10,10" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" />
|
<!-- <TextBlock x:Name="TbResults"></TextBlock> -->
|
||||||
|
<ListBox x:Name="LbResults"></ListBox>
|
||||||
|
<!-- <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" /> -->
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
+36
-4
@@ -28,12 +28,25 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
private void GenerateView(List<KasPerson> result)
|
private void GenerateView(List<KasPerson> result)
|
||||||
{
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
// Filter to only show persons with errors
|
// Filter to only show persons with errors
|
||||||
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
||||||
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
StkResults.Children.Clear();
|
// TbResults.Text = "";
|
||||||
foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
// foreach (var person in result_with_errors) TbResults.Text += person.PersonError.GetString()+"\n";
|
||||||
|
LbResults.Items.Clear();
|
||||||
|
foreach (var person in result_with_errors) LbResults.Items.Add(person.PersonError.ToString(person));
|
||||||
|
// StkResults.Children.Clear();
|
||||||
|
// foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log("Error while generating result view: " + ex.Message, Logger.LogType.Warning);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Grid CreatePersonGrid(KasPerson person)
|
private Grid CreatePersonGrid(KasPerson person)
|
||||||
@@ -101,6 +114,8 @@ public partial class ResultWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void Load(List<KasPerson> 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>();
|
||||||
@@ -141,12 +156,20 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateFilter()
|
private void UpdateFilter()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var temp_result = new List<KasPerson>();
|
var temp_result = new List<KasPerson>();
|
||||||
|
|
||||||
@@ -201,8 +224,17 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
StkResults.Children.Clear();
|
LbResults.Items.Clear();
|
||||||
foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
foreach (var person in temp_result) LbResults.Items.Add(person.PersonError.ToString(person));
|
||||||
|
// TbResults.Text = "";
|
||||||
|
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
|
||||||
|
// StkResults.Children.Clear();
|
||||||
|
// foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
||||||
|
} catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log("Error while updating filter: " + ex.Message, Logger.LogType.Warning);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+16
-2
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@@ -37,6 +38,8 @@ public class AddressCheck
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async Task<List<KasPerson>> Perform(int id)
|
public async Task<List<KasPerson>> Perform(int id)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
// Find the index of the address set with the given id
|
// Find the index of the address set with the given id
|
||||||
var adset_index = -1;
|
var adset_index = -1;
|
||||||
@@ -237,7 +240,8 @@ public class AddressCheck
|
|||||||
// Directly set PersonError in the address set
|
// Directly set PersonError in the address set
|
||||||
var person_index = adset.KasPersons.IndexOf(person);
|
var person_index = adset.KasPersons.IndexOf(person);
|
||||||
if (person_index >= 0)
|
if (person_index >= 0)
|
||||||
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index].PersonError =
|
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index]
|
||||||
|
.PersonError =
|
||||||
new KasPersonError((errors, warnings));
|
new KasPersonError((errors, warnings));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,7 +251,8 @@ public class AddressCheck
|
|||||||
await Dispatcher.UIThread.InvokeAsync(() =>
|
await Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
if (hasFaults)
|
if (hasFaults)
|
||||||
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
|
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
|
||||||
|
Convert.ToInt32(percent).ToString());
|
||||||
|
|
||||||
_progress.ChangePercentage(percent);
|
_progress.ChangePercentage(percent);
|
||||||
});
|
});
|
||||||
@@ -260,5 +265,14 @@ public class AddressCheck
|
|||||||
return Settings._instance.addressSets.addresses[adset_index].KasPersons
|
return Settings._instance.addressSets.addresses[adset_index].KasPersons
|
||||||
.Where(p => p.PersonError != null)
|
.Where(p => p.PersonError != null)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address check: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -64,12 +64,8 @@ public static class AddressCreator
|
|||||||
// 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; try to map via Global countries alternatives -> translation
|
// if the country is not Germany, set it; try to map via Global countries alternatives -> translation
|
||||||
var trimmedLand = (address.land ?? "").Trim();
|
var trimmedLand = (address.land ?? "").Trim();
|
||||||
var trimmedLowerLand = trimmedLand.ToLower();
|
|
||||||
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
|
|
||||||
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
|
|
||||||
trimmedLowerLand == "deutschland";
|
|
||||||
|
|
||||||
if (!isGermany)
|
if (!address.IsGermany())
|
||||||
{
|
{
|
||||||
var countryToShow = trimmedLand; // default: use raw land value
|
var countryToShow = trimmedLand; // default: use raw land value
|
||||||
|
|
||||||
@@ -104,7 +100,11 @@ public static class AddressCreator
|
|||||||
// Alternative A: pplz valid and city existing
|
// Alternative A: pplz valid and city existing
|
||||||
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
||||||
{
|
{
|
||||||
string_address = address.pplz + " " + address.ort + "\n" + string_address;
|
string pplz = address.pplz;
|
||||||
|
if (address.IsGermany()) pplz = NormalizeGermanPLZ(address.pplz);
|
||||||
|
|
||||||
|
KasPerson.SetUsedPLZ(id, pplz);
|
||||||
|
string_address = pplz + " " + address.ort + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
if (!string.IsNullOrWhiteSpace(address.postfach))
|
if (!string.IsNullOrWhiteSpace(address.postfach))
|
||||||
{
|
{
|
||||||
@@ -150,7 +150,12 @@ public static class AddressCreator
|
|||||||
} // 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;
|
string plz = address.plz;
|
||||||
|
if (address.IsGermany()) plz = NormalizeGermanPLZ(address.plz);
|
||||||
|
|
||||||
|
|
||||||
|
KasPerson.SetUsedPLZ(id, plz);
|
||||||
|
string_address = plz + " " + address.ort + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
if (!string.IsNullOrWhiteSpace(address.strasse))
|
if (!string.IsNullOrWhiteSpace(address.strasse))
|
||||||
{
|
{
|
||||||
@@ -200,6 +205,8 @@ public static class AddressCreator
|
|||||||
|
|
||||||
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
||||||
string name, string namezus)
|
string name, string namezus)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(anredezus))
|
if (!string.IsNullOrWhiteSpace(anredezus))
|
||||||
return string.Join(" ",
|
return string.Join(" ",
|
||||||
@@ -215,6 +222,13 @@ public static class AddressCreator
|
|||||||
)
|
)
|
||||||
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address name line creation: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Returns true if a plz (or pplz) is valid
|
/// Returns true if a plz (or pplz) is valid
|
||||||
@@ -223,6 +237,8 @@ public static class AddressCreator
|
|||||||
/// <param name="land">country, to check the plz</param>
|
/// <param name="land">country, to check the plz</param>
|
||||||
/// <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)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(plz)) return false;
|
if (string.IsNullOrWhiteSpace(plz)) return false;
|
||||||
|
|
||||||
@@ -249,4 +265,31 @@ public static class AddressCreator
|
|||||||
// For non-German countries, accept any non-empty postal code
|
// For non-German countries, accept any non-empty postal code
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address plz check: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string NormalizeGermanPLZ(string plz)
|
||||||
|
{
|
||||||
|
if(plz.Length == 5) return plz;
|
||||||
|
if(plz.Length > 5)
|
||||||
|
{
|
||||||
|
return plz.Substring(0, 5);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (plz.Length < 5)
|
||||||
|
{
|
||||||
|
int toadd = 5 - plz.Length;
|
||||||
|
for (int i = 0; i < toadd; i++)
|
||||||
|
{
|
||||||
|
plz = "0" + plz;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return plz;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ using System.IO;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using Logof_Client;
|
||||||
|
|
||||||
public class AddressPatch
|
public class AddressPatch
|
||||||
{
|
{
|
||||||
@@ -57,6 +58,8 @@ public class AddressPatch
|
|||||||
public bool has_funktionad { get; set; }
|
public bool has_funktionad { get; set; }
|
||||||
|
|
||||||
public static AddressPatch Import(Uri filename)
|
public static AddressPatch Import(Uri filename)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var patch = new AddressPatch();
|
var patch = new AddressPatch();
|
||||||
|
|
||||||
@@ -92,9 +95,20 @@ public class AddressPatch
|
|||||||
|
|
||||||
return patch;
|
return patch;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing address patch: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public override string ToString()
|
public override string ToString()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
|
||||||
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
|
||||||
@@ -115,4 +129,12 @@ public class AddressPatch
|
|||||||
|
|
||||||
return lines.ToString().TrimEnd();
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
+112
-79
@@ -16,16 +16,59 @@ public class CombineAddresses
|
|||||||
_progress = progressWindow;
|
_progress = progressWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
|
public enum CombineType
|
||||||
|
{
|
||||||
|
refsid,
|
||||||
|
final_adress,
|
||||||
|
none
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
|
bool? exportUnused, bool? deleteOld)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||||
|
|
||||||
|
if (deleteOld == true)
|
||||||
|
{
|
||||||
|
foreach (var list in address_lists)
|
||||||
|
{
|
||||||
|
Settings._instance.addressSets.addresses.Remove(list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing address combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
bool? exportUnused)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, exportUnused);
|
try
|
||||||
if (type == "union") return await Union(address_lists, exportUnused);
|
{
|
||||||
if (type == "intersection") return await Intersection(address_lists, exportUnused);
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
if (type == "symdiff") return await SymmetricDifference(address_lists, 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);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while executing address combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -35,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 &&
|
||||||
@@ -67,9 +113,11 @@ public class CombineAddresses
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused,
|
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(await KasAddressList.GenerateName("difference")), null);
|
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
|
||||||
@@ -85,11 +133,13 @@ public class CombineAddresses
|
|||||||
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(await KasAddressList.GenerateName("difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true)
|
||||||
|
second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
|
||||||
|
|
||||||
foreach (var person in address_lists[0].KasPersons)
|
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
|
||||||
@@ -106,13 +156,25 @@ public class CombineAddresses
|
|||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
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,
|
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
|
||||||
Progress progress = null)
|
Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true)
|
||||||
|
second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -123,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);
|
||||||
@@ -143,6 +205,14 @@ public class CombineAddresses
|
|||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
return (result, null);
|
return (result, null);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while performing union-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<KasAddressList> MoveDuplicatesToNew()
|
public async Task<KasAddressList> MoveDuplicatesToNew()
|
||||||
@@ -150,11 +220,14 @@ public class CombineAddresses
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -170,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);
|
||||||
@@ -195,13 +268,24 @@ public class CombineAddresses
|
|||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
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,
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -216,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
|
||||||
@@ -253,66 +337,15 @@ public class CombineAddresses
|
|||||||
if (return_unused == true) return (result, second_result);
|
if (return_unused == true) return (result, second_result);
|
||||||
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
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -64,6 +65,8 @@ public class CsvBuilder
|
|||||||
}
|
}
|
||||||
|
|
||||||
private string EscapeCsvField(string? value)
|
private string EscapeCsvField(string? value)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var field = value ?? string.Empty;
|
var field = value ?? string.Empty;
|
||||||
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
||||||
@@ -72,4 +75,12 @@ public class CsvBuilder
|
|||||||
|
|
||||||
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while escapting csv field: {ex.Message}",Logger.LogType.Warning);
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+29
-2
@@ -19,6 +19,8 @@ public class DataImport
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
{
|
{
|
||||||
@@ -83,7 +85,7 @@ public class DataImport
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
Logger.Log($"Error while creating new kas person (import): {ex.Message}",Logger.LogType.Error);
|
||||||
Console.WriteLine(ex.StackTrace);
|
Console.WriteLine(ex.StackTrace);
|
||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
@@ -91,9 +93,18 @@ public class DataImport
|
|||||||
|
|
||||||
return (true, imported);
|
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,
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||||
char separator)
|
char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
{
|
{
|
||||||
@@ -217,13 +228,19 @@ public class DataImport
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Error while parsing line: {line} - {ex.Message}");
|
Logger.Log($"Error while creating kas person (import, patch): {ex.Message}",Logger.LogType.Error);
|
||||||
Console.WriteLine(ex.StackTrace);
|
Console.WriteLine(ex.StackTrace);
|
||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return (true, imported);
|
return (true, imported);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing kas address list with patch: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// int GenerateNewRefsid()
|
// int GenerateNewRefsid()
|
||||||
// {
|
// {
|
||||||
@@ -236,6 +253,7 @@ public class DataImport
|
|||||||
// last_refsid = biggest + 1;
|
// last_refsid = biggest + 1;
|
||||||
// return last_refsid;
|
// return last_refsid;
|
||||||
// }
|
// }
|
||||||
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -245,6 +263,8 @@ public class DataImport
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static string[] ParseCsvLine(string line, char separator)
|
private static string[] ParseCsvLine(string line, char separator)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var fields = new List<string>();
|
var fields = new List<string>();
|
||||||
var current = new StringBuilder();
|
var current = new StringBuilder();
|
||||||
@@ -280,4 +300,11 @@ public class DataImport
|
|||||||
fields.Add(current.ToString().Trim());
|
fields.Add(current.ToString().Trim());
|
||||||
return fields.ToArray();
|
return fields.ToArray();
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while persing csv line: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+799
-1
@@ -17,6 +17,8 @@ public class PdfBuilder
|
|||||||
private readonly XFont _smallFont;
|
private readonly XFont _smallFont;
|
||||||
|
|
||||||
public PdfBuilder(PdfExportSettings? settings = null)
|
public PdfBuilder(PdfExportSettings? settings = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
EnsureFontResolverRegistered();
|
EnsureFontResolverRegistered();
|
||||||
_settings = settings ?? new PdfExportSettings();
|
_settings = settings ?? new PdfExportSettings();
|
||||||
@@ -32,8 +34,9 @@ public class PdfBuilder
|
|||||||
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while searching for fonts: {ex.Message}",Logger.LogType.Error);
|
||||||
chosenFamily = "Arial";
|
chosenFamily = "Arial";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,15 +44,32 @@ public class PdfBuilder
|
|||||||
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
_regularFont = new XFont(chosenFamily, _settings.fontSize, XFontStyleEx.Regular);
|
||||||
_smallFont = new XFont(chosenFamily, _settings.smallFontSize, 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()
|
private static void EnsureFontResolverRegistered()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (GlobalFontSettings.FontResolver != null) return;
|
if (GlobalFontSettings.FontResolver != null) return;
|
||||||
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||||
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
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)
|
private static string StripStyleSuffix(string name)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(name)) return name;
|
if (string.IsNullOrEmpty(name)) return name;
|
||||||
var idx = name.IndexOf('-');
|
var idx = name.IndexOf('-');
|
||||||
@@ -58,6 +78,14 @@ public class PdfBuilder
|
|||||||
return name.Substring(0, idx);
|
return name.Substring(0, idx);
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while stripping style suffix: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -68,6 +96,8 @@ public class PdfBuilder
|
|||||||
/// <param name="outputPath">Path where the PDF should be saved</param>
|
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||||
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText,
|
||||||
string outputPath)
|
string outputPath)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
// Find the AddressSet by ID
|
// Find the AddressSet by ID
|
||||||
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
|
||||||
@@ -104,7 +134,24 @@ public class PdfBuilder
|
|||||||
addresses.Add(addr);
|
addresses.Add(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (addresses.Count == 0)
|
||||||
|
{
|
||||||
|
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
|
||||||
|
return;
|
||||||
|
}
|
||||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||||
|
|
||||||
|
if (_settings.exportRunningSheets)
|
||||||
|
{
|
||||||
|
ExportRunningSheets(addressSetId, outputPath);
|
||||||
|
}
|
||||||
|
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>
|
/// <summary>
|
||||||
@@ -114,6 +161,8 @@ public class PdfBuilder
|
|||||||
/// <param name="placeholderText">Text for the first cell (top-left)</param>
|
/// <param name="placeholderText">Text for the first cell (top-left)</param>
|
||||||
/// <param name="outputPath">Path where the PDF should be saved</param>
|
/// <param name="outputPath">Path where the PDF should be saved</param>
|
||||||
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
public void CreateAddressLabelPdfWithPlaceholder(List<string> addresses, string placeholderText, string outputPath)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (addresses == null || addresses.Count == 0)
|
if (addresses == null || addresses.Count == 0)
|
||||||
throw new ArgumentException("Addresses array cannot be null or empty");
|
throw new ArgumentException("Addresses array cannot be null or empty");
|
||||||
@@ -136,6 +185,12 @@ public class PdfBuilder
|
|||||||
|
|
||||||
document.Save(outputPath);
|
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)
|
private void DrawPage(XGraphics gfx, List<string> addresses, ref int addressIndex)
|
||||||
{
|
{
|
||||||
@@ -158,6 +213,8 @@ public class PdfBuilder
|
|||||||
|
|
||||||
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
private void DrawPageWithPlaceholder(XGraphics gfx, List<string> addresses, ref int addressIndex,
|
||||||
ref bool isFirstCell, string placeholderText)
|
ref bool isFirstCell, string placeholderText)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
for (var row = 0; row < _settings.rowsPerPage; row++)
|
for (var row = 0; row < _settings.rowsPerPage; row++)
|
||||||
for (var col = 0; col < _settings.columnsPerPage; col++)
|
for (var col = 0; col < _settings.columnsPerPage; col++)
|
||||||
@@ -182,8 +239,16 @@ public class PdfBuilder
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
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)
|
private void DrawCell(XGraphics gfx, double x, double y, string? address)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
@@ -195,8 +260,16 @@ public class PdfBuilder
|
|||||||
// Draw address content if available
|
// Draw address content if available
|
||||||
if (!string.IsNullOrEmpty(address)) DrawMarkdownText(gfx, address, x, y, cellWidthPoints, cellHeightPoints);
|
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)
|
private void DrawEmptyCell(XGraphics gfx, double x, double y)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
var cellWidthPoints = MmToPoints(GetCellWidthMm());
|
||||||
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
var cellHeightPoints = MmToPoints(GetCellHeightMm());
|
||||||
@@ -204,8 +277,16 @@ public class PdfBuilder
|
|||||||
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
var rect = new XRect(x, y, cellWidthPoints, cellHeightPoints);
|
||||||
gfx.DrawRectangle(XPens.Black, rect);
|
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)
|
private void DrawMarkdownText(XGraphics gfx, string text, double x, double y, double cellWidth, double cellHeight)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
var paddingLeftPoints = MmToPoints(_settings.cellPaddingLeftMm);
|
||||||
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
var paddingRightPoints = MmToPoints(_settings.cellPaddingRightMm);
|
||||||
@@ -240,8 +321,16 @@ public class PdfBuilder
|
|||||||
currentY += lineHeight;
|
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)
|
private void DrawLineWithMarkdown(XGraphics gfx, string line, double x, double y, double maxWidth)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrWhiteSpace(line)) return;
|
if (string.IsNullOrWhiteSpace(line)) return;
|
||||||
var currentX = x;
|
var currentX = x;
|
||||||
@@ -331,8 +420,16 @@ public class PdfBuilder
|
|||||||
i = textEnd;
|
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)
|
private string TruncateTextToWidth(XGraphics gfx, string text, XFont font, double maxWidth)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(text))
|
if (string.IsNullOrEmpty(text))
|
||||||
return text;
|
return text;
|
||||||
@@ -347,6 +444,13 @@ public class PdfBuilder
|
|||||||
|
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while truncating text to width: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Converts millimeters to points (1 mm = 2.834645669 points)
|
/// Converts millimeters to points (1 mm = 2.834645669 points)
|
||||||
@@ -387,4 +491,698 @@ public class PdfBuilder
|
|||||||
if (left < 0 || top < 0 || right < 0 || bottom < 0)
|
if (left < 0 || top < 0 || right < 0 || bottom < 0)
|
||||||
throw new ArgumentException("Margins cannot be negative");
|
throw new ArgumentException("Margins cannot be negative");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void ExportRunningSheets(int setID, string path)
|
||||||
|
{
|
||||||
|
string international_path = path;
|
||||||
|
if (path.EndsWith(".pdf"))
|
||||||
|
{
|
||||||
|
path = path.Substring(0, path.Length - 4);
|
||||||
|
international_path = path;
|
||||||
|
path = path + "-Laufzettel.pdf";
|
||||||
|
international_path = international_path + "-Laufzettel-International.pdf";
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
path = path + "-Laufzettel.pdf";
|
||||||
|
international_path = international_path + "-Laufzettel-International.pdf";
|
||||||
|
}
|
||||||
|
|
||||||
|
CreateGermanyRunningSheets(setID, path);
|
||||||
|
CreateInternationalRunningSheets(setID, international_path);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void CreateGermanyRunningSheets(int setID, string path)
|
||||||
|
{
|
||||||
|
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||||
|
var document = new PdfDocument();
|
||||||
|
document.Info.Title = $"Laufzettel für {list.Name}";
|
||||||
|
document.Info.Subject = "powered by logofclient";
|
||||||
|
document.Info.Author = "logofclient";
|
||||||
|
|
||||||
|
var grouped_nums = GroupAddresses(setID).ToList();
|
||||||
|
|
||||||
|
// Zwei Tabellen pro A4-Seite
|
||||||
|
int sheets = (grouped_nums.Count + 1) / 2;
|
||||||
|
|
||||||
|
// Layout
|
||||||
|
double marginX = 20;
|
||||||
|
double marginY = 20;
|
||||||
|
double gapY = 12;
|
||||||
|
|
||||||
|
for (int pageIndex = 0; pageIndex < sheets; pageIndex++)
|
||||||
|
{
|
||||||
|
var page = document.AddPage();
|
||||||
|
page.Size = PageSize.A4;
|
||||||
|
var gfx = XGraphics.FromPdfPage(page);
|
||||||
|
|
||||||
|
double pageW = page.Width.Point;
|
||||||
|
double pageH = page.Height.Point;
|
||||||
|
|
||||||
|
double usableW = pageW - 2 * marginX;
|
||||||
|
double usableH = pageH - 2 * marginY;
|
||||||
|
double tableH = (usableH - gapY) / 2.0;
|
||||||
|
|
||||||
|
double top1 = marginY;
|
||||||
|
double top2 = marginY + tableH + gapY;
|
||||||
|
|
||||||
|
var fontLabel = new XFont("Arial", 6, XFontStyleEx.Bold);
|
||||||
|
var fontText = new XFont("Arial", 6, XFontStyleEx.Regular);
|
||||||
|
var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold);
|
||||||
|
|
||||||
|
int firstIndex = pageIndex * 2;
|
||||||
|
DrawGermanyRunningSheet(
|
||||||
|
gfx,
|
||||||
|
marginX,
|
||||||
|
top1,
|
||||||
|
usableW,
|
||||||
|
tableH,
|
||||||
|
list,
|
||||||
|
grouped_nums[firstIndex],
|
||||||
|
grouped_nums,
|
||||||
|
fontLabel,
|
||||||
|
fontText,
|
||||||
|
fontBig
|
||||||
|
);
|
||||||
|
|
||||||
|
if (firstIndex + 1 < grouped_nums.Count)
|
||||||
|
{
|
||||||
|
DrawGermanyRunningSheet(
|
||||||
|
gfx,
|
||||||
|
marginX,
|
||||||
|
top2,
|
||||||
|
usableW,
|
||||||
|
tableH,
|
||||||
|
list,
|
||||||
|
grouped_nums[firstIndex + 1],
|
||||||
|
grouped_nums,
|
||||||
|
fontLabel,
|
||||||
|
fontText,
|
||||||
|
fontBig
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.Save(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DrawGermanyRunningSheet(
|
||||||
|
XGraphics gfx,
|
||||||
|
double x,
|
||||||
|
double y,
|
||||||
|
double w,
|
||||||
|
double h,
|
||||||
|
KasAddressList list,
|
||||||
|
dynamic result,
|
||||||
|
List<(int,string,string,string,int)> grouped_nums,
|
||||||
|
XFont fontLabel,
|
||||||
|
XFont fontText,
|
||||||
|
XFont fontBig)
|
||||||
|
{
|
||||||
|
double line = 1.0;
|
||||||
|
|
||||||
|
string sender = Customer.GetCustomerByID(list.owner_id)?.sender_address ?? "[Absender]";
|
||||||
|
string customerName = Customer.GetCustomerByID(list.owner_id)?.name ?? "[Kunde]";
|
||||||
|
string start = result.Item3?.ToString() ?? "[Start]";
|
||||||
|
string end = result.Item4?.ToString() ?? "[Ende]";
|
||||||
|
string amount = result.Item5?.ToString() ?? "[Anzahl]";
|
||||||
|
string groupNo = result.Item2?.ToString() ?? "[PLZ]";
|
||||||
|
string fraction = result.Item1?.ToString() ?? "[Fraktion]";
|
||||||
|
|
||||||
|
int total_frac = 0;
|
||||||
|
foreach (var item in grouped_nums)
|
||||||
|
{
|
||||||
|
if (item.Item2 == result.Item2) total_frac++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Outer border
|
||||||
|
gfx.DrawRectangle(XPens.Black, x, y, w, h);
|
||||||
|
|
||||||
|
// Row heights
|
||||||
|
double r1 = h * 0.1;
|
||||||
|
double r2 = h * 0.1;
|
||||||
|
double r3 = h * 0.54;
|
||||||
|
double r4 = h * 0.30;
|
||||||
|
|
||||||
|
// Main horizontal lines
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1, x + w, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1 + r2, x + w, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1 + r2 + r3, x + w, y + r1 + r2 + r3);
|
||||||
|
|
||||||
|
// Top row columns
|
||||||
|
double c1 = w * 0.39;
|
||||||
|
double c2 = w * 0.20;
|
||||||
|
double c3 = w * 0.26;
|
||||||
|
double c4 = w * 0.15;
|
||||||
|
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1, y, x + c1, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2, y, x + c1 + c2, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2 + c3, y, x + c1 + c2 + c3, y + r1);
|
||||||
|
|
||||||
|
// Second row columns
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1, y + r1, x + c1, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2, y + r1, x + c1 + c2, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2 + c3, y + r1, x + c1 + c2 + c3, y + r1 + r2);
|
||||||
|
|
||||||
|
// Middle large area split
|
||||||
|
double midSplit = x + w * 0.55;
|
||||||
|
gfx.DrawLine(XPens.Black, midSplit, y + r1 + r2, midSplit, y + r1 + r2 + r3);
|
||||||
|
|
||||||
|
// Bottom section split
|
||||||
|
double leftBottomW = w * 0.42;
|
||||||
|
gfx.DrawLine(XPens.Black, x + leftBottomW, y + r1 + r2 + r3, x + leftBottomW, y + h);
|
||||||
|
|
||||||
|
// Bottom left rows
|
||||||
|
double blY1 = y + r1 + r2 + r3 + (r4 * 0.14);
|
||||||
|
double blY2 = y + r1 + r2 + r3 + (r4 * 0.28);
|
||||||
|
double blY3 = y + r1 + r2 + r3 + (r4 * 0.42);
|
||||||
|
double blY4 = y + r1 + r2 + r3 + (r4 * 0.56);
|
||||||
|
double blY5 = y + r1 + r2 + r3 + (r4 * 0.70);
|
||||||
|
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY1, x + leftBottomW, blY1);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY2, x + leftBottomW, blY2);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY3, x + leftBottomW, blY3);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY4, x + leftBottomW, blY4);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY5, x + leftBottomW, blY5);
|
||||||
|
|
||||||
|
// Labels top row
|
||||||
|
gfx.DrawString("Absender:", fontLabel, XBrushes.Black, new XRect(x + 5, y + 4, c1 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Kunden-Nr. Absender:", fontLabel, XBrushes.Black, new XRect(x + c1 + 5, y + 4, c2 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("ZKZ/Titel:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 4, c3 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Anzahl Sendungen:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 4, c4 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Values top row
|
||||||
|
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Second row labels
|
||||||
|
gfx.DrawString("Einlieferer:", fontLabel, XBrushes.Black, new XRect(x + 5, y + r1 + 4, c1 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Kunden-Nr. Einlieferer:", fontLabel, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 4, c2 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Interne Vermerke:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 4, c3 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Laufzeit", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 4, c4 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Second row values
|
||||||
|
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Middle area
|
||||||
|
gfx.DrawString(groupNo, fontBig, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + 5, w * 0.50 - 10, r3 - 10),
|
||||||
|
XStringFormats.Center);
|
||||||
|
|
||||||
|
gfx.DrawString("PRESSE/ELN", fontBig, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + 5, w * 0.50 - 10, r3 - 90),
|
||||||
|
XStringFormats.Center);
|
||||||
|
|
||||||
|
gfx.DrawString($"Fraktion {fraction}/{total_frac}", fontText, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + r3 - 18, w * 0.50 - 10, 14),
|
||||||
|
XStringFormats.CenterLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bereich für postalische Zwecke:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(midSplit + 5, y + r1 + r2 + 4, w - (midSplit - x) - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Bottom left labels
|
||||||
|
// Bottom left labels
|
||||||
|
gfx.DrawString("Einlieferungsdatum:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + r3 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("AM-Auftragsnummer:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY1 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bundgewicht:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY2 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Paletten-Nr.:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY3 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bund-Nr./Bunde auf Palette:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY4 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bund-Nr. von Gesamtanzahl:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY5 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Bottom placeholders rechts daneben, gleiche Zeile
|
||||||
|
double valueX = x + leftBottomW * 0.55;
|
||||||
|
double valueW = leftBottomW - (valueX - x) - 5;
|
||||||
|
|
||||||
|
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY1 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY2 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY3 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bund-Nr./Bunde auf Palette]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY4 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bund-Nr. von Gesamtanzahl]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY5 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
|
||||||
|
// Right bottom postal area label
|
||||||
|
gfx.DrawString("Feld für Palettenlabel/NVE:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + leftBottomW + 5, y + r1 + r2 + r3 + 4, w - leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
}
|
||||||
|
|
||||||
|
// public void CreateInternationalRunningSheets(int setID, string path)
|
||||||
|
// {
|
||||||
|
// KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||||
|
// var document = new PdfDocument();
|
||||||
|
// document.Info.Title = $"Laufzettel für {list.Name}";
|
||||||
|
// document.Info.Subject = "powered by logofclient";
|
||||||
|
// document.Info.Author = "logofclient";
|
||||||
|
//
|
||||||
|
// int margin = 50;
|
||||||
|
//
|
||||||
|
// var grouped_nums = GroupAddressesInternational(setID);
|
||||||
|
//
|
||||||
|
// foreach (var result in grouped_nums)
|
||||||
|
// {
|
||||||
|
// var page = document.AddPage();
|
||||||
|
// page.Size = PageSize.A4;
|
||||||
|
//
|
||||||
|
// var gfx = XGraphics.FromPdfPage(page);
|
||||||
|
//
|
||||||
|
// var width = page.Width.Point-margin;
|
||||||
|
// var height = page.Height.Point-margin;
|
||||||
|
// gfx.DrawLine(XPens.Black, margin, margin, margin, height);
|
||||||
|
// gfx.DrawLine(XPens.Black, margin, margin, width, margin);
|
||||||
|
// gfx.DrawLine(XPens.Black, width, margin, width, height);
|
||||||
|
// gfx.DrawLine(XPens.Black, margin, height, width, height);
|
||||||
|
//
|
||||||
|
// var boldfont = new XFont("Cantarell", 11, XFontStyleEx.Bold);
|
||||||
|
// var font = new XFont("Cantarell", 11, XFontStyleEx.Regular);
|
||||||
|
// var bigboldfont = new XFont("Cantarell", 35, XFontStyleEx.Bold);
|
||||||
|
//
|
||||||
|
// // Versandinfo
|
||||||
|
// gfx.DrawString($"Versand {list.Name}", boldfont, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"Start: ", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"{result.Item3}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+75, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"Ende: ", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"{result.Item4}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+75, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"Kunde: ", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).name}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+75, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"Absender: ", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).sender_address}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+75, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"Anzahl: ", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"{result.Item5}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+75, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
//
|
||||||
|
// // logofclient ad
|
||||||
|
// gfx.DrawString($"powered by logofclient", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, height-55, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"(c) 2026 MyPapertown", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, height-40, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
// gfx.DrawString($"mypapercloud.de/logof", font, XBrushes.Black,
|
||||||
|
// new XRect(margin+5, height-25, width-margin, 25), XStringFormats.CenterLeft);
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// int total_frac = 0;
|
||||||
|
// foreach (var item in grouped_nums)
|
||||||
|
// {
|
||||||
|
// if (item.Item2 == result.Item2) total_frac++;
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// // group number
|
||||||
|
// gfx.DrawString($"{result.Item2}", bigboldfont, XBrushes.Black,
|
||||||
|
// new XRect(margin, margin, width-margin, (height-margin)/2), XStringFormats.Center);
|
||||||
|
// gfx.DrawString($"Fraktion {result.Item1}/{total_frac}", font, XBrushes.Black,
|
||||||
|
// new XRect(margin, margin, width-margin, (height-margin)/2 + 50), XStringFormats.Center);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// if (document.PageCount > 0)
|
||||||
|
// {
|
||||||
|
// document.Save(path);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// }
|
||||||
|
|
||||||
|
public void CreateInternationalRunningSheets(int setID, string path)
|
||||||
|
{
|
||||||
|
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||||
|
|
||||||
|
var document = new PdfDocument();
|
||||||
|
document.Info.Title = $"Laufzettel für {list.Name}";
|
||||||
|
document.Info.Subject = "powered by logofclient";
|
||||||
|
document.Info.Author = "logofclient";
|
||||||
|
|
||||||
|
var grouped_nums = GroupAddressesInternational(setID).ToList();
|
||||||
|
|
||||||
|
int sheets = (grouped_nums.Count + 1) / 2;
|
||||||
|
|
||||||
|
double marginX = 20;
|
||||||
|
double marginY = 20;
|
||||||
|
double gapY = 12;
|
||||||
|
|
||||||
|
for (int pageIndex = 0; pageIndex < sheets; pageIndex++)
|
||||||
|
{
|
||||||
|
var page = document.AddPage();
|
||||||
|
page.Size = PageSize.A4;
|
||||||
|
|
||||||
|
var gfx = XGraphics.FromPdfPage(page);
|
||||||
|
|
||||||
|
double pageW = page.Width.Point;
|
||||||
|
double pageH = page.Height.Point;
|
||||||
|
|
||||||
|
double usableW = pageW - 2 * marginX;
|
||||||
|
double usableH = pageH - 2 * marginY;
|
||||||
|
double tableH = (usableH - gapY) / 2.0;
|
||||||
|
|
||||||
|
double top1 = marginY;
|
||||||
|
double top2 = marginY + tableH + gapY;
|
||||||
|
|
||||||
|
var fontLabel = new XFont("Arial", 6, XFontStyleEx.Bold);
|
||||||
|
var fontText = new XFont("Arial", 6, XFontStyleEx.Regular);
|
||||||
|
var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold);
|
||||||
|
|
||||||
|
int firstIndex = pageIndex * 2;
|
||||||
|
|
||||||
|
DrawInternationalRunningSheet(
|
||||||
|
gfx,
|
||||||
|
marginX,
|
||||||
|
top1,
|
||||||
|
usableW,
|
||||||
|
tableH,
|
||||||
|
list,
|
||||||
|
grouped_nums[firstIndex],
|
||||||
|
grouped_nums,
|
||||||
|
fontLabel,
|
||||||
|
fontText,
|
||||||
|
fontBig
|
||||||
|
);
|
||||||
|
|
||||||
|
if (firstIndex + 1 < grouped_nums.Count)
|
||||||
|
{
|
||||||
|
DrawInternationalRunningSheet(
|
||||||
|
gfx,
|
||||||
|
marginX,
|
||||||
|
top2,
|
||||||
|
usableW,
|
||||||
|
tableH,
|
||||||
|
list,
|
||||||
|
grouped_nums[firstIndex + 1],
|
||||||
|
grouped_nums,
|
||||||
|
fontLabel,
|
||||||
|
fontText,
|
||||||
|
fontBig
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
document.Save(path);
|
||||||
|
}
|
||||||
|
private void DrawInternationalRunningSheet(
|
||||||
|
XGraphics gfx,
|
||||||
|
double x,
|
||||||
|
double y,
|
||||||
|
double w,
|
||||||
|
double h,
|
||||||
|
KasAddressList list,
|
||||||
|
dynamic result,
|
||||||
|
List<(int,string,string,string,int)> grouped_nums,
|
||||||
|
XFont fontLabel,
|
||||||
|
XFont fontText,
|
||||||
|
XFont fontBig)
|
||||||
|
{
|
||||||
|
double line = 1.0;
|
||||||
|
|
||||||
|
string sender = Customer.GetCustomerByID(list.owner_id)?.sender_address ?? "[Absender]";
|
||||||
|
string customerName = Customer.GetCustomerByID(list.owner_id)?.name ?? "[Kunde]";
|
||||||
|
string start = result.Item3?.ToString() ?? "[Start]";
|
||||||
|
string end = result.Item4?.ToString() ?? "[Ende]";
|
||||||
|
string amount = result.Item5?.ToString() ?? "[Anzahl]";
|
||||||
|
string groupNo = result.Item2?.ToString() ?? "[PLZ]";
|
||||||
|
string fraction = result.Item1?.ToString() ?? "[Fraktion]";
|
||||||
|
|
||||||
|
int total_frac = 0;
|
||||||
|
foreach (var item in grouped_nums)
|
||||||
|
{
|
||||||
|
if (item.Item2 == result.Item2) total_frac++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Outer border
|
||||||
|
gfx.DrawRectangle(XPens.Black, x, y, w, h);
|
||||||
|
|
||||||
|
// Row heights
|
||||||
|
double r1 = h * 0.1;
|
||||||
|
double r2 = h * 0.1;
|
||||||
|
double r3 = h * 0.54;
|
||||||
|
double r4 = h * 0.30;
|
||||||
|
|
||||||
|
// Main horizontal lines
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1, x + w, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1 + r2, x + w, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x, y + r1 + r2 + r3, x + w, y + r1 + r2 + r3);
|
||||||
|
|
||||||
|
// Top row columns
|
||||||
|
double c1 = w * 0.39;
|
||||||
|
double c2 = w * 0.20;
|
||||||
|
double c3 = w * 0.26;
|
||||||
|
double c4 = w * 0.15;
|
||||||
|
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1, y, x + c1, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2, y, x + c1 + c2, y + r1);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2 + c3, y, x + c1 + c2 + c3, y + r1);
|
||||||
|
|
||||||
|
// Second row columns
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1, y + r1, x + c1, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2, y + r1, x + c1 + c2, y + r1 + r2);
|
||||||
|
gfx.DrawLine(XPens.Black, x + c1 + c2 + c3, y + r1, x + c1 + c2 + c3, y + r1 + r2);
|
||||||
|
|
||||||
|
// Middle large area split
|
||||||
|
double midSplit = x + w * 0.55;
|
||||||
|
gfx.DrawLine(XPens.Black, midSplit, y + r1 + r2, midSplit, y + r1 + r2 + r3);
|
||||||
|
|
||||||
|
// Bottom section split
|
||||||
|
double leftBottomW = w * 0.42;
|
||||||
|
gfx.DrawLine(XPens.Black, x + leftBottomW, y + r1 + r2 + r3, x + leftBottomW, y + h);
|
||||||
|
|
||||||
|
// Bottom left rows
|
||||||
|
double blY1 = y + r1 + r2 + r3 + (r4 * 0.14);
|
||||||
|
double blY2 = y + r1 + r2 + r3 + (r4 * 0.28);
|
||||||
|
double blY3 = y + r1 + r2 + r3 + (r4 * 0.42);
|
||||||
|
double blY4 = y + r1 + r2 + r3 + (r4 * 0.56);
|
||||||
|
double blY5 = y + r1 + r2 + r3 + (r4 * 0.70);
|
||||||
|
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY1, x + leftBottomW, blY1);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY2, x + leftBottomW, blY2);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY3, x + leftBottomW, blY3);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY4, x + leftBottomW, blY4);
|
||||||
|
gfx.DrawLine(XPens.Black, x, blY5, x + leftBottomW, blY5);
|
||||||
|
|
||||||
|
// Labels top row
|
||||||
|
gfx.DrawString("Absender:", fontLabel, XBrushes.Black, new XRect(x + 5, y + 4, c1 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Kunden-Nr. Absender:", fontLabel, XBrushes.Black, new XRect(x + c1 + 5, y + 4, c2 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("ZKZ/Titel:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 4, c3 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Anzahl Sendungen:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 4, c4 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Values top row
|
||||||
|
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Second row labels
|
||||||
|
gfx.DrawString("Einlieferer:", fontLabel, XBrushes.Black, new XRect(x + 5, y + r1 + 4, c1 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Kunden-Nr. Einlieferer:", fontLabel, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 4, c2 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Interne Vermerke:", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 4, c3 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("Laufzeit", fontLabel, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 4, c4 - 10, 14), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Second row values
|
||||||
|
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Middle area
|
||||||
|
gfx.DrawString(groupNo, fontBig, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + 5, w * 0.50 - 10, r3 - 10),
|
||||||
|
XStringFormats.Center);
|
||||||
|
|
||||||
|
gfx.DrawString("PRESSE/ELN", fontBig, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + 5, w * 0.50 - 10, r3 - 90),
|
||||||
|
XStringFormats.Center);
|
||||||
|
|
||||||
|
gfx.DrawString($"Fraktion {fraction}/{total_frac}", fontText, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + r3 - 18, w * 0.50 - 10, 14),
|
||||||
|
XStringFormats.CenterLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bereich für postalische Zwecke:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(midSplit + 5, y + r1 + r2 + 4, w - (midSplit - x) - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Bottom left labels
|
||||||
|
// Bottom left labels
|
||||||
|
gfx.DrawString("Einlieferungsdatum:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, y + r1 + r2 + r3 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("AM-Auftragsnummer:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY1 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bundgewicht:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY2 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Paletten-Nr.:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY3 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bund-Nr./Bunde auf Palette:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY4 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
gfx.DrawString("Bund-Nr. von Gesamtanzahl:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + 5, blY5 + 4, leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
|
||||||
|
// Bottom placeholders rechts daneben, gleiche Zeile
|
||||||
|
double valueX = x + leftBottomW * 0.55;
|
||||||
|
double valueW = leftBottomW - (valueX - x) - 5;
|
||||||
|
|
||||||
|
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY1 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY2 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY3 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bund-Nr./Bunde auf Palette]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY4 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
gfx.DrawString("[Bund-Nr. von Gesamtanzahl]", fontText, XBrushes.Black,
|
||||||
|
new XRect(valueX, blY5 + 4, valueW, 14),
|
||||||
|
XStringFormats.TopRight);
|
||||||
|
|
||||||
|
|
||||||
|
// Right bottom postal area label
|
||||||
|
gfx.DrawString("Feld für Palettenlabel/NVE:", fontLabel, XBrushes.Black,
|
||||||
|
new XRect(x + leftBottomW + 5, y + r1 + r2 + r3 + 4, w - leftBottomW - 10, 14),
|
||||||
|
XStringFormats.TopLeft);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Calculates address groups to summarize for the single pages of the running sheets.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="setID"></param>
|
||||||
|
/// <returns>List of quadruples consisting of a number and the starting of the plz, as well as first, last plz and total amount of addresses</returns>
|
||||||
|
public List<(int, string, string, string, int)> GroupAddresses(int setID)
|
||||||
|
{
|
||||||
|
int grpcount = Settings._instance.pdfExport.rsNumGrouped; // Amount of addresses per group
|
||||||
|
int stpoint = Settings._instance.pdfExport.rsPlzStartpoint; // group starting point (first n characters of the plz)
|
||||||
|
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||||
|
if (list == null)
|
||||||
|
throw new Exception("AddressSet nicht gefunden");
|
||||||
|
|
||||||
|
List<(int, string, string, string, int)> output = new();
|
||||||
|
|
||||||
|
List<IGrouping<string, KasPerson>> sorted_list = list.KasPersons
|
||||||
|
.Where(x => !string.IsNullOrEmpty(x?.used_plz) &&
|
||||||
|
x.used_plz.Length >= stpoint && x.IsGermany())
|
||||||
|
.OrderBy(x => x.used_plz)
|
||||||
|
.GroupBy(x => x.used_plz.Substring(0, stpoint))
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
foreach (var group in sorted_list)
|
||||||
|
{
|
||||||
|
string start = group.Key;
|
||||||
|
int fraktion = 0;
|
||||||
|
|
||||||
|
for (int count = 0; count < group.Count(); count += grpcount)
|
||||||
|
{
|
||||||
|
fraktion++;
|
||||||
|
|
||||||
|
int currentGroupSize = Math.Min(grpcount, group.Count() - count);
|
||||||
|
|
||||||
|
string first = group.ElementAt(count).used_plz;
|
||||||
|
string last = group.ElementAt(count + currentGroupSize - 1).used_plz;
|
||||||
|
|
||||||
|
output.Add((fraktion, start, first, last, currentGroupSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<(int, string, string, string, int)> GroupAddressesInternational(int setID)
|
||||||
|
{
|
||||||
|
int grpcount = Settings._instance.pdfExport.rsNumGrouped; // Amount of addresses per group
|
||||||
|
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||||
|
if (list == null)
|
||||||
|
throw new Exception("AddressSet nicht gefunden");
|
||||||
|
|
||||||
|
List<(int, string, string, string, int)> output = new();
|
||||||
|
|
||||||
|
List<IGrouping<string, KasPerson>> sorted_list = list.KasPersons
|
||||||
|
.Where(x => !string.IsNullOrEmpty(x?.used_plz) && !x.IsGermany())
|
||||||
|
.OrderBy(x => x.used_plz)
|
||||||
|
.GroupBy(x => x.land)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
foreach (var group in sorted_list)
|
||||||
|
{
|
||||||
|
string start = group.Key;
|
||||||
|
int fraktion = 0;
|
||||||
|
|
||||||
|
for (int count = 0; count < group.Count(); count += grpcount)
|
||||||
|
{
|
||||||
|
fraktion++;
|
||||||
|
|
||||||
|
int currentGroupSize = Math.Min(grpcount, group.Count() - count);
|
||||||
|
|
||||||
|
string first = group.ElementAt(count).used_plz;
|
||||||
|
string last = group.ElementAt(count + currentGroupSize - 1).used_plz;
|
||||||
|
|
||||||
|
output.Add((fraktion, start, first, last, currentGroupSize));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -62,13 +62,15 @@ public class StableFontResolver : IFontResolver
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// ignore resolver init errors
|
Logger.Log($"Error while initializing FontResolver: {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string NormalizeStyle(string s)
|
private static string NormalizeStyle(string s)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(s)) return "Regular";
|
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||||
s = s.ToLowerInvariant();
|
s = s.ToLowerInvariant();
|
||||||
@@ -78,8 +80,17 @@ public class StableFontResolver : IFontResolver
|
|||||||
if (s.Contains("regular") || s == "r") return "Regular";
|
if (s.Contains("regular") || s == "r") return "Regular";
|
||||||
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
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)
|
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
// If requested family exists, pick corresponding style if available
|
// If requested family exists, pick corresponding style if available
|
||||||
string familyToUse = null;
|
string familyToUse = null;
|
||||||
@@ -100,8 +111,17 @@ public class StableFontResolver : IFontResolver
|
|||||||
// Face name format: Family#Style
|
// Face name format: Family#Style
|
||||||
return new FontResolverInfo($"{familyToUse}#{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)
|
public byte[] GetFont(string faceName)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(faceName)) return null;
|
if (string.IsNullOrEmpty(faceName)) return null;
|
||||||
|
|
||||||
@@ -133,4 +153,11 @@ public class StableFontResolver : IFontResolver
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while getting font: {ex.Message}",Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
x:Class="Logof_Client.Wiki.EditorWindow"
|
x:Class="Logof_Client.Wiki.EditorWindow"
|
||||||
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
||||||
<Grid>
|
<Grid Margin="10,0,10,10">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="50" />
|
<RowDefinition Height="50" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Grid.Row="0" Orientation="Horizontal">
|
<StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
|
||||||
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
||||||
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
||||||
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBox Grid.Row="1" x:Name="TbContent" />
|
<TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -10,20 +10,24 @@ public partial class EditorWindow : Window
|
|||||||
public string filename = "";
|
public string filename = "";
|
||||||
|
|
||||||
public EditorWindow(string filename = "")
|
public EditorWindow(string filename = "")
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
this.filename = filename;
|
this.filename = PathUtilities.NormalizeFileSystemPath(filename);
|
||||||
if (!string.IsNullOrWhiteSpace(filename) && File.Exists(filename))
|
if (!string.IsNullOrWhiteSpace(this.filename) && File.Exists(this.filename))
|
||||||
{
|
{
|
||||||
var content = TbContent;
|
var content = TbContent;
|
||||||
if (content != null) content.Text = File.ReadAllText(this.filename);
|
if (content != null) content.Text = File.ReadAllText(this.filename);
|
||||||
Title = "Wiki Editor - " + filename;
|
Title = "Wiki Editor - " + filename;
|
||||||
}
|
}
|
||||||
else if (!string.IsNullOrWhiteSpace(filename))
|
else if (!string.IsNullOrWhiteSpace(this.filename))
|
||||||
{
|
{
|
||||||
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -31,20 +35,22 @@ public partial class EditorWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.WriteAllText(filename, TbContent.Text);
|
File.WriteAllText(filename, TbContent.Text);
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree(filename, filename);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(null,
|
MessageBox.Show(null,
|
||||||
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
||||||
ex.StackTrace, "Fehler");
|
ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
MessageBox.Show(null,
|
MessageBox.Show(null,
|
||||||
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " + Global._instance.wiki_storage_path,
|
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " +
|
||||||
|
PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path),
|
||||||
"Fehler");
|
"Fehler");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,7 +58,11 @@ public partial class EditorWindow : Window
|
|||||||
{
|
{
|
||||||
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
||||||
if (result == MessageBoxResult.No) return;
|
if (result == MessageBoxResult.No) return;
|
||||||
|
try
|
||||||
|
{
|
||||||
File.Delete(filename);
|
File.Delete(filename);
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree();
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|||||||
+127
-116
@@ -1,3 +1,4 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Media;
|
using Avalonia.Media;
|
||||||
@@ -10,120 +11,130 @@ namespace Logof_Client.Wiki;
|
|||||||
|
|
||||||
public static class MarkdownRenderer
|
public static class MarkdownRenderer
|
||||||
{
|
{
|
||||||
public static Control Render(string markdown)
|
// public static Control Render(string markdown)
|
||||||
{
|
// {
|
||||||
var panel = new StackPanel { Spacing = 6 };
|
// try
|
||||||
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
// {
|
||||||
|
// var panel = new StackPanel { Spacing = 6 };
|
||||||
var doc = Markdown.Parse(markdown);
|
// if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||||
|
//
|
||||||
foreach (var block in doc)
|
// var doc = Markdown.Parse(markdown);
|
||||||
{
|
//
|
||||||
switch (block)
|
// foreach (var block in doc)
|
||||||
{
|
// {
|
||||||
case HeadingBlock hb:
|
// switch (block)
|
||||||
{
|
// {
|
||||||
var text = GetInlineText(hb.Inline);
|
// case HeadingBlock hb:
|
||||||
var tb = new TextBlock
|
// {
|
||||||
{
|
// var text = GetInlineText(hb.Inline);
|
||||||
Text = text,
|
// var tb = new TextBlock
|
||||||
FontWeight = FontWeight.Bold,
|
// {
|
||||||
Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
// Text = text,
|
||||||
};
|
// FontWeight = FontWeight.Bold,
|
||||||
tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
// Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
||||||
panel.Children.Add(tb);
|
// };
|
||||||
break;
|
// 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);
|
// case ParagraphBlock pb:
|
||||||
var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
// {
|
||||||
panel.Children.Add(tb);
|
// var text = GetInlineText(pb.Inline);
|
||||||
break;
|
// var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
||||||
}
|
// panel.Children.Add(tb);
|
||||||
|
// break;
|
||||||
case FencedCodeBlock cb:
|
// }
|
||||||
{
|
//
|
||||||
var sb = new StringBuilder();
|
// case FencedCodeBlock cb:
|
||||||
foreach (var line in cb.Lines.Lines)
|
// {
|
||||||
{
|
// var sb = new StringBuilder();
|
||||||
sb.Append(line.ToString());
|
// foreach (var line in cb.Lines.Lines)
|
||||||
}
|
// {
|
||||||
var codeBox = new TextBox
|
// sb.Append(line.ToString());
|
||||||
{
|
// }
|
||||||
Text = sb.ToString(),
|
// var codeBox = new TextBox
|
||||||
FontFamily = "Consolas, monospace",
|
// {
|
||||||
IsReadOnly = true,
|
// Text = sb.ToString(),
|
||||||
AcceptsReturn = true
|
// FontFamily = "Consolas, monospace",
|
||||||
};
|
// IsReadOnly = true,
|
||||||
panel.Children.Add(codeBox);
|
// AcceptsReturn = true
|
||||||
break;
|
// };
|
||||||
}
|
// panel.Children.Add(codeBox);
|
||||||
|
// break;
|
||||||
case ListBlock lb:
|
// }
|
||||||
{
|
//
|
||||||
var sp = new StackPanel { Spacing = 2 };
|
// case ListBlock lb:
|
||||||
var number = 1;
|
// {
|
||||||
foreach (var item in lb)
|
// var sp = new StackPanel { Spacing = 2 };
|
||||||
{
|
// var number = 1;
|
||||||
if (item is ListItemBlock lib)
|
// foreach (var item in lb)
|
||||||
{
|
// {
|
||||||
var itemText = new StringBuilder();
|
// if (item is ListItemBlock lib)
|
||||||
foreach (var sub in lib)
|
// {
|
||||||
{
|
// var itemText = new StringBuilder();
|
||||||
if (sub is ParagraphBlock pp)
|
// foreach (var sub in lib)
|
||||||
itemText.Append(GetInlineText(pp.Inline));
|
// {
|
||||||
}
|
// if (sub is ParagraphBlock pp)
|
||||||
var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
// itemText.Append(GetInlineText(pp.Inline));
|
||||||
sp.Children.Add(tb);
|
// }
|
||||||
}
|
// var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
||||||
}
|
// sp.Children.Add(tb);
|
||||||
panel.Children.Add(sp);
|
// }
|
||||||
break;
|
// }
|
||||||
}
|
// panel.Children.Add(sp);
|
||||||
|
// break;
|
||||||
default:
|
// }
|
||||||
{
|
//
|
||||||
// fallback: raw text
|
// default:
|
||||||
panel.Children.Add(new TextBlock { Text = block.ToString() });
|
// {
|
||||||
break;
|
// // fallback: raw text
|
||||||
}
|
// panel.Children.Add(new TextBlock { Text = block.ToString() });
|
||||||
}
|
// break;
|
||||||
}
|
// }
|
||||||
|
// }
|
||||||
return panel;
|
// }
|
||||||
}
|
//
|
||||||
|
// return panel;
|
||||||
private static string GetInlineText(ContainerInline? container)
|
// } catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
{
|
//
|
||||||
if (container == null) return string.Empty;
|
// return new Panel();
|
||||||
var sb = new StringBuilder();
|
// }
|
||||||
foreach (var inline in container)
|
//
|
||||||
{
|
// private static string GetInlineText(ContainerInline? container)
|
||||||
switch (inline)
|
// {
|
||||||
{
|
// try
|
||||||
case LiteralInline li:
|
// {
|
||||||
sb.Append(li.Content.ToString());
|
// if (container == null) return string.Empty;
|
||||||
break;
|
// var sb = new StringBuilder();
|
||||||
case EmphasisInline ei:
|
// foreach (var inline in container)
|
||||||
sb.Append(GetInlineText(ei));
|
// {
|
||||||
break;
|
// switch (inline)
|
||||||
case CodeInline ci:
|
// {
|
||||||
sb.Append(ci.Content);
|
// case LiteralInline li:
|
||||||
break;
|
// sb.Append(li.Content.ToString());
|
||||||
case LinkInline li:
|
// break;
|
||||||
sb.Append(GetInlineText(li));
|
// case EmphasisInline ei:
|
||||||
break;
|
// sb.Append(GetInlineText(ei));
|
||||||
case LineBreakInline:
|
// break;
|
||||||
sb.Append("\n");
|
// case CodeInline ci:
|
||||||
break;
|
// sb.Append(ci.Content);
|
||||||
default:
|
// break;
|
||||||
sb.Append(inline.ToString());
|
// case LinkInline li:
|
||||||
break;
|
// sb.Append(GetInlineText(li));
|
||||||
}
|
// break;
|
||||||
}
|
// case LineBreakInline:
|
||||||
|
// sb.Append("\n");
|
||||||
return sb.ToString();
|
// break;
|
||||||
}
|
// default:
|
||||||
|
// sb.Append(inline.ToString());
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// return sb.ToString();
|
||||||
|
// } catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
//
|
||||||
|
// return null;
|
||||||
|
// }
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-2
@@ -13,7 +13,7 @@ public class WikiService
|
|||||||
// prefer global wiki storage path if configured
|
// prefer global wiki storage path if configured
|
||||||
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
if (Global._instance != null && !string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||||
{
|
{
|
||||||
var cfg = Global._instance.wiki_storage_path;
|
var cfg = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
WikiRootFullPath = Path.IsPathRooted(cfg)
|
WikiRootFullPath = Path.IsPathRooted(cfg)
|
||||||
? cfg
|
? cfg
|
||||||
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
: Path.Combine(Directory.GetCurrentDirectory(), cfg);
|
||||||
@@ -25,8 +25,11 @@ public class WikiService
|
|||||||
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
wikiRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
"logofclient",
|
"logofclient",
|
||||||
"wiki");
|
"wiki");
|
||||||
|
wikiRoot = PathUtilities.NormalizeFileSystemPath(wikiRoot);
|
||||||
WikiRoot = wikiRoot;
|
WikiRoot = wikiRoot;
|
||||||
WikiRootFullPath = Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
WikiRootFullPath = Path.IsPathRooted(wikiRoot)
|
||||||
|
? wikiRoot
|
||||||
|
: Path.Combine(Directory.GetCurrentDirectory(), wikiRoot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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