6 Commits

13 changed files with 991 additions and 1191 deletions
+9 -3
View File
@@ -45,8 +45,9 @@ public class Settings
}
catch (Exception ex)
{
Logger.Log($"Error while reading settings. Generating new... {ex.Message}", Logger.LogType.Warning);
Console.WriteLine(ex.Message);
Console.WriteLine(ex.StackTrace);
Console.WriteLine("Error while reading settings. Generating new...");
_instance = new Settings();
}
}
@@ -69,6 +70,9 @@ public class PdfExportSettings
public double fontSize { get; set; } = 9;
public double smallFontSize { get; set; } = 6;
public bool exportRunningSheets { get; set; } = true;
public double rsNumGrouped { get; set; } = 25;
public double rsPlzStartpoint { get; set; } = 2;
}
public class Global
@@ -122,7 +126,9 @@ public class Global
}
catch (Exception ex)
{
Logger.Log($"Error while reading global settings. Generating new... {ex.Message}", Logger.LogType.Warning);
Console.WriteLine(ex.Message);
Console.WriteLine(ex.StackTrace);
Console.WriteLine("Error while reading global settings. Generating new...");
_instance = new Global();
Save();
}
-40
View File
@@ -1,40 +0,0 @@
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
}
}
+9
View File
@@ -254,6 +254,7 @@
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<CheckBox Content="Laufzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
@@ -273,6 +274,10 @@
<Label Content="Zellenabstand links"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Anzahl gruppierter Sendungen"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzcount" Minimum="1" Maximum="10000" Value="25"></NumericUpDown>
</Grid>
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
@@ -292,6 +297,10 @@
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Gruppierpunkt"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpRnsPlzStartpoint" Minimum="1" Maximum="10" Value="2"></NumericUpDown>
</Grid>
</StackPanel>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+61 -147
View File
@@ -24,9 +24,6 @@ public partial class MainWindow : Window
public MainWindow()
{
Logger.Log("Welcome to logofclient");
Logger.Log($"Session on {DateTime.Now:G}");
Logger.Log("Initializing...");
InitializeComponent();
//Hide();
@@ -35,7 +32,6 @@ public partial class MainWindow : Window
_instance = this;
WindowState = WindowState.Maximized;
Logger.Log("Loading settings...");
Global.Load();
Settings.Load();
LoadPdfExportOptions();
@@ -44,7 +40,6 @@ public partial class MainWindow : Window
RefreshCountryView();
// Initialize wiki integration
Logger.Log("Building wiki...");
_wikiService = new WikiService();
try
{
@@ -59,9 +54,8 @@ public partial class MainWindow : Window
if (!string.IsNullOrWhiteSpace(Global._instance.wiki_storage_path))
TbWikiPath.Text = Global._instance.wiki_storage_path;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while setting paths: {ex.Message}", Logger.LogType.Error);
}
try
@@ -70,14 +64,12 @@ public partial class MainWindow : Window
BtnFontPath.Click += BtnFontPath_Click;
BtnConfigPath.Click += BtnConfigPath_Click;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while adding click functions?: {ex.Message}", Logger.LogType.Error);
}
}
catch (Exception ex)
catch
{
Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error);
}
//Thread.Sleep(3000);
@@ -129,6 +121,23 @@ public partial class MainWindow : Window
//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)
{
@@ -147,7 +156,7 @@ public partial class MainWindow : Window
}
catch (Exception ex)
{
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
}
}
@@ -163,7 +172,7 @@ public partial class MainWindow : Window
}
catch (Exception ex)
{
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
}
}
@@ -179,7 +188,7 @@ public partial class MainWindow : Window
}
catch (Exception ex)
{
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
}
}
@@ -223,9 +232,9 @@ public partial class MainWindow : Window
var rendered = MarkdownRenderer.Render(text ?? string.Empty);
PreviewPanel.Children.Add(rendered);
}
catch (Exception ex)
catch
{
Logger.Log($"Error while rendering markdown: {ex.Message}", Logger.LogType.Error);
// fallback: plain text
PreviewPanel.Children.Clear();
PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
}
@@ -240,8 +249,6 @@ public partial class MainWindow : Window
}
public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
{
try
{
var roots = _wikiService.GetRootItems();
var nodes = new List<TreeViewItem>();
@@ -255,10 +262,6 @@ public partial class MainWindow : Window
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
selectedNode != null)
NavTree.SelectedItem = selectedNode;
}catch (Exception ex)
{
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
}
}
private TreeViewItem BuildNode(WikiItem item)
@@ -272,8 +275,6 @@ public partial class MainWindow : Window
}
private string GetSelectedWikiTargetDirectory()
{
try
{
var wikiRoot = Global._instance.wiki_storage_path;
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
@@ -283,13 +284,8 @@ public partial class MainWindow : Window
var parentDir = Path.GetDirectoryName(selectedItem.Path);
if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
}
return wikiRoot;
}catch (Exception ex)
{
Logger.Log($"Error while getting selected wiki target directory: {ex.Message}", Logger.LogType.Error);
}
return null;
return wikiRoot;
}
private static bool PathsEqual(string left, string right)
@@ -348,9 +344,8 @@ public partial class MainWindow : Window
UseShellExecute = true
});
}
catch (Exception ex)
catch
{
Logger.Log($"Error while starting process: {ex.Message}", Logger.LogType.Error);
}
}
@@ -448,9 +443,8 @@ public partial class MainWindow : Window
{
LstSettingsCustomers.SelectedIndex = LstSettingsCustomers.Items.Count - 1;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
}
}
@@ -521,25 +515,17 @@ public partial class MainWindow : Window
{
LstSettingsCustomers.SelectedIndex = index;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while setting selected index: {ex.Message}", Logger.LogType.Error);
}
}
private void TbSettingsCustomerDescription_OnTextChanged(object? sender, TextChangedEventArgs e)
{
try
{
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
foreach (var customer in Settings._instance.customers.customers)
if (customer.ID == Settings._instance.customers.current.ID)
customer.description = TbSettingsCustomerDescription.Text;
} catch (Exception ex)
{
Logger.Log($"Error while changing customer description: {ex.Message}", Logger.LogType.Error);
}
//Settings.Save();
}
@@ -558,8 +544,6 @@ public partial class MainWindow : Window
}
private async void BtnCustomerAddressSetImport_OnClick(object? sender, RoutedEventArgs e)
{
try
{
MakeCalcManVisible();
var opts = new FilePickerOpenOptions();
@@ -618,13 +602,6 @@ public partial class MainWindow : Window
Settings.Save();
}
catch (Exception ex)
{
Logger.Log($"Error while importing: {ex.Message}", Logger.LogType.Error);
}
}
public void RefreshAddressSetListItems(int customer_id)
@@ -669,8 +646,6 @@ public partial class MainWindow : Window
}
private async void BtnSettingsImportCustomerAddressPatch_OnClick(object? sender, RoutedEventArgs e)
{
try
{
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
@@ -697,11 +672,6 @@ public partial class MainWindow : Window
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)
@@ -719,14 +689,11 @@ public partial class MainWindow : Window
catch (FormatException ex)
{
MessageBox.Show(this, "Error while converting: " + ex.Message, "Could not parse");
Logger.Log($"Error while converting: {ex.Message}", Logger.LogType.Error);
}
catch (Exception ex)
{
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)
@@ -736,10 +703,11 @@ public partial class MainWindow : Window
list.Add((KasAddressList)item);
try
{
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
}catch (Exception ex)
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "difference", GetCombiningTyp());
}
catch
{
Logger.Log($"Error while combining (difference): {ex.Message}", Logger.LogType.Error);
}
}
@@ -752,9 +720,9 @@ public partial class MainWindow : Window
{
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
}
catch (Exception ex)
catch
{
Logger.Log($"Error while combining (union): {ex.Message}", Logger.LogType.Error);
}
}
@@ -766,11 +734,11 @@ public partial class MainWindow : Window
list.Add((KasAddressList)item);
try
{
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "intersection", GetCombiningTyp());
}
catch (Exception ex)
{
Logger.Log($"Error while combining (intersection): {ex.Message}", Logger.LogType.Error);
Console.WriteLine("Error while trying to start intersection: " + ex.Message);
}
}
@@ -793,7 +761,7 @@ public partial class MainWindow : Window
foreach (var item in LstCustomerAdressSets.SelectedItems)
list.Add((KasAddressList)item);
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "symdiff", GetCombiningTyp());
}
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
@@ -805,72 +773,36 @@ public partial class MainWindow : Window
}
private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
{
try
{
SavePdfExportOptions();
var saveDialog = new SaveFileDialog
{
DefaultExtension = "pdf",
Filters =
{
new FileDialogFilter
{
Name = "PDF-Dateien",
Extensions = { "pdf" }
}
}
Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
};
var filePath = await saveDialog.ShowAsync(this);
Console.WriteLine($"RAW: {filePath}");
if (!string.IsNullOrWhiteSpace(filePath))
if (!string.IsNullOrEmpty(filePath))
{
if (filePath.StartsWith("file://"))
{
filePath = new Uri(filePath).LocalPath;
}
Console.WriteLine($"PATH: {filePath}");
var builder = new PdfBuilder(Settings._instance.pdfExport);
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
((KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
(KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
"Company Logo/Info",
filePath
);
Console.WriteLine("PDF OK");
}
}
catch (Exception ex)
{
Logger.Log($"Error while generating labels: {ex.Message}", Logger.LogType.Error);
//return true;
}
}
private void HookPdfExportOptionEvents()
{
try
{
var controls = GetPdfExportControls();
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()
{
try
{
var options = Settings._instance.pdfExport ?? new PdfExportSettings();
@@ -889,12 +821,6 @@ public partial class MainWindow : Window
NudExpMargFontSize.Value = (decimal)options.fontSize;
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
}
catch (Exception ex)
{
Logger.Log($"Error while loading PDF Export Options: {ex.Message}", Logger.LogType.Error);
}
}
private void SavePdfExportOptions()
{
@@ -974,7 +900,6 @@ public partial class MainWindow : Window
public void RefreshCountryView()
{
if (_suppressCountryRefresh) return;
try
{
@@ -989,9 +914,8 @@ public partial class MainWindow : Window
{
CountryList.Items.Clear();
}
catch (Exception ex)
catch
{
Logger.Log($"Error while clearing country list: {ex.Message}", Logger.LogType.Error);
}
foreach (var c in Global._instance.countries) CountryList.Items.Add(c.name);
@@ -999,19 +923,17 @@ public partial class MainWindow : Window
{
CountryList.SelectedIndex = country_index;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
}
try
{
_selectedCountry = Country.GetByName(CountryList.SelectedItems[0].ToString());
}
catch (Exception ex)
catch
{
_selectedCountry = null;
Logger.Log($"Error while getting country: {ex.Message}", Logger.LogType.Error);
}
if (_selectedCountry == null) return;
@@ -1025,9 +947,8 @@ public partial class MainWindow : Window
{
LbSettingsAlternatives.SelectedIndex = alt_index;
}
catch (Exception ex)
catch
{
Logger.Log($"Error while setting selected item: {ex.Message}", Logger.LogType.Error);
}
}
finally
@@ -1043,9 +964,9 @@ public partial class MainWindow : Window
{
_selectedCountry.alternatives.Remove(selected.ToString());
}
catch (Exception ex)
catch
{
Logger.Log($"Error while removing alternatives: {ex.Message}", Logger.LogType.Error);
Console.WriteLine("Error while removing country alternative");
}
RefreshCountryView();
@@ -1120,7 +1041,6 @@ public partial class MainWindow : Window
catch (Exception ex)
{
MessageBox.Show(this, ex.StackTrace, "Fehler");
Logger.Log($"Error while adding wiki file: {ex.Message}", Logger.LogType.Error);
}
}
@@ -1144,39 +1064,34 @@ public partial class MainWindow : Window
catch (Exception ex)
{
MessageBox.Show(this, ex.StackTrace, "Fehler");
Logger.Log($"Error while adding wiki folder: {ex.Message}", Logger.LogType.Error);
}
}
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
{
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
var curr_set = new KasAddressList("");
foreach (var set in Settings._instance.addressSets.addresses)
if (set.ID == id)
{
curr_set = set;
}
if (LstCustomerAdressSets.SelectedItems.Count > 0)
try
{
var result = await NamingWindow.Show(this, curr_set.Name);
var result = await NamingWindow.Show(this);
if (result != null)
{
curr_set.Name = result;
var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
.ToString());
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
foreach (var set in Settings._instance.addressSets.addresses)
if (set.ID == id)
{
set.Name = result;
Settings.Save();
RefreshAddressSetListItems(cus_id);
break;
}
}
}
catch (Exception ex)
{
MessageBox.Show(this, ex.StackTrace, "Fehler");
Logger.Log($"Error while renaming address set: {ex.Message}", Logger.LogType.Error);
}
}
@@ -1190,7 +1105,6 @@ public partial class MainWindow : Window
catch (Exception ex)
{
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
Logger.Log($"Error while deleting customer: {ex.Message}", Logger.LogType.Error);
}
RefreshCustomerItems();
}
@@ -1217,9 +1131,9 @@ public partial class MainWindow : Window
TbSettingsCustomerCsvSeparator.Text = div;
Settings.Save();
}
catch (Exception ex)
catch
{
Logger.Log($"Error while changing CSV divider: {ex.Message}", Logger.LogType.Error);
Console.WriteLine("Error while parsing");
}
}
+1 -1
View File
@@ -52,7 +52,7 @@ public partial class NamingWindow : Window
}
catch (Exception ex)
{
Logger.Log("Error while showing naming window: " + ex.Message, Logger.LogType.Warning);
Console.WriteLine("Error while showing naming window: " + ex.Message);
return Task.FromResult<string>(null!);
}
}
-24
View File
@@ -28,10 +28,6 @@ public partial class ResultWindow : Window
private void GenerateView(List<KasPerson> result)
{
try
{
// Filter to only show persons with errors
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
@@ -43,11 +39,6 @@ public partial class ResultWindow : Window
// StkResults.Children.Clear();
// foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
}
catch (Exception ex)
{
Logger.Log("Error while generating result view: " + ex.Message, Logger.LogType.Warning);
}
}
private Grid CreatePersonGrid(KasPerson person)
{
@@ -114,8 +105,6 @@ public partial class ResultWindow : Window
}
private void Load(List<KasPerson> result)
{
try
{
var knownErrors = new List<AddressCheck.ErrorTypes>();
var knownWarnings = new List<AddressCheck.WarningTypes>();
@@ -156,20 +145,12 @@ public partial class ResultWindow : Window
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 UpdateFilter()
{
try
{
var temp_result = new List<KasPerson>();
@@ -230,11 +211,6 @@ public partial class ResultWindow : Window
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
// StkResults.Children.Clear();
// foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
} catch (Exception ex)
{
Logger.Log("Error while updating filter: " + ex.Message, Logger.LogType.Warning);
}
}
+2 -15
View File
@@ -38,8 +38,6 @@ public class AddressCheck
}
public async Task<List<KasPerson>> Perform(int id)
{
try
{
// Find the index of the address set with the given id
var adset_index = -1;
@@ -240,8 +238,7 @@ public class AddressCheck
// Directly set PersonError in the address set
var person_index = adset.KasPersons.IndexOf(person);
if (person_index >= 0)
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index]
.PersonError =
Settings._instance.addressSets.addresses[adset_index].KasPersons[person_index].PersonError =
new KasPersonError((errors, warnings));
}
@@ -251,8 +248,7 @@ public class AddressCheck
await Dispatcher.UIThread.InvokeAsync(() =>
{
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);
});
@@ -265,14 +261,5 @@ public class AddressCheck
return Settings._instance.addressSets.addresses[adset_index].KasPersons
.Where(p => p.PersonError != null)
.ToList();
}
catch (Exception ex)
{
Logger.Log($"Error while performing address check: {ex.Message}", Logger.LogType.Error);
}
return null;
}
}
+1 -29
View File
@@ -43,8 +43,7 @@ public static class AddressCreator
public static string? CreateFinalMarkdownString(int id)
{
// Maximum seven lines of information
try
{
// find the address
KasPerson? address = null;
var string_address = "";
@@ -198,18 +197,9 @@ public static class AddressCreator
if (address_line_count > 1) return string_address;
return null;
}
catch (Exception ex)
{
Logger.Log($"Error while creating markdown string: {ex.Message}", Logger.LogType.Error);
}
return null;
}
public static string CreateNameLine(string anredezus, string anrede, string titel, string vorname, string adel,
string name, string namezus)
{
try
{
if (!string.IsNullOrWhiteSpace(anredezus))
return string.Join(" ",
@@ -225,14 +215,6 @@ public static class AddressCreator
)
+ (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>
/// Returns true if a plz (or pplz) is valid
@@ -241,8 +223,6 @@ public static class AddressCreator
/// <param name="land">country, to check the plz</param>
/// <returns>true or faslse, depending on result :+1:</returns>
public static bool CheckPLZ(string plz, string land)
{
try
{
if (string.IsNullOrWhiteSpace(plz)) return false;
@@ -269,12 +249,4 @@ public static class AddressCreator
// For non-German countries, accept any non-empty postal code
return true;
}
catch (Exception ex)
{
Logger.Log($"Error while performing address plz check: {ex.Message}", Logger.LogType.Error);
}
return false;
}
}
-22
View File
@@ -3,7 +3,6 @@ using System.IO;
using System.Linq;
using System.Reflection;
using System.Text;
using Logof_Client;
public class AddressPatch
{
@@ -58,8 +57,6 @@ public class AddressPatch
public bool has_funktionad { get; set; }
public static AddressPatch Import(Uri filename)
{
try
{
var patch = new AddressPatch();
@@ -95,20 +92,9 @@ public class AddressPatch
return patch;
}
catch (Exception ex)
{
Logger.Log($"Error while importing address patch: {ex.Message}", Logger.LogType.Error);
}
return null;
}
public override string ToString()
{
try
{
var properties = GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
var stringProps = properties.Where(p => p.PropertyType == typeof(string) && p.Name.EndsWith("_is"));
@@ -129,12 +115,4 @@ public class AddressPatch
return lines.ToString().TrimEnd();
}
catch (Exception ex)
{
Logger.Log($"Error while parsing: {ex.Message}", Logger.LogType.Error);
}
return "Error while parsing";
}
}
+9 -11
View File
@@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
namespace Logof_Client;
@@ -10,16 +9,15 @@ public class AddressRepair(ProgressWindow progressWindow)
public KasAddressList Perform(KasAddressList all_addresses,
List<(int, List<AddressCheck.ErrorTypes>)> failed_addresses)
{
try
{
}
catch (Exception ex)
{
Logger.Log($"Error while performing address repair: {ex.Message}", Logger.LogType.Error);
}
return null;
// foreach (var k in all_addresses.KasPersons)
// foreach (var p in failed_addresses)
// {
// if (k.refsid != p.Item1) continue;
//
// if (p.Item1.Contains(AddressCheck.WarningTypes.DoubledRefsid))
// {
// }
// }
return null;
}
+2 -7
View File
@@ -12,8 +12,7 @@ public class AddressShortener(ProgressWindow progressWindow)
public async Task Perform(KasAddressList list)
{
try
{
// find doubled addresses by refsid
List<int> doubled_ids = new List<int>();
for (int i = 0; i < list.KasPersons.Count; i++)
{
@@ -74,11 +73,7 @@ public class AddressShortener(ProgressWindow progressWindow)
// does this remove both of the doubled addresses?
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
}
}
catch (Exception ex)
{
Logger.Log($"Error while performing address shortener: {ex.Message}", Logger.LogType.Error);
}
//return null;
}
}
-61
View File
@@ -25,8 +25,6 @@ public class CombineAddresses
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
bool? exportUnused, bool? deleteOld)
{
try
{
var result = await Execute(address_lists,type,comb_type,exportUnused);
@@ -39,21 +37,11 @@ public class CombineAddresses
}
return result;
}
catch (Exception ex)
{
Logger.Log($"Error while performing address combining: {ex.Message}", Logger.LogType.Error);
}
return (null,null);
}
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
bool? exportUnused)
{
try
{
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
@@ -61,14 +49,6 @@ public class CombineAddresses
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
return (null, null);
}
catch (Exception ex)
{
Logger.Log($"Error while executing address combining: {ex.Message}", Logger.LogType.Error);
}
return (null,null);
}
/// <summary>
@@ -80,7 +60,6 @@ public class CombineAddresses
/// <returns></returns>
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
{
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
if(comb_type == CombineType.refsid)
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
@@ -116,8 +95,6 @@ public class CombineAddresses
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
bool? return_unused,
Progress? progress = null)
{
try
{
if (address_lists == null || address_lists.Count == 0)
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
@@ -156,20 +133,10 @@ public class CombineAddresses
if (return_unused == true) return (result, second_result);
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,
Progress progress = null)
{
try
{
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
var second_result = new KasAddressList("none");
@@ -205,14 +172,6 @@ public class CombineAddresses
if (return_unused == true) return (result, second_result);
return (result, null);
}
catch (Exception ex)
{
Logger.Log($"Error while performing union-combining: {ex.Message}", Logger.LogType.Error);
}
return (null,null);
}
public async Task<KasAddressList> MoveDuplicatesToNew()
@@ -222,8 +181,6 @@ public class CombineAddresses
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
bool? return_unused, Progress progress = null)
{
try
{
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
var second_result = new KasAddressList("none");
@@ -268,20 +225,10 @@ public class CombineAddresses
if (return_unused == true) return (result, second_result);
return (result, null);
}
catch (Exception ex)
{
Logger.Log($"Error while performing intersection-combining: {ex.Message}", Logger.LogType.Error);
}
return (null,null);
}
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
bool? return_unused, Progress progress = null)
{
try
{
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
var second_result = new KasAddressList("none");
@@ -337,14 +284,6 @@ public class CombineAddresses
if (return_unused == true) return (result, second_result);
return (result, null);
}
catch (Exception ex)
{
Logger.Log($"Error while performing symdiff-combining: {ex.Message}", Logger.LogType.Error);
}
return (null,null);
}
}
+66
View File
@@ -104,7 +104,17 @@ public class PdfBuilder
addresses.Add(addr);
}
if (addresses.Count == 0)
{
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
return;
}
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
if (_settings.exportRunningSheets)
{
ExportRunningSheets(addressSetId, outputPath);
}
}
/// <summary>
@@ -387,4 +397,60 @@ public class PdfBuilder
if (left < 0 || top < 0 || right < 0 || bottom < 0)
throw new ArgumentException("Margins cannot be negative");
}
public void ExportRunningSheets(int setID, string path)
{
if (path.EndsWith(".pdf"))
{
path = path.Substring(0, path.Length - 4);
path = path + "-Laufzettel.pdf";
}
else
{
path = path + "-Laufzettel.pdf";
}
CreateRunningSheets(setID, path);
}
public void CreateRunningSheets(int setID, string path)
{
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
var document = new PdfDocument();
document.Info.Title = $"Laufzettel für {list.Name}";
document.Info.Subject = "powered by logofclient";
document.Info.Author = "logofclient";
int margin = 50;
List<(int, int)> grouped_nums = GroupAddresses(setID);
var page = document.AddPage();
page.Size = PageSize.A4;
var gfx = XGraphics.FromPdfPage(page);
var width = page.Width.Point-margin;
var height = page.Height.Point-margin;
gfx.DrawLine(XPens.Black, margin, margin, margin, height);
gfx.DrawLine(XPens.Black, margin, margin, width, margin);
gfx.DrawLine(XPens.Black, width, margin, margin, height);
gfx.DrawLine(XPens.Black, margin, height, width, margin);
var font = new XFont("Times New Roman", 20, XFontStyleEx.BoldItalic);
gfx.DrawString($"Versand {list.Name}", font, XBrushes.Black,
new XRect(0, 0, page.Width.Point, page.Height.Point), XStringFormats.Center);
document.Save(path);
}
public List<(int, int)> GroupAddresses(int setID)
{
return null;
}
}