Compare commits
23 Commits
v0.7.0
...
9777c6b5a2
| Author | SHA1 | Date | |
|---|---|---|---|
| 9777c6b5a2 | |||
| 9ad378c800 | |||
| 5ccd4a4e99 | |||
| ac7b23cc28 | |||
| 16ed64dbf4 | |||
| cc48c0ae2c | |||
| ba640c602a | |||
| e8738a2eab | |||
| afbb4626a0 | |||
| ee83aca490 | |||
| b40ddfbf2e | |||
| 5172de332c | |||
| d478fd5129 | |||
| 5dcb44aa2a | |||
| ea31637bdb | |||
| 2c909820d3 | |||
| 96eb122ff8 | |||
| fed817a6dc | |||
| d5073465b2 | |||
| 10b0eb5bcd | |||
| 013bd4a070 | |||
| 2c4eb1fcef | |||
| 0395537a55 |
@@ -1,60 +0,0 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace Logof_Client;
|
|
||||||
|
|
||||||
public class CsvBuilder
|
|
||||||
{
|
|
||||||
private readonly string Header;
|
|
||||||
private readonly List<object> Instances;
|
|
||||||
private readonly KasAddressList KasAddressList;
|
|
||||||
|
|
||||||
public CsvBuilder(string header, List<object> instances)
|
|
||||||
{
|
|
||||||
Header = header;
|
|
||||||
Instances = instances;
|
|
||||||
}
|
|
||||||
|
|
||||||
public CsvBuilder(string header, KasAddressList instances)
|
|
||||||
{
|
|
||||||
Header = header;
|
|
||||||
KasAddressList = instances;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string? BuildKas()
|
|
||||||
{
|
|
||||||
var result = new StringBuilder();
|
|
||||||
|
|
||||||
result.AppendLine(Header);
|
|
||||||
foreach (var l in KasAddressList.KasPersons)
|
|
||||||
|
|
||||||
result.AppendLine(
|
|
||||||
l.refsid + "," +
|
|
||||||
l.anrede + "," +
|
|
||||||
l.titel + "," +
|
|
||||||
l.vorname + "," +
|
|
||||||
l.adel + "," +
|
|
||||||
l.name + "," +
|
|
||||||
l.namezus + "," +
|
|
||||||
l.anredzus + "," +
|
|
||||||
l.strasse + "," +
|
|
||||||
l.strasse2 + "," +
|
|
||||||
l.plz + "," +
|
|
||||||
l.ort + "," +
|
|
||||||
l.land + "," +
|
|
||||||
l.pplz + "," +
|
|
||||||
l.postfach + "," +
|
|
||||||
l.name1 + "," +
|
|
||||||
l.name2 + "," +
|
|
||||||
l.name3 + "," +
|
|
||||||
l.name4 + "," +
|
|
||||||
l.name5 + "," +
|
|
||||||
l.funktion + "," +
|
|
||||||
l.funktion2 + "," +
|
|
||||||
l.abteilung + "," +
|
|
||||||
l.funktionad);
|
|
||||||
|
|
||||||
// weitere Cases
|
|
||||||
return result.ToString();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
|
|
||||||
@@ -32,11 +33,16 @@ public class KasAddressList //Address-Set
|
|||||||
this.owner_id = owner_id;
|
this.owner_id = owner_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string GenerateName(string basic_type, bool? is_rest = false)
|
public static async Task<string> GenerateName(string basic_type, bool? is_rest = false)
|
||||||
{
|
{
|
||||||
|
string pre = "";
|
||||||
|
|
||||||
if (is_rest == true)
|
if (is_rest == true)
|
||||||
return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
|
return basic_type + " - " + DateTime.Now.ToShortDateString() + " - Rest";
|
||||||
return basic_type + " - " + DateTime.Now.ToShortDateString();
|
pre = basic_type + " - " + DateTime.Now.ToShortDateString();
|
||||||
|
|
||||||
|
var result = await NamingWindow.Show(MainWindow._instance, pre);
|
||||||
|
return string.IsNullOrWhiteSpace(result) ? pre : result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// public void UpdateErrorList(List<KasPersonError> errorList)
|
// public void UpdateErrorList(List<KasPersonError> errorList)
|
||||||
@@ -169,13 +175,18 @@ public class KasPerson
|
|||||||
|
|
||||||
public static int GenerateNewID(int base_id)
|
public static int GenerateNewID(int base_id)
|
||||||
{
|
{
|
||||||
var newid = 100000 + base_id;
|
//var newid = 100000 + base_id;
|
||||||
|
int highest = 0;
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
{
|
||||||
foreach (var add in set.KasPersons)
|
foreach (var add in set.KasPersons)
|
||||||
if (add.id >= newid)
|
{
|
||||||
newid = add.id + 1;
|
if(add.id >= highest) highest = add.id+1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return newid;
|
|
||||||
|
return highest + base_id + 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,9 +61,18 @@ public class Global
|
|||||||
_instance = this;
|
_instance = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string config_path { get; set; } = "";
|
public string config_path { get; set; } = Path.Combine(
|
||||||
public string wiki_storage_path { get; set; } = "";
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient",
|
||||||
|
"config.json");
|
||||||
|
|
||||||
|
public string wiki_storage_path { get; set; } = Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"logofclient",
|
||||||
|
"wiki");
|
||||||
|
|
||||||
public List<Country> countries { get; set; } = new();
|
public List<Country> countries { get; set; } = new();
|
||||||
|
public string font_path { get; set; } = Path.Combine(AppContext.BaseDirectory, "assets", "fonts");
|
||||||
|
|
||||||
public static void Save()
|
public static void Save()
|
||||||
{
|
{
|
||||||
@@ -50,4 +50,12 @@
|
|||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</AvaloniaResource>
|
</AvaloniaResource>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Content Include="assets\fonts\**\*.*">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
|
||||||
|
<Folder Include="assets\fonts\"/>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
+36
-5
@@ -67,7 +67,20 @@
|
|||||||
SelectionChanged="LstCustomerAdressSets_OnSelectionChanged"
|
SelectionChanged="LstCustomerAdressSets_OnSelectionChanged"
|
||||||
Background="AliceBlue"
|
Background="AliceBlue"
|
||||||
Margin="0,5,0,5"
|
Margin="0,5,0,5"
|
||||||
SelectionMode="Multiple,Toggle" />
|
SelectionMode="Multiple,Toggle">
|
||||||
|
<ListBox.ContextMenu>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem x:Name="MnIAdSetRename" Click="MnIAdSetRename_OnClick">
|
||||||
|
<MenuItem.Header>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Pencil" Width="12" Height="12" Size="12" />
|
||||||
|
<Label Content="Umbenennen" VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</MenuItem.Header>
|
||||||
|
</MenuItem>
|
||||||
|
</ContextMenu>
|
||||||
|
</ListBox.ContextMenu>
|
||||||
|
</ListBox>
|
||||||
|
|
||||||
<Button Grid.Row="2" HorizontalAlignment="Stretch" x:Name="BtnCustomerAddressSetImport"
|
<Button Grid.Row="2" HorizontalAlignment="Stretch" x:Name="BtnCustomerAddressSetImport"
|
||||||
Click="BtnCustomerAddressSetImport_OnClick">
|
Click="BtnCustomerAddressSetImport_OnClick">
|
||||||
@@ -257,9 +270,10 @@
|
|||||||
<Grid ColumnDefinitions="300,*">
|
<Grid ColumnDefinitions="300,*">
|
||||||
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
||||||
<StackPanel>
|
<StackPanel>
|
||||||
<TextBlock Text="Wiki" FontSize="18" Margin="12" />
|
<Button Content="+ Hinzufügen" Margin="10" x:Name="BtnWikiAddFile"
|
||||||
|
Click="BtnWikiAddFile_OnClick" />
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<TreeView Name="NavTree" Margin="8" />
|
<TreeView Name="NavTree" Margin="10" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Border>
|
</Border>
|
||||||
@@ -307,7 +321,7 @@
|
|||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
<TextBox x:Name="TbConfigPath" HorizontalAlignment="Stretch"
|
||||||
Watermark="/home/username/.config/logofclient/config.json" />
|
Watermark="/home/username/.config/logofclient/config.json" />
|
||||||
<Button IsEnabled="False">
|
<Button x:Name="BtnConfigPath" HorizontalAlignment="Right">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="File" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="File" Width="16" Height="16" Size="16" />
|
||||||
@@ -324,7 +338,24 @@
|
|||||||
<StackPanel Orientation="Horizontal" Spacing="5">
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
<TextBox x:Name="TbWikiPath" HorizontalAlignment="Stretch"
|
||||||
Watermark="/home/username/.config/logofclient/wiki" />
|
Watermark="/home/username/.config/logofclient/wiki" />
|
||||||
<Button IsEnabled="True" x:Name="BtnWikiPath">
|
<Button IsEnabled="True" x:Name="BtnWikiPath" HorizontalAlignment="Right">
|
||||||
|
<Button.Content>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||||
|
<Label Content="Öffnen..." VerticalContentAlignment="Center" />
|
||||||
|
</StackPanel>
|
||||||
|
</Button.Content>
|
||||||
|
</Button>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Grid>
|
||||||
|
<Grid ColumnDefinitions="400,*">
|
||||||
|
<Label Grid.Column="0">Font-Pfad</Label>
|
||||||
|
<StackPanel Grid.Column="1" Orientation="Vertical" Spacing="5">
|
||||||
|
<StackPanel Orientation="Horizontal" Spacing="5">
|
||||||
|
<TextBox x:Name="TbFontPath" HorizontalAlignment="Stretch"
|
||||||
|
Watermark="[App-Direcotry]/assets/fonts/" />
|
||||||
|
<Button IsEnabled="True" x:Name="BtnFontPath" HorizontalAlignment="Right">
|
||||||
<Button.Content>
|
<Button.Content>
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="Folder" Width="16" Height="16" Size="16" />
|
||||||
|
|||||||
+139
-26
@@ -15,6 +15,7 @@ public partial class MainWindow : Window
|
|||||||
public static MainWindow _instance;
|
public static MainWindow _instance;
|
||||||
|
|
||||||
private Country _selectedCountry;
|
private Country _selectedCountry;
|
||||||
|
private string _selectedWikiFilePath;
|
||||||
private bool _suppressCountryRefresh;
|
private bool _suppressCountryRefresh;
|
||||||
|
|
||||||
private WikiService _wikiService;
|
private WikiService _wikiService;
|
||||||
@@ -57,6 +58,8 @@ public partial class MainWindow : Window
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
BtnWikiPath.Click += BtnWikiPath_Click;
|
BtnWikiPath.Click += BtnWikiPath_Click;
|
||||||
|
BtnFontPath.Click += BtnFontPath_Click;
|
||||||
|
BtnConfigPath.Click += BtnConfigPath_Click;
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -94,23 +97,23 @@ public partial class MainWindow : Window
|
|||||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void StartAddressRepair(Uri path)
|
// private async void StartAddressRepair(Uri path)
|
||||||
{
|
// {
|
||||||
var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
// var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||||
var progressWindow = new ProgressWindow();
|
// var progressWindow = new ProgressWindow();
|
||||||
|
//
|
||||||
progressWindow.Show(_instance);
|
// progressWindow.Show(_instance);
|
||||||
|
//
|
||||||
var processor = new AddressRepair(progressWindow);
|
// var processor = new AddressRepair(progressWindow);
|
||||||
//var result = await processor.Perform(addresses.Item2, errors);
|
// //var result = await processor.Perform(addresses.Item2, errors);
|
||||||
|
//
|
||||||
|
//
|
||||||
progressWindow.Close();
|
// progressWindow.Close();
|
||||||
|
//
|
||||||
|
//
|
||||||
//new ResultWindow(result, addresses.Item2).Show();
|
// //new ResultWindow(result, addresses.Item2).Show();
|
||||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
// //await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||||
}
|
// }
|
||||||
|
|
||||||
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuExit_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -191,7 +194,7 @@ public partial class MainWindow : Window
|
|||||||
private async void StartCombine(Uri path)
|
private async void StartCombine(Uri path)
|
||||||
{
|
{
|
||||||
MakeCalcManVisible();
|
MakeCalcManVisible();
|
||||||
var addresses = DataImport.ImportKasAddressList(path);
|
var addresses = await DataImport.ImportKasAddressList(path);
|
||||||
var progressWindow = new ProgressWindow();
|
var progressWindow = new ProgressWindow();
|
||||||
var address_list = new List<KasAddressList> { addresses.Item2 };
|
var address_list = new List<KasAddressList> { addresses.Item2 };
|
||||||
|
|
||||||
@@ -213,7 +216,7 @@ public partial class MainWindow : Window
|
|||||||
if (file == null) return;
|
if (file == null) return;
|
||||||
|
|
||||||
//filePath = file[0].Path;
|
//filePath = file[0].Path;
|
||||||
foreach (var f in file) address_list.Add(DataImport.ImportKasAddressList(f.Path).Item2);
|
foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
|
||||||
|
|
||||||
progressWindow.Show(_instance);
|
progressWindow.Show(_instance);
|
||||||
|
|
||||||
@@ -228,6 +231,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
|
||||||
{
|
{
|
||||||
|
_selectedWikiFilePath = item.Path;
|
||||||
var text = await _wikiService.LoadFileContentAsync(item.Path);
|
var text = await _wikiService.LoadFileContentAsync(item.Path);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -244,9 +248,14 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
EditButton.IsEnabled = true;
|
EditButton.IsEnabled = true;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_selectedWikiFilePath = null;
|
||||||
|
EditButton.IsEnabled = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PopulateNavTree()
|
public void PopulateNavTree()
|
||||||
{
|
{
|
||||||
var roots = _wikiService.GetRootItems();
|
var roots = _wikiService.GetRootItems();
|
||||||
var nodes = new List<TreeViewItem>();
|
var nodes = new List<TreeViewItem>();
|
||||||
@@ -302,6 +311,40 @@ public partial class MainWindow : Window
|
|||||||
PopulateNavTree();
|
PopulateNavTree();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void BtnFontPath_Click(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var top = GetTopLevel(this);
|
||||||
|
var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
|
||||||
|
{
|
||||||
|
Title = "Font Pfad wählen",
|
||||||
|
AllowMultiple = false
|
||||||
|
});
|
||||||
|
|
||||||
|
if (folder == null || folder.Count == 0) return;
|
||||||
|
var chosen = folder[0].Path;
|
||||||
|
TbFontPath.Text = chosen.ToString();
|
||||||
|
Global._instance.font_path = chosen.ToString();
|
||||||
|
Global.Save();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void BtnConfigPath_Click(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var top = GetTopLevel(this);
|
||||||
|
var folder = await top.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
|
||||||
|
{
|
||||||
|
Title = "Config Pfad wählen",
|
||||||
|
AllowMultiple = false
|
||||||
|
});
|
||||||
|
|
||||||
|
if (folder == null || folder.Count == 0) return;
|
||||||
|
var chosen = folder[0].Path;
|
||||||
|
TbConfigPath.Text = chosen.ToString();
|
||||||
|
Global._instance.config_path = chosen.ToString();
|
||||||
|
Global.Save();
|
||||||
|
|
||||||
|
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<string> OpenSettingsSaveAsDialog()
|
private async Task<string> OpenSettingsSaveAsDialog()
|
||||||
{
|
{
|
||||||
var settingsFileName = "KAS-Adress-Liste";
|
var settingsFileName = "KAS-Adress-Liste";
|
||||||
@@ -410,7 +453,16 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
if (string.IsNullOrWhiteSpace(_selectedWikiFilePath))
|
||||||
|
{
|
||||||
|
await MessageBox.Show(this, "Bitte wählen Sie zunächst eine Wiki-Datei aus.", "Keine Datei ausgewählt");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
EditorWindow ew = new(_selectedWikiFilePath);
|
||||||
|
ew.Show();
|
||||||
|
|
||||||
|
//await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RefreshCustomerItems(int index = 0)
|
public void RefreshCustomerItems(int index = 0)
|
||||||
@@ -490,7 +542,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (customer.patch == null)
|
if (customer.patch == null)
|
||||||
{
|
{
|
||||||
var got = DataImport.ImportKasAddressList(selected_path, null, customer.separator);
|
var got = await DataImport.ImportKasAddressList(selected_path, null, customer.separator);
|
||||||
if (!got.Item1)
|
if (!got.Item1)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while importing. Please try another file.");
|
Console.WriteLine("Error while importing. Please try another file.");
|
||||||
@@ -506,7 +558,7 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var got = DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
|
var got = await DataImport.ImportKasAddressList(selected_path, customer.patch, customer.separator);
|
||||||
if (!got.Item1)
|
if (!got.Item1)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Error while importing. Please try another file.");
|
Console.WriteLine("Error while importing. Please try another file.");
|
||||||
@@ -623,9 +675,15 @@ public partial class MainWindow : Window
|
|||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
|
try
|
||||||
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void BtnCombineUnion_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombineUnion_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -633,9 +691,16 @@ public partial class MainWindow : Window
|
|||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
|
try
|
||||||
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private void BtnCombineIntersection_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombineIntersection_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -643,9 +708,15 @@ public partial class MainWindow : Window
|
|||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
|
try
|
||||||
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
|
||||||
}
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -820,4 +891,46 @@ public partial class MainWindow : Window
|
|||||||
new List<string> { countryie.ThreeLetterCode, countryie.TwoLetterCode }));
|
new List<string> { countryie.ThreeLetterCode, countryie.TwoLetterCode }));
|
||||||
RefreshCountryView();
|
RefreshCountryView();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void BtnWikiAddFile_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var result = await NamingWindow.Show(this);
|
||||||
|
if (result != null)
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.WriteAllText(Path.Combine(Global._instance.wiki_storage_path, result), "");
|
||||||
|
PopulateNavTree();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var result = await NamingWindow.Show(this);
|
||||||
|
if (result != null)
|
||||||
|
{
|
||||||
|
var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
|
||||||
|
.ToString());
|
||||||
|
var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
if (set.ID == id)
|
||||||
|
{
|
||||||
|
set.Name = result;
|
||||||
|
Settings.Save();
|
||||||
|
RefreshAddressSetListItems(cus_id);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
||||||
|
x:Class="Logof_Client.NamingWindow"
|
||||||
|
Title="NamingWindow">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
|
<TextBlock Name="Text" Margin="10" TextWrapping="Wrap" />
|
||||||
|
<TextBox Name="Input" Margin="10" />
|
||||||
|
<StackPanel HorizontalAlignment="Right" Margin="5" Orientation="Horizontal" Name="Buttons">
|
||||||
|
<StackPanel.Styles>
|
||||||
|
<Style Selector="Button">
|
||||||
|
<Setter Property="Margin" Value="5" />
|
||||||
|
</Style>
|
||||||
|
</StackPanel.Styles>
|
||||||
|
</StackPanel>
|
||||||
|
</StackPanel>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using Avalonia.Controls;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public partial class NamingWindow : Window
|
||||||
|
{
|
||||||
|
public NamingWindow()
|
||||||
|
{
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Task<string> Show(Window parent, string input = "", string info = "Bitte geben Sie einen Namen ein:")
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var wind = new NamingWindow
|
||||||
|
{
|
||||||
|
Title = "Name eingeben"
|
||||||
|
};
|
||||||
|
wind.FindControl<TextBlock>("Text").Text = info;
|
||||||
|
var buttonPanel = wind.FindControl<StackPanel>("Buttons");
|
||||||
|
var inputBox = wind.FindControl<TextBox>("Input");
|
||||||
|
|
||||||
|
inputBox.Text = input;
|
||||||
|
string res = null;
|
||||||
|
|
||||||
|
void AddButton(string caption)
|
||||||
|
{
|
||||||
|
var btn = new Button { Content = caption };
|
||||||
|
btn.Click += (_, __) =>
|
||||||
|
{
|
||||||
|
res = inputBox.Text;
|
||||||
|
wind.Close();
|
||||||
|
};
|
||||||
|
buttonPanel.Children.Add(btn);
|
||||||
|
}
|
||||||
|
|
||||||
|
AddButton("Ok");
|
||||||
|
|
||||||
|
|
||||||
|
var tcs = new TaskCompletionSource<string>();
|
||||||
|
wind.Closed += delegate { tcs.TrySetResult(res); };
|
||||||
|
if (parent != null)
|
||||||
|
wind.ShowDialog(parent);
|
||||||
|
else wind.Show();
|
||||||
|
|
||||||
|
return tcs.Task;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine("Error while showing naming window: " + ex.Message);
|
||||||
|
return Task.FromResult<string>(null!);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# Logofclient
|
||||||
|
Free and open source software suite to manage customers, prices, employees, etc.
|
||||||
|
|
||||||
|
## Bugs
|
||||||
|
Please report any bugs you find to fierke@mypapertown.de, thank you!
|
||||||
|
|
||||||
|
## Contributing
|
||||||
|
Feel free to contribute to this project using your MyPaperCloud-Account (request it via fierke@mypapertown.de) or a local git.mypapercloud.de-Account you are able to create.
|
||||||
+13
-38
@@ -19,36 +19,11 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
|
||||||
bool? exportUnused)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
var res = await Task.Run(async () =>
|
if (type == "difference") return await Difference(address_lists, exportUnused);
|
||||||
{
|
if (type == "union") return await Union(address_lists, exportUnused);
|
||||||
if (type == "difference") return Difference(address_lists, exportUnused);
|
if (type == "intersection") return await Intersection(address_lists, exportUnused);
|
||||||
if (type == "union") return Union(address_lists, exportUnused);
|
if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
|
||||||
if (type == "intersection") return Intersection(address_lists, exportUnused);
|
|
||||||
if (type == "symdiff") return SymmetricDifference(address_lists, exportUnused);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
return res.Result;
|
|
||||||
|
|
||||||
|
|
||||||
// KasAddressList result = new("Ergebnis_" + DateTime.Now.ToString("ddMMyy_HHmmss"));
|
|
||||||
// await Task.Run(async () =>
|
|
||||||
// {
|
|
||||||
// for (var i = 0; i < address_lists.Count; i++)
|
|
||||||
// if (i == 0)
|
|
||||||
// lock (result)
|
|
||||||
// {
|
|
||||||
// result = address_lists[i];
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// lock (result)
|
|
||||||
// {
|
|
||||||
// result = Merge(result, address_lists[i], i + 1, address_lists.Count).Result;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// return result;
|
|
||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,7 +72,7 @@ public class CombineAddresses
|
|||||||
Progress? progress = null)
|
Progress? progress = null)
|
||||||
{
|
{
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (new KasAddressList(KasAddressList.GenerateName("difference")), null);
|
return (new KasAddressList(await KasAddressList.GenerateName("difference")), null);
|
||||||
|
|
||||||
progress ??= new Progress
|
progress ??= new Progress
|
||||||
{
|
{
|
||||||
@@ -109,8 +84,8 @@ public class CombineAddresses
|
|||||||
var restUnion = new List<KasPerson>();
|
var restUnion = new List<KasPerson>();
|
||||||
for (var i = 1; i < address_lists.Count; i++)
|
for (var i = 1; i < address_lists.Count; i++)
|
||||||
restUnion.AddRange(address_lists[i].KasPersons);
|
restUnion.AddRange(address_lists[i].KasPersons);
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("difference_rest"));
|
var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
|
||||||
|
|
||||||
foreach (var person in address_lists[0].KasPersons)
|
foreach (var person in address_lists[0].KasPersons)
|
||||||
{
|
{
|
||||||
@@ -136,8 +111,8 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
|
public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
|
||||||
Progress progress = null)
|
Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("union"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
|
var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -178,8 +153,8 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("intersection"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
|
var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
@@ -225,8 +200,8 @@ public class CombineAddresses
|
|||||||
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
|
var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
|
||||||
|
|
||||||
if (address_lists == null || address_lists.Count == 0)
|
if (address_lists == null || address_lists.Count == 0)
|
||||||
return (result, null);
|
return (result, null);
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class CsvBuilder
|
||||||
|
{
|
||||||
|
private readonly string Header;
|
||||||
|
private readonly List<object> Instances;
|
||||||
|
private readonly KasAddressList KasAddressList;
|
||||||
|
private readonly char Separator;
|
||||||
|
|
||||||
|
public CsvBuilder(string header, List<object> instances, char separator = ',')
|
||||||
|
{
|
||||||
|
Header = header;
|
||||||
|
Instances = instances;
|
||||||
|
Separator = separator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public CsvBuilder(string header, KasAddressList instances, char separator = ',')
|
||||||
|
{
|
||||||
|
Header = header;
|
||||||
|
KasAddressList = instances;
|
||||||
|
Separator = separator;
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? BuildKas()
|
||||||
|
{
|
||||||
|
var result = new StringBuilder();
|
||||||
|
|
||||||
|
result.AppendLine(Header);
|
||||||
|
foreach (var l in KasAddressList.KasPersons)
|
||||||
|
result.AppendLine(string.Join(Separator, new[]
|
||||||
|
{
|
||||||
|
EscapeCsvField(l.refsid.ToString()),
|
||||||
|
EscapeCsvField(l.anrede),
|
||||||
|
EscapeCsvField(l.titel),
|
||||||
|
EscapeCsvField(l.vorname),
|
||||||
|
EscapeCsvField(l.adel),
|
||||||
|
EscapeCsvField(l.name),
|
||||||
|
EscapeCsvField(l.namezus),
|
||||||
|
EscapeCsvField(l.anredzus),
|
||||||
|
EscapeCsvField(l.strasse),
|
||||||
|
EscapeCsvField(l.strasse2),
|
||||||
|
EscapeCsvField(l.plz),
|
||||||
|
EscapeCsvField(l.ort),
|
||||||
|
EscapeCsvField(l.land),
|
||||||
|
EscapeCsvField(l.pplz),
|
||||||
|
EscapeCsvField(l.postfach),
|
||||||
|
EscapeCsvField(l.name1),
|
||||||
|
EscapeCsvField(l.name2),
|
||||||
|
EscapeCsvField(l.name3),
|
||||||
|
EscapeCsvField(l.name4),
|
||||||
|
EscapeCsvField(l.name5),
|
||||||
|
EscapeCsvField(l.funktion),
|
||||||
|
EscapeCsvField(l.funktion2),
|
||||||
|
EscapeCsvField(l.abteilung),
|
||||||
|
EscapeCsvField(l.funktionad)
|
||||||
|
}));
|
||||||
|
|
||||||
|
// weitere Cases
|
||||||
|
return result.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private string EscapeCsvField(string? value)
|
||||||
|
{
|
||||||
|
var field = value ?? string.Empty;
|
||||||
|
var mustQuote = field.Contains(Separator) || field.Contains('"') || field.Contains('\r') || field.Contains('\n');
|
||||||
|
if (!mustQuote)
|
||||||
|
return field;
|
||||||
|
|
||||||
|
return "\"" + field.Replace("\"", "\"\"") + "\"";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,20 +3,22 @@ using System.Collections.Generic;
|
|||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
|
|
||||||
public class DataImport
|
public class DataImport
|
||||||
{
|
{
|
||||||
public static (bool, KasAddressList) ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
public static async Task<(bool, KasAddressList)> ImportKasAddressList(Uri pathToCsv, AddressPatch patch = null,
|
||||||
char separator = ',')
|
char separator = ',')
|
||||||
{
|
{
|
||||||
if (patch == null)
|
if (patch == null)
|
||||||
return ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
return await ImportKasAddressListWithoutPatch(pathToCsv, separator);
|
||||||
return ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
return await ImportKasAddressListWithPatch(pathToCsv, patch, separator);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static (bool, KasAddressList) ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithoutPatch(Uri pathToCsv, char separator)
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
{
|
{
|
||||||
@@ -32,8 +34,8 @@ public class DataImport
|
|||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
var imported =
|
var imported = new KasAddressList(
|
||||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
|
|
||||||
while (!reader.EndOfStream)
|
while (!reader.EndOfStream)
|
||||||
{
|
{
|
||||||
@@ -41,7 +43,7 @@ public class DataImport
|
|||||||
if (string.IsNullOrWhiteSpace(line))
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
if (parts.Length < 24)
|
if (parts.Length < 24)
|
||||||
{
|
{
|
||||||
@@ -90,7 +92,7 @@ public class DataImport
|
|||||||
return (true, imported);
|
return (true, imported);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static (bool, KasAddressList) ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
private static async Task<(bool, KasAddressList)> ImportKasAddressListWithPatch(Uri pathToCsv, AddressPatch patch,
|
||||||
char separator)
|
char separator)
|
||||||
{
|
{
|
||||||
if (!File.Exists(pathToCsv.LocalPath))
|
if (!File.Exists(pathToCsv.LocalPath))
|
||||||
@@ -107,10 +109,10 @@ public class DataImport
|
|||||||
return (false, null);
|
return (false, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
|
var headers = ParseCsvLine(headerLine, separator);
|
||||||
|
|
||||||
var imported =
|
var imported = new KasAddressList(
|
||||||
new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
await KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
|
||||||
var patchType = typeof(AddressPatch);
|
var patchType = typeof(AddressPatch);
|
||||||
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
|
||||||
|
|
||||||
@@ -126,7 +128,7 @@ public class DataImport
|
|||||||
if (string.IsNullOrWhiteSpace(line))
|
if (string.IsNullOrWhiteSpace(line))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
var parts = line.Split(separator).Select(p => p.Trim()).ToArray();
|
var parts = ParseCsvLine(line, separator);
|
||||||
|
|
||||||
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
@@ -241,4 +243,41 @@ public class DataImport
|
|||||||
{
|
{
|
||||||
return int.TryParse(input, out var result) ? result : 0;
|
return int.TryParse(input, out var result) ? result : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string[] ParseCsvLine(string line, char separator)
|
||||||
|
{
|
||||||
|
var fields = new List<string>();
|
||||||
|
var current = new StringBuilder();
|
||||||
|
var inQuotes = false;
|
||||||
|
|
||||||
|
for (var i = 0; i < line.Length; i++)
|
||||||
|
{
|
||||||
|
var c = line[i];
|
||||||
|
|
||||||
|
if (c == '"')
|
||||||
|
{
|
||||||
|
if (inQuotes && i + 1 < line.Length && line[i + 1] == '"')
|
||||||
|
{
|
||||||
|
current.Append('"');
|
||||||
|
i++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
inQuotes = !inQuotes;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (c == separator && !inQuotes)
|
||||||
|
{
|
||||||
|
fields.Add(current.ToString().Trim());
|
||||||
|
current.Clear();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
current.Append(c);
|
||||||
|
}
|
||||||
|
|
||||||
|
fields.Add(current.ToString().Trim());
|
||||||
|
return fields.ToArray();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+47
-3
@@ -1,8 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using PdfSharp;
|
using PdfSharp;
|
||||||
using PdfSharp.Drawing;
|
using PdfSharp.Drawing;
|
||||||
|
using PdfSharp.Fonts;
|
||||||
using PdfSharp.Pdf;
|
using PdfSharp.Pdf;
|
||||||
|
|
||||||
namespace Logof_Client;
|
namespace Logof_Client;
|
||||||
@@ -12,7 +14,7 @@ public class PdfBuilder
|
|||||||
// Table layout
|
// Table layout
|
||||||
private const int CellsPerRow = 3;
|
private const int CellsPerRow = 3;
|
||||||
private const int CellsPerPage = 21; // 3 columns × 7 rows
|
private const int CellsPerPage = 21; // 3 columns × 7 rows
|
||||||
private readonly XFont _boldFont = new("Arial", 9, XFontStyleEx.Bold);
|
private readonly XFont _boldFont;
|
||||||
private readonly double _cellHeight = 42.43; // mm
|
private readonly double _cellHeight = 42.43; // mm
|
||||||
private readonly double _cellPaddingBottom = 5; // mm
|
private readonly double _cellPaddingBottom = 5; // mm
|
||||||
|
|
||||||
@@ -32,8 +34,50 @@ public class PdfBuilder
|
|||||||
private readonly double _marginLeft = 0; // mm
|
private readonly double _marginLeft = 0; // mm
|
||||||
private readonly double _marginRight = 0; // mm
|
private readonly double _marginRight = 0; // mm
|
||||||
private readonly double _marginTop = 0; // mm
|
private readonly double _marginTop = 0; // mm
|
||||||
private readonly XFont _regularFont = new("Arial", 9, XFontStyleEx.Regular);
|
private readonly XFont _regularFont;
|
||||||
private readonly XFont _smallFont = new("Arial", 6, XFontStyleEx.Regular);
|
private readonly XFont _smallFont;
|
||||||
|
|
||||||
|
public PdfBuilder()
|
||||||
|
{
|
||||||
|
EnsureFontResolverRegistered();
|
||||||
|
|
||||||
|
// Select first font from build output fonts folder (AppContext.BaseDirectory/fonts)
|
||||||
|
var chosenFamily = "Arial";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (Directory.Exists(Global._instance.font_path))
|
||||||
|
{
|
||||||
|
var first = Directory.EnumerateFiles(Global._instance.font_path, "*.ttf").FirstOrDefault();
|
||||||
|
if (!string.IsNullOrEmpty(first))
|
||||||
|
chosenFamily = StripStyleSuffix(Path.GetFileNameWithoutExtension(first)) ?? chosenFamily;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
chosenFamily = "Arial";
|
||||||
|
}
|
||||||
|
|
||||||
|
_boldFont = new XFont(chosenFamily, 9, XFontStyleEx.Bold);
|
||||||
|
_regularFont = new XFont(chosenFamily, 9, XFontStyleEx.Regular);
|
||||||
|
_smallFont = new XFont(chosenFamily, 6, XFontStyleEx.Regular);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void EnsureFontResolverRegistered()
|
||||||
|
{
|
||||||
|
if (GlobalFontSettings.FontResolver != null) return;
|
||||||
|
//var fontsDir = Path.Combine(AppContext.BaseDirectory, "fonts");
|
||||||
|
GlobalFontSettings.FontResolver = new StableFontResolver(Global._instance.font_path);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string StripStyleSuffix(string name)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(name)) return name;
|
||||||
|
var idx = name.IndexOf('-');
|
||||||
|
if (idx < 0) idx = name.IndexOf('_');
|
||||||
|
if (idx > 0)
|
||||||
|
return name.Substring(0, idx);
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -0,0 +1,136 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using PdfSharp.Fonts;
|
||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace Logof_Client;
|
||||||
|
|
||||||
|
public class StableFontResolver : IFontResolver
|
||||||
|
{
|
||||||
|
// family -> style -> bytes
|
||||||
|
private readonly Dictionary<string, Dictionary<string, byte[]>> _families = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
private readonly List<string> _orderedFamilies = new();
|
||||||
|
|
||||||
|
public StableFontResolver(string fontsDirectory)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(fontsDirectory)) return;
|
||||||
|
if (!Directory.Exists(fontsDirectory)) return;
|
||||||
|
|
||||||
|
var files = Directory.EnumerateFiles(fontsDirectory, "*.ttf");
|
||||||
|
foreach (var f in files)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var baseName = Path.GetFileNameWithoutExtension(f);
|
||||||
|
if (string.IsNullOrEmpty(baseName)) continue;
|
||||||
|
|
||||||
|
// Try to split family and style by hyphen or underscore
|
||||||
|
var family = baseName;
|
||||||
|
var style = "Regular";
|
||||||
|
|
||||||
|
var idx = baseName.IndexOf('-');
|
||||||
|
if (idx < 0) idx = baseName.IndexOf('_');
|
||||||
|
if (idx > 0)
|
||||||
|
{
|
||||||
|
family = baseName.Substring(0, idx);
|
||||||
|
style = baseName.Substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Normalize common style names
|
||||||
|
style = NormalizeStyle(style);
|
||||||
|
|
||||||
|
var data = File.ReadAllBytes(f);
|
||||||
|
if (data == null || data.Length == 0) continue;
|
||||||
|
|
||||||
|
if (!_families.TryGetValue(family, out var dict))
|
||||||
|
{
|
||||||
|
dict = new Dictionary<string, byte[]>(StringComparer.OrdinalIgnoreCase);
|
||||||
|
_families[family] = dict;
|
||||||
|
_orderedFamilies.Add(family);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!dict.ContainsKey(style))
|
||||||
|
dict[style] = data;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// ignore individual font load errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// ignore resolver init errors
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string NormalizeStyle(string s)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(s)) return "Regular";
|
||||||
|
s = s.ToLowerInvariant();
|
||||||
|
if (s.Contains("bold") && s.Contains("italic")) return "BoldItalic";
|
||||||
|
if (s.Contains("bold")) return "Bold";
|
||||||
|
if (s.Contains("italic") || s.Contains("oblique")) return "Italic";
|
||||||
|
if (s.Contains("regular") || s == "r") return "Regular";
|
||||||
|
return CultureInfo.InvariantCulture.TextInfo.ToTitleCase(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
public FontResolverInfo ResolveTypeface(string familyName, bool isBold, bool isItalic)
|
||||||
|
{
|
||||||
|
// If requested family exists, pick corresponding style if available
|
||||||
|
string familyToUse = null;
|
||||||
|
if (!string.IsNullOrEmpty(familyName) && _families.ContainsKey(familyName))
|
||||||
|
familyToUse = familyName;
|
||||||
|
|
||||||
|
if (familyToUse == null && _orderedFamilies.Count > 0)
|
||||||
|
familyToUse = _orderedFamilies[0];
|
||||||
|
|
||||||
|
if (familyToUse == null)
|
||||||
|
return new FontResolverInfo("Arial");
|
||||||
|
|
||||||
|
var style = "Regular";
|
||||||
|
if (isBold && isItalic) style = "BoldItalic";
|
||||||
|
else if (isBold) style = "Bold";
|
||||||
|
else if (isItalic) style = "Italic";
|
||||||
|
|
||||||
|
// Face name format: Family#Style
|
||||||
|
return new FontResolverInfo($"{familyToUse}#{style}");
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] GetFont(string faceName)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(faceName)) return null;
|
||||||
|
|
||||||
|
// faceName expected as "Family#Style" or just "Family"
|
||||||
|
var family = faceName;
|
||||||
|
var style = "Regular";
|
||||||
|
var idx = faceName.IndexOf('#');
|
||||||
|
if (idx >= 0)
|
||||||
|
{
|
||||||
|
family = faceName.Substring(0, idx);
|
||||||
|
style = faceName.Substring(idx + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
style = NormalizeStyle(style);
|
||||||
|
|
||||||
|
if (_families.TryGetValue(family, out var dict))
|
||||||
|
{
|
||||||
|
// Try exact style
|
||||||
|
if (dict.TryGetValue(style, out var data)) return data;
|
||||||
|
|
||||||
|
// Fallback order
|
||||||
|
if (style != "Regular" && dict.TryGetValue("Regular", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Bold", out data)) return data;
|
||||||
|
if (dict.TryGetValue("Italic", out data)) return data;
|
||||||
|
|
||||||
|
// Any available
|
||||||
|
foreach (var kv in dict) return kv.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
+11
-2
@@ -1,8 +1,17 @@
|
|||||||
<Window xmlns="https://github.com/avaloniaui"
|
<Window xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
x:Class="Logof_Client.Wiki.EditorWindow"
|
x:Class="Logof_Client.Wiki.EditorWindow"
|
||||||
Title="Wiki Editor (disabled)" Width="400" Height="150">
|
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
||||||
<Grid>
|
<Grid>
|
||||||
<TextBlock Margin="12" TextWrapping="Wrap">Coming soon.</TextBlock>
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="50" />
|
||||||
|
<RowDefinition Height="*" />
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<StackPanel Grid.Row="0" Orientation="Horizontal">
|
||||||
|
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
||||||
|
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
||||||
|
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
||||||
|
</StackPanel>
|
||||||
|
<TextBox Grid.Row="1" x:Name="TbContent" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -1,17 +1,59 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.IO;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
using Avalonia.Interactivity;
|
||||||
|
|
||||||
namespace Logof_Client.Wiki;
|
namespace Logof_Client.Wiki;
|
||||||
|
|
||||||
public partial class EditorWindow : Window
|
public partial class EditorWindow : Window
|
||||||
{
|
{
|
||||||
private void InitializeComponent()
|
public string filename = "";
|
||||||
{
|
|
||||||
Avalonia.Markup.Xaml.AvaloniaXamlLoader.Load(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
public EditorWindow()
|
public EditorWindow(string filename = "")
|
||||||
{
|
{
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
this.filename = filename;
|
||||||
|
if (!string.IsNullOrWhiteSpace(filename) && File.Exists(filename))
|
||||||
|
{
|
||||||
|
var content = TbContent;
|
||||||
|
if (content != null) content.Text = File.ReadAllText(this.filename);
|
||||||
|
Title = "Wiki Editor - " + filename;
|
||||||
|
}
|
||||||
|
else if (!string.IsNullOrWhiteSpace(filename))
|
||||||
|
{
|
||||||
|
MessageBox.Show(null, "Die Datei existiert nicht", "Fehler");
|
||||||
|
Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnSave_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
File.WriteAllText(filename, TbContent.Text);
|
||||||
|
MainWindow._instance.PopulateNavTree();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(null,
|
||||||
|
"Es ist ein Fehler aufgetreten. Bitte senden Sie ihn über git.mypapercloud.de/fierke/logofclient ein:\n" +
|
||||||
|
ex.StackTrace, "Fehler");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void BtnSaveAs_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
MessageBox.Show(null,
|
||||||
|
"Feature noch nicht implemetiert.\nErstelle neue Dateien unter " + Global._instance.wiki_storage_path,
|
||||||
|
"Fehler");
|
||||||
|
}
|
||||||
|
|
||||||
|
private async void BtnDelete_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
||||||
|
if (result == MessageBoxResult.No) return;
|
||||||
|
File.Delete(filename);
|
||||||
|
MainWindow._instance.PopulateNavTree();
|
||||||
|
Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,6 +115,9 @@ public static class MarkdownRenderer
|
|||||||
case LinkInline li:
|
case LinkInline li:
|
||||||
sb.Append(GetInlineText(li));
|
sb.Append(GetInlineText(li));
|
||||||
break;
|
break;
|
||||||
|
case LineBreakInline:
|
||||||
|
sb.Append("\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
sb.Append(inline.ToString());
|
sb.Append(inline.ToString());
|
||||||
break;
|
break;
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user