Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6c1d0e7a70 | |||
| a72722745b | |||
| bd565960ba | |||
| 58fed451a1 | |||
| ddea77bf3f | |||
| 0e4da1b150 | |||
| 7fe45ce4e3 | |||
| a46539c3cc | |||
| 72a5630db1 | |||
| 7697edac5e | |||
| 028b9793db |
@@ -70,6 +70,9 @@ public class PdfExportSettings
|
||||
|
||||
public double fontSize { get; set; } = 9;
|
||||
public double smallFontSize { get; set; } = 6;
|
||||
public bool exportRunningSheets { get; set; } = true;
|
||||
public double rsNumGrouped { get; set; } = 25;
|
||||
public double rsPlzStartpoint { get; set; } = 2;
|
||||
}
|
||||
|
||||
public class Global
|
||||
|
||||
+20
-3
@@ -121,7 +121,7 @@
|
||||
FontWeight="Bold" />
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Width="250" IsEnabled="False"
|
||||
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
||||
Margin="0,0,0,10">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
@@ -254,6 +254,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 +274,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 +297,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">
|
||||
@@ -485,12 +494,20 @@
|
||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||
x:Name="TbSettingsCustomerSenderAddress" />
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="150,*">
|
||||
<Grid ColumnDefinitions="150,*,Auto">
|
||||
<Label Content="CSV-Trennzeichen" />
|
||||
<TextBox Grid.Column="1" Watermark=","
|
||||
HorizontalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
||||
x:Name="TbSettingsCustomerCsvSeparator" />
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
|
||||
<Button Click="ChangeCSVDivider" Content=","></Button>
|
||||
<Button Click="ChangeCSVDivider" Content=";"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="TAB"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="|"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="SPACE"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content=":"></Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="150,*">
|
||||
<Label Content="Address-Patch-Info" />
|
||||
|
||||
+57
-6
@@ -96,10 +96,31 @@ public partial class MainWindow : Window
|
||||
|
||||
new ResultWindow(result, addresSetID).Show();
|
||||
|
||||
Settings.Save();
|
||||
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
|
||||
private async void StartAddressShortener(KasAddressList set)
|
||||
{
|
||||
//var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
|
||||
var progressWindow = new ProgressWindow();
|
||||
|
||||
progressWindow.Show(_instance);
|
||||
|
||||
var processor = new AddressShortener(progressWindow);
|
||||
await processor.Perform(set);
|
||||
|
||||
// foreach (var item in result)
|
||||
// {
|
||||
// }
|
||||
|
||||
progressWindow.Close();
|
||||
Settings.Save();
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
|
||||
// private async void StartAddressRepair(Uri path)
|
||||
// {
|
||||
// var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
@@ -543,7 +564,7 @@ public partial class MainWindow : Window
|
||||
var selected_path = paths[0].Path;
|
||||
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
|
||||
if (customer == ((Customer)LstCustomers.SelectedItems[0]))
|
||||
{
|
||||
if (customer.patch == null)
|
||||
{
|
||||
@@ -617,6 +638,7 @@ public partial class MainWindow : Window
|
||||
BtnCheck.IsEnabled = true;
|
||||
BtnCombine.IsEnabled = true;
|
||||
BtnGenerateLabels.IsEnabled = true;
|
||||
BtnShorten.IsEnabled = true;
|
||||
|
||||
// BtnRepair.IsEnabled = true;
|
||||
// BtnShorten.IsEnabled = true;
|
||||
@@ -681,7 +703,7 @@ public partial class MainWindow : Window
|
||||
list.Add((KasAddressList)item);
|
||||
try
|
||||
{
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "difference", GetCombiningTyp());
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -712,11 +734,11 @@ 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
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
Console.WriteLine("Error while trying to start intersection: " + ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -739,7 +761,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)
|
||||
@@ -1086,4 +1108,33 @@ public partial class MainWindow : Window
|
||||
}
|
||||
RefreshCustomerItems();
|
||||
}
|
||||
|
||||
private void BtnShorten_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
MakeCalcManVisible();
|
||||
if (LstCustomerAdressSets.SelectedIndex == -1)
|
||||
{
|
||||
MessageBox.Show(null, "Bitte zunächst ein Adress-Set auswählen", "Kein Adress-Set ausgewählt");
|
||||
return;
|
||||
}
|
||||
|
||||
StartAddressShortener((KasAddressList)LstCustomerAdressSets.SelectedItem);
|
||||
}
|
||||
|
||||
private void ChangeCSVDivider(object sender, RoutedEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
string div = (sender as Button).Content as string;
|
||||
if (div == "TAB") div = "\t";
|
||||
if (div == "SPACE") div = " ";
|
||||
TbSettingsCustomerCsvSeparator.Text = div;
|
||||
Settings.Save();
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("Error while parsing");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks.Dataflow;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
public class AddressShortener(ProgressWindow progressWindow)
|
||||
{
|
||||
private readonly ProgressWindow _progress = progressWindow;
|
||||
|
||||
public async Task Perform(KasAddressList list)
|
||||
{
|
||||
// find doubled addresses by refsid
|
||||
List<int> doubled_ids = new List<int>();
|
||||
for (int i = 0; i < list.KasPersons.Count; i++)
|
||||
{
|
||||
var address = list.KasPersons[i];
|
||||
for (int j = 0; j < list.KasPersons.Count; j++)
|
||||
{
|
||||
if (i == j) continue;
|
||||
var sec_address = list.KasPersons[j];
|
||||
|
||||
if (address.refsid == sec_address.refsid && !doubled_ids.Contains(address.refsid) && address.refsid != 0)
|
||||
{
|
||||
doubled_ids.Add(address.refsid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// delete doubled addresses by refsid
|
||||
foreach (int id in doubled_ids)
|
||||
{
|
||||
// does this remove both of the doubled addresses?
|
||||
list.KasPersons.Remove(list.KasPersons.FirstOrDefault(x => x.refsid == id));
|
||||
}
|
||||
|
||||
List<int> toRemove = new List<int>();
|
||||
foreach (var address in list.KasPersons)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.NoPLZorPPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
|
||||
address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
} else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
|
||||
address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable) &&
|
||||
address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("PersonError not accessible: " + address.id);
|
||||
}
|
||||
}
|
||||
|
||||
// delete doubled addresses by refsid
|
||||
foreach (int id in toRemove)
|
||||
{
|
||||
// does this remove both of the doubled addresses?
|
||||
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
|
||||
}
|
||||
|
||||
//return null;
|
||||
}
|
||||
}
|
||||
@@ -104,7 +104,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);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -387,4 +397,60 @@ 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)
|
||||
{
|
||||
if (path.EndsWith(".pdf"))
|
||||
{
|
||||
path = path.Substring(0, path.Length - 4);
|
||||
path = path + "-Laufzettel.pdf";
|
||||
}
|
||||
else
|
||||
{
|
||||
path = path + "-Laufzettel.pdf";
|
||||
}
|
||||
|
||||
CreateRunningSheets(setID, path);
|
||||
|
||||
}
|
||||
|
||||
public void CreateRunningSheets(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;
|
||||
|
||||
List<(int, int)> grouped_nums = GroupAddresses(setID);
|
||||
|
||||
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, margin, height);
|
||||
gfx.DrawLine(XPens.Black, margin, height, width, margin);
|
||||
|
||||
var font = new XFont("Times New Roman", 20, XFontStyleEx.BoldItalic);
|
||||
|
||||
gfx.DrawString($"Versand {list.Name}", font, XBrushes.Black,
|
||||
new XRect(0, 0, page.Width.Point, page.Height.Point), XStringFormats.Center);
|
||||
|
||||
|
||||
document.Save(path);
|
||||
}
|
||||
|
||||
public List<(int, int)> GroupAddresses(int setID)
|
||||
{
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user