18 Commits
Author SHA1 Message Date
fierke 8ea3ed1e8c [feat:] logging unsuable addresses 2026-09-26 18:47:07 +02:00
fierke 8745286860 [fix:] pallet number DividedByZero Exception fixed 2026-09-24 17:15:35 +02:00
fierke 321d22eb60 [fix:] enabling/disabling running sheet wasn't stored either lol 2026-09-24 17:02:23 +02:00
fierke e8c159831e [fix:] rsNumGrouped was not stored 👀 2026-09-24 16:50:08 +02:00
fierke 1d54bd749a [feat:] dashboard 2026-09-23 18:14:50 +02:00
fierke cbda6d6563 [fix:] label pdf is not sorted by used_plz 2026-09-23 17:30:09 +02:00
fierke 6ed8c0e231 [fix:] default module config was wrong 2026-09-19 20:15:56 +02:00
fierke 59ea707007 [feat:] module enabling (default: none) 2026-09-19 12:58:29 +02:00
fierke 0cce15a8f6 [chore:] implementation for schema version 4 (adds module config) 2026-09-19 11:25:04 +02:00
fierke 5f200fbeef [chore:] Schema version 4 2026-09-19 11:24:40 +02:00
fierke d4f6b5beb9 Merge pull request 'Data editing' (#77) from data-editing into main
Reviewed-on: #77
2026-08-24 10:57:41 +00:00
fierke 7119e515e2 Merge branch 'main' into data-editing 2026-08-24 10:57:30 +00:00
fierke 7ad0612170 [feat:] integration of PreviewWindow for full sets 2026-08-24 12:56:58 +02:00
fierke 9aa467d9f0 [feat:] PreviewWindow finalized (first version) 2026-08-24 12:56:25 +02:00
fierke 522970f341 [feat:] PreviewWindow usage 2026-08-14 14:55:11 +02:00
fierke 74208a4f04 [chore:] PreviewWindow integration 2026-08-14 14:54:55 +02:00
fierke 9cd6500da9 [init:] editable PreviewWindow (saving untested...) 2026-08-14 14:54:43 +02:00
fierke c223ca222d [chore:] SelectionMode and Name of Result ListBox 2026-08-14 14:54:18 +02:00
11 changed files with 645 additions and 76 deletions
+6 -5
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
namespace Logof_Client;
@@ -12,7 +13,7 @@ namespace Logof_Client;
public static class SchemaMigration
{
// Current schema version - increment when you make breaking changes
public const int CURRENT_SCHEMA_VERSION = 3;
public const int CURRENT_SCHEMA_VERSION = 4;
// Dictionary of migration functions, keyed by the version they migrate TO
private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new()
@@ -22,7 +23,7 @@ public static class SchemaMigration
// { 2, MigrateV1ToV2 },
// Example: Migration from v2 to v3
// { 3, MigrateV2ToV3 },
{ 4, MigrateV3ToV4 },
};
/// <summary>
@@ -93,12 +94,12 @@ public static class SchemaMigration
/// Example migration function: from v2 to v3.
/// Add a new required field with a default value.
/// </summary>
private static JObject MigrateV2ToV3(JObject obj)
private static JObject MigrateV3ToV4(JObject obj)
{
// Example: Add a new field that didn't exist before
if (!obj.ContainsKey("new_required_field"))
if (!obj.ContainsKey("moduleConfig"))
{
obj["new_required_field"] = "default_value";
obj["moduleConfig"] = JToken.FromObject(new ModuleConfig());
}
return obj;
+26
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Reflection;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
@@ -19,6 +20,8 @@ public class Settings
public Customers customers = new();
public PdfExportSettings pdfExport { get; set; } = new();
public ModuleConfig moduleConfig { get; set; } = new ModuleConfig();
public Settings()
{
_instance = this;
@@ -70,6 +73,29 @@ public class Settings
}
}
public class ModuleConfig
{
/// <summary>
/// Contains enabled modules and whether it's password-protected or not (non-existing-feature but soon)
/// </summary>
public List<(LCModule, bool)> EnabledModules = new();
public ModuleConfig()
{
EnabledModules = new List<(LCModule,bool)>();
}
}
public enum LCModule
{
Addressmanagement,
Pricemanagement,
Wiki,
Staffmanagement,
UnifiedEndpointManagement,
Financemanagement
}
public class PdfExportSettings
{
public double cellPaddingTopMm { get; set; } = 4;
+7
View File
@@ -71,4 +71,11 @@
<Folder Include="assets\fonts\" />
</ItemGroup>
<ItemGroup>
<Compile Update="PreviewWindow.axaml.cs">
<DependentUpon>PreviewWindow.axaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
</ItemGroup>
</Project>
+70 -6
View File
@@ -21,8 +21,45 @@
<MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick" />
</MenuItem>
</Menu>
<TabControl Grid.Row="1">
<TabItem>
<TabControl Grid.Row="1" x:Name="TcMain">
<TabItem x:Name="Home">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="House" Width="32" Height="32" Size="32" />
<!-- <Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" /> -->
</StackPanel>
</TabItem.Header>
<Grid RowDefinitions="3*,*,100">
<StackPanel Orientation="Vertical" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" > <!-- ColumnDefinitions="*,*" -->
<Label Content="Welcome to Logofclient!" HorizontalAlignment="Center" FontSize="32" ></Label>
<Label Content="Version 1.0.1" FontSize="16" HorizontalAlignment="Center"></Label>
<!-- <Image Source="assets/calc_man.png" MaxHeight="350" VerticalAlignment="Center" HorizontalAlignment="Center" /> -->
</StackPanel>
<Grid Grid.Row="1" Margin="20" IsVisible="True" x:Name="GrdHMCalcMan">
<Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Grid>
<!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
<StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
Margin="0,0,5,0">
<Button Width="250" HorizontalContentAlignment="Center"
Margin="0,0,0,10" IsEnabled="True" VerticalAlignment="Stretch"
x:Name="BtnAdmgmt" Click="BtnAdmgmt_OnClick">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="MapPinHouse" Width="36" Height="36" />
<Label Content="Addressverwaltung" VerticalContentAlignment="Center" FontSize="15"
FontWeight="Bold" />
</StackPanel>
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Strukturierte Verwaltung von Adressen für Pressepost-Printmailings inkl. Erstellung von Bundleitzetteln." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
</StackPanel>
</Button>
</StackPanel>
<!-- </Grid> -->
</Grid>
</TabItem>
<TabItem IsVisible="False" x:Name="Addressmanagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="MapPinHouse" Width="32" Height="32" Size="32" />
@@ -79,6 +116,14 @@
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="MnIAdSetView" Click="MnIAdSetView_OnClick">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="Eye" Width="12" Height="12" Size="12" />
<Label Content="Anzeigen" VerticalContentAlignment="Center" />
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
@@ -388,7 +433,7 @@
</Grid>
</Grid>
</TabItem>
<TabItem IsEnabled="False">
<TabItem IsEnabled="False" IsVisible="False" x:Name="Staffmanagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="Users" Width="32" Height="32" Size="32" />
@@ -396,7 +441,7 @@
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem IsEnabled="False">
<TabItem IsEnabled="False" IsVisible="False" x:Name="Financemanagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="BadgeEuro" Width="32" Height="32" Size="32" />
@@ -404,7 +449,7 @@
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem IsEnabled="False">
<TabItem IsEnabled="False" IsVisible="False" x:Name="Pricemanagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="ReceiptEuro" Width="32" Height="32" Size="32" />
@@ -412,7 +457,15 @@
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem IsEnabled="True">
<TabItem IsEnabled="False" IsVisible="False" x:Name="UnifiedEndpointManagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="MonitorCog" Width="32" Height="32" Size="32" />
<Label FontSize="20" Content="UEM" VerticalContentAlignment="Center" />
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem IsEnabled="True" IsVisible="False" x:Name="Wiki">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" />
@@ -532,6 +585,17 @@
<!-- </Grid> -->
</StackPanel>
</TabItem>
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="Puzzle" Width="16" Height="16" Size="16" />
<Label FontSize="16" Content="Module" VerticalContentAlignment="Center" />
</StackPanel>
</TabItem.Header>
<StackPanel Orientation="Vertical" Spacing="10" x:Name="StpSettingsModules">
</StackPanel>
</TabItem>
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal">
+106 -1
View File
@@ -85,8 +85,92 @@ public partial class MainWindow : Window
{
Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error);
}
try
{
foreach(var module in Enum.GetValues<LCModule>())
{
CheckBox b = new CheckBox
{
IsChecked = false
};
b.Click += (object sender, RoutedEventArgs e) => {
RenewModuleSettings(module, b.IsChecked);
};
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
if(conf.Item1 == module)
{
b.IsChecked = true;
}
}
Label l = new Label()
{
Content = module.ToString(),
};
StpSettingsModules.Children.Add(new StackPanel()
{
Orientation = Avalonia.Layout.Orientation.Horizontal,
Children = {b,l}
});
}
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
Logger.Log($"Enabling module: {conf.Item1}");
switch (conf.Item1)
{
case LCModule.Addressmanagement:
Addressmanagement.IsVisible = true;
break;
case LCModule.Pricemanagement:
Pricemanagement.IsVisible = true;
break;
case LCModule.Staffmanagement:
Staffmanagement.IsVisible = true;
break;
case LCModule.Financemanagement:
Financemanagement.IsVisible = true;
break;
case LCModule.Wiki:
Wiki.IsVisible = true;
break;
case LCModule.UnifiedEndpointManagement:
UnifiedEndpointManagement.IsVisible = true;
break;
default:
break;
}
}
} catch (Exception ex)
{
Logger.Log($"Error while applying module configuration: {ex.Message}");
}
}
private void RenewModuleSettings(LCModule value, bool? enabled = true)
{
if (enabled == true)
{
Settings._instance.moduleConfig.EnabledModules.Add((value,false));
} else
{
int index = -1;
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
if(conf.Item1 == value)
{
index = Settings._instance.moduleConfig.EnabledModules.IndexOf(conf);
}
}
if(index != -1)
Settings._instance.moduleConfig.EnabledModules.RemoveAt(index);
}
Settings.Save();
}
private async void StartAddressCheck(int addresSetID)
{
var progressWindow = new ProgressWindow();
@@ -910,6 +994,7 @@ public partial class MainWindow : Window
NudExpMargFontSize.Value = (decimal)options.fontSize;
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
CbExpRnsPvSt.IsChecked = options.rsPvSt;
CbExpRnsEnable.IsChecked = options.exportRunningSheets;
TbExpRnsKNrAbs.Text = options.rsKNrAbs;
TbExpRnsKNrEmp.Text = options.rsKNrEmp;
@@ -956,8 +1041,10 @@ public partial class MainWindow : Window
rsBundGew = TbExpRnsBundGew.Text,
rsPalNr = ReadInt(NudExpRnsPalNr, 1),
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20),
rsNumGrouped = ReadInt(NudExpRnsPlzcount, 25),
rsPvSt = CbExpRnsPvSt.IsChecked.Value
rsPvSt = CbExpRnsPvSt.IsChecked.Value,
exportRunningSheets = CbExpRnsEnable.IsChecked.Value
};
Settings.Save();
@@ -1377,4 +1464,22 @@ public partial class MainWindow : Window
BtnCombineAddressSetSortUp.IsEnabled = true;
}
}
private void MnIAdSetView_OnClick(object? sender, RoutedEventArgs e)
{
if (LstCustomerAdressSets.SelectedItems.Count > 0)
{
var preview = new PreviewWindow((LstCustomerAdressSets.SelectedItems[0] as KasAddressList).KasPersons);
preview.Show();
}
}
private void BtnAdmgmt_OnClick(object? sender, RoutedEventArgs e)
{
if (Addressmanagement.IsVisible && Addressmanagement.IsVisible)
{
TcMain.SelectedIndex = 1;
}
}
}
+289
View File
@@ -0,0 +1,289 @@
<Window xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" Icon="assets/icon.ico"
xmlns:local="using:Logof_Client" Closing="Window_OnClosing"
x:Class="Logof_Client.PreviewWindow"
Title="Datensätze bearbeiten" x:DataType="local:PreviewWindow">
<Grid ColumnDefinitions="*,400"
Margin="10">
<!-- Adressliste -->
<ListBox Grid.Column="0"
x:Name="AddressList"
ItemsSource="{Binding Addresses}"
SelectedItem="{Binding SelectedAddress}"
SelectionMode="Single">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
<DataTemplate>
<Grid ColumnDefinitions="70,150,180,250,80,180,150"
Height="32">
<TextBlock Grid.Column="0"
Text="{Binding id}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="1"
Text="{Binding vorname}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="2"
Text="{Binding name}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="3"
Text="{Binding strasse}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="4"
Text="{Binding plz}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="5"
Text="{Binding ort}"
VerticalAlignment="Center"/>
<TextBlock Grid.Column="6"
Text="{Binding land}"
VerticalAlignment="Center"/>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<!-- Editor -->
<ScrollViewer Grid.Column="1"
Margin="15,0,0,0">
<StackPanel Spacing="6">
<TextBlock Text="Adresse bearbeiten"
FontSize="20"
FontWeight="Bold"
Margin="0,0,0,10"/>
<Grid ColumnDefinitions="120,*"
RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" RowSpacing="4">
<TextBlock Grid.Row="0"
Text="ID"
VerticalAlignment="Center"/>
<TextBox Grid.Row="0"
Grid.Column="1"
Text="{Binding SelectedAddress.id}"
IsReadOnly="True" IsEnabled="False"/>
<TextBlock Grid.Row="1"
Text="RefSID"
VerticalAlignment="Center"/>
<TextBox Grid.Row="1"
Grid.Column="1"
Text="{Binding SelectedAddress.refsid}"/>
<TextBlock Grid.Row="2"
Text="Anrede"
VerticalAlignment="Center"/>
<TextBox Grid.Row="2"
Grid.Column="1"
Text="{Binding SelectedAddress.anrede}"/>
<TextBlock Grid.Row="3"
Text="Titel"
VerticalAlignment="Center"/>
<TextBox Grid.Row="3"
Grid.Column="1"
Text="{Binding SelectedAddress.titel}"/>
<TextBlock Grid.Row="4"
Text="Vorname"
VerticalAlignment="Center"/>
<TextBox Grid.Row="4"
Grid.Column="1"
Text="{Binding SelectedAddress.vorname}"/>
<TextBlock Grid.Row="5"
Text="Adel"
VerticalAlignment="Center"/>
<TextBox Grid.Row="5"
Grid.Column="1"
Text="{Binding SelectedAddress.adel}"/>
<TextBlock Grid.Row="6"
Text="Name"
VerticalAlignment="Center"/>
<TextBox Grid.Row="6"
Grid.Column="1"
Text="{Binding SelectedAddress.name}"/>
<TextBlock Grid.Row="7"
Text="Namenszusatz"
VerticalAlignment="Center"/>
<TextBox Grid.Row="7"
Grid.Column="1"
Text="{Binding SelectedAddress.namezus}"/>
<TextBlock Grid.Row="8"
Text="Anredzusatz"
VerticalAlignment="Center"/>
<TextBox Grid.Row="8"
Grid.Column="1"
Text="{Binding SelectedAddress.anredzus}"/>
<TextBlock Grid.Row="9"
Text="Straße"
VerticalAlignment="Center"/>
<TextBox Grid.Row="9"
Grid.Column="1"
Text="{Binding SelectedAddress.strasse}"/>
<TextBlock Grid.Row="10"
Text="Straße 2"
VerticalAlignment="Center"/>
<TextBox Grid.Row="10"
Grid.Column="1"
Text="{Binding SelectedAddress.strasse2}"/>
<TextBlock Grid.Row="11"
Text="PLZ"
VerticalAlignment="Center"/>
<TextBox Grid.Row="11"
Grid.Column="1"
Text="{Binding SelectedAddress.plz}"/>
<TextBlock Grid.Row="12"
Text="Ort"
VerticalAlignment="Center"/>
<TextBox Grid.Row="12"
Grid.Column="1"
Text="{Binding SelectedAddress.ort}"/>
<TextBlock Grid.Row="13"
Text="Land"
VerticalAlignment="Center"/>
<TextBox Grid.Row="13"
Grid.Column="1"
Text="{Binding SelectedAddress.land}"/>
<TextBlock Grid.Row="14"
Text="PPLZ"
VerticalAlignment="Center"/>
<TextBox Grid.Row="14"
Grid.Column="1"
Text="{Binding SelectedAddress.pplz}"/>
<TextBlock Grid.Row="15"
Text="Postfach"
VerticalAlignment="Center"/>
<TextBox Grid.Row="15"
Grid.Column="1"
Text="{Binding SelectedAddress.postfach}"/>
<TextBlock Grid.Row="16"
Text="Name 1"
VerticalAlignment="Center"/>
<TextBox Grid.Row="16"
Grid.Column="1"
Text="{Binding SelectedAddress.name1}"/>
<TextBlock Grid.Row="17"
Text="Name 2"
VerticalAlignment="Center"/>
<TextBox Grid.Row="17"
Grid.Column="1"
Text="{Binding SelectedAddress.name2}"/>
<TextBlock Grid.Row="18"
Text="Name 3"
VerticalAlignment="Center"/>
<TextBox Grid.Row="18"
Grid.Column="1"
Text="{Binding SelectedAddress.name3}"/>
<TextBlock Grid.Row="19"
Text="Name 4"
VerticalAlignment="Center"/>
<TextBox Grid.Row="19"
Grid.Column="1"
Text="{Binding SelectedAddress.name4}"/>
<TextBlock Grid.Row="20"
Text="Name 5"
VerticalAlignment="Center"/>
<TextBox Grid.Row="20"
Grid.Column="1"
Text="{Binding SelectedAddress.name5}"/>
<TextBlock Grid.Row="21"
Text="Funktion"
VerticalAlignment="Center"/>
<TextBox Grid.Row="21"
Grid.Column="1"
Text="{Binding SelectedAddress.funktion}"/>
<TextBlock Grid.Row="22"
Text="Funktion 2"
VerticalAlignment="Center"/>
<TextBox Grid.Row="22"
Grid.Column="1"
Text="{Binding SelectedAddress.funktion2}"/>
<TextBlock Grid.Row="23"
Text="Abteilung"
VerticalAlignment="Center"/>
<TextBox Grid.Row="23"
Grid.Column="1"
Text="{Binding SelectedAddress.abteilung}"/>
<TextBlock Grid.Row="24"
Text="Funktion AD"
VerticalAlignment="Center"/>
<TextBox Grid.Row="24"
Grid.Column="1"
Text="{Binding SelectedAddress.funktionad}"/>
</Grid>
</StackPanel>
</ScrollViewer>
</Grid>
</Window>
+52
View File
@@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Linq;
using System.Runtime.CompilerServices;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Interactivity;
using Avalonia.Layout;
using Avalonia.Media;
namespace Logof_Client;
using System.ComponentModel;
using System.Runtime.CompilerServices;
public partial class PreviewWindow : Window, INotifyPropertyChanged
{
public ObservableCollection<KasPerson> Addresses { get; }
private KasPerson? _selectedAddress;
public KasPerson? SelectedAddress
{
get => _selectedAddress;
set
{
_selectedAddress = value;
PropertyChanged?.Invoke(
this,
new PropertyChangedEventArgs(nameof(SelectedAddress)));
}
}
public event PropertyChangedEventHandler? PropertyChanged;
public PreviewWindow(IEnumerable<KasPerson> addresses)
{
InitializeComponent();
Addresses = new ObservableCollection<KasPerson>(addresses);
DataContext = this;
}
private void Window_OnClosing(object? sender, WindowClosingEventArgs e)
{
Settings.Save();
Global.Save();
}
}
+1 -1
View File
@@ -45,7 +45,7 @@
<!-- </DataGrid.Columns> -->
<!-- -->
<!-- </DataGrid> -->
<ListBox ItemsSource="{Binding Results}" SelectedItems="{Binding SelectedResults}">
<ListBox ItemsSource="{Binding Results}" SelectionMode="Multiple" x:Name="LbResults" SelectedItems="{Binding SelectedResults}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
+14 -1
View File
@@ -230,7 +230,20 @@ public partial class ResultWindow : Window, INotifyPropertyChanged
private void BtnShowSelected_OnClick(object? sender, RoutedEventArgs e)
{
// once upon a time, there was a feature like this
if (LbResults.SelectedItems.Count > 0)
{
var selectedPersons = LbResults.SelectedItems
.Cast<ResultItem>()
.Select(x => x.Person)
.ToList();
if (selectedPersons.Count == 0)
return;
var preview = new PreviewWindow(selectedPersons);
preview.Show();
}
}
private void BtnExecuteFilter_OnClick(object? sender, RoutedEventArgs e)
+1
View File
@@ -168,6 +168,7 @@ public static class AddressCreator
} // Error-Handling?
if (address_line_count > 1) return string_address;
Logger.Log($"Address with ID {address.id} (refsid: {address.refsid} not valid for production use", Logger.LogType.Warning);
return null;
}
+73 -62
View File
@@ -121,17 +121,18 @@ public class PdfBuilder
}
// national addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++)
foreach (var person in addressSet.KasPersons
.Where(person => person.IsGermany())
.OrderBy(person => person.used_plz))
{
string senderLineID = senderLine;
if (!addressSet.KasPersons[i].IsGermany()) continue;
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
var addr = AddressCreator.CreateFinalMarkdownString(person.id);
if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>";
if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {person.refsid}\n</font6>";
else
senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID))
@@ -141,17 +142,19 @@ public class PdfBuilder
}
// international addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++)
foreach (var person in addressSet.KasPersons
.Where(person => !person.IsGermany())
.OrderBy(person => person.land)
.ThenBy(person => person.used_plz))
{
string senderLineID = senderLine;
if (addressSet.KasPersons[i].IsGermany()) continue;
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
var addr = AddressCreator.CreateFinalMarkdownString(person.id);
if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>";
if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {person.refsid}\n</font6>";
else
senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID))
@@ -194,7 +197,7 @@ public class PdfBuilder
{
if (addresses == null || addresses.Count == 0)
throw new ArgumentException("Addresses array cannot be null or empty");
var document = new PdfDocument();
var addressIndex = 0;
@@ -709,12 +712,14 @@ public class PdfBuilder
var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold);
int firstIndex = pageIndex * 2;
int palletNumber =
Settings._instance.pdfExport.rsPalNr +
(firstIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet =
(firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
int? palletNumber = null;
int? bundleOnPallet = null;
if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
palletNumber = Settings._instance.pdfExport.rsPalNr +
(firstIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet = (firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
DrawGermanyRunningSheet(
gfx,
@@ -735,12 +740,14 @@ public class PdfBuilder
int secondIndex = firstIndex + 1;
int palletNumber2 =
Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet2 =
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
int? palletNumber2 = null;
int? bundleOnPallet2 = null;
if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
palletNumber2 = Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet2 = (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
if (firstIndex + 1 < grouped_nums.Count)
{
@@ -766,7 +773,7 @@ public class PdfBuilder
document.Save(path);
}
private void DrawGermanyRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int pal_nr, int bundleOnPallet, int totalBundleNumber)
private void DrawGermanyRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int? pal_nr, int? bundleOnPallet, int totalBundleNumber)
{
double line = 1.0;
@@ -914,20 +921,20 @@ public class PdfBuilder
new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight);
if (options.rsBundNrPal == null) goto nopal;
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
if (options.rsBundNrPal > 0)
{
gfx.DrawString(pal_nr?.ToString() ?? string.Empty, fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(
$"{bundleOnPallet}/{options.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
}
nopal:
gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}",
fontText,
@@ -984,12 +991,14 @@ public class PdfBuilder
int firstIndex = pageIndex * 2;
int palletNumber =
Settings._instance.pdfExport.rsPalNr +
(firstIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet =
(firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
int? palletNumber = null;
int? bundleOnPallet = null;
if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
palletNumber = Settings._instance.pdfExport.rsPalNr +
(firstIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet = (firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
@@ -1014,12 +1023,14 @@ public class PdfBuilder
{
int secondIndex = firstIndex + 1;
int palletNumber2 =
Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet2 =
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
int? palletNumber2 = null;
int? bundleOnPallet2 = null;
if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
palletNumber2 = Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet2 = (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
DrawInternationalRunningSheet(
gfx,
@@ -1042,7 +1053,7 @@ public class PdfBuilder
document.Save(path);
}
private void DrawInternationalRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int pal_nr, int bundleOnPallet, int totalBundleNumber, string category = "ECONOMY Non-EU")
private void DrawInternationalRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int? pal_nr, int? bundleOnPallet, int totalBundleNumber, string category = "ECONOMY Non-EU")
{
double line = 1.0;
@@ -1194,20 +1205,20 @@ public class PdfBuilder
new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight);
if (options.rsBundNrPal == 0) goto nopal;
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
if (options.rsBundNrPal > 0)
{
gfx.DrawString(pal_nr?.ToString() ?? string.Empty, fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(
$"{bundleOnPallet}/{options.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
}
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
nopal:
gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}",
fontText,