Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 516ca58740 | |||
| 1b200ee41e | |||
| 0750c51448 | |||
| 5a47fedcf0 | |||
| b22d33dc97 | |||
| 8b740304f6 |
@@ -178,6 +178,23 @@ public class KasPerson
|
|||||||
public string abteilung { get; set; }
|
public string abteilung { get; set; }
|
||||||
public string funktionad { get; set; }
|
public string funktionad { get; set; }
|
||||||
|
|
||||||
|
public string used_plz { get; set; } = "";
|
||||||
|
|
||||||
|
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)
|
public static int GenerateNewID(int base_id)
|
||||||
{
|
{
|
||||||
//var newid = 100000 + base_id;
|
//var newid = 100000 + base_id;
|
||||||
|
|||||||
+15
-2
@@ -71,8 +71,8 @@ public class PdfExportSettings
|
|||||||
public double fontSize { get; set; } = 9;
|
public double fontSize { get; set; } = 9;
|
||||||
public double smallFontSize { get; set; } = 6;
|
public double smallFontSize { get; set; } = 6;
|
||||||
public bool exportRunningSheets { get; set; } = true;
|
public bool exportRunningSheets { get; set; } = true;
|
||||||
public double rsNumGrouped { get; set; } = 25;
|
public int rsNumGrouped { get; set; } = 25;
|
||||||
public double rsPlzStartpoint { get; set; } = 2;
|
public int rsPlzStartpoint { get; set; } = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Global
|
public class Global
|
||||||
@@ -165,6 +165,19 @@ public class Customer
|
|||||||
public char separator { get; set; } = ',';
|
public char separator { get; set; } = ',';
|
||||||
public int ID { get; }
|
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)
|
// public static int GetIDByCustomerListItem(string item_content)
|
||||||
// {
|
// {
|
||||||
|
|||||||
@@ -104,7 +104,9 @@ public static class AddressCreator
|
|||||||
// Alternative A: pplz valid and city existing
|
// Alternative A: pplz valid and city existing
|
||||||
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.pplz, address.land))
|
||||||
{
|
{
|
||||||
string_address = address.pplz + " " + address.ort + "\n" + string_address;
|
string pplz = NormalizeGermanPLZ(address.pplz);
|
||||||
|
KasPerson.SetUsedPLZ(id, pplz);
|
||||||
|
string_address = pplz + " " + address.ort + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
if (!string.IsNullOrWhiteSpace(address.postfach))
|
if (!string.IsNullOrWhiteSpace(address.postfach))
|
||||||
{
|
{
|
||||||
@@ -150,7 +152,9 @@ public static class AddressCreator
|
|||||||
} // Alternative B: plz valid and city existing
|
} // Alternative B: plz valid and city existing
|
||||||
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
else if (!string.IsNullOrEmpty(address.ort) && CheckPLZ(address.plz, address.land))
|
||||||
{
|
{
|
||||||
string_address = address.plz + " " + address.ort + "\n" + string_address;
|
string plz = NormalizeGermanPLZ(address.plz);
|
||||||
|
KasPerson.SetUsedPLZ(id, plz);
|
||||||
|
string_address = plz + " " + address.ort + "\n" + string_address;
|
||||||
address_line_count++;
|
address_line_count++;
|
||||||
if (!string.IsNullOrWhiteSpace(address.strasse))
|
if (!string.IsNullOrWhiteSpace(address.strasse))
|
||||||
{
|
{
|
||||||
@@ -249,4 +253,23 @@ public static class AddressCreator
|
|||||||
// For non-German countries, accept any non-empty postal code
|
// For non-German countries, accept any non-empty postal code
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+98
-23
@@ -424,40 +424,115 @@ public class PdfBuilder
|
|||||||
|
|
||||||
int margin = 50;
|
int margin = 50;
|
||||||
|
|
||||||
List<(int, int)> grouped_nums = GroupAddresses(setID);
|
var grouped_nums = GroupAddresses(setID);
|
||||||
|
|
||||||
var page = document.AddPage();
|
foreach (var result in grouped_nums)
|
||||||
page.Size = PageSize.A4;
|
{
|
||||||
|
var page = document.AddPage();
|
||||||
|
page.Size = PageSize.A4;
|
||||||
|
|
||||||
var gfx = XGraphics.FromPdfPage(page);
|
var gfx = XGraphics.FromPdfPage(page);
|
||||||
|
|
||||||
var width = page.Width.Point-margin;
|
var width = page.Width.Point-margin;
|
||||||
var height = page.Height.Point-margin;
|
var height = page.Height.Point-margin;
|
||||||
gfx.DrawLine(XPens.Black, margin, margin, margin, height);
|
gfx.DrawLine(XPens.Black, margin, margin, margin, height);
|
||||||
gfx.DrawLine(XPens.Black, margin, margin, width, margin);
|
gfx.DrawLine(XPens.Black, margin, margin, width, margin);
|
||||||
gfx.DrawLine(XPens.Black, width, margin, width, height);
|
gfx.DrawLine(XPens.Black, width, margin, width, height);
|
||||||
gfx.DrawLine(XPens.Black, margin, height, width, height);
|
gfx.DrawLine(XPens.Black, margin, height, width, height);
|
||||||
|
|
||||||
var boldfont = new XFont("Cantarell", 11, XFontStyleEx.Bold);
|
var boldfont = new XFont("Cantarell", 11, XFontStyleEx.Bold);
|
||||||
var font = new XFont("Cantarell", 11, XFontStyleEx.Regular);
|
var font = new XFont("Cantarell", 11, XFontStyleEx.Regular);
|
||||||
var bigboldfont = new XFont("Cantarell", 35, XFontStyleEx.Bold);
|
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 number = 0;
|
|
||||||
gfx.DrawString($"Versand {list.Name}", boldfont, XBrushes.Black,
|
int total_frac = 0;
|
||||||
new XRect(margin+5, margin, width-margin, 25), XStringFormats.CenterLeft);
|
foreach (var item in grouped_nums)
|
||||||
gfx.DrawString($"powered by logofclient", font, XBrushes.Black,
|
{
|
||||||
new XRect(margin+5, margin+25, width-margin, 25), XStringFormats.CenterLeft);
|
if (item.Item2 == result.Item2) total_frac++;
|
||||||
|
}
|
||||||
gfx.DrawString($"{number}", bigboldfont, XBrushes.Black,
|
|
||||||
new XRect(margin, margin, width-margin, (height-margin)/2), XStringFormats.Center);
|
// 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);
|
document.Save(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<(int, int)> GroupAddresses(int setID)
|
/// <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)
|
||||||
|
.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;
|
||||||
|
|
||||||
return null;
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user