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

Merge branch 'running-sheets'

Browse Source 
# Conflicts:
#	MainWindow.axaml.cs
#	Tasks/AddressCreation.cs
#	Tasks/PdfBuilder.cs
This commit is contained in:
Elias Fierke
2026-06-04 08:28:52 +02:00
parent c140a20549 516ca58740
commit af3f8234c0
6 changed files with 374 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MainWindow.axaml.cs
+5 -4
View File
@@ -772,8 +772,9 @@ public partial class MainWindow : Window
list.Add((KasAddressList)item);
try
{
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
}catch (Exception ex)
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "difference", GetCombiningTyp());
}
catch (Exception ex)
{
Logger.Log($"Error while combining (difference): {ex.Message}", Logger.LogType.Error);
}
@@ -802,7 +803,7 @@ 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 (Exception ex)
{
@@ -829,7 +830,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)