5 Commits
8 changed files with 136 additions and 5 deletions
+29
View File
@@ -33,6 +33,35 @@ public class KasAddressList //Address-Set
this.owner_id = owner_id; this.owner_id = owner_id;
} }
public async Task<string> GenerateCSV()
{
var customer = Customer.GetCustomerByID(owner_id);
// using adpac
string result = "";
string sep = customer.separator + " ";
if(customer.patch == null)
{
result = $"refsid{sep} anrede{sep} titel{sep} vorname{sep} adel{sep} name{sep} namezus{sep} anredzus{sep} strasse{sep} strasse2{sep} plz{sep} ort{sep} land{sep} pplz{sep} postfach{sep} name1{sep} name2{sep} name3{sep} name4{sep} name5{sep} funktion{sep} funktion2{sep} abteilung{sep} funktionad{sep} lastupdate\n";
}
foreach(var item in KasPersons)
{
if(customer.patch != null) // Fall 1: adpac
{
// Fall 1: adpac
} else // Fall 2: kein adpac:
{
// refsid anrede titel vorname adel name namezus anredzus strasse strasse2 plz ort land pplz postfach name1 name2 name3 name4 name5 funktion funktion2 abteilung funktionad lastupdate
result += item.refsid + sep + item.anrede+ sep + item.titel+ sep + item.vorname+ sep + item.adel+ sep + item.name+ sep + item.namezus+ sep + item.anredzus+ sep + item.strasse+ sep + item.strasse2+ sep + item.plz+ sep + item.ort+ sep + item.land+ sep + item.pplz+ sep + item.postfach+ sep + item.name1+ sep + item.name2+ sep + item.name3+ sep + item.name4+ sep + item.name5+ sep + item.funktion+ sep + item.funktion2+ sep + item.abteilung+ sep + item.funktionad+ sep + "null\n";
}
}
return result;
}
public static async Task<string> GenerateName(string basic_type, bool? is_rest = false) public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
{ {
string pre = ""; string pre = "";
+12 -1
View File
@@ -13,7 +13,7 @@ namespace Logof_Client;
public static class SchemaMigration public static class SchemaMigration
{ {
// Current schema version - increment when you make breaking changes // Current schema version - increment when you make breaking changes
public const int CURRENT_SCHEMA_VERSION = 4; public const int CURRENT_SCHEMA_VERSION = 5;
// Dictionary of migration functions, keyed by the version they migrate TO // Dictionary of migration functions, keyed by the version they migrate TO
private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new() private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new()
@@ -24,6 +24,7 @@ public static class SchemaMigration
// Example: Migration from v2 to v3 // Example: Migration from v2 to v3
{ 4, MigrateV3ToV4 }, { 4, MigrateV3ToV4 },
{ 5, MigrateV4ToV5 },
}; };
/// <summary> /// <summary>
@@ -104,6 +105,16 @@ public static class SchemaMigration
return obj; return obj;
} }
private static JObject MigrateV4ToV5(JObject obj)
{
// Example: Add a new field that didn't exist before
if (!obj.ContainsKey("expLabEnable"))
{
obj["expLabEnable"] = JToken.FromObject(new PdfExportSettings().expLabEnable);
}
return obj;
}
/// <summary> /// <summary>
/// Registers a new migration function that will be called when upgrading to a specific version. /// Registers a new migration function that will be called when upgrading to a specific version.
+1
View File
@@ -98,6 +98,7 @@ public enum LCModule
public class PdfExportSettings public class PdfExportSettings
{ {
public bool expLabEnable {get; set;} = true;
public double cellPaddingTopMm { get; set; } = 4; public double cellPaddingTopMm { get; set; } = 4;
public double cellPaddingBottomMm { get; set; } = 4; public double cellPaddingBottomMm { get; set; } = 4;
public double cellPaddingLeftMm { get; set; } = 4; public double cellPaddingLeftMm { get; set; } = 4;
+9
View File
@@ -124,6 +124,14 @@
</StackPanel> </StackPanel>
</MenuItem.Header> </MenuItem.Header>
</MenuItem> </MenuItem>
<MenuItem x:Name="MnIAdSetExp" Click="MnIAdSetExp_OnClick">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="FileUp" Width="12" Height="12" Size="12" />
<Label Content="Exportieren (CSV)" VerticalContentAlignment="Center" />
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True"> <MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
<MenuItem.Header> <MenuItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@@ -315,6 +323,7 @@
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions"> <Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
<ScrollViewer Grid.Column="1"> <ScrollViewer Grid.Column="1">
<StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" > <StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
<CheckBox Content="Versandetiketten erstellen" x:Name="CbExpLabEnable" Margin="10,10,10,0"></CheckBox>
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0"> <Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
<StackPanel Orientation="Vertical" Spacing="10"> <StackPanel Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
+31
View File
@@ -978,6 +978,8 @@ public partial class MainWindow : Window
{ {
var options = Settings._instance.pdfExport ?? new PdfExportSettings(); var options = Settings._instance.pdfExport ?? new PdfExportSettings();
CbExpLabEnable.IsChecked = (bool)options.expLabEnable;
NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm; NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm;
NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm; NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm;
NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm; NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm;
@@ -1031,6 +1033,8 @@ public partial class MainWindow : Window
fontSize = ReadDouble(NudExpMargFontSize), fontSize = ReadDouble(NudExpMargFontSize),
smallFontSize = ReadDouble(NudExpMargSmallFontSize), smallFontSize = ReadDouble(NudExpMargSmallFontSize),
expLabEnable = CbExpLabEnable.IsChecked.Value,
rsKNrAbs = TbExpRnsKNrAbs.Text, rsKNrAbs = TbExpRnsKNrAbs.Text,
rsKNrEmp = TbExpRnsKNrEmp.Text, rsKNrEmp = TbExpRnsKNrEmp.Text,
rsZKZ = TbExpRnsZKZ.Text, rsZKZ = TbExpRnsZKZ.Text,
@@ -1475,6 +1479,33 @@ public partial class MainWindow : Window
} }
} }
private async void MnIAdSetExp_OnClick(object? sender, RoutedEventArgs e)
{
var topLevel = TopLevel.GetTopLevel(this);
var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
{
Title = "Select a Folder",
AllowMultiple = false
});
if (folders.Count > 0)
{
var folderPath = folders[0].Path.LocalPath;
if (LstCustomerAdressSets.SelectedItems.Count > 0)
{
foreach (var set in LstCustomerAdressSets.SelectedItems)
{
string output = await ((KasAddressList)set).GenerateCSV();
File.WriteAllText(Path.Combine(folderPath,((KasAddressList)set).Name + ".csv"), output);
}
}
}
}
private void BtnAdmgmt_OnClick(object? sender, RoutedEventArgs e) private void BtnAdmgmt_OnClick(object? sender, RoutedEventArgs e)
{ {
if (Addressmanagement.IsVisible && Addressmanagement.IsVisible) if (Addressmanagement.IsVisible && Addressmanagement.IsVisible)
+1
View File
@@ -168,6 +168,7 @@ public static class AddressCreator
} // Error-Handling? } // Error-Handling?
if (address_line_count > 1) return string_address; 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; return null;
} }
+30 -2
View File
@@ -3,16 +3,26 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow; using System.Threading.Tasks.Dataflow;
using System.Threading;
using Avalonia.Threading;
namespace Logof_Client; namespace Logof_Client;
public class AddressShortener(ProgressWindow progressWindow) public class AddressShortener
{ {
private readonly ProgressWindow _progress;
public AddressShortener(ProgressWindow progressWindow)
{
_progress = progressWindow;
}
public async Task Perform(KasAddressList list) public async Task Perform(KasAddressList list)
{ {
try try
{ {
List<int> doubled_ids = new List<int>(); List<int> doubled_ids = new List<int>();
int[] percentages = [25,25,25,25];
for (int i = 0; i < list.KasPersons.Count; i++) for (int i = 0; i < list.KasPersons.Count; i++)
{ {
var address = list.KasPersons[i]; var address = list.KasPersons[i];
@@ -26,8 +36,19 @@ public class AddressShortener(ProgressWindow progressWindow)
doubled_ids.Add(address.refsid); doubled_ids.Add(address.refsid);
} }
} }
// var cd = Interlocked.Increment(ref current);
// if (cd % 10 == 0)
// {
// var percent = cd / (double)total * 100;
// await Dispatcher.UIThread.InvokeAsync(() =>
// _progress.ChangePercentage(percent));
// }
} }
// delete doubled addresses by refsid // delete doubled addresses by refsid
foreach (int id in doubled_ids) foreach (int id in doubled_ids)
{ {
@@ -65,12 +86,19 @@ public class AddressShortener(ProgressWindow progressWindow)
} }
} }
string faileds = "Folgende Adressen wurden entfernt:\n(refsid - Name, Vorname)\n\n";
// delete doubled addresses by refsid // delete doubled addresses by refsid
foreach (int id in toRemove) foreach (int id in toRemove)
{ {
// does this remove both of the doubled addresses? // does this remove both of the doubled addresses?
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id)); var pers = list.KasPersons.Find(x => x.id == id);
faileds += pers.refsid + " - " + pers.name + ", " + pers.vorname + "\n";
list.KasPersons.Remove(pers);
} }
await Dispatcher.UIThread.InvokeAsync(() => _progress.Hide());
if (toRemove.Count > 0) await Dispatcher.UIThread.InvokeAsync(() => MessageBox.Show(null,faileds,"Fehlerhafte Adressen"));
} }
catch (Exception ex) catch (Exception ex)
{ {
+21
View File
@@ -92,6 +92,8 @@ public class PdfBuilder
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText, bool pvst, public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText, bool pvst,
string outputPath) string outputPath)
{ {
try try
{ {
// Find the AddressSet by ID // Find the AddressSet by ID
@@ -120,6 +122,7 @@ public class PdfBuilder
senderLine = null; senderLine = null;
} }
List<KasPerson> failed = new();
// national addresses // national addresses
foreach (var person in addressSet.KasPersons foreach (var person in addressSet.KasPersons
.Where(person => person.IsGermany()) .Where(person => person.IsGermany())
@@ -127,6 +130,7 @@ public class PdfBuilder
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
var addr = AddressCreator.CreateFinalMarkdownString(person.id); var addr = AddressCreator.CreateFinalMarkdownString(person.id);
if(addr == null) failed.Add(person);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
@@ -149,6 +153,7 @@ public class PdfBuilder
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
var addr = AddressCreator.CreateFinalMarkdownString(person.id); var addr = AddressCreator.CreateFinalMarkdownString(person.id);
if(addr == null) failed.Add(person);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
@@ -171,13 +176,29 @@ public class PdfBuilder
string output_inter = outputPath.Replace(".pdf", "-international.pdf"); string output_inter = outputPath.Replace(".pdf", "-international.pdf");
if(Settings._instance.pdfExport.expLabEnable == false)
{
Logger.Log("Skipping label pdf generation cause it was disabled by user");
} else
{
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst); if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst);
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst); if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst);
}
if (_settings.exportRunningSheets) if (_settings.exportRunningSheets)
{ {
ExportRunningSheets(addressSetId, outputPath); ExportRunningSheets(addressSetId, outputPath);
} }
if(failed.Count > 0)
{
string faileds = "Versandetiketten zu folgenden Adressen konnten nicht generiert werden:\n(refsid - Name, Vorname)\n\n";
foreach(var pers in failed)
{
faileds += pers.refsid + " - " + pers.name + ", " + pers.vorname + "\n";
}
MessageBox.Show(MainWindow._instance,faileds,"Fehlerhafte Adressen");
}
} }
catch (Exception ex) catch (Exception ex)
{ {