fierke/logofclient
2
2
Fork 0
Code Issues 17 Pull Requests Releases 4 Wiki Activity

Compare commits

base: fierke/logofclient:v0.9.0
Branches Tags
fierke/logofclient:main fierke/logofclient:running-sheets fierke/logofclient:windows-paths fierke/logofclient:export-margin-options
fierke/logofclient:v0.9.0 fierke/logofclient:v0.8.1 fierke/logofclient:v0.8.0 fierke/logofclient:v0.7.0
...
compare: fierke/logofclient:42f8e499a472da89e6e68a3ea43d9f7b81a33d42
Branches Tags
fierke/logofclient:main fierke/logofclient:running-sheets fierke/logofclient:windows-paths fierke/logofclient:export-margin-options
fierke/logofclient:v0.9.0 fierke/logofclient:v0.8.1 fierke/logofclient:v0.8.0 fierke/logofclient:v0.7.0

11 Commits
v0.9.0 ... 42f8e499a4

Author SHA1 Message Date
fierke 42f8e499a4 [chore:] removed unneccessary comment 2026-06-26 15:22:46 +02:00
fierke 391f5bb0ec [feat:] BundNrPal = 0 => no details 2026-06-26 15:22:33 +02:00
fierke ba56561eec [fix:] default cell margin settings for pdf export 2026-06-26 13:18:06 +02:00
fierke 637cb2f4db [fix:] typo and two comments 2026-06-26 12:52:18 +02:00
fierke 1a956a473a [chore:] "-" equals germany -_- 2026-06-26 12:31:27 +02:00
fierke 32d15c56d3 [fix:] national was overwritten by international 2026-06-25 22:46:33 +02:00
fierke 6d8034a3de [feat:] include pallet- and bundle-nr to pdf (int) 2026-06-23 16:14:09 +02:00
fierke fd30f4effc [fix:] replaced the condition 2026-06-23 16:13:34 +02:00
fierke e20a59a524 [feat:] include pallet- and bundle-nr to pdf (de) 2026-06-23 16:08:23 +02:00
fierke 363dc17f2d [feat:] frontend for running sheet details (ZKZ, KNr, AMANr, ...) 2026-06-14 16:13:06 +02:00
fierke 413004d161 [feat:] split into german and international addresses 2026-06-10 14:55:17 +02:00
5 changed files with 311 additions and 209 deletions
Expand all files Collapse all files
DataStore/DataStructures.cs
+1 -1
View File
@@ -185,7 +185,7 @@ public class KasPerson
var trimmedLand = (land ?? "").Trim();
var trimmedLowerLand = trimmedLand.ToLower();
var isGermany = trimmedLowerLand == "germany" || trimmedLowerLand == "ger" ||
trimmedLowerLand == "" || trimmedLowerLand == "de" ||
trimmedLowerLand == "" || trimmedLowerLand == "de" || trimmedLowerLand == "-" ||
trimmedLowerLand == "deutschland";
return isGermany;
DataStore/Settings.cs
+16 -4
View File
@@ -52,10 +52,10 @@ public class Settings
public class PdfExportSettings
{
public double cellPaddingTopMm { get; set; } = 5;
public double cellPaddingBottomMm { get; set; } = 5;
public double cellPaddingLeftMm { get; set; } = 5;
public double cellPaddingRightMm { get; set; } = 5;
public double cellPaddingTopMm { get; set; } = 4;
public double cellPaddingBottomMm { get; set; } = 4;
public double cellPaddingLeftMm { get; set; } = 4;
public double cellPaddingRightMm { get; set; } = 4;
public double pageMarginTopMm { get; set; } = 0;
public double pageMarginBottomMm { get; set; } = 0;
@@ -70,6 +70,18 @@ public class PdfExportSettings
public bool exportRunningSheets { get; set; } = true;
public int rsNumGrouped { get; set; } = 25;
public int rsPlzStartpoint { get; set; } = 2;
public string rsKNrAbs { get; set; } = "";
public string rsKNrEmp { get; set; } = "";
public string rsZKZ { get; set; } = "";
public string rsIntVer { get; set; } = "";
public string rsLaufz { get; set; } = "";
public string rsEinldat { get; set; } = "";
public string rsAMANr { get; set; } = "";
public string rsBundGew { get; set; } = "";
public int rsPalNr { get; set; } = 1;
public int rsBundNrPal { get; set; } = 20;
}
public class Global
MainWindow.axaml
+118 -70
View File
@@ -251,78 +251,126 @@
</StackPanel>
</Grid>
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="20">
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20">
<StackPanel Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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>
<ScrollViewer Grid.Column="1">
<StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
<StackPanel Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand oben (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingTop" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand unten (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingBot" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Zellenrand links (mm)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingLeft" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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">
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand oben"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand unten"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand rechts"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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">
<Grid ColumnDefinitions="*,*">
<Label Content="Zeilen pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Spalten pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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>
<Grid ColumnDefinitions="*,*" ColumnSpacing="20" Margin="10,10,10,0">
<StackPanel Grid.Column="0" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Kunden-Nr. Absender" />
<TextBox Grid.Column="1" x:Name="TbExpRnsKNrAbs" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Kunden-Nr. Empfänger" />
<TextBox Grid.Column="1" x:Name="TbExpRnsKNrEmp" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="ZKZ/Titel" />
<TextBox Grid.Column="1" x:Name="TbExpRnsZKZ" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Interner Vermerk" />
<TextBox Grid.Column="1" x:Name="TbExpRnsIntVer" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Laufzeit" />
<TextBox Grid.Column="1" x:Name="TbExpRnsLaufz" />
</Grid>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Einlieferungsdatum" />
<TextBox Grid.Column="1" x:Name="TbExpRnsEinldat" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="AM-Auftragsnummer" />
<TextBox Grid.Column="1" x:Name="TbExpRnsAMANr" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Bundgewicht" />
<TextBox Grid.Column="1" x:Name="TbExpRnsBundGew" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Paletten-Nr. (Start)" />
<NumericUpDown Grid.Column="1" Minimum="0" Value="1" x:Name="NudExpRnsPalNr" />
</Grid>
<Grid ColumnDefinitions="*,2*">
<Label Grid.Column="0" Content="Anzahl Bunde auf Palette" />
<NumericUpDown Grid.Column="1" Minimum="0" Value="20" x:Name="NudExpRnsBundNrPal" />
</Grid>
</StackPanel>
</Grid>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10,10,10,10">
<Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand oben"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginTop" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand unten"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginBottom" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Content="Zellenabstand rechts"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginRight" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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">
<Grid ColumnDefinitions="*,*">
<Label Content="Zeilen pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="TbExpMargRowsPerPage" Minimum="1" Maximum="10" Value="7"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Spalten pro Seite"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargColumnsPerPage" Minimum="1" Maximum="8" Value="3"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<Label Grid.Column="0" Content="Schriftgröße (groß)"></Label>
<NumericUpDown Grid.Column="1" x:Name="NudExpMargFontSize" Minimum="5" Maximum="30" Value="9"></NumericUpDown>
</Grid>
<Grid ColumnDefinitions="*,*">
<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">
<Button Content="Start" Click="BtnStartGenerateLabels_OnClick"></Button>
</StackPanel>
</StackPanel>
</ScrollViewer>
</Grid>
</Grid>
</TabItem>
MainWindow.axaml.cs
+23 -1
View File
@@ -936,6 +936,17 @@ public partial class MainWindow : Window
NudExpMargColumnsPerPage.Value = options.columnsPerPage;
NudExpMargFontSize.Value = (decimal)options.fontSize;
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
TbExpRnsKNrAbs.Text = options.rsKNrAbs;
TbExpRnsKNrEmp.Text = options.rsKNrEmp;
TbExpRnsZKZ.Text = options.rsZKZ;
TbExpRnsIntVer.Text = options.rsIntVer;
TbExpRnsLaufz.Text = options.rsLaufz;
TbExpRnsEinldat.Text = options.rsEinldat;
TbExpRnsAMANr.Text = options.rsAMANr;
TbExpRnsBundGew.Text = options.rsBundGew;
NudExpRnsPalNr.Value = options.rsPalNr;
NudExpRnsBundNrPal.Value = options.rsBundNrPal;
}
catch (Exception ex)
{
@@ -959,7 +970,18 @@ public partial class MainWindow : Window
rowsPerPage = ReadInt(TbExpMargRowsPerPage, 7),
columnsPerPage = ReadInt(NudExpMargColumnsPerPage, 3),
fontSize = ReadDouble(NudExpMargFontSize),
smallFontSize = ReadDouble(NudExpMargSmallFontSize)
smallFontSize = ReadDouble(NudExpMargSmallFontSize),
rsKNrAbs = TbExpRnsKNrAbs.Text,
rsKNrEmp = TbExpRnsKNrEmp.Text,
rsZKZ = TbExpRnsZKZ.Text,
rsIntVer = TbExpRnsIntVer.Text,
rsLaufz = TbExpRnsLaufz.Text,
rsEinldat = TbExpRnsEinldat.Text,
rsAMANr = TbExpRnsAMANr.Text,
rsBundGew = TbExpRnsBundGew.Text,
rsPalNr = ReadInt(NudExpRnsPalNr, 1),
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20)
};
Settings.Save();
Tasks/PdfBuilder.cs
+153 -133
View File
@@ -101,6 +101,12 @@ public class PdfBuilder
{
// Find the AddressSet by ID
var addressSet = Settings._instance.addressSets.GetAddressSetByID(addressSetId);
// foreach (var pers in addressSet.KasPersons)
// {
// AddressCreator.CreateFinalMarkdownString(pers.id);
// }
// addressSet.KasPersons = addressSet.KasPersons.OrderBy(x => x.IsGermany()).ThenBy(y => y.used_plz).ToList();
if (addressSet == null)
throw new ArgumentException($"AddressSet with ID {addressSetId} not found");
@@ -109,7 +115,8 @@ public class PdfBuilder
// Generate markdown addresses from all KasPersons in the set
//var addresses = new string?[addressSet.KasPersons.Count];
var addresses = new List<string>();
var addresses_german = new List<string>();
var addresses_inter = new List<string>();
// find customer (owner) to include sender_address
string senderLine = null;
@@ -124,28 +131,52 @@ public class PdfBuilder
senderLine = null;
}
for (var i = 0; i < addressSet.KasPersons.Count; i++)
// national addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++)
{
if (!addressSet.KasPersons[i].IsGermany()) continue;
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
if (string.IsNullOrWhiteSpace(addr)) continue;
if (!string.IsNullOrEmpty(senderLine))
addresses.Add(senderLine + (addr ?? ""));
addresses_german.Add(senderLine + (addr ?? ""));
else
addresses.Add(addr);
addresses_german.Add(addr);
}
// international addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++)
{
if (addressSet.KasPersons[i].IsGermany()) continue;
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
if (string.IsNullOrWhiteSpace(addr)) continue;
if (!string.IsNullOrEmpty(senderLine))
addresses_inter.Add(senderLine + (addr ?? ""));
else
addresses_inter.Add(addr);
}
if (addresses.Count == 0)
{
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
return;
}
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
if (addresses_german.Count == 0 && addresses_inter.Count == 0)
{
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
return;
}
string output_inter = outputPath.Replace(".pdf", "-international.pdf");
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath);
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter);
if (_settings.exportRunningSheets)
{
ExportRunningSheets(addressSetId, outputPath);
}
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
if (_settings.exportRunningSheets)
{
ExportRunningSheets(addressSetId, outputPath);
}
//CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath);
//CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter);
}
catch (Exception ex)
{
@@ -553,6 +584,13 @@ 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;
DrawGermanyRunningSheet(
gfx,
marginX,
@@ -564,9 +602,21 @@ public class PdfBuilder
grouped_nums,
fontLabel,
fontText,
fontBig
fontBig,
palletNumber,
bundleOnPallet,
firstIndex + 1
);
int secondIndex = firstIndex + 1;
int palletNumber2 =
Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet2 =
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
if (firstIndex + 1 < grouped_nums.Count)
{
DrawGermanyRunningSheet(
@@ -576,11 +626,14 @@ public class PdfBuilder
usableW,
tableH,
list,
grouped_nums[firstIndex + 1],
grouped_nums[secondIndex],
grouped_nums,
fontLabel,
fontText,
fontBig
fontBig,
palletNumber2,
bundleOnPallet2,
secondIndex + 1
);
}
}
@@ -599,8 +652,10 @@ public class PdfBuilder
List<(int,string,string,string,int)> grouped_nums,
XFont fontLabel,
XFont fontText,
XFont fontBig)
{
XFont fontBig,
int pal_nr,
int bundleOnPallet,
int totalBundleNumber){
double line = 1.0;
string sender = Customer.GetCustomerByID(list.owner_id)?.sender_address ?? "[Absender]";
@@ -610,6 +665,8 @@ public class PdfBuilder
string amount = result.Item5?.ToString() ?? "[Anzahl]";
string groupNo = result.Item2?.ToString() ?? "[PLZ]";
string fraction = result.Item1?.ToString() ?? "[Fraktion]";
var options = Settings._instance.pdfExport;
int total_frac = 0;
foreach (var item in grouped_nums)
@@ -675,8 +732,8 @@ public class PdfBuilder
// Values top row
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsKNrAbs, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsZKZ, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
// Second row labels
@@ -687,9 +744,9 @@ public class PdfBuilder
// Second row values
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsKNrEmp, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsIntVer, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsLaufz, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
// Middle area
gfx.DrawString(groupNo, fontBig, XBrushes.Black,
@@ -738,27 +795,32 @@ public class PdfBuilder
double valueX = x + leftBottomW * 0.55;
double valueW = leftBottomW - (valueX - x) - 5;
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black,
gfx.DrawString(options.rsEinldat, fontText, XBrushes.Black,
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black,
gfx.DrawString(options.rsAMANr, fontText, XBrushes.Black,
new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black,
new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black,
if (options.rsBundNrPal == null) goto nopal;
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bund-Nr./Bunde auf Palette]", fontText, XBrushes.Black,
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bund-Nr. von Gesamtanzahl]", fontText, XBrushes.Black,
nopal:
gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}",
fontText,
XBrushes.Black,
new XRect(valueX, blY5 + 4, valueW, 14),
XStringFormats.TopRight);
@@ -769,88 +831,7 @@ public class PdfBuilder
XStringFormats.TopLeft);
}
// 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);
// }
//
// }
public void CreateInternationalRunningSheets(int setID, string path)
{
@@ -892,6 +873,15 @@ 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;
DrawInternationalRunningSheet(
gfx,
marginX,
@@ -903,11 +893,23 @@ public class PdfBuilder
grouped_nums,
fontLabel,
fontText,
fontBig
fontBig,
palletNumber,
bundleOnPallet,
firstIndex + 1
);
if (firstIndex + 1 < grouped_nums.Count)
{
int secondIndex = firstIndex + 1;
int palletNumber2 =
Settings._instance.pdfExport.rsPalNr +
(secondIndex / Settings._instance.pdfExport.rsBundNrPal);
int bundleOnPallet2 =
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
DrawInternationalRunningSheet(
gfx,
marginX,
@@ -915,18 +917,21 @@ public class PdfBuilder
usableW,
tableH,
list,
grouped_nums[firstIndex + 1],
grouped_nums[secondIndex],
grouped_nums,
fontLabel,
fontText,
fontBig
fontBig,
palletNumber2,
bundleOnPallet2,
secondIndex + 1
);
}
}
document.Save(path);
}
private void DrawInternationalRunningSheet(
private void DrawInternationalRunningSheet(
XGraphics gfx,
double x,
double y,
@@ -937,7 +942,11 @@ public class PdfBuilder
List<(int,string,string,string,int)> grouped_nums,
XFont fontLabel,
XFont fontText,
XFont fontBig)
XFont fontBig,
int pal_nr,
int bundleOnPallet,
int totalBundleNumber,
string category = "ECONOMY Non-EU")
{
double line = 1.0;
@@ -949,6 +958,8 @@ public class PdfBuilder
string groupNo = result.Item2?.ToString() ?? "[PLZ]";
string fraction = result.Item1?.ToString() ?? "[Fraktion]";
var options = Settings._instance.pdfExport;
int total_frac = 0;
foreach (var item in grouped_nums)
{
@@ -1013,8 +1024,8 @@ public class PdfBuilder
// Values top row
gfx.DrawString(sender, fontText, XBrushes.Black, new XRect(x + 5, y + 20, c1 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Absender]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString("[ZKZ/Titel]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsKNrAbs, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + 20, c2 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsZKZ, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + 20, c3 - 10, r1 - 22), XStringFormats.TopLeft);
gfx.DrawString(amount, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + 20, c4 - 10, r1 - 22), XStringFormats.TopLeft);
// Second row labels
@@ -1025,9 +1036,9 @@ public class PdfBuilder
// Second row values
gfx.DrawString(customerName, fontText, XBrushes.Black, new XRect(x + 5, y + r1 + 20, c1 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Kunden-Nr. Einlieferer]", fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Interne Vermerke]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString("[Laufzeit]", fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsKNrEmp, fontText, XBrushes.Black, new XRect(x + c1 + 5, y + r1 + 20, c2 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsIntVer, fontText, XBrushes.Black, new XRect(x + c1 + c2 + 5, y + r1 + 20, c3 - 10, r2 - 22), XStringFormats.TopLeft);
gfx.DrawString(options.rsLaufz, fontText, XBrushes.Black, new XRect(x + c1 + c2 + c3 + 5, y + r1 + 20, c4 - 10, r2 - 22), XStringFormats.TopLeft);
// Middle area
gfx.DrawString(groupNo, fontBig, XBrushes.Black,
@@ -1076,27 +1087,36 @@ public class PdfBuilder
double valueX = x + leftBottomW * 0.55;
double valueW = leftBottomW - (valueX - x) - 5;
gfx.DrawString("[Einlieferungsdatum]", fontText, XBrushes.Black,
gfx.DrawString(options.rsEinldat, fontText, XBrushes.Black,
new XRect(valueX, y + r1 + r2 + r3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[AM-Auftragsnummer]", fontText, XBrushes.Black,
gfx.DrawString(options.rsAMANr, fontText, XBrushes.Black,
new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bundgewicht]", fontText, XBrushes.Black,
gfx.DrawString(options.rsBundGew, fontText, XBrushes.Black,
new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Paletten-Nr.]", fontText, XBrushes.Black,
if (options.rsBundNrPal == 0) goto nopal;
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black,
new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bund-Nr./Bunde auf Palette]", fontText, XBrushes.Black,
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString("[Bund-Nr. von Gesamtanzahl]", fontText, XBrushes.Black,
nopal:
gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}",
fontText,
XBrushes.Black,
new XRect(valueX, blY5 + 4, valueW, 14),
XStringFormats.TopRight);