Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d337f94851 | |||
| 1922b30ada | |||
| 68541621d9 | |||
| 474b628f0b |
@@ -70,9 +70,6 @@ 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 double rsNumGrouped { get; set; } = 25;
|
|
||||||
public double rsPlzStartpoint { get; set; } = 2;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Global
|
public class Global
|
||||||
|
|||||||
@@ -254,7 +254,6 @@
|
|||||||
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
<Label Grid.Column="0" Content="Zellenrand rechts (mm)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargCellPaddingRight" Minimum="0" Maximum="20" Value="5"></NumericUpDown>
|
||||||
</Grid>
|
</Grid>
|
||||||
<CheckBox Content="Laufzettel erstellen" x:Name="CbExpRnsEnable"></CheckBox>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="10">
|
||||||
@@ -274,10 +273,6 @@
|
|||||||
<Label Content="Zellenabstand links"></Label>
|
<Label Content="Zellenabstand links"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="TbExpMargMarginLeft" Minimum="0" Maximum="20" Value="0"></NumericUpDown>
|
||||||
</Grid>
|
</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>
|
||||||
|
|
||||||
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
<StackPanel Grid.Column="2" Orientation="Vertical" Spacing="10">
|
||||||
@@ -297,10 +292,6 @@
|
|||||||
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
<Label Grid.Column="0" Content="Schriftgröße (klein)"></Label>
|
||||||
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
<NumericUpDown Grid.Column="1" x:Name="NudExpMargSmallFontSize" Minimum="3" Maximum="30" Value="6"></NumericUpDown>
|
||||||
</Grid>
|
</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>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
|
||||||
|
|||||||
+63
-33
@@ -703,7 +703,7 @@ public partial class MainWindow : Window
|
|||||||
list.Add((KasAddressList)item);
|
list.Add((KasAddressList)item);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "difference", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -734,11 +734,11 @@ public partial class MainWindow : Window
|
|||||||
list.Add((KasAddressList)item);
|
list.Add((KasAddressList)item);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "intersection", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while trying to start intersection: " + ex.Message);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -761,7 +761,7 @@ public partial class MainWindow : Window
|
|||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add((KasAddressList)item);
|
list.Add((KasAddressList)item);
|
||||||
|
|
||||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "symdiff", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -774,25 +774,51 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnStartGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
SavePdfExportOptions();
|
try
|
||||||
|
|
||||||
var saveDialog = new SaveFileDialog
|
|
||||||
{
|
{
|
||||||
DefaultExtension = "pdf",
|
SavePdfExportOptions();
|
||||||
Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
|
|
||||||
};
|
|
||||||
var filePath = await saveDialog.ShowAsync(this);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(filePath))
|
var saveDialog = new SaveFileDialog
|
||||||
|
{
|
||||||
|
DefaultExtension = "pdf",
|
||||||
|
Filters =
|
||||||
|
{
|
||||||
|
new FileDialogFilter
|
||||||
|
{
|
||||||
|
Name = "PDF-Dateien",
|
||||||
|
Extensions = { "pdf" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
var filePath = await saveDialog.ShowAsync(this);
|
||||||
|
|
||||||
|
Console.WriteLine($"RAW: {filePath}");
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(filePath))
|
||||||
|
{
|
||||||
|
if (filePath.StartsWith("file://"))
|
||||||
|
{
|
||||||
|
filePath = new Uri(filePath).LocalPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
Console.WriteLine($"PATH: {filePath}");
|
||||||
|
|
||||||
|
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
||||||
|
|
||||||
|
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
|
||||||
|
((KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
|
||||||
|
"Company Logo/Info",
|
||||||
|
filePath
|
||||||
|
);
|
||||||
|
|
||||||
|
Console.WriteLine("PDF OK");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
Console.WriteLine(ex);
|
||||||
|
File.WriteAllText("crash.txt", ex.ToString());
|
||||||
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
|
|
||||||
(KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
|
|
||||||
"Company Logo/Info",
|
|
||||||
filePath
|
|
||||||
);
|
|
||||||
//return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1070,23 +1096,27 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
|
||||||
|
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||||
|
var curr_set = new KasAddressList("");
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
if (set.ID == id)
|
||||||
|
{
|
||||||
|
curr_set = set;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = await NamingWindow.Show(this);
|
var result = await NamingWindow.Show(this, curr_set.Name);
|
||||||
if (result != null)
|
if (result != null)
|
||||||
{
|
{
|
||||||
var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
|
curr_set.Name = result;
|
||||||
.ToString());
|
Settings.Save();
|
||||||
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
RefreshAddressSetListItems(cus_id);
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
return;
|
||||||
if (set.ID == id)
|
|
||||||
{
|
|
||||||
set.Name = result;
|
|
||||||
Settings.Save();
|
|
||||||
RefreshAddressSetListItems(cus_id);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
|
|||||||
@@ -104,17 +104,7 @@ public class PdfBuilder
|
|||||||
addresses.Add(addr);
|
addresses.Add(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (addresses.Count == 0)
|
|
||||||
{
|
|
||||||
MessageBox.Show(MainWindow._instance, "Keine validen Adressen konnten generiert werden. Abbruch.", "Fehler");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
CreateAddressLabelPdfWithPlaceholder(addresses, placeholderText, outputPath);
|
||||||
|
|
||||||
if (_settings.exportRunningSheets)
|
|
||||||
{
|
|
||||||
ExportRunningSheets(addressSetId, outputPath);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -397,60 +387,4 @@ public class PdfBuilder
|
|||||||
if (left < 0 || top < 0 || right < 0 || bottom < 0)
|
if (left < 0 || top < 0 || right < 0 || bottom < 0)
|
||||||
throw new ArgumentException("Margins cannot be negative");
|
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