Compare commits
30 Commits
68541621d9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
+26
-19
@@ -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))
|
||||||
"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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -83,9 +80,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,17 +120,23 @@ 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
|
||||||
|
|||||||
@@ -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
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
-2
@@ -78,7 +78,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" />
|
||||||
@@ -389,7 +389,7 @@
|
|||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||||
Watermark="/home/username/.config/logofclient/config.json" />
|
Watermark="/home/username/.config/logofclient/" />
|
||||||
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
|
|||||||
+204
-69
@@ -24,6 +24,9 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
public MainWindow()
|
public MainWindow()
|
||||||
{
|
{
|
||||||
|
Logger.Log("Welcome to logofclient");
|
||||||
|
Logger.Log($"Session on {DateTime.Now:G}");
|
||||||
|
Logger.Log("Initializing...");
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
//Hide();
|
//Hide();
|
||||||
|
|
||||||
@@ -32,14 +35,21 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
_instance = this;
|
_instance = this;
|
||||||
WindowState = WindowState.Maximized;
|
WindowState = WindowState.Maximized;
|
||||||
|
Logger.Log("Loading settings...");
|
||||||
Global.Load();
|
Global.Load();
|
||||||
Settings.Load();
|
Settings.Load();
|
||||||
|
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(Global._instance.config_path))
|
||||||
|
TbConfigPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.config_path);
|
||||||
|
|
||||||
LoadPdfExportOptions();
|
LoadPdfExportOptions();
|
||||||
HookPdfExportOptionEvents();
|
HookPdfExportOptionEvents();
|
||||||
|
|
||||||
RefreshCountryView();
|
RefreshCountryView();
|
||||||
|
|
||||||
// Initialize wiki integration
|
// Initialize wiki integration
|
||||||
|
Logger.Log("Building wiki...");
|
||||||
_wikiService = new WikiService();
|
_wikiService = new WikiService();
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -52,10 +62,11 @@ public partial class MainWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
|
||||||
TbWikiPath.Text = Global._instance.wiki_storage_path;
|
TbWikiPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while setting paths: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -64,12 +75,14 @@ public partial class MainWindow : Window
|
|||||||
BtnFontPath.Click += BtnFontPath_Click;
|
BtnFontPath.Click += BtnFontPath_Click;
|
||||||
BtnConfigPath.Click += BtnConfigPath_Click;
|
BtnConfigPath.Click += BtnConfigPath_Click;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while adding click functions?: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Thread.Sleep(3000);
|
//Thread.Sleep(3000);
|
||||||
@@ -121,26 +134,11 @@ public partial class MainWindow : Window
|
|||||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||||
}
|
}
|
||||||
|
|
||||||
// private async void StartAddressRepair(Uri path)
|
|
||||||
// {
|
|
||||||
// var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
|
||||||
// var progressWindow = new ProgressWindow();
|
|
||||||
//
|
|
||||||
// progressWindow.Show(_instance);
|
|
||||||
//
|
|
||||||
// var processor = new AddressRepair(progressWindow);
|
|
||||||
// //var result = await processor.Perform(addresses.Item2, errors);
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// progressWindow.Close();
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// //new ResultWindow(result, addresses.Item2).Show();
|
|
||||||
// //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
|
||||||
// }
|
|
||||||
|
|
||||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
Settings.Save();
|
||||||
|
Global.Save();
|
||||||
Environment.Exit(0);
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -156,7 +154,7 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
|
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -172,7 +170,7 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
|
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,7 +186,7 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
|
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -221,6 +219,11 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
|
|
||||||
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
|
{
|
||||||
|
ReloadWikiItem();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void ReloadWikiItem()
|
||||||
{
|
{
|
||||||
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
||||||
{
|
{
|
||||||
@@ -232,9 +235,9 @@ public partial class MainWindow : Window
|
|||||||
var rendered = MarkdownRenderer.Render(text ?? string.Empty);
|
var rendered = MarkdownRenderer.Render(text ?? string.Empty);
|
||||||
PreviewPanel.Children.Add(rendered);
|
PreviewPanel.Children.Add(rendered);
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
// fallback: plain text
|
Logger.Log($"Error while rendering markdown: {ex.Message}", Logger.LogType.Error);
|
||||||
PreviewPanel.Children.Clear();
|
PreviewPanel.Children.Clear();
|
||||||
PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
|
PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
|
||||||
}
|
}
|
||||||
@@ -249,6 +252,8 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
|
public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var roots = _wikiService.GetRootItems();
|
var roots = _wikiService.GetRootItems();
|
||||||
var nodes = new List<TreeViewItem>();
|
var nodes = new List<TreeViewItem>();
|
||||||
@@ -262,6 +267,12 @@ public partial class MainWindow : Window
|
|||||||
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
||||||
selectedNode != null)
|
selectedNode != null)
|
||||||
NavTree.SelectedItem = selectedNode;
|
NavTree.SelectedItem = selectedNode;
|
||||||
|
|
||||||
|
ReloadWikiItem();
|
||||||
|
}catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private TreeViewItem BuildNode(WikiItem item)
|
private TreeViewItem BuildNode(WikiItem item)
|
||||||
@@ -276,7 +287,9 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private string GetSelectedWikiTargetDirectory()
|
private string GetSelectedWikiTargetDirectory()
|
||||||
{
|
{
|
||||||
var wikiRoot = Global._instance.wiki_storage_path;
|
try
|
||||||
|
{
|
||||||
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
||||||
{
|
{
|
||||||
if (selectedItem.IsFolder) return selectedItem.Path;
|
if (selectedItem.IsFolder) return selectedItem.Path;
|
||||||
@@ -284,12 +297,20 @@ public partial class MainWindow : Window
|
|||||||
var parentDir = Path.GetDirectoryName(selectedItem.Path);
|
var parentDir = Path.GetDirectoryName(selectedItem.Path);
|
||||||
if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
|
if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
|
||||||
}
|
}
|
||||||
|
|
||||||
return wikiRoot;
|
return wikiRoot;
|
||||||
|
}catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while getting selected wiki target directory: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool PathsEqual(string left, string right)
|
private static bool PathsEqual(string left, string right)
|
||||||
{
|
{
|
||||||
|
left = PathUtilities.NormalizeFileSystemPath(left);
|
||||||
|
right = PathUtilities.NormalizeFileSystemPath(right);
|
||||||
|
|
||||||
var normalizedLeft = Path.GetFullPath(left)
|
var normalizedLeft = Path.GetFullPath(left)
|
||||||
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
||||||
var normalizedRight = Path.GetFullPath(right)
|
var normalizedRight = Path.GetFullPath(right)
|
||||||
@@ -333,7 +354,7 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var path = Global._instance.wiki_storage_path;
|
var path = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
if (!Directory.Exists(path)) return;
|
if (!Directory.Exists(path)) return;
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -344,8 +365,9 @@ public partial class MainWindow : Window
|
|||||||
UseShellExecute = true
|
UseShellExecute = true
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -359,9 +381,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbWikiPath.Text = chosen.ToString();
|
TbWikiPath.Text = chosen;
|
||||||
Global._instance.wiki_storage_path = chosen.ToString();
|
Global._instance.wiki_storage_path = chosen;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
|
|
||||||
// reinit wiki service and reload tree
|
// reinit wiki service and reload tree
|
||||||
@@ -379,9 +401,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbFontPath.Text = chosen.ToString();
|
TbFontPath.Text = chosen;
|
||||||
Global._instance.font_path = chosen.ToString();
|
Global._instance.font_path = chosen;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -395,9 +417,9 @@ public partial class MainWindow : Window
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (folder == null || folder.Count == 0) return;
|
if (folder == null || folder.Count == 0) return;
|
||||||
var chosen = folder[0].Path;
|
var chosen = PathUtilities.NormalizeFileSystemPath(folder[0].Path);
|
||||||
TbConfigPath.Text = chosen.ToString();
|
Global._instance.SetConfigPath(chosen);
|
||||||
Global._instance.config_path = chosen.ToString();
|
TbConfigPath.Text = Global._instance.config_path;
|
||||||
Global.Save();
|
Global.Save();
|
||||||
|
|
||||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||||
@@ -436,6 +458,7 @@ public partial class MainWindow : Window
|
|||||||
TbSettingsCustomerDescription.Text = "";
|
TbSettingsCustomerDescription.Text = "";
|
||||||
TbSettingsCustomerName.Text = "";
|
TbSettingsCustomerName.Text = "";
|
||||||
TbSettingsCustomerPatchInfo.Text = "";
|
TbSettingsCustomerPatchInfo.Text = "";
|
||||||
|
TbSettingsCustomerName.Focus();
|
||||||
|
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
RefreshCustomerItems();
|
RefreshCustomerItems();
|
||||||
@@ -443,8 +466,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
LstSettingsCustomers.SelectedIndex = LstSettingsCustomers.Items.Count - 1;
|
LstSettingsCustomers.SelectedIndex = LstSettingsCustomers.Items.Count - 1;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -485,7 +509,13 @@ public partial class MainWindow : Window
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var editedWikiFilePath = _selectedWikiFilePath;
|
||||||
EditorWindow ew = new(_selectedWikiFilePath);
|
EditorWindow ew = new(_selectedWikiFilePath);
|
||||||
|
ew.Closed += (_, _) =>
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(editedWikiFilePath) && File.Exists(editedWikiFilePath))
|
||||||
|
PopulateNavTree(editedWikiFilePath, editedWikiFilePath);
|
||||||
|
};
|
||||||
ew.Show();
|
ew.Show();
|
||||||
|
|
||||||
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
||||||
@@ -515,17 +545,25 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
LstSettingsCustomers.SelectedIndex = index;
|
LstSettingsCustomers.SelectedIndex = index;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while setting selected index: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TbSettingsCustomerDescription_OnTextChanged(object? sender, TextChangedEventArgs e)
|
private void TbSettingsCustomerDescription_OnTextChanged(object? sender, TextChangedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
if (customer.ID == Settings._instance.customers.current.ID)
|
if (customer.ID == Settings._instance.customers.current.ID)
|
||||||
customer.description = TbSettingsCustomerDescription.Text;
|
customer.description = TbSettingsCustomerDescription.Text;
|
||||||
|
} catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while changing customer description: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
//Settings.Save();
|
//Settings.Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -544,6 +582,8 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnCustomerAddressSetImport_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnCustomerAddressSetImport_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
MakeCalcManVisible();
|
MakeCalcManVisible();
|
||||||
var opts = new FilePickerOpenOptions();
|
var opts = new FilePickerOpenOptions();
|
||||||
@@ -602,6 +642,13 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
|
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
|
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RefreshAddressSetListItems(int customer_id)
|
public void RefreshAddressSetListItems(int customer_id)
|
||||||
@@ -646,6 +693,8 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnSettingsImportCustomerAddressPatch_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnSettingsImportCustomerAddressPatch_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
|
|
||||||
@@ -672,6 +721,11 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
|
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
|
} catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while importing customer address patch: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void TbSettingsCustomerCsvSeparator_OnTextChanged(object? sender, TextChangedEventArgs e)
|
private void TbSettingsCustomerCsvSeparator_OnTextChanged(object? sender, TextChangedEventArgs e)
|
||||||
@@ -689,11 +743,14 @@ public partial class MainWindow : Window
|
|||||||
catch (FormatException ex)
|
catch (FormatException ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, "Error while converting: " + ex.Message, "Could not parse");
|
MessageBox.Show(this, "Error while converting: " + ex.Message, "Could not parse");
|
||||||
|
Logger.Log($"Error while converting: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
||||||
|
Logger.Log($"Error while converting: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnCombineDifference_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombineDifference_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -704,10 +761,9 @@ public partial class MainWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
||||||
}
|
}catch (Exception ex)
|
||||||
catch
|
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while combining (difference): {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -720,9 +776,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while combining (union): {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -736,9 +792,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while combining (intersection): {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -773,25 +829,33 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
SavePdfExportOptions();
|
SavePdfExportOptions();
|
||||||
|
|
||||||
var saveDialog = new SaveFileDialog
|
var saveDialog = new SaveFileDialog
|
||||||
{
|
{
|
||||||
DefaultExtension = "pdf",
|
DefaultExtension = "pdf",
|
||||||
Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
|
Filters =
|
||||||
|
{
|
||||||
|
new FileDialogFilter
|
||||||
|
{
|
||||||
|
Name = "PDF-Dateien",
|
||||||
|
Extensions = { "pdf" }
|
||||||
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// hier nach winpafd prüfen
|
|
||||||
var filePath = await saveDialog.ShowAsync(this);
|
var filePath = await saveDialog.ShowAsync(this);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(filePath))
|
Console.WriteLine($"RAW: {filePath}");
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(filePath))
|
||||||
{
|
{
|
||||||
if (Uri.TryCreate(filePath, UriKind.Absolute, out var uri)
|
filePath = PathUtilities.NormalizeFileSystemPath(filePath);
|
||||||
&& uri.IsFile)
|
|
||||||
{
|
Console.WriteLine($"PATH: {filePath}");
|
||||||
filePath = uri.LocalPath;
|
|
||||||
}
|
|
||||||
|
|
||||||
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
||||||
|
|
||||||
@@ -800,16 +864,34 @@ public partial class MainWindow : Window
|
|||||||
"Company Logo/Info",
|
"Company Logo/Info",
|
||||||
filePath
|
filePath
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Console.WriteLine("PDF OK");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while generating labels: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HookPdfExportOptionEvents()
|
private void HookPdfExportOptionEvents()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var controls = GetPdfExportControls();
|
var controls = GetPdfExportControls();
|
||||||
foreach (var control in controls) control.ValueChanged += PdfExportOption_OnValueChanged;
|
foreach (var control in controls) control.ValueChanged += PdfExportOption_OnValueChanged;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while hooking pdf export margins: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void LoadPdfExportOptions()
|
private void LoadPdfExportOptions()
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var options = Settings._instance.pdfExport ?? new PdfExportSettings();
|
var options = Settings._instance.pdfExport ?? new PdfExportSettings();
|
||||||
|
|
||||||
@@ -828,6 +910,12 @@ public partial class MainWindow : Window
|
|||||||
NudExpMargFontSize.Value = (decimal)options.fontSize;
|
NudExpMargFontSize.Value = (decimal)options.fontSize;
|
||||||
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
|
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while loading PDF Export Options: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void SavePdfExportOptions()
|
private void SavePdfExportOptions()
|
||||||
{
|
{
|
||||||
@@ -907,6 +995,7 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
public void RefreshCountryView()
|
public void RefreshCountryView()
|
||||||
{
|
{
|
||||||
|
|
||||||
if (_suppressCountryRefresh) return;
|
if (_suppressCountryRefresh) return;
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -921,8 +1010,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
CountryList.Items.Clear();
|
CountryList.Items.Clear();
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while clearing country list: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var c in Global._instance.countries) CountryList.Items.Add(c.name);
|
foreach (var c in Global._instance.countries) CountryList.Items.Add(c.name);
|
||||||
@@ -930,17 +1020,19 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
CountryList.SelectedIndex = country_index;
|
CountryList.SelectedIndex = country_index;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
_selectedCountry = Country.GetByName(CountryList.SelectedItems[0].ToString());
|
_selectedCountry = Country.GetByName(CountryList.SelectedItems[0].ToString());
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_selectedCountry = null;
|
_selectedCountry = null;
|
||||||
|
Logger.Log($"Error while getting country: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_selectedCountry == null) return;
|
if (_selectedCountry == null) return;
|
||||||
@@ -954,8 +1046,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
LbSettingsAlternatives.SelectedIndex = alt_index;
|
LbSettingsAlternatives.SelectedIndex = alt_index;
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@@ -971,9 +1064,9 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
_selectedCountry.alternatives.Remove(selected.ToString());
|
_selectedCountry.alternatives.Remove(selected.ToString());
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while removing country alternative");
|
Logger.Log($"Error while removing alternatives: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
RefreshCountryView();
|
RefreshCountryView();
|
||||||
@@ -1034,11 +1127,18 @@ public partial class MainWindow : Window
|
|||||||
result = result.Trim();
|
result = result.Trim();
|
||||||
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
||||||
|
|
||||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
if (!Directory.Exists(wikiRoot))
|
||||||
|
Directory.CreateDirectory(wikiRoot);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, "Der Dateiname enthält ungültige Zeichen.", "Fehler");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
Directory.CreateDirectory(targetDirectory);
|
Directory.CreateDirectory(targetDirectory);
|
||||||
var newFilePath = Path.Combine(targetDirectory, result);
|
var newFilePath = Path.Combine(targetDirectory, result);
|
||||||
@@ -1048,6 +1148,7 @@ public partial class MainWindow : Window
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while adding wiki file: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1058,11 +1159,18 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
result = result.Trim();
|
result = result.Trim();
|
||||||
|
|
||||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
var wikiRoot = PathUtilities.NormalizeFileSystemPath(Global._instance.wiki_storage_path);
|
||||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
if (!Directory.Exists(wikiRoot))
|
||||||
|
Directory.CreateDirectory(wikiRoot);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
if (PathUtilities.HasInvalidFileNameChars(result))
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, "Der Ordnername enthält ungültige Zeichen.", "Fehler");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
var newFolderPath = Path.Combine(targetDirectory, result);
|
var newFolderPath = Path.Combine(targetDirectory, result);
|
||||||
Directory.CreateDirectory(newFolderPath);
|
Directory.CreateDirectory(newFolderPath);
|
||||||
@@ -1071,6 +1179,7 @@ public partial class MainWindow : Window
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while adding wiki folder: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1097,12 +1206,12 @@ public partial class MainWindow : Window
|
|||||||
curr_set.Name = result;
|
curr_set.Name = result;
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
RefreshAddressSetListItems(cus_id);
|
RefreshAddressSetListItems(cus_id);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while renaming address set: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1116,6 +1225,7 @@ public partial class MainWindow : Window
|
|||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
||||||
|
Logger.Log($"Error while deleting customer: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
RefreshCustomerItems();
|
RefreshCustomerItems();
|
||||||
}
|
}
|
||||||
@@ -1142,10 +1252,35 @@ public partial class MainWindow : Window
|
|||||||
TbSettingsCustomerCsvSeparator.Text = div;
|
TbSettingsCustomerCsvSeparator.Text = div;
|
||||||
Settings.Save();
|
Settings.Save();
|
||||||
}
|
}
|
||||||
catch
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while parsing");
|
Logger.Log($"Error while changing CSV divider: {ex.Message}", Logger.LogType.Error);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void MnIAdSetDelete_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if(await MessageBox.Show(this,"Wirklich löschen?","",MessageBoxButton.YesNo) == MessageBoxResult.Yes)
|
||||||
|
{
|
||||||
|
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||||
|
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
if (set.ID == id)
|
||||||
|
{
|
||||||
|
Settings._instance.addressSets.addresses.Remove(set);
|
||||||
|
Settings.Save();
|
||||||
|
RefreshAddressSetListItems(cus_id);
|
||||||
|
break;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
Logger.Log($"Error while deleting address set: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+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>
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ public partial class NamingWindow : Window
|
|||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while showing naming window: " + ex.Message);
|
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
|
||||||
return Task.FromResult<string>(null!);
|
return Task.FromResult<string>(null!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,10 @@ 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";
|
||||||
@@ -39,6 +43,11 @@ public partial class ResultWindow : Window
|
|||||||
// StkResults.Children.Clear();
|
// StkResults.Children.Clear();
|
||||||
// foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
// 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)
|
||||||
{
|
{
|
||||||
@@ -105,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>();
|
||||||
@@ -145,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>();
|
||||||
|
|
||||||
@@ -211,6 +230,11 @@ public partial class ResultWindow : Window
|
|||||||
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
|
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
|
||||||
// StkResults.Children.Clear();
|
// StkResults.Children.Clear();
|
||||||
// foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
// 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);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+15
-2
@@ -38,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;
|
||||||
@@ -238,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));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -248,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", Convert.ToInt32(percent).ToString());
|
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft",
|
||||||
|
Convert.ToInt32(percent).ToString());
|
||||||
|
|
||||||
_progress.ChangePercentage(percent);
|
_progress.ChangePercentage(percent);
|
||||||
});
|
});
|
||||||
@@ -261,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;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -43,7 +43,8 @@ public static class AddressCreator
|
|||||||
public static string? CreateFinalMarkdownString(int id)
|
public static string? CreateFinalMarkdownString(int id)
|
||||||
{
|
{
|
||||||
// Maximum seven lines of information
|
// Maximum seven lines of information
|
||||||
|
try
|
||||||
|
{
|
||||||
// find the address
|
// find the address
|
||||||
KasPerson? address = null;
|
KasPerson? address = null;
|
||||||
var string_address = "";
|
var string_address = "";
|
||||||
@@ -197,9 +198,18 @@ public static class AddressCreator
|
|||||||
if (address_line_count > 1) return string_address;
|
if (address_line_count > 1) return string_address;
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.Log($"Error while creating markdown string: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
|
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 +225,14 @@ 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 +241,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 +269,12 @@ 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;
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ public class AddressShortener(ProgressWindow progressWindow)
|
|||||||
|
|
||||||
public async Task Perform(KasAddressList list)
|
public async Task Perform(KasAddressList list)
|
||||||
{
|
{
|
||||||
// find doubled addresses by refsid
|
try
|
||||||
|
{
|
||||||
List<int> doubled_ids = new List<int>();
|
List<int> doubled_ids = new List<int>();
|
||||||
for (int i = 0; i < list.KasPersons.Count; i++)
|
for (int i = 0; i < list.KasPersons.Count; i++)
|
||||||
{
|
{
|
||||||
@@ -73,7 +74,11 @@ public class AddressShortener(ProgressWindow progressWindow)
|
|||||||
// does this remove both of the doubled addresses?
|
// does this remove both of the doubled addresses?
|
||||||
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
//return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -25,6 +25,8 @@ public class CombineAddresses
|
|||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
bool? exportUnused, bool? deleteOld)
|
bool? exportUnused, bool? deleteOld)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||||
|
|
||||||
@@ -37,11 +39,21 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
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,
|
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
bool? exportUnused)
|
bool? exportUnused)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||||
@@ -49,6 +61,14 @@ public class CombineAddresses
|
|||||||
if (type == "symdiff") return await SymmetricDifference(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>
|
||||||
@@ -60,6 +80,7 @@ public class CombineAddresses
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
||||||
{
|
{
|
||||||
|
|
||||||
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
||||||
if(comb_type == CombineType.refsid)
|
if(comb_type == CombineType.refsid)
|
||||||
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
||||||
@@ -95,6 +116,8 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
|
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);
|
||||||
@@ -133,10 +156,20 @@ 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, CombineType comb_type, bool? return_unused,
|
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, CombineType comb_type, bool? return_unused,
|
||||||
Progress progress = null)
|
Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
var second_result = new KasAddressList("none");
|
var second_result = new KasAddressList("none");
|
||||||
@@ -172,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()
|
||||||
@@ -181,6 +222,8 @@ public class CombineAddresses
|
|||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
var second_result = new KasAddressList("none");
|
var second_result = new KasAddressList("none");
|
||||||
@@ -225,10 +268,20 @@ 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, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
var second_result = new KasAddressList("none");
|
var second_result = new KasAddressList("none");
|
||||||
@@ -284,6 +337,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 symdiff-combining: {ex.Message}", Logger.LogType.Error);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (null,null);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+94
-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);
|
||||||
@@ -106,6 +136,12 @@ public class PdfBuilder
|
|||||||
|
|
||||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, 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>
|
||||||
/// Creates a PDF document with a single placeholder cell for other information.
|
/// Creates a PDF document with a single placeholder cell for other information.
|
||||||
@@ -114,6 +150,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 +174,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 +202,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 +228,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 +249,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 +266,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 +310,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 +409,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 +433,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)
|
||||||
|
|||||||
@@ -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 [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +61,7 @@ public partial class EditorWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.Delete(filename);
|
File.Delete(filename);
|
||||||
} catch {}
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree();
|
||||||
Close();
|
Close();
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -11,6 +12,8 @@ namespace Logof_Client.Wiki;
|
|||||||
public static class MarkdownRenderer
|
public static class MarkdownRenderer
|
||||||
{
|
{
|
||||||
public static Control Render(string markdown)
|
public static Control Render(string markdown)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
var panel = new StackPanel { Spacing = 6 };
|
var panel = new StackPanel { Spacing = 6 };
|
||||||
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||||
@@ -93,9 +96,14 @@ public static class MarkdownRenderer
|
|||||||
}
|
}
|
||||||
|
|
||||||
return panel;
|
return panel;
|
||||||
|
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||||
|
|
||||||
|
return new Panel();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static string GetInlineText(ContainerInline? container)
|
private static string GetInlineText(ContainerInline? container)
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
if (container == null) return string.Empty;
|
if (container == null) return string.Empty;
|
||||||
var sb = new StringBuilder();
|
var sb = new StringBuilder();
|
||||||
@@ -125,5 +133,8 @@ public static class MarkdownRenderer
|
|||||||
}
|
}
|
||||||
|
|
||||||
return sb.ToString();
|
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