16 Commits
9 changed files with 561 additions and 78 deletions
+111
View File
@@ -33,6 +33,39 @@ public class KasAddressList //Address-Set
this.owner_id = owner_id; this.owner_id = owner_id;
} }
public async Task<string> GenerateCSV(bool expAsAdpac)
{
var customer = Customer.GetCustomerByID(owner_id);
// using adpac
string result = "";
string sep = customer.separator + " ";
if(customer.patch != null && expAsAdpac)
{
string header = customer.patch.GetCSVHeader(sep);
} else
{
result = $"refsid{sep} anrede{sep} titel{sep} vorname{sep} adel{sep} name{sep} namezus{sep} anredzus{sep} strasse{sep} strasse2{sep} plz{sep} ort{sep} land{sep} pplz{sep} postfach{sep} name1{sep} name2{sep} name3{sep} name4{sep} name5{sep} funktion{sep} funktion2{sep} abteilung{sep} funktionad{sep} lastupdate\n";
}
foreach(var item in KasPersons)
{
if(customer.patch != null && expAsAdpac) // Fall 1: adpac
{
// Fall 1: adpac
result += item.getAdpacValues(sep,customer.patch) + "\n";
} else // Fall 2: kein adpac:
{
// refsid anrede titel vorname adel name namezus anredzus strasse strasse2 plz ort land pplz postfach name1 name2 name3 name4 name5 funktion funktion2 abteilung funktionad lastupdate
result += item.refsid + sep + item.anrede+ sep + item.titel+ sep + item.vorname+ sep + item.adel+ sep + item.name+ sep + item.namezus+ sep + item.anredzus+ sep + item.strasse+ sep + item.strasse2+ sep + item.plz+ sep + item.ort+ sep + item.land+ sep + item.pplz+ sep + item.postfach+ sep + item.name1+ sep + item.name2+ sep + item.name3+ sep + item.name4+ sep + item.name5+ sep + item.funktion+ sep + item.funktion2+ sep + item.abteilung+ sep + item.funktionad+ sep + "null\n";
}
}
return result;
}
public static async Task<string> GenerateName(string basic_type, bool? is_rest = false) public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
{ {
string pre = ""; string pre = "";
@@ -228,6 +261,84 @@ public class KasPerson
return id + " - " + name; return id + " - " + name;
} }
public string getAdpacValues(string sep,AddressPatch ap)
{
string output = "";
if(ap.has_refsid){
output += ap.refsid_is + sep + " ";
}
if(ap.has_anrede){
output += ap.anrede_is + sep + " ";
}
if(ap.has_titel){
output += ap.titel_is + sep + " ";
}
if(ap.has_vorname){
output += ap.vorname_is + sep + " ";
}
if(ap.has_adel){
output += ap.adel_is + sep + " ";
}
if(ap.has_name){
output += ap.name_is + sep + " ";
}
if(ap.has_namezus){
output += ap.namezus_is + sep + " ";
}
if(ap.has_anredzus){
output += ap.anredzus_is + sep + " ";
}
if(ap.has_strasse){
output += ap.strasse_is + sep + " ";
}
if(ap.has_strasse2){
output += ap.strasse2_is + sep + " ";
}
if(ap.has_plz){
output += ap.plz_is + sep + " ";
}
if(ap.has_ort){
output += ap.ort_is + sep + " ";
}
if(ap.has_land){
output += ap.land_is + sep + " ";
}
if(ap.has_pplz){
output += ap.pplz_is + sep + " ";
}
if(ap.has_postfach){
output += ap.postfach_is + sep + " ";
}
if(ap.has_name1){
output += ap.name1_is + sep + " ";
}
if(ap.has_name2){
output += ap.name2_is + sep + " ";
}
if(ap.has_name3){
output += ap.name3_is + sep + " ";
}
if(ap.has_name4){
output += ap.name4_is + sep + " ";
}
if(ap.has_name5){
output += ap.name5_is + sep + " ";
}
if(ap.has_funktion){
output += ap.funktion_is + sep + " ";
}
if(ap.has_funktion2){
output += ap.funktion2_is + sep + " ";
}
if(ap.has_abteilung){
output += ap.abteilung_is + sep + " ";
}
if(ap.has_funktionad){
output += ap.funktionad_is + sep + " ";
}
return output;
}
} }
public class KasPersonError public class KasPersonError
+17 -5
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
namespace Logof_Client; namespace Logof_Client;
@@ -12,7 +13,7 @@ namespace Logof_Client;
public static class SchemaMigration public static class SchemaMigration
{ {
// Current schema version - increment when you make breaking changes // Current schema version - increment when you make breaking changes
public const int CURRENT_SCHEMA_VERSION = 3; public const int CURRENT_SCHEMA_VERSION = 5;
// Dictionary of migration functions, keyed by the version they migrate TO // Dictionary of migration functions, keyed by the version they migrate TO
private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new() private static readonly Dictionary<int, Func<JObject, JObject>> Migrations = new()
@@ -22,7 +23,8 @@ public static class SchemaMigration
// { 2, MigrateV1ToV2 }, // { 2, MigrateV1ToV2 },
// Example: Migration from v2 to v3 // Example: Migration from v2 to v3
// { 3, MigrateV2ToV3 }, { 4, MigrateV3ToV4 },
{ 5, MigrateV4ToV5 },
}; };
/// <summary> /// <summary>
@@ -93,12 +95,22 @@ public static class SchemaMigration
/// Example migration function: from v2 to v3. /// Example migration function: from v2 to v3.
/// Add a new required field with a default value. /// Add a new required field with a default value.
/// </summary> /// </summary>
private static JObject MigrateV2ToV3(JObject obj) private static JObject MigrateV3ToV4(JObject obj)
{ {
// Example: Add a new field that didn't exist before // Example: Add a new field that didn't exist before
if (!obj.ContainsKey("new_required_field")) if (!obj.ContainsKey("moduleConfig"))
{ {
obj["new_required_field"] = "default_value"; obj["moduleConfig"] = JToken.FromObject(new ModuleConfig());
}
return obj;
}
private static JObject MigrateV4ToV5(JObject obj)
{
// Example: Add a new field that didn't exist before
if (!obj.ContainsKey("expLabEnable"))
{
obj["expLabEnable"] = JToken.FromObject(new PdfExportSettings().expLabEnable);
} }
return obj; return obj;
+27
View File
@@ -1,6 +1,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Reflection;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
@@ -19,6 +20,8 @@ public class Settings
public Customers customers = new(); public Customers customers = new();
public PdfExportSettings pdfExport { get; set; } = new(); public PdfExportSettings pdfExport { get; set; } = new();
public ModuleConfig moduleConfig { get; set; } = new ModuleConfig();
public Settings() public Settings()
{ {
_instance = this; _instance = this;
@@ -70,8 +73,32 @@ public class Settings
} }
} }
public class ModuleConfig
{
/// <summary>
/// Contains enabled modules and whether it's password-protected or not (non-existing-feature but soon)
/// </summary>
public List<(LCModule, bool)> EnabledModules = new();
public ModuleConfig()
{
EnabledModules = new List<(LCModule,bool)>();
}
}
public enum LCModule
{
Addressmanagement,
Pricemanagement,
Wiki,
Staffmanagement,
UnifiedEndpointManagement,
Financemanagement
}
public class PdfExportSettings public class PdfExportSettings
{ {
public bool expLabEnable {get; set;} = true;
public double cellPaddingTopMm { get; set; } = 4; public double cellPaddingTopMm { get; set; } = 4;
public double cellPaddingBottomMm { get; set; } = 4; public double cellPaddingBottomMm { get; set; } = 4;
public double cellPaddingLeftMm { get; set; } = 4; public double cellPaddingLeftMm { get; set; } = 4;
+71 -6
View File
@@ -21,8 +21,45 @@
<MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick" /> <MenuItem Header="Über" x:Name="MnuAbout" Click="MnuAbout_OnClick" />
</MenuItem> </MenuItem>
</Menu> </Menu>
<TabControl Grid.Row="1"> <TabControl Grid.Row="1" x:Name="TcMain">
<TabItem> <TabItem x:Name="Home">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="House" Width="32" Height="32" Size="32" />
<!-- <Label FontSize="20" Content="Addressverwaltung" VerticalContentAlignment="Center" /> -->
</StackPanel>
</TabItem.Header>
<Grid RowDefinitions="3*,*,100">
<StackPanel Orientation="Vertical" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" > <!-- ColumnDefinitions="*,*" -->
<Label Content="Welcome to Logofclient!" HorizontalAlignment="Center" FontSize="32" ></Label>
<Label Content="Version 1.0.1" FontSize="16" HorizontalAlignment="Center"></Label>
<!-- <Image Source="assets/calc_man.png" MaxHeight="350" VerticalAlignment="Center" HorizontalAlignment="Center" /> -->
</StackPanel>
<Grid Grid.Row="1" Margin="20" IsVisible="True" x:Name="GrdHMCalcMan">
<Image Source="assets/calc_man.png" VerticalAlignment="Center" HorizontalAlignment="Center" />
</Grid>
<!-- <Grid ColumnDefinitions="*,*,*" Grid.Row="1"> -->
<StackPanel Grid.Row="2" Orientation="Horizontal" Spacing="10" HorizontalAlignment="Center"
Margin="0,0,5,0">
<Button Width="250" HorizontalContentAlignment="Center"
Margin="0,0,0,10" IsEnabled="True" VerticalAlignment="Stretch"
x:Name="BtnAdmgmt" Click="BtnAdmgmt_OnClick">
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="MapPinHouse" Width="36" Height="36" />
<Label Content="Addressverwaltung" VerticalContentAlignment="Center" FontSize="15"
FontWeight="Bold" />
</StackPanel>
<TextBlock TextWrapping="Wrap" FontSize="9" Text="Strukturierte Verwaltung von Adressen für Pressepost-Printmailings inkl. Erstellung von Bundleitzetteln." HorizontalAlignment="Stretch" TextAlignment="Left"></TextBlock>
</StackPanel>
</Button>
</StackPanel>
<!-- </Grid> -->
</Grid>
</TabItem>
<TabItem IsVisible="False" x:Name="Addressmanagement">
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="MapPinHouse" Width="32" Height="32" Size="32" /> <LucideIcon Kind="MapPinHouse" Width="32" Height="32" Size="32" />
@@ -87,6 +124,14 @@
</StackPanel> </StackPanel>
</MenuItem.Header> </MenuItem.Header>
</MenuItem> </MenuItem>
<MenuItem x:Name="MnIAdSetExp" Click="MnIAdSetExp_OnClick">
<MenuItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="FileUp" Width="12" Height="12" Size="12" />
<Label Content="Exportieren (CSV)" VerticalContentAlignment="Center" />
</StackPanel>
</MenuItem.Header>
</MenuItem>
<MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True"> <MenuItem x:Name="MnIAdSetDelete" Click="MnIAdSetDelete_OnClick" IsEnabled="True">
<MenuItem.Header> <MenuItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
@@ -278,6 +323,7 @@
<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">
<ScrollViewer Grid.Column="1"> <ScrollViewer Grid.Column="1">
<StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" > <StackPanel Margin="5,5,5,5" Orientation="Vertical" Spacing="20" Background="AliceBlue" >
<CheckBox Content="Versandetiketten erstellen" x:Name="CbExpLabEnable" Margin="10,10,10,0"></CheckBox>
<Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0"> <Grid ColumnDefinitions="*,*,*" ColumnSpacing="20" Margin="10,10,10,0">
<StackPanel Orientation="Vertical" Spacing="10"> <StackPanel Orientation="Vertical" Spacing="10">
<Grid ColumnDefinitions="*,*"> <Grid ColumnDefinitions="*,*">
@@ -396,7 +442,7 @@
</Grid> </Grid>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem IsEnabled="False"> <TabItem IsEnabled="False" IsVisible="False" x:Name="Staffmanagement">
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="Users" Width="32" Height="32" Size="32" /> <LucideIcon Kind="Users" Width="32" Height="32" Size="32" />
@@ -404,7 +450,7 @@
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
</TabItem> </TabItem>
<TabItem IsEnabled="False"> <TabItem IsEnabled="False" IsVisible="False" x:Name="Financemanagement">
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="BadgeEuro" Width="32" Height="32" Size="32" /> <LucideIcon Kind="BadgeEuro" Width="32" Height="32" Size="32" />
@@ -412,7 +458,7 @@
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
</TabItem> </TabItem>
<TabItem IsEnabled="False"> <TabItem IsEnabled="False" IsVisible="False" x:Name="Pricemanagement">
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="ReceiptEuro" Width="32" Height="32" Size="32" /> <LucideIcon Kind="ReceiptEuro" Width="32" Height="32" Size="32" />
@@ -420,7 +466,15 @@
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
</TabItem> </TabItem>
<TabItem IsEnabled="True"> <TabItem IsEnabled="False" IsVisible="False" x:Name="UnifiedEndpointManagement">
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="MonitorCog" Width="32" Height="32" Size="32" />
<Label FontSize="20" Content="UEM" VerticalContentAlignment="Center" />
</StackPanel>
</TabItem.Header>
</TabItem>
<TabItem IsEnabled="True" IsVisible="False" x:Name="Wiki">
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" /> <LucideIcon Kind="LibraryBig" Width="32" Height="32" Size="32" />
@@ -540,6 +594,17 @@
<!-- </Grid> --> <!-- </Grid> -->
</StackPanel> </StackPanel>
</TabItem> </TabItem>
<TabItem>
<TabItem.Header>
<StackPanel Orientation="Horizontal">
<LucideIcon Kind="Puzzle" Width="16" Height="16" Size="16" />
<Label FontSize="16" Content="Module" VerticalContentAlignment="Center" />
</StackPanel>
</TabItem.Header>
<StackPanel Orientation="Vertical" Spacing="10" x:Name="StpSettingsModules">
</StackPanel>
</TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
+127 -1
View File
@@ -85,8 +85,92 @@ public partial class MainWindow : Window
{ {
Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error); Logger.Log($"Error while doing wiki stuff: {ex.Message}", Logger.LogType.Error);
} }
try
{
foreach(var module in Enum.GetValues<LCModule>())
{
CheckBox b = new CheckBox
{
IsChecked = false
};
b.Click += (object sender, RoutedEventArgs e) => {
RenewModuleSettings(module, b.IsChecked);
};
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
if(conf.Item1 == module)
{
b.IsChecked = true;
}
}
Label l = new Label()
{
Content = module.ToString(),
};
StpSettingsModules.Children.Add(new StackPanel()
{
Orientation = Avalonia.Layout.Orientation.Horizontal,
Children = {b,l}
});
}
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
Logger.Log($"Enabling module: {conf.Item1}");
switch (conf.Item1)
{
case LCModule.Addressmanagement:
Addressmanagement.IsVisible = true;
break;
case LCModule.Pricemanagement:
Pricemanagement.IsVisible = true;
break;
case LCModule.Staffmanagement:
Staffmanagement.IsVisible = true;
break;
case LCModule.Financemanagement:
Financemanagement.IsVisible = true;
break;
case LCModule.Wiki:
Wiki.IsVisible = true;
break;
case LCModule.UnifiedEndpointManagement:
UnifiedEndpointManagement.IsVisible = true;
break;
default:
break;
}
}
} catch (Exception ex)
{
Logger.Log($"Error while applying module configuration: {ex.Message}");
}
} }
private void RenewModuleSettings(LCModule value, bool? enabled = true)
{
if (enabled == true)
{
Settings._instance.moduleConfig.EnabledModules.Add((value,false));
} else
{
int index = -1;
foreach(var conf in Settings._instance.moduleConfig.EnabledModules)
{
if(conf.Item1 == value)
{
index = Settings._instance.moduleConfig.EnabledModules.IndexOf(conf);
}
}
if(index != -1)
Settings._instance.moduleConfig.EnabledModules.RemoveAt(index);
}
Settings.Save();
}
private async void StartAddressCheck(int addresSetID) private async void StartAddressCheck(int addresSetID)
{ {
var progressWindow = new ProgressWindow(); var progressWindow = new ProgressWindow();
@@ -894,6 +978,8 @@ public partial class MainWindow : Window
{ {
var options = Settings._instance.pdfExport ?? new PdfExportSettings(); var options = Settings._instance.pdfExport ?? new PdfExportSettings();
CbExpLabEnable.IsChecked = (bool)options.expLabEnable;
NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm; NudExpMargCellPaddingTop.Value = (decimal)options.cellPaddingTopMm;
NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm; NudExpMargCellPaddingBot.Value = (decimal)options.cellPaddingBottomMm;
NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm; NudExpMargCellPaddingLeft.Value = (decimal)options.cellPaddingLeftMm;
@@ -910,6 +996,7 @@ public partial class MainWindow : Window
NudExpMargFontSize.Value = (decimal)options.fontSize; NudExpMargFontSize.Value = (decimal)options.fontSize;
NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize; NudExpMargSmallFontSize.Value = (decimal)options.smallFontSize;
CbExpRnsPvSt.IsChecked = options.rsPvSt; CbExpRnsPvSt.IsChecked = options.rsPvSt;
CbExpRnsEnable.IsChecked = options.exportRunningSheets;
TbExpRnsKNrAbs.Text = options.rsKNrAbs; TbExpRnsKNrAbs.Text = options.rsKNrAbs;
TbExpRnsKNrEmp.Text = options.rsKNrEmp; TbExpRnsKNrEmp.Text = options.rsKNrEmp;
@@ -946,6 +1033,8 @@ public partial class MainWindow : Window
fontSize = ReadDouble(NudExpMargFontSize), fontSize = ReadDouble(NudExpMargFontSize),
smallFontSize = ReadDouble(NudExpMargSmallFontSize), smallFontSize = ReadDouble(NudExpMargSmallFontSize),
expLabEnable = CbExpLabEnable.IsChecked.Value,
rsKNrAbs = TbExpRnsKNrAbs.Text, rsKNrAbs = TbExpRnsKNrAbs.Text,
rsKNrEmp = TbExpRnsKNrEmp.Text, rsKNrEmp = TbExpRnsKNrEmp.Text,
rsZKZ = TbExpRnsZKZ.Text, rsZKZ = TbExpRnsZKZ.Text,
@@ -956,8 +1045,10 @@ public partial class MainWindow : Window
rsBundGew = TbExpRnsBundGew.Text, rsBundGew = TbExpRnsBundGew.Text,
rsPalNr = ReadInt(NudExpRnsPalNr, 1), rsPalNr = ReadInt(NudExpRnsPalNr, 1),
rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20), rsBundNrPal = ReadInt(NudExpRnsBundNrPal, 20),
rsNumGrouped = ReadInt(NudExpRnsPlzcount, 25),
rsPvSt = CbExpRnsPvSt.IsChecked.Value rsPvSt = CbExpRnsPvSt.IsChecked.Value,
exportRunningSheets = CbExpRnsEnable.IsChecked.Value
}; };
Settings.Save(); Settings.Save();
@@ -1387,4 +1478,39 @@ public partial class MainWindow : Window
} }
} }
private async void MnIAdSetExp_OnClick(object? sender, RoutedEventArgs e)
{
var topLevel = TopLevel.GetTopLevel(this);
var folders = await topLevel.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
{
Title = "Select a Folder",
AllowMultiple = false
});
if (folders.Count > 0)
{
var folderPath = folders[0].Path.LocalPath;
if (LstCustomerAdressSets.SelectedItems.Count > 0)
{
foreach (var set in LstCustomerAdressSets.SelectedItems)
{
string output = await ((KasAddressList)set).GenerateCSV();
File.WriteAllText(Path.Combine(folderPath,((KasAddressList)set).Name + ".csv"), output);
}
}
}
}
private void BtnAdmgmt_OnClick(object? sender, RoutedEventArgs e)
{
if (Addressmanagement.IsVisible && Addressmanagement.IsVisible)
{
TcMain.SelectedIndex = 1;
}
}
} }
+1
View File
@@ -168,6 +168,7 @@ public static class AddressCreator
} // Error-Handling? } // Error-Handling?
if (address_line_count > 1) return string_address; if (address_line_count > 1) return string_address;
Logger.Log($"Address with ID {address.id} (refsid: {address.refsid} not valid for production use", Logger.LogType.Warning);
return null; return null;
} }
+81
View File
@@ -3,6 +3,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;
using Avalonia.Controls;
using Logof_Client; using Logof_Client;
public class AddressPatch public class AddressPatch
@@ -134,4 +135,84 @@ public class AddressPatch
return "Error while parsing"; return "Error while parsing";
} }
public string GetCSVHeader(string sep)
{
string output = "";
if(has_refsid){
output += refsid_is + sep + " ";
}
if(has_anrede){
output += anrede_is + sep + " ";
}
if(has_titel){
output += titel_is + sep + " ";
}
if(has_vorname){
output += vorname_is + sep + " ";
}
if(has_adel){
output += adel_is + sep + " ";
}
if(has_name){
output += name_is + sep + " ";
}
if(has_namezus){
output += namezus_is + sep + " ";
}
if(has_anredzus){
output += anredzus_is + sep + " ";
}
if(has_strasse){
output += strasse_is + sep + " ";
}
if(has_strasse2){
output += strasse2_is + sep + " ";
}
if(has_plz){
output += plz_is + sep + " ";
}
if(has_ort){
output += ort_is + sep + " ";
}
if(has_land){
output += land_is + sep + " ";
}
if(has_pplz){
output += pplz_is + sep + " ";
}
if(has_postfach){
output += postfach_is + sep + " ";
}
if(has_name1){
output += name1_is + sep + " ";
}
if(has_name2){
output += name2_is + sep + " ";
}
if(has_name3){
output += name3_is + sep + " ";
}
if(has_name4){
output += name4_is + sep + " ";
}
if(has_name5){
output += name5_is + sep + " ";
}
if(has_funktion){
output += funktion_is + sep + " ";
}
if(has_funktion2){
output += funktion2_is + sep + " ";
}
if(has_abteilung){
output += abteilung_is + sep + " ";
}
if(has_funktionad){
output += funktionad_is + sep + " ";
}
return output;
}
} }
+30 -2
View File
@@ -3,16 +3,26 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Threading.Tasks.Dataflow; using System.Threading.Tasks.Dataflow;
using System.Threading;
using Avalonia.Threading;
namespace Logof_Client; namespace Logof_Client;
public class AddressShortener(ProgressWindow progressWindow) public class AddressShortener
{ {
private readonly ProgressWindow _progress;
public AddressShortener(ProgressWindow progressWindow)
{
_progress = progressWindow;
}
public async Task Perform(KasAddressList list) public async Task Perform(KasAddressList list)
{ {
try try
{ {
List<int> doubled_ids = new List<int>(); List<int> doubled_ids = new List<int>();
int[] percentages = [25,25,25,25];
for (int i = 0; i < list.KasPersons.Count; i++) for (int i = 0; i < list.KasPersons.Count; i++)
{ {
var address = list.KasPersons[i]; var address = list.KasPersons[i];
@@ -26,8 +36,19 @@ public class AddressShortener(ProgressWindow progressWindow)
doubled_ids.Add(address.refsid); doubled_ids.Add(address.refsid);
} }
} }
// var cd = Interlocked.Increment(ref current);
// if (cd % 10 == 0)
// {
// var percent = cd / (double)total * 100;
// await Dispatcher.UIThread.InvokeAsync(() =>
// _progress.ChangePercentage(percent));
// }
} }
// delete doubled addresses by refsid // delete doubled addresses by refsid
foreach (int id in doubled_ids) foreach (int id in doubled_ids)
{ {
@@ -65,12 +86,19 @@ public class AddressShortener(ProgressWindow progressWindow)
} }
} }
string faileds = "Folgende Adressen wurden entfernt:\n(refsid - Name, Vorname)\n\n";
// delete doubled addresses by refsid // delete doubled addresses by refsid
foreach (int id in toRemove) foreach (int id in toRemove)
{ {
// does this remove both of the doubled addresses? // does this remove both of the doubled addresses?
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id)); var pers = list.KasPersons.Find(x => x.id == id);
faileds += pers.refsid + " - " + pers.name + ", " + pers.vorname + "\n";
list.KasPersons.Remove(pers);
} }
await Dispatcher.UIThread.InvokeAsync(() => _progress.Hide());
if (toRemove.Count > 0) await Dispatcher.UIThread.InvokeAsync(() => MessageBox.Show(null,faileds,"Fehlerhafte Adressen"));
} }
catch (Exception ex) catch (Exception ex)
{ {
+94 -62
View File
@@ -92,6 +92,8 @@ public class PdfBuilder
public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText, bool pvst, public void CreateAddressLabelPdfFromAddressSetWithPlaceholder(int addressSetId, string placeholderText, bool pvst,
string outputPath) string outputPath)
{ {
try try
{ {
// Find the AddressSet by ID // Find the AddressSet by ID
@@ -120,18 +122,21 @@ public class PdfBuilder
senderLine = null; senderLine = null;
} }
List<KasPerson> failed = new();
// national addresses // national addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++) foreach (var person in addressSet.KasPersons
.Where(person => person.IsGermany())
.OrderBy(person => person.used_plz))
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
if (!addressSet.KasPersons[i].IsGermany()) continue; var addr = AddressCreator.CreateFinalMarkdownString(person.id);
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id); if(addr == null) failed.Add(person);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0) if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>"; senderLineID += $"ID: {person.refsid}\n</font6>";
else else
senderLineID += "\n</font6>"; senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID)) if (!string.IsNullOrEmpty(senderLineID))
@@ -141,17 +146,20 @@ public class PdfBuilder
} }
// international addresses // international addresses
for (var i = 0; i < addressSet.KasPersons.Count; i++) foreach (var person in addressSet.KasPersons
.Where(person => !person.IsGermany())
.OrderBy(person => person.land)
.ThenBy(person => person.used_plz))
{ {
string senderLineID = senderLine; string senderLineID = senderLine;
if (addressSet.KasPersons[i].IsGermany()) continue; var addr = AddressCreator.CreateFinalMarkdownString(person.id);
var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id); if(addr == null) failed.Add(person);
if (string.IsNullOrWhiteSpace(addr)) continue; if (string.IsNullOrWhiteSpace(addr)) continue;
if (pvst) if (pvst)
senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>"; senderLineID += $"</font6>**PvSt, DP AG, Entgelt bezahlt, ZKZ {Settings._instance.pdfExport.rsZKZ}**\n<font6>";
if (addressSet.KasPersons[i].refsid != null || addressSet.KasPersons[i].refsid != 0) if (person.refsid != null || person.refsid != 0)
senderLineID += $"ID: {addressSet.KasPersons[i].refsid}\n</font6>"; senderLineID += $"ID: {person.refsid}\n</font6>";
else else
senderLineID += "\n</font6>"; senderLineID += "\n</font6>";
if (!string.IsNullOrEmpty(senderLineID)) if (!string.IsNullOrEmpty(senderLineID))
@@ -168,13 +176,29 @@ public class PdfBuilder
string output_inter = outputPath.Replace(".pdf", "-international.pdf"); string output_inter = outputPath.Replace(".pdf", "-international.pdf");
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst); if(Settings._instance.pdfExport.expLabEnable == false)
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst); {
Logger.Log("Skipping label pdf generation cause it was disabled by user");
} else
{
if(addresses_german.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_german, placeholderText, outputPath, pvst);
if(addresses_inter.Count > 0) CreateAddressLabelPdfWithPlaceholder(addresses_inter, placeholderText, output_inter, pvst);
}
if (_settings.exportRunningSheets) if (_settings.exportRunningSheets)
{ {
ExportRunningSheets(addressSetId, outputPath); ExportRunningSheets(addressSetId, outputPath);
} }
if(failed.Count > 0)
{
string faileds = "Versandetiketten zu folgenden Adressen konnten nicht generiert werden:\n(refsid - Name, Vorname)\n\n";
foreach(var pers in failed)
{
faileds += pers.refsid + " - " + pers.name + ", " + pers.vorname + "\n";
}
MessageBox.Show(MainWindow._instance,faileds,"Fehlerhafte Adressen");
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -709,12 +733,14 @@ public class PdfBuilder
var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold); var fontBig = new XFont("Arial", 30, XFontStyleEx.Bold);
int firstIndex = pageIndex * 2; int firstIndex = pageIndex * 2;
int palletNumber = int? palletNumber = null;
Settings._instance.pdfExport.rsPalNr + int? bundleOnPallet = null;
(firstIndex / Settings._instance.pdfExport.rsBundNrPal); if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
int bundleOnPallet = palletNumber = Settings._instance.pdfExport.rsPalNr +
(firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; (firstIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet = (firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
DrawGermanyRunningSheet( DrawGermanyRunningSheet(
gfx, gfx,
@@ -735,12 +761,14 @@ public class PdfBuilder
int secondIndex = firstIndex + 1; int secondIndex = firstIndex + 1;
int palletNumber2 = int? palletNumber2 = null;
Settings._instance.pdfExport.rsPalNr + int? bundleOnPallet2 = null;
(secondIndex / Settings._instance.pdfExport.rsBundNrPal); if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
int bundleOnPallet2 = palletNumber2 = Settings._instance.pdfExport.rsPalNr +
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; (secondIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet2 = (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
if (firstIndex + 1 < grouped_nums.Count) if (firstIndex + 1 < grouped_nums.Count)
{ {
@@ -766,7 +794,7 @@ public class PdfBuilder
document.Save(path); document.Save(path);
} }
private void DrawGermanyRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int pal_nr, int bundleOnPallet, int totalBundleNumber) private void DrawGermanyRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int? pal_nr, int? bundleOnPallet, int totalBundleNumber)
{ {
double line = 1.0; double line = 1.0;
@@ -914,20 +942,20 @@ public class PdfBuilder
new XRect(valueX, blY1 + 4, valueW, 14), new XRect(valueX, blY1 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
if (options.rsBundNrPal == null) goto nopal; if (options.rsBundNrPal > 0)
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black, {
new XRect(valueX, blY3 + 4, valueW, 14), gfx.DrawString(pal_nr?.ToString() ?? string.Empty, fontText, XBrushes.Black,
XStringFormats.TopRight); new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(
$"{bundleOnPallet}/{options.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
}
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
nopal:
gfx.DrawString( gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}", $"{totalBundleNumber}/{grouped_nums.Count}",
fontText, fontText,
@@ -984,12 +1012,14 @@ public class PdfBuilder
int firstIndex = pageIndex * 2; int firstIndex = pageIndex * 2;
int palletNumber = int? palletNumber = null;
Settings._instance.pdfExport.rsPalNr + int? bundleOnPallet = null;
(firstIndex / Settings._instance.pdfExport.rsBundNrPal); if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
int bundleOnPallet = palletNumber = Settings._instance.pdfExport.rsPalNr +
(firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; (firstIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet = (firstIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
@@ -1014,12 +1044,14 @@ public class PdfBuilder
{ {
int secondIndex = firstIndex + 1; int secondIndex = firstIndex + 1;
int palletNumber2 = int? palletNumber2 = null;
Settings._instance.pdfExport.rsPalNr + int? bundleOnPallet2 = null;
(secondIndex / Settings._instance.pdfExport.rsBundNrPal); if (Settings._instance.pdfExport.rsBundNrPal > 0)
{
int bundleOnPallet2 = palletNumber2 = Settings._instance.pdfExport.rsPalNr +
(secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1; (secondIndex / Settings._instance.pdfExport.rsBundNrPal);
bundleOnPallet2 = (secondIndex % Settings._instance.pdfExport.rsBundNrPal) + 1;
}
DrawInternationalRunningSheet( DrawInternationalRunningSheet(
gfx, gfx,
@@ -1042,7 +1074,7 @@ public class PdfBuilder
document.Save(path); document.Save(path);
} }
private void DrawInternationalRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int pal_nr, int bundleOnPallet, int totalBundleNumber, string category = "ECONOMY Non-EU") private void DrawInternationalRunningSheet(XGraphics gfx, double x, double y, double w, double h, KasAddressList list, dynamic result, List<(int,string,string,string,int)> grouped_nums, XFont fontLabel, XFont fontText, XFont fontBig, int? pal_nr, int? bundleOnPallet, int totalBundleNumber, string category = "ECONOMY Non-EU")
{ {
double line = 1.0; double line = 1.0;
@@ -1194,20 +1226,20 @@ public class PdfBuilder
new XRect(valueX, blY2 + 4, valueW, 14), new XRect(valueX, blY2 + 4, valueW, 14),
XStringFormats.TopRight); XStringFormats.TopRight);
if (options.rsBundNrPal == 0) goto nopal; if (options.rsBundNrPal > 0)
gfx.DrawString(pal_nr.ToString(), fontText, XBrushes.Black, {
new XRect(valueX, blY3 + 4, valueW, 14), gfx.DrawString(pal_nr?.ToString() ?? string.Empty, fontText, XBrushes.Black,
XStringFormats.TopRight); new XRect(valueX, blY3 + 4, valueW, 14),
XStringFormats.TopRight);
gfx.DrawString(
$"{bundleOnPallet}/{options.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
}
gfx.DrawString(
$"{bundleOnPallet}/{Settings._instance.pdfExport.rsBundNrPal}",
fontText,
XBrushes.Black,
new XRect(valueX, blY4 + 4, valueW, 14),
XStringFormats.TopRight);
nopal:
gfx.DrawString( gfx.DrawString(
$"{totalBundleNumber}/{grouped_nums.Count}", $"{totalBundleNumber}/{grouped_nums.Count}",
fontText, fontText,