Compare commits
30 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e62861a25b | |||
| e3cdb61932 | |||
| a2d0b72899 | |||
| acaf0856ed | |||
| 2da822e0e7 | |||
| a4c7132756 | |||
| c32cd44184 | |||
| af3f8234c0 | |||
| 516ca58740 | |||
| c140a20549 | |||
| ac717c5345 | |||
| 1b200ee41e | |||
| 0750c51448 | |||
| 5a47fedcf0 | |||
| b22d33dc97 | |||
| 8b740304f6 | |||
| 57b4ac5001 | |||
| 1580d30d72 | |||
| 0dacaf19b9 | |||
| 75b6b1dc4d | |||
| 1161a437c4 | |||
| 605ba95848 | |||
| eb38bafd23 | |||
| e2d5ae2a70 | |||
| 6c1d0e7a70 | |||
| a72722745b | |||
| bd565960ba | |||
| 58fed451a1 | |||
| ddea77bf3f | |||
| 0e4da1b150 |
@@ -178,6 +178,34 @@ public class KasPerson
|
||||
public string abteilung { get; set; }
|
||||
public string funktionad { get; set; }
|
||||
|
||||
public string used_plz { get; set; } = "";
|
||||
|
||||
public bool IsGermany()
|
||||
{
|
||||
var trimmedLand = (land ?? "").Trim();
|
||||
var trimmedLowerLand = trimmedLand.ToLower();
|
||||
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
|
||||
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
|
||||
trimmedLowerLand == "deutschland";
|
||||
|
||||
return isGermany;
|
||||
}
|
||||
|
||||
public static void SetUsedPLZ(int id, string plz)
|
||||
{
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
{
|
||||
foreach (var add in set.KasPersons)
|
||||
{
|
||||
if (add.id == id)
|
||||
{
|
||||
add.used_plz = plz;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static int GenerateNewID(int base_id)
|
||||
{
|
||||
//var newid = 100000 + base_id;
|
||||
|
||||
+17
-1
@@ -23,7 +23,7 @@ public class Settings
|
||||
|
||||
public static void Save()
|
||||
{
|
||||
if (!Directory.Exists(Global._instance.config_path))
|
||||
if (!Directory.Exists(Global._instance.config_path) && !File.Exists((Global._instance.config_path)))
|
||||
Directory.CreateDirectory(Global._instance.config_path);
|
||||
// if (!string.IsNullOrEmpty(Global._instance.config_path)) _instance.settingsPath = Global._instance.config_path;
|
||||
|
||||
@@ -67,6 +67,9 @@ public class PdfExportSettings
|
||||
|
||||
public double fontSize { get; set; } = 9;
|
||||
public double smallFontSize { get; set; } = 6;
|
||||
public bool exportRunningSheets { get; set; } = true;
|
||||
public int rsNumGrouped { get; set; } = 25;
|
||||
public int rsPlzStartpoint { get; set; } = 2;
|
||||
}
|
||||
|
||||
public class Global
|
||||
@@ -169,6 +172,19 @@ public class Customer
|
||||
public char separator { get; set; } = ',';
|
||||
public int ID { get; }
|
||||
|
||||
public static Customer GetCustomerByID(int id)
|
||||
{
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
{
|
||||
if (id == customer.ID)
|
||||
{
|
||||
return customer;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
// public static int GetIDByCustomerListItem(string item_content)
|
||||
// {
|
||||
|
||||
+16
-15
@@ -9,25 +9,26 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" Version="11.3.2"/>
|
||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2"/>
|
||||
<PackageReference Include="Avalonia.Desktop" Version="11.3.2"/>
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2"/>
|
||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2"/>
|
||||
<PackageReference Include="Avalonia" Version="11.3.2" />
|
||||
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
|
||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
|
||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
|
||||
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
|
||||
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="ISO3166" Version="1.0.4"/>
|
||||
<PackageReference Include="Lucide.Avalonia" Version="0.1.35"/>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
|
||||
<PackageReference Include="PdfSharp" Version="6.1.1"/>
|
||||
<PackageReference Include="ISO3166" Version="1.0.4" />
|
||||
<PackageReference Include="Lucide.Avalonia" Version="0.1.35" />
|
||||
<PackageReference Include="Markdown.Avalonia" Version="11.0.3" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
|
||||
<PackageReference Include="PdfSharp" Version="6.1.1" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Markdig" Version="0.30.3"/>
|
||||
<PackageReference Include="AvaloniaEdit" Version="0.10.12"/>
|
||||
<PackageReference Include="Markdig" Version="0.30.3" />
|
||||
<PackageReference Include="AvaloniaEdit" Version="0.10.12" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -37,15 +38,15 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<None Remove="assets\icon.ico"/>
|
||||
<None Remove="assets\icon.ico" />
|
||||
<AvaloniaResource Include="assets\icon.ico">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</AvaloniaResource>
|
||||
<None Remove="assets\calc_man.png"/>
|
||||
<None Remove="assets\calc_man.png" />
|
||||
<AvaloniaResource Include="assets\calc_man.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</AvaloniaResource>
|
||||
<None Remove="assets\loading.mp4"/>
|
||||
<None Remove="assets\loading.mp4" />
|
||||
<AvaloniaResource Include="assets\loading.mp4">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</AvaloniaResource>
|
||||
@@ -56,6 +57,6 @@
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
||||
<Folder Include="assets\fonts\"/>
|
||||
<Folder Include="assets\fonts\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
+16
-8
@@ -2,6 +2,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:md="https://github.com/whistyun/Markdown.Avalonia"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
MinWidth="1000" MinHeight="600" IsVisible="False"
|
||||
x:Class="Logof_Client.MainWindow" WindowState="Maximized" Icon="assets/icon.ico"
|
||||
@@ -78,7 +79,7 @@
|
||||
</StackPanel>
|
||||
</MenuItem.Header>
|
||||
</MenuItem>
|
||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetRename_OnClick" IsEnabled="False">
|
||||
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
|
||||
<MenuItem.Header>
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Trash" Width="12" Height="12" Size="12" />
|
||||
@@ -254,6 +255,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 +275,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 +298,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">
|
||||
@@ -361,9 +371,7 @@
|
||||
</StackPanel>
|
||||
|
||||
<Border Grid.Row="1" Margin="8" BorderBrush="#DDD" BorderThickness="1" CornerRadius="4">
|
||||
<ScrollViewer>
|
||||
<StackPanel Name="PreviewPanel" Margin="8" />
|
||||
</ScrollViewer>
|
||||
<md:MarkdownScrollViewer x:Name="MsvWikiView"/>
|
||||
</Border>
|
||||
</Grid>
|
||||
</Grid>
|
||||
@@ -388,7 +396,7 @@
|
||||
<Label Grid.Column="0">config-Datei</Label>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch" TextChanged="Tb_OnTextChanged"
|
||||
Watermark="/home/username/.config/logofclient/" />
|
||||
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
@@ -405,7 +413,7 @@
|
||||
<Label Grid.Column="0">Wiki-Pfad</Label>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
||||
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch" TextChanged="Tb_OnTextChanged"
|
||||
Watermark="/home/username/.config/logofclient/wiki" />
|
||||
<Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
@@ -422,7 +430,7 @@
|
||||
<Label Grid.Column="0">Font-Pfad</Label>
|
||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||
<TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch"
|
||||
<TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch" TextChanged="Tb_OnTextChanged"
|
||||
Watermark="[App-Direcotry]/assets/fonts/" />
|
||||
<Button IsEnabled="True" x:Name="BtnFontPath" HorizontalAlignment="Right">
|
||||
<Button.Content>
|
||||
@@ -485,7 +493,7 @@
|
||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||
x:Name="TbSettingsCustomerSenderAddress" />
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="150,*,Auto">
|
||||
<Grid ColumnDefinitions="150,*,Auto" x:Name="GrdCSVDividerButtonsAndTb">
|
||||
<Label Content="CSV-Trennzeichen" />
|
||||
<TextBox Grid.Column="1" Watermark=","
|
||||
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||
|
||||
+84
-19
@@ -28,6 +28,7 @@ public partial class MainWindow : Window
|
||||
Logger.Log($"Session on {DateTime.Now:G}");
|
||||
Logger.Log("Initializing...");
|
||||
InitializeComponent();
|
||||
SetSettingsCustomerEnabledState(false);
|
||||
//Hide();
|
||||
|
||||
var s = new StartupWindow();
|
||||
@@ -38,6 +39,11 @@ public partial class MainWindow : Window
|
||||
Logger.Log("Loading settings...");
|
||||
Global.Load();
|
||||
Settings.Load();
|
||||
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(Global._instance.config_path))
|
||||
TbConfigPath.Text = PathUtilities.NormalizeFileSystemPath(Global._instance.config_path);
|
||||
|
||||
LoadPdfExportOptions();
|
||||
HookPdfExportOptionEvents();
|
||||
|
||||
@@ -132,6 +138,8 @@ public partial class MainWindow : Window
|
||||
|
||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
Settings.Save();
|
||||
Global.Save();
|
||||
Environment.Exit(0);
|
||||
}
|
||||
|
||||
@@ -212,23 +220,29 @@ public partial class MainWindow : Window
|
||||
|
||||
|
||||
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)
|
||||
{
|
||||
_selectedWikiFilePath = item.Path;
|
||||
var text = await _wikiService.LoadFileContentAsync(item.Path);
|
||||
try
|
||||
{
|
||||
PreviewPanel.Children.Clear();
|
||||
var rendered = MarkdownRenderer.Render(text ?? string.Empty);
|
||||
PreviewPanel.Children.Add(rendered);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while rendering markdown: {ex.Message}", Logger.LogType.Error);
|
||||
PreviewPanel.Children.Clear();
|
||||
PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
|
||||
}
|
||||
MsvWikiView.Markdown = text;
|
||||
// try
|
||||
// {
|
||||
// PreviewPanel.Children.Clear();
|
||||
// var rendered = MarkdownRenderer.Render(text ?? string.Empty);
|
||||
// PreviewPanel.Children.Add(rendered);
|
||||
// }
|
||||
// catch (Exception ex)
|
||||
// {
|
||||
// Logger.Log($"Error while rendering markdown: {ex.Message}", Logger.LogType.Error);
|
||||
// PreviewPanel.Children.Clear();
|
||||
// PreviewPanel.Children.Add(new TextBlock { Text = text ?? string.Empty });
|
||||
// }
|
||||
|
||||
EditButton.IsEnabled = true;
|
||||
}
|
||||
@@ -255,6 +269,8 @@ public partial class MainWindow : Window
|
||||
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
||||
selectedNode != null)
|
||||
NavTree.SelectedItem = selectedNode;
|
||||
|
||||
ReloadWikiItem();
|
||||
}catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
|
||||
@@ -444,6 +460,7 @@ public partial class MainWindow : Window
|
||||
TbSettingsCustomerDescription.Text = "";
|
||||
TbSettingsCustomerName.Text = "";
|
||||
TbSettingsCustomerPatchInfo.Text = "";
|
||||
TbSettingsCustomerName.Focus();
|
||||
|
||||
Settings.Save();
|
||||
RefreshCustomerItems();
|
||||
@@ -469,6 +486,7 @@ public partial class MainWindow : Window
|
||||
|
||||
private void LstSettingsCustomers_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
SetSettingsCustomerEnabledState(false);
|
||||
if (LstSettingsCustomers.SelectedIndex < 0) return;
|
||||
Settings._instance.customers.current =
|
||||
((Customer)LstSettingsCustomers.SelectedItems[0]);
|
||||
@@ -483,9 +501,19 @@ public partial class MainWindow : Window
|
||||
TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
|
||||
else
|
||||
TbSettingsCustomerPatchInfo.Text = "";
|
||||
SetSettingsCustomerEnabledState();
|
||||
//}
|
||||
}
|
||||
|
||||
private void SetSettingsCustomerEnabledState(bool enable = true)
|
||||
{
|
||||
List<Object> nboom = new() { BtnSettingsImportCustomerAddressPatch, GrdCSVDividerButtonsAndTb, TbSettingsCustomerDescription, TbSettingsCustomerName, BtnDeleteCustomer, TbSettingsCustomerSenderAddress};
|
||||
foreach (var obj in nboom)
|
||||
{
|
||||
(obj as Control).IsEnabled = enable;
|
||||
}
|
||||
}
|
||||
|
||||
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(_selectedWikiFilePath))
|
||||
@@ -494,7 +522,13 @@ public partial class MainWindow : Window
|
||||
return;
|
||||
}
|
||||
|
||||
var editedWikiFilePath = _selectedWikiFilePath;
|
||||
EditorWindow ew = new(_selectedWikiFilePath);
|
||||
ew.Closed += (_, _) =>
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(editedWikiFilePath) && File.Exists(editedWikiFilePath))
|
||||
PopulateNavTree(editedWikiFilePath, editedWikiFilePath);
|
||||
};
|
||||
ew.Show();
|
||||
|
||||
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
||||
@@ -739,8 +773,9 @@ 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 (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while combining (difference): {ex.Message}", Logger.LogType.Error);
|
||||
}
|
||||
@@ -769,7 +804,7 @@ 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)
|
||||
{
|
||||
@@ -796,7 +831,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)
|
||||
@@ -828,13 +863,13 @@ public partial class MainWindow : Window
|
||||
|
||||
var filePath = await saveDialog.ShowAsync(this);
|
||||
|
||||
Console.WriteLine($"RAW: {filePath}");
|
||||
Logger.Log($"RAW: {filePath}");
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(filePath))
|
||||
{
|
||||
filePath = PathUtilities.NormalizeFileSystemPath(filePath);
|
||||
|
||||
Console.WriteLine($"PATH: {filePath}");
|
||||
Logger.Log($"PATH: {filePath}");
|
||||
|
||||
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
||||
|
||||
@@ -844,7 +879,7 @@ public partial class MainWindow : Window
|
||||
filePath
|
||||
);
|
||||
|
||||
Console.WriteLine("PDF OK");
|
||||
Logger.Log("PDF OK");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1237,4 +1272,34 @@ public partial class MainWindow : Window
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
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);
|
||||
}}
|
||||
}
|
||||
|
||||
private void Tb_OnTextChanged(object? sender, TextChangedEventArgs e)
|
||||
{
|
||||
Global.Save();
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
||||
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen"
|
||||
x:Class="Logof_Client.MessageBox" Icon="assets/icon.ico"
|
||||
Title="MessageBox">
|
||||
<StackPanel>
|
||||
|
||||
+178
-163
@@ -43,166 +43,163 @@ 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 = "";
|
||||
var address_line_count = 0;
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
{
|
||||
// find the address
|
||||
KasPerson? address = null;
|
||||
var string_address = "";
|
||||
var address_line_count = 0;
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
{
|
||||
var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
|
||||
if (temp != null)
|
||||
{
|
||||
address = temp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// no address found
|
||||
if (address == null) return null;
|
||||
|
||||
// let's get started: we start from the bottom
|
||||
// if the country is not Germany, set it; try to map via Global countries alternatives -> translation
|
||||
var trimmedLand = (address.land ?? "").Trim();
|
||||
var trimmedLowerLand = trimmedLand.ToLower();
|
||||
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
|
||||
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
|
||||
trimmedLowerLand == "deutschland";
|
||||
|
||||
if (!isGermany)
|
||||
{
|
||||
var countryToShow = trimmedLand; // default: use raw land value
|
||||
|
||||
if (!string.IsNullOrEmpty(trimmedLand))
|
||||
// search for matching country via alternatives using for-loops
|
||||
for (var ci = 0; ci < Global._instance.countries.Count; ci++)
|
||||
{
|
||||
var country = Global._instance.countries[ci];
|
||||
for (var ai = 0; ai < country.alternatives.Count; ai++)
|
||||
try
|
||||
{
|
||||
var alt = (country.alternatives[ai] ?? "").Trim();
|
||||
if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
countryToShow = string.IsNullOrWhiteSpace(country.translation)
|
||||
? country.name
|
||||
: country.translation;
|
||||
goto CountryFound;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignore malformed alternative
|
||||
}
|
||||
}
|
||||
|
||||
CountryFound:
|
||||
string_address = "**" + countryToShow + "**"; // Needs to be bold
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
// Alternative A: pplz valid and city existing
|
||||
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
||||
{
|
||||
string_address = address.pplz + " " + address.ort + "\n" + string_address;
|
||||
address_line_count++;
|
||||
if (!string.IsNullOrWhiteSpace(address.postfach))
|
||||
{
|
||||
string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
|
||||
{
|
||||
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||
address.adel, address.name, address.namezus);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(nameline))
|
||||
{
|
||||
string_address = nameline + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
// REIHENFOLGE
|
||||
var nameattribs = new[]
|
||||
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
|
||||
|
||||
var names = "";
|
||||
for (var i = 0; i < nameattribs.Length; i++)
|
||||
try
|
||||
{
|
||||
if (address_line_count >= 7) break;
|
||||
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
||||
{
|
||||
names += "\n" + nameattribs[i];
|
||||
address_line_count++;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("ERROR 15821");
|
||||
}
|
||||
|
||||
string_address = names + "\n" + string_address;
|
||||
} // Alternative B: plz valid and city existing
|
||||
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
||||
{
|
||||
string_address = address.plz + " " + address.ort + "\n" + string_address;
|
||||
address_line_count++;
|
||||
if (!string.IsNullOrWhiteSpace(address.strasse))
|
||||
{
|
||||
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
|
||||
{
|
||||
string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||
address.adel, address.name, address.namezus);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(nameline))
|
||||
{
|
||||
string_address = nameline + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameattribs = new[]
|
||||
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
|
||||
|
||||
var names = "";
|
||||
for (var i = 0; i < nameattribs.Length; i++)
|
||||
try
|
||||
{
|
||||
if (address_line_count >= 7) break;
|
||||
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
||||
{
|
||||
names += "\n" + nameattribs[i];
|
||||
address_line_count++;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("ERROR 15821");
|
||||
}
|
||||
|
||||
string_address = names + "\n" + string_address;
|
||||
} // Error-Handling?
|
||||
|
||||
if (address_line_count > 1) return string_address;
|
||||
return null;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Logger.Log($"Error while creating markdown string: {ex.Message}", Logger.LogType.Error);
|
||||
var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
|
||||
if (temp != null)
|
||||
{
|
||||
address = temp;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// no address found
|
||||
if (address == null) return null;
|
||||
|
||||
// let's get started: we start from the bottom
|
||||
// if the country is not Germany, set it; try to map via Global countries alternatives -> translation
|
||||
var trimmedLand = (address.land ?? "").Trim();
|
||||
|
||||
if (!address.IsGermany())
|
||||
{
|
||||
var countryToShow = trimmedLand; // default: use raw land value
|
||||
|
||||
if (!string.IsNullOrEmpty(trimmedLand))
|
||||
// search for matching country via alternatives using for-loops
|
||||
for (var ci = 0; ci < Global._instance.countries.Count; ci++)
|
||||
{
|
||||
var country = Global._instance.countries[ci];
|
||||
for (var ai = 0; ai < country.alternatives.Count; ai++)
|
||||
try
|
||||
{
|
||||
var alt = (country.alternatives[ai] ?? "").Trim();
|
||||
if (string.Equals(alt, trimmedLand, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
countryToShow = string.IsNullOrWhiteSpace(country.translation)
|
||||
? country.name
|
||||
: country.translation;
|
||||
goto CountryFound;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// ignore malformed alternative
|
||||
}
|
||||
}
|
||||
|
||||
CountryFound:
|
||||
string_address = "**" + countryToShow + "**"; // Needs to be bold
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
// Alternative A: pplz valid and city existing
|
||||
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
||||
{
|
||||
string pplz = address.pplz;
|
||||
if (address.IsGermany()) pplz = NormalizeGermanPLZ(address.pplz);
|
||||
|
||||
KasPerson.SetUsedPLZ(id, pplz);
|
||||
string_address = pplz + " " + address.ort + "\n" + string_address;
|
||||
address_line_count++;
|
||||
if (!string.IsNullOrWhiteSpace(address.postfach))
|
||||
{
|
||||
string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(address.strasse.Trim()))
|
||||
{
|
||||
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||
address.adel, address.name, address.namezus);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(nameline))
|
||||
{
|
||||
string_address = nameline + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
// REIHENFOLGE
|
||||
var nameattribs = new[]
|
||||
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
|
||||
|
||||
var names = "";
|
||||
for (var i = 0; i < nameattribs.Length; i++)
|
||||
try
|
||||
{
|
||||
if (address_line_count >= 7) break;
|
||||
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
||||
{
|
||||
names += "\n" + nameattribs[i];
|
||||
address_line_count++;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("ERROR 15821");
|
||||
}
|
||||
|
||||
string_address = names + "\n" + string_address;
|
||||
} // Alternative B: plz valid and city existing
|
||||
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
||||
{
|
||||
string plz = address.plz;
|
||||
if (address.IsGermany()) plz = NormalizeGermanPLZ(address.plz);
|
||||
|
||||
|
||||
KasPerson.SetUsedPLZ(id, plz);
|
||||
string_address = plz + " " + address.ort + "\n" + string_address;
|
||||
address_line_count++;
|
||||
if (!string.IsNullOrWhiteSpace(address.strasse))
|
||||
{
|
||||
string_address = address.strasse.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
else if (!string.IsNullOrWhiteSpace(address.postfach.Trim()))
|
||||
{
|
||||
string_address = "Postfach " + address.postfach.Trim() + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameline = CreateNameLine(address.anredzus, address.anrede, address.titel, address.vorname,
|
||||
address.adel, address.name, address.namezus);
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(nameline))
|
||||
{
|
||||
string_address = nameline + "\n" + string_address;
|
||||
address_line_count++;
|
||||
}
|
||||
|
||||
var nameattribs = new[]
|
||||
{ address.name1, address.name2, address.name3, address.name4, address.name5, address.abteilung };
|
||||
|
||||
var names = "";
|
||||
for (var i = 0; i < nameattribs.Length; i++)
|
||||
try
|
||||
{
|
||||
if (address_line_count >= 7) break;
|
||||
if (!string.IsNullOrWhiteSpace(nameattribs[i]))
|
||||
{
|
||||
names += "\n" + nameattribs[i];
|
||||
address_line_count++;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("ERROR 15821");
|
||||
}
|
||||
|
||||
string_address = names + "\n" + string_address;
|
||||
} // Error-Handling?
|
||||
|
||||
if (address_line_count > 1) return string_address;
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -212,11 +209,11 @@ public static class AddressCreator
|
||||
try
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(anredezus))
|
||||
return string.Join(" ",
|
||||
new[] { anredezus, titel, vorname, adel, name }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))
|
||||
)
|
||||
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||
return string.Join(" ",
|
||||
new[] { anredezus, titel, vorname, adel, name }
|
||||
.Where(s => !string.IsNullOrWhiteSpace(s))
|
||||
)
|
||||
+ (string.IsNullOrWhiteSpace(namezus) ? "" : $" ({namezus.Trim()})");
|
||||
|
||||
// else
|
||||
return string.Join(" ",
|
||||
@@ -231,7 +228,6 @@ public static class AddressCreator
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -277,4 +273,23 @@ public static class AddressCreator
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
public static string NormalizeGermanPLZ(string plz)
|
||||
{
|
||||
if(plz.Length == 5) return plz;
|
||||
if(plz.Length > 5)
|
||||
{
|
||||
return plz.Substring(0, 5);
|
||||
}
|
||||
|
||||
if (plz.Length < 5)
|
||||
{
|
||||
int toadd = 5 - plz.Length;
|
||||
for (int i = 0; i < toadd; i++)
|
||||
{
|
||||
plz = "0" + plz;
|
||||
}
|
||||
}
|
||||
return plz;
|
||||
}
|
||||
}
|
||||
@@ -134,6 +134,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);
|
||||
}
|
||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -480,4 +491,267 @@ 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)
|
||||
{
|
||||
string international_path = path;
|
||||
if (path.EndsWith(".pdf"))
|
||||
{
|
||||
path = path.Substring(0, path.Length - 4);
|
||||
international_path = path;
|
||||
path = path + "-Laufzettel.pdf";
|
||||
international_path = international_path + "-Laufzettel-International.pdf";
|
||||
}
|
||||
else
|
||||
{
|
||||
path = path + "-Laufzettel.pdf";
|
||||
international_path = international_path + "-Laufzettel-International.pdf";
|
||||
}
|
||||
|
||||
CreateGermanyRunningSheets(setID, path);
|
||||
CreateInternationalRunningSheets(setID, international_path);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void CreateGermanyRunningSheets(int setID, string path)
|
||||
{
|
||||
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||
var document = new PdfDocument();
|
||||
document.Info.Title = $"Laufzettel für {list.Name}";
|
||||
document.Info.Subject = "powered by logofclient";
|
||||
document.Info.Author = "logofclient";
|
||||
|
||||
int margin = 50;
|
||||
|
||||
var grouped_nums = GroupAddresses(setID);
|
||||
|
||||
foreach (var result in grouped_nums)
|
||||
{
|
||||
var page = document.AddPage();
|
||||
page.Size = PageSize.A4;
|
||||
|
||||
var gfx = XGraphics.FromPdfPage(page);
|
||||
|
||||
var width = page.Width.Point-margin;
|
||||
var height = page.Height.Point-margin;
|
||||
gfx.DrawLine(XPens.Black, margin, margin, margin, height);
|
||||
gfx.DrawLine(XPens.Black, margin, margin, width, margin);
|
||||
gfx.DrawLine(XPens.Black, width, margin, width, height);
|
||||
gfx.DrawLine(XPens.Black, margin, height, width, height);
|
||||
|
||||
var boldfont = new XFont("Cantarell", 11, XFontStyleEx.Bold);
|
||||
var font = new XFont("Cantarell", 11, XFontStyleEx.Regular);
|
||||
var bigboldfont = new XFont("Cantarell", 35, XFontStyleEx.Bold);
|
||||
|
||||
// Versandinfo
|
||||
gfx.DrawString($"Versand {list.Name}", boldfont, XBrushes.Black,
|
||||
new XRect(margin+5, margin, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Start: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item3}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Ende: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item4}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Kunde: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).name}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Absender: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).sender_address}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Anzahl: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item5}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||
|
||||
// logofclient ad
|
||||
gfx.DrawString($"powered by logofclient", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"(c) 2026 MyPapertown", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"mypapercloud.de/logof", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
|
||||
|
||||
int total_frac = 0;
|
||||
foreach (var item in grouped_nums)
|
||||
{
|
||||
if (item.Item2 == result.Item2) total_frac++;
|
||||
}
|
||||
|
||||
// group number
|
||||
gfx.DrawString($"{result.Item2}", bigboldfont, XBrushes.Black,
|
||||
new XRect(margin, margin, width-margin, (height-margin)/2), XStringFormats.Center);
|
||||
gfx.DrawString($"Fraktion {result.Item1}/{total_frac}", font, XBrushes.Black,
|
||||
new XRect(margin, margin, width-margin, (height-margin)/2 + 50), XStringFormats.Center);
|
||||
}
|
||||
|
||||
document.Save(path);
|
||||
}
|
||||
|
||||
public void CreateInternationalRunningSheets(int setID, string path)
|
||||
{
|
||||
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||
var document = new PdfDocument();
|
||||
document.Info.Title = $"Laufzettel für {list.Name}";
|
||||
document.Info.Subject = "powered by logofclient";
|
||||
document.Info.Author = "logofclient";
|
||||
|
||||
int margin = 50;
|
||||
|
||||
var grouped_nums = GroupAddressesInternational(setID);
|
||||
|
||||
foreach (var result in grouped_nums)
|
||||
{
|
||||
var page = document.AddPage();
|
||||
page.Size = PageSize.A4;
|
||||
|
||||
var gfx = XGraphics.FromPdfPage(page);
|
||||
|
||||
var width = page.Width.Point-margin;
|
||||
var height = page.Height.Point-margin;
|
||||
gfx.DrawLine(XPens.Black, margin, margin, margin, height);
|
||||
gfx.DrawLine(XPens.Black, margin, margin, width, margin);
|
||||
gfx.DrawLine(XPens.Black, width, margin, width, height);
|
||||
gfx.DrawLine(XPens.Black, margin, height, width, height);
|
||||
|
||||
var boldfont = new XFont("Cantarell", 11, XFontStyleEx.Bold);
|
||||
var font = new XFont("Cantarell", 11, XFontStyleEx.Regular);
|
||||
var bigboldfont = new XFont("Cantarell", 35, XFontStyleEx.Bold);
|
||||
|
||||
// Versandinfo
|
||||
gfx.DrawString($"Versand {list.Name}", boldfont, XBrushes.Black,
|
||||
new XRect(margin+5, margin, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Start: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item3}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Ende: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item4}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Kunde: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).name}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Absender: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{Customer.GetCustomerByID(list.owner_id).sender_address}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+70, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"Anzahl: ", font, XBrushes.Black,
|
||||
new XRect(margin+5, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"{result.Item5}", font, XBrushes.Black,
|
||||
new XRect(margin+75, margin+85, width-margin, 25), XStringFormats.CenterLeft);
|
||||
|
||||
// logofclient ad
|
||||
gfx.DrawString($"powered by logofclient", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-55, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"(c) 2026 MyPapertown", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-40, width-margin, 25), XStringFormats.CenterLeft);
|
||||
gfx.DrawString($"mypapercloud.de/logof", font, XBrushes.Black,
|
||||
new XRect(margin+5, height-25, width-margin, 25), XStringFormats.CenterLeft);
|
||||
|
||||
|
||||
int total_frac = 0;
|
||||
foreach (var item in grouped_nums)
|
||||
{
|
||||
if (item.Item2 == result.Item2) total_frac++;
|
||||
}
|
||||
|
||||
// group number
|
||||
gfx.DrawString($"{result.Item2}", bigboldfont, XBrushes.Black,
|
||||
new XRect(margin, margin, width-margin, (height-margin)/2), XStringFormats.Center);
|
||||
gfx.DrawString($"Fraktion {result.Item1}/{total_frac}", font, XBrushes.Black,
|
||||
new XRect(margin, margin, width-margin, (height-margin)/2 + 50), XStringFormats.Center);
|
||||
}
|
||||
|
||||
if (document.PageCount > 0)
|
||||
{
|
||||
document.Save(path);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Calculates address groups to summarize for the single pages of the running sheets.
|
||||
/// </summary>
|
||||
/// <param name="setID"></param>
|
||||
/// <returns>List of quadruples consisting of a number and the starting of the plz, as well as first, last plz and total amount of addresses</returns>
|
||||
public List<(int, string, string, string, int)> GroupAddresses(int setID)
|
||||
{
|
||||
int grpcount = Settings._instance.pdfExport.rsNumGrouped; // Amount of addresses per group
|
||||
int stpoint = Settings._instance.pdfExport.rsPlzStartpoint; // group starting point (first n characters of the plz)
|
||||
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||
if (list == null)
|
||||
throw new Exception("AddressSet nicht gefunden");
|
||||
|
||||
List<(int, string, string, string, int)> output = new();
|
||||
|
||||
List<IGrouping<string, KasPerson>> sorted_list = list.KasPersons
|
||||
.Where(x => !string.IsNullOrEmpty(x?.used_plz) &&
|
||||
x.used_plz.Length >= stpoint && x.IsGermany())
|
||||
.OrderBy(x => x.used_plz)
|
||||
.GroupBy(x => x.used_plz.Substring(0, stpoint))
|
||||
.ToList();
|
||||
|
||||
foreach (var group in sorted_list)
|
||||
{
|
||||
string start = group.Key;
|
||||
int fraktion = 0;
|
||||
|
||||
for (int count = 0; count < group.Count(); count += grpcount)
|
||||
{
|
||||
fraktion++;
|
||||
|
||||
int currentGroupSize = Math.Min(grpcount, group.Count() - count);
|
||||
|
||||
string first = group.ElementAt(count).used_plz;
|
||||
string last = group.ElementAt(count + currentGroupSize - 1).used_plz;
|
||||
|
||||
output.Add((fraktion, start, first, last, currentGroupSize));
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
public List<(int, string, string, string, int)> GroupAddressesInternational(int setID)
|
||||
{
|
||||
int grpcount = Settings._instance.pdfExport.rsNumGrouped; // Amount of addresses per group
|
||||
KasAddressList list = Settings._instance.addressSets.GetAddressSetByID(setID);
|
||||
if (list == null)
|
||||
throw new Exception("AddressSet nicht gefunden");
|
||||
|
||||
List<(int, string, string, string, int)> output = new();
|
||||
|
||||
List<IGrouping<string, KasPerson>> sorted_list = list.KasPersons
|
||||
.Where(x => !string.IsNullOrEmpty(x?.used_plz) && !x.IsGermany())
|
||||
.OrderBy(x => x.used_plz)
|
||||
.GroupBy(x => x.land)
|
||||
.ToList();
|
||||
|
||||
foreach (var group in sorted_list)
|
||||
{
|
||||
string start = group.Key;
|
||||
int fraktion = 0;
|
||||
|
||||
for (int count = 0; count < group.Count(); count += grpcount)
|
||||
{
|
||||
fraktion++;
|
||||
|
||||
int currentGroupSize = Math.Min(grpcount, group.Count() - count);
|
||||
|
||||
string first = group.ElementAt(count).used_plz;
|
||||
string last = group.ElementAt(count + currentGroupSize - 1).used_plz;
|
||||
|
||||
output.Add((fraktion, start, first, last, currentGroupSize));
|
||||
}
|
||||
}
|
||||
|
||||
return output;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ public partial class EditorWindow : Window
|
||||
try
|
||||
{
|
||||
File.WriteAllText(filename, TbContent.Text);
|
||||
MainWindow._instance.PopulateNavTree();
|
||||
MainWindow._instance.PopulateNavTree(filename, filename);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
+126
-126
@@ -11,130 +11,130 @@ namespace Logof_Client.Wiki;
|
||||
|
||||
public static class MarkdownRenderer
|
||||
{
|
||||
public static Control Render(string markdown)
|
||||
{
|
||||
try
|
||||
{
|
||||
var panel = new StackPanel { Spacing = 6 };
|
||||
if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||
|
||||
var doc = Markdown.Parse(markdown);
|
||||
|
||||
foreach (var block in doc)
|
||||
{
|
||||
switch (block)
|
||||
{
|
||||
case HeadingBlock hb:
|
||||
{
|
||||
var text = GetInlineText(hb.Inline);
|
||||
var tb = new TextBlock
|
||||
{
|
||||
Text = text,
|
||||
FontWeight = FontWeight.Bold,
|
||||
Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
||||
};
|
||||
tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
||||
panel.Children.Add(tb);
|
||||
break;
|
||||
}
|
||||
|
||||
case ParagraphBlock pb:
|
||||
{
|
||||
var text = GetInlineText(pb.Inline);
|
||||
var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
||||
panel.Children.Add(tb);
|
||||
break;
|
||||
}
|
||||
|
||||
case FencedCodeBlock cb:
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
foreach (var line in cb.Lines.Lines)
|
||||
{
|
||||
sb.Append(line.ToString());
|
||||
}
|
||||
var codeBox = new TextBox
|
||||
{
|
||||
Text = sb.ToString(),
|
||||
FontFamily = "Consolas, monospace",
|
||||
IsReadOnly = true,
|
||||
AcceptsReturn = true
|
||||
};
|
||||
panel.Children.Add(codeBox);
|
||||
break;
|
||||
}
|
||||
|
||||
case ListBlock lb:
|
||||
{
|
||||
var sp = new StackPanel { Spacing = 2 };
|
||||
var number = 1;
|
||||
foreach (var item in lb)
|
||||
{
|
||||
if (item is ListItemBlock lib)
|
||||
{
|
||||
var itemText = new StringBuilder();
|
||||
foreach (var sub in lib)
|
||||
{
|
||||
if (sub is ParagraphBlock pp)
|
||||
itemText.Append(GetInlineText(pp.Inline));
|
||||
}
|
||||
var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
||||
sp.Children.Add(tb);
|
||||
}
|
||||
}
|
||||
panel.Children.Add(sp);
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
{
|
||||
// fallback: raw text
|
||||
panel.Children.Add(new TextBlock { Text = block.ToString() });
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return panel;
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
return new Panel();
|
||||
}
|
||||
|
||||
private static string GetInlineText(ContainerInline? container)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (container == null) return string.Empty;
|
||||
var sb = new StringBuilder();
|
||||
foreach (var inline in container)
|
||||
{
|
||||
switch (inline)
|
||||
{
|
||||
case LiteralInline li:
|
||||
sb.Append(li.Content.ToString());
|
||||
break;
|
||||
case EmphasisInline ei:
|
||||
sb.Append(GetInlineText(ei));
|
||||
break;
|
||||
case CodeInline ci:
|
||||
sb.Append(ci.Content);
|
||||
break;
|
||||
case LinkInline li:
|
||||
sb.Append(GetInlineText(li));
|
||||
break;
|
||||
case LineBreakInline:
|
||||
sb.Append("\n");
|
||||
break;
|
||||
default:
|
||||
sb.Append(inline.ToString());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
} catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
|
||||
return null;
|
||||
}
|
||||
// public static Control Render(string markdown)
|
||||
// {
|
||||
// try
|
||||
// {
|
||||
// var panel = new StackPanel { Spacing = 6 };
|
||||
// if (string.IsNullOrWhiteSpace(markdown)) return panel;
|
||||
//
|
||||
// var doc = Markdown.Parse(markdown);
|
||||
//
|
||||
// foreach (var block in doc)
|
||||
// {
|
||||
// switch (block)
|
||||
// {
|
||||
// case HeadingBlock hb:
|
||||
// {
|
||||
// var text = GetInlineText(hb.Inline);
|
||||
// var tb = new TextBlock
|
||||
// {
|
||||
// Text = text,
|
||||
// FontWeight = FontWeight.Bold,
|
||||
// Margin = new Avalonia.Thickness(0, hb.Level == 1 ? 6 : 2, 0, 2)
|
||||
// };
|
||||
// tb.FontSize = hb.Level switch { 1 => 22, 2 => 18, 3 => 16, _ => 14 };
|
||||
// panel.Children.Add(tb);
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// case ParagraphBlock pb:
|
||||
// {
|
||||
// var text = GetInlineText(pb.Inline);
|
||||
// var tb = new TextBlock { Text = text, TextWrapping = Avalonia.Media.TextWrapping.Wrap };
|
||||
// panel.Children.Add(tb);
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// case FencedCodeBlock cb:
|
||||
// {
|
||||
// var sb = new StringBuilder();
|
||||
// foreach (var line in cb.Lines.Lines)
|
||||
// {
|
||||
// sb.Append(line.ToString());
|
||||
// }
|
||||
// var codeBox = new TextBox
|
||||
// {
|
||||
// Text = sb.ToString(),
|
||||
// FontFamily = "Consolas, monospace",
|
||||
// IsReadOnly = true,
|
||||
// AcceptsReturn = true
|
||||
// };
|
||||
// panel.Children.Add(codeBox);
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// case ListBlock lb:
|
||||
// {
|
||||
// var sp = new StackPanel { Spacing = 2 };
|
||||
// var number = 1;
|
||||
// foreach (var item in lb)
|
||||
// {
|
||||
// if (item is ListItemBlock lib)
|
||||
// {
|
||||
// var itemText = new StringBuilder();
|
||||
// foreach (var sub in lib)
|
||||
// {
|
||||
// if (sub is ParagraphBlock pp)
|
||||
// itemText.Append(GetInlineText(pp.Inline));
|
||||
// }
|
||||
// var tb = new TextBlock { Text = (lb.IsOrdered ? (number++ + ". ") : "• ") + itemText.ToString() };
|
||||
// sp.Children.Add(tb);
|
||||
// }
|
||||
// }
|
||||
// panel.Children.Add(sp);
|
||||
// break;
|
||||
// }
|
||||
//
|
||||
// default:
|
||||
// {
|
||||
// // fallback: raw text
|
||||
// panel.Children.Add(new TextBlock { Text = block.ToString() });
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return panel;
|
||||
// } catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
//
|
||||
// return new Panel();
|
||||
// }
|
||||
//
|
||||
// private static string GetInlineText(ContainerInline? container)
|
||||
// {
|
||||
// try
|
||||
// {
|
||||
// if (container == null) return string.Empty;
|
||||
// var sb = new StringBuilder();
|
||||
// foreach (var inline in container)
|
||||
// {
|
||||
// switch (inline)
|
||||
// {
|
||||
// case LiteralInline li:
|
||||
// sb.Append(li.Content.ToString());
|
||||
// break;
|
||||
// case EmphasisInline ei:
|
||||
// sb.Append(GetInlineText(ei));
|
||||
// break;
|
||||
// case CodeInline ci:
|
||||
// sb.Append(ci.Content);
|
||||
// break;
|
||||
// case LinkInline li:
|
||||
// sb.Append(GetInlineText(li));
|
||||
// break;
|
||||
// case LineBreakInline:
|
||||
// sb.Append("\n");
|
||||
// break;
|
||||
// default:
|
||||
// sb.Append(inline.ToString());
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// return sb.ToString();
|
||||
// } catch (Exception ex) { Logger.Log($"Error while : {ex.Message}",Logger.LogType.Error);}
|
||||
//
|
||||
// return null;
|
||||
// }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user