Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 516ca58740 | |||
| 1b200ee41e | |||
| 0750c51448 | |||
| 5a47fedcf0 | |||
| b22d33dc97 | |||
| 8b740304f6 | |||
| 57b4ac5001 | |||
| 6c1d0e7a70 | |||
| a72722745b | |||
| bd565960ba | |||
| 58fed451a1 | |||
| ddea77bf3f | |||
| 0e4da1b150 | |||
| 7fe45ce4e3 | |||
| a46539c3cc | |||
| 72a5630db1 | |||
| 7697edac5e | |||
| 028b9793db | |||
| 2c5f2ed48b |
@@ -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;
|
||||||
|
|||||||
@@ -70,6 +70,9 @@ 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 int rsNumGrouped { get; set; } = 25;
|
||||||
|
public int rsPlzStartpoint { get; set; } = 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Global
|
public class Global
|
||||||
@@ -162,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)
|
||||||
// {
|
// {
|
||||||
|
|||||||
+29
-8
@@ -121,7 +121,7 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -220,14 +220,18 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
|
||||||
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
<StackPanel Orientation="Vertical" >
|
||||||
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
||||||
|
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
||||||
|
</StackPanel>
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
|
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
||||||
|
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeDeleteOld" IsChecked="False">Lösche ursprüngliche Sets</CheckBox>
|
||||||
|
</StackPanel>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<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">
|
||||||
@@ -250,6 +254,7 @@
|
|||||||
<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">
|
||||||
@@ -269,6 +274,10 @@
|
|||||||
<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">
|
||||||
@@ -288,6 +297,10 @@
|
|||||||
<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">
|
||||||
@@ -481,12 +494,20 @@
|
|||||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerSenderAddress" />
|
x:Name="TbSettingsCustomerSenderAddress" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*,Auto">
|
||||||
<Label Content="CSV-Trennzeichen" />
|
<Label Content="CSV-Trennzeichen" />
|
||||||
<TextBox Grid.Column="1" Watermark=","
|
<TextBox Grid.Column="1" Watermark=","
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||||
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerCsvSeparator" />
|
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>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*">
|
||||||
<Label Content="Address-Patch-Info" />
|
<Label Content="Address-Patch-Info" />
|
||||||
|
|||||||
+58
-7
@@ -96,7 +96,28 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
new ResultWindow(result, addresSetID).Show();
|
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");
|
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -391,7 +412,7 @@ public partial class MainWindow : Window
|
|||||||
progressWindow.Show(_instance);
|
progressWindow.Show(_instance);
|
||||||
|
|
||||||
var processor = new CombineAddresses(progressWindow);
|
var processor = new CombineAddresses(progressWindow);
|
||||||
var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
|
var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked, CbMergeDeleteOld.IsChecked);
|
||||||
|
|
||||||
if (result.Item1 != null)
|
if (result.Item1 != null)
|
||||||
result.Item1.owner_id = owner_id;
|
result.Item1.owner_id = owner_id;
|
||||||
@@ -543,7 +564,7 @@ public partial class MainWindow : Window
|
|||||||
var selected_path = paths[0].Path;
|
var selected_path = paths[0].Path;
|
||||||
|
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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)
|
if (customer.patch == null)
|
||||||
{
|
{
|
||||||
@@ -617,6 +638,7 @@ public partial class MainWindow : Window
|
|||||||
BtnCheck.IsEnabled = true;
|
BtnCheck.IsEnabled = true;
|
||||||
BtnCombine.IsEnabled = true;
|
BtnCombine.IsEnabled = true;
|
||||||
BtnGenerateLabels.IsEnabled = true;
|
BtnGenerateLabels.IsEnabled = true;
|
||||||
|
BtnShorten.IsEnabled = true;
|
||||||
|
|
||||||
// BtnRepair.IsEnabled = true;
|
// BtnRepair.IsEnabled = true;
|
||||||
// BtnShorten.IsEnabled = true;
|
// BtnShorten.IsEnabled = true;
|
||||||
@@ -681,7 +703,7 @@ public partial class MainWindow : Window
|
|||||||
list.Add((KasAddressList)item);
|
list.Add((KasAddressList)item);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "difference", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -712,11 +734,11 @@ public partial class MainWindow : Window
|
|||||||
list.Add((KasAddressList)item);
|
list.Add((KasAddressList)item);
|
||||||
try
|
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)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add((KasAddressList)item);
|
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)
|
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -1086,4 +1108,33 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
RefreshCustomerItems();
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,13 +24,29 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
|
bool? exportUnused, bool? deleteOld)
|
||||||
|
{
|
||||||
|
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||||
|
|
||||||
|
if (deleteOld == true)
|
||||||
|
{
|
||||||
|
foreach (var list in address_lists)
|
||||||
|
{
|
||||||
|
Settings._instance.addressSets.addresses.Remove(list);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
bool? exportUnused)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||||
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
||||||
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
||||||
|
|
||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -104,7 +104,17 @@ 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>
|
||||||
@@ -387,4 +397,142 @@ 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;
|
||||||
|
|
||||||
|
var grouped_nums = GroupAddresses(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);
|
||||||
|
}
|
||||||
|
|
||||||
|
document.Save(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <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;
|
||||||
|
|
||||||
|
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