Compare commits
13 Commits
16982c3d95
..
v0.8.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 488830cdad | |||
| 52fbefb803 | |||
| c5aabc2a02 | |||
| 4a9f9a1ff0 | |||
| fab14eb107 | |||
| 2dcc1bd657 | |||
| 3767fece48 | |||
| 842608e96f | |||
| d9ee3e2fc9 | |||
| 80d1498cc7 | |||
| de2f453553 | |||
| 7e168c4d0f | |||
| 9becedbd97 |
+10
-2
@@ -223,6 +223,10 @@
|
|||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
||||||
|
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
||||||
|
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
||||||
|
</StackPanel>
|
||||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -327,8 +331,12 @@
|
|||||||
<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>
|
||||||
<Button Content="+ Hinzufügen" Margin="10" x:Name="BtnWikiAddFile"
|
<StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
|
||||||
|
<Button Content="+ Datei" x:Name="BtnWikiAddFile"
|
||||||
Click="BtnWikiAddFile_OnClick" />
|
Click="BtnWikiAddFile_OnClick" />
|
||||||
|
<Button Content="+ Ordner" x:Name="BtnWikiAddFolder"
|
||||||
|
Click="BtnWikiAddFolder_OnClick" />
|
||||||
|
</StackPanel>
|
||||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||||
<TreeView Name="NavTree" Margin="10" />
|
<TreeView Name="NavTree" Margin="10" />
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
@@ -505,7 +513,7 @@
|
|||||||
VerticalContentAlignment="Center" />
|
VerticalContentAlignment="Center" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Background="#99963434" HorizontalAlignment="Stretch"
|
<Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
|
||||||
HorizontalContentAlignment="Center">
|
HorizontalContentAlignment="Center">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
<LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
|
<LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
|
||||||
|
|||||||
+160
-13
@@ -125,12 +125,34 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private void MnuAbout_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuAbout_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
try
|
||||||
|
{
|
||||||
|
Process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = "https://mypapercloud.de/logof/",
|
||||||
|
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MnuHelp_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuHelp_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
throw new NotImplementedException();
|
try
|
||||||
|
{
|
||||||
|
Process.Start(new ProcessStartInfo
|
||||||
|
{
|
||||||
|
FileName = "https://mypapercloud.de/logof/wiki/",
|
||||||
|
UseShellExecute = true // Wichtig für Plattformübergreifendes Öffnen
|
||||||
|
});
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Console.WriteLine($"Fehler beim Öffnen des Links: {ex.Message}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void MnuGit_OnClick(object? sender, RoutedEventArgs e)
|
private void MnuGit_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -260,12 +282,20 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void PopulateNavTree()
|
public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
|
||||||
{
|
{
|
||||||
var roots = _wikiService.GetRootItems();
|
var roots = _wikiService.GetRootItems();
|
||||||
var nodes = new List<TreeViewItem>();
|
var nodes = new List<TreeViewItem>();
|
||||||
foreach (var r in roots) nodes.Add(BuildNode(r));
|
foreach (var r in roots) nodes.Add(BuildNode(r));
|
||||||
NavTree.ItemsSource = nodes;
|
NavTree.ItemsSource = nodes;
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(expandToPath))
|
||||||
|
ExpandAndFindNode(nodes, expandToPath, out _);
|
||||||
|
|
||||||
|
if (!string.IsNullOrWhiteSpace(selectPath) &&
|
||||||
|
ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
|
||||||
|
selectedNode != null)
|
||||||
|
NavTree.SelectedItem = selectedNode;
|
||||||
}
|
}
|
||||||
|
|
||||||
private TreeViewItem BuildNode(WikiItem item)
|
private TreeViewItem BuildNode(WikiItem item)
|
||||||
@@ -278,6 +308,63 @@ public partial class MainWindow : Window
|
|||||||
return node;
|
return node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private string GetSelectedWikiTargetDirectory()
|
||||||
|
{
|
||||||
|
var wikiRoot = Global._instance.wiki_storage_path;
|
||||||
|
if (NavTree.SelectedItem is TreeViewItem treeItem && treeItem.Tag is WikiItem selectedItem)
|
||||||
|
{
|
||||||
|
if (selectedItem.IsFolder) return selectedItem.Path;
|
||||||
|
|
||||||
|
var parentDir = Path.GetDirectoryName(selectedItem.Path);
|
||||||
|
if (!string.IsNullOrWhiteSpace(parentDir)) return parentDir;
|
||||||
|
}
|
||||||
|
|
||||||
|
return wikiRoot;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool PathsEqual(string left, string right)
|
||||||
|
{
|
||||||
|
var normalizedLeft = Path.GetFullPath(left)
|
||||||
|
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
||||||
|
var normalizedRight = Path.GetFullPath(right)
|
||||||
|
.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
|
||||||
|
|
||||||
|
var comparison = OperatingSystem.IsWindows()
|
||||||
|
? StringComparison.OrdinalIgnoreCase
|
||||||
|
: StringComparison.Ordinal;
|
||||||
|
return string.Equals(normalizedLeft, normalizedRight, comparison);
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool ExpandAndFindNode(IEnumerable<TreeViewItem> nodes, string targetPath, out TreeViewItem? foundNode)
|
||||||
|
{
|
||||||
|
foreach (var node in nodes)
|
||||||
|
if (TryExpandToPath(node, targetPath, out foundNode))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
foundNode = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private bool TryExpandToPath(TreeViewItem node, string targetPath, out TreeViewItem? foundNode)
|
||||||
|
{
|
||||||
|
if (node.Tag is WikiItem item && PathsEqual(item.Path, targetPath))
|
||||||
|
{
|
||||||
|
foundNode = node;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var childRaw in node.Items)
|
||||||
|
if (childRaw is TreeViewItem childNode &&
|
||||||
|
TryExpandToPath(childNode, targetPath, out foundNode))
|
||||||
|
{
|
||||||
|
node.IsExpanded = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
foundNode = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
private void OpenFolderButton_Click(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var path = Global._instance.wiki_storage_path;
|
var path = Global._instance.wiki_storage_path;
|
||||||
@@ -384,14 +471,14 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type)
|
private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type, CombineAddresses.CombineType comb_type)
|
||||||
{
|
{
|
||||||
var progressWindow = new ProgressWindow();
|
var progressWindow = new ProgressWindow();
|
||||||
|
|
||||||
progressWindow.Show(_instance);
|
progressWindow.Show(_instance);
|
||||||
|
|
||||||
var processor = new CombineAddresses(progressWindow);
|
var processor = new CombineAddresses(progressWindow);
|
||||||
var result = await processor.Perform(address_lists, type, CbMergeExportUnmerged.IsChecked);
|
var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
|
||||||
|
|
||||||
if (result.Item1 != null)
|
if (result.Item1 != null)
|
||||||
result.Item1.owner_id = owner_id;
|
result.Item1.owner_id = owner_id;
|
||||||
@@ -682,7 +769,7 @@ public partial class MainWindow : Window
|
|||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -698,7 +785,7 @@ public partial class MainWindow : Window
|
|||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -715,7 +802,7 @@ public partial class MainWindow : Window
|
|||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -723,6 +810,19 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public CombineAddresses.CombineType GetCombiningTyp()
|
||||||
|
{
|
||||||
|
if (RbComprefsid.IsChecked == true)
|
||||||
|
{
|
||||||
|
return CombineAddresses.CombineType.refsid;
|
||||||
|
} else if (RbCompfinAd.IsChecked == true)
|
||||||
|
{
|
||||||
|
return CombineAddresses.CombineType.final_adress;
|
||||||
|
}
|
||||||
|
|
||||||
|
return CombineAddresses.CombineType.none;
|
||||||
|
}
|
||||||
|
|
||||||
private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombineSymmetricDifference_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var list = new List<KasAddressList>();
|
var list = new List<KasAddressList>();
|
||||||
@@ -730,7 +830,7 @@ public partial class MainWindow : Window
|
|||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||||
|
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff");
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnGenerateLabels_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -991,15 +1091,21 @@ public partial class MainWindow : Window
|
|||||||
private async void BtnWikiAddFile_OnClick(object? sender, RoutedEventArgs e)
|
private async void BtnWikiAddFile_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
var result = await NamingWindow.Show(this);
|
var result = await NamingWindow.Show(this);
|
||||||
if (!result.EndsWith(".md")) result += ".md";
|
if (string.IsNullOrWhiteSpace(result)) return;
|
||||||
|
|
||||||
|
result = result.Trim();
|
||||||
|
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
||||||
|
|
||||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
||||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
||||||
|
|
||||||
if (result != null)
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
File.WriteAllText(Path.Combine(Global._instance.wiki_storage_path, result), "");
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
PopulateNavTree();
|
Directory.CreateDirectory(targetDirectory);
|
||||||
|
var newFilePath = Path.Combine(targetDirectory, result);
|
||||||
|
File.WriteAllText(newFilePath, "");
|
||||||
|
PopulateNavTree(targetDirectory, newFilePath);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
@@ -1007,6 +1113,30 @@ public partial class MainWindow : Window
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void BtnWikiAddFolder_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
var result = await NamingWindow.Show(this);
|
||||||
|
if (string.IsNullOrWhiteSpace(result)) return;
|
||||||
|
|
||||||
|
result = result.Trim();
|
||||||
|
|
||||||
|
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
||||||
|
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||||
|
var newFolderPath = Path.Combine(targetDirectory, result);
|
||||||
|
Directory.CreateDirectory(newFolderPath);
|
||||||
|
PopulateNavTree(targetDirectory, newFolderPath);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
||||||
@@ -1033,4 +1163,21 @@ public partial class MainWindow : Window
|
|||||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
|
if (customer.ID == Settings._instance.customers.current)
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Settings._instance.customers.customers.Remove(customer);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
||||||
|
}
|
||||||
|
RefreshCustomerItems();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d" SizeToContent="WidthAndHeight"
|
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||||
x:Class="Logof_Client.NamingWindow"
|
x:Class="Logof_Client.NamingWindow"
|
||||||
Title="NamingWindow">
|
Title="NamingWindow">
|
||||||
<StackPanel Orientation="Vertical">
|
<StackPanel Orientation="Vertical">
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Runtime.CompilerServices;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
|
|
||||||
@@ -45,6 +46,7 @@ public partial class NamingWindow : Window
|
|||||||
if (parent != null)
|
if (parent != null)
|
||||||
wind.ShowDialog(parent);
|
wind.ShowDialog(parent);
|
||||||
else wind.Show();
|
else wind.Show();
|
||||||
|
wind.Focus();
|
||||||
|
|
||||||
return tcs.Task;
|
return tcs.Task;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
|
mc:Ignorable="d" d:DesignWidth="800" Width="800" MinWidth="800" MaxWidth="800" d:DesignHeight="150"
|
||||||
Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico"
|
Height="150" MinHeight="150" MaxHeight="150" Icon="assets/icon.ico" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||||
x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
|
x:Class="Logof_Client.ProgressWindow" Title="Verarbeitung läuft...">
|
||||||
<Grid>
|
<Grid>
|
||||||
<!-- <ScrollViewer x:Name="ScvLog"> -->
|
<!-- <ScrollViewer x:Name="ScvLog"> -->
|
||||||
|
|||||||
+33
-78
@@ -16,13 +16,20 @@ public class CombineAddresses
|
|||||||
_progress = progressWindow;
|
_progress = progressWindow;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
|
public enum CombineType
|
||||||
|
{
|
||||||
|
refsid,
|
||||||
|
final_adress,
|
||||||
|
none
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||||
bool? exportUnused)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, exportUnused);
|
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||||
if (type == "union") return await Union(address_lists, exportUnused);
|
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||||
if (type == "intersection") return await Intersection(address_lists, exportUnused);
|
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
||||||
if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
|
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
||||||
|
|
||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
@@ -35,11 +42,12 @@ public class CombineAddresses
|
|||||||
/// <param name="second">Second address to compare</param>
|
/// <param name="second">Second address to compare</param>
|
||||||
/// <param name="only_refsid">If true, only a refsid-check will be done</param>
|
/// <param name="only_refsid">If true, only a refsid-check will be done</param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
|
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
||||||
{
|
{
|
||||||
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
// A refsid of 0 means "missing", so it must not collapse unrelated entries.
|
||||||
|
if(comb_type == CombineType.refsid)
|
||||||
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
if (first.refsid != 0 && second.refsid != 0 && first.refsid == second.refsid) return true;
|
||||||
if (!only_refsid)
|
if (comb_type == CombineType.final_adress)
|
||||||
if (first.name == second.name &&
|
if (first.name == second.name &&
|
||||||
first.anrede == second.anrede &&
|
first.anrede == second.anrede &&
|
||||||
first.anredzus == second.anredzus &&
|
first.anredzus == second.anredzus &&
|
||||||
@@ -68,7 +76,7 @@ public class CombineAddresses
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused,
|
bool? return_unused,
|
||||||
Progress? progress = null)
|
Progress? progress = null)
|
||||||
{
|
{
|
||||||
@@ -86,11 +94,13 @@ public class CombineAddresses
|
|||||||
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(await KasAddressList.GenerateName("difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("difference"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("difference_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true)
|
||||||
|
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)
|
||||||
{
|
{
|
||||||
var isDouble = restUnion.Any(p => CompareAddresses(person, p));
|
var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
|
||||||
if (!isDouble)
|
if (!isDouble)
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
else
|
else
|
||||||
@@ -109,11 +119,13 @@ 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, CombineType comb_type, bool? return_unused,
|
||||||
Progress progress = null)
|
Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("union"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("union_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true)
|
||||||
|
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);
|
||||||
@@ -124,7 +136,7 @@ public class CombineAddresses
|
|||||||
foreach (var list in address_lists)
|
foreach (var list in address_lists)
|
||||||
foreach (var person in list.KasPersons)
|
foreach (var person in list.KasPersons)
|
||||||
{
|
{
|
||||||
if (!result.KasPersons.Any(existing => CompareAddresses(existing, person)))
|
if (!result.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)))
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
else
|
else
|
||||||
second_result.KasPersons.Add(person);
|
second_result.KasPersons.Add(person);
|
||||||
@@ -151,11 +163,12 @@ public class CombineAddresses
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("intersection"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("intersection_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) 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);
|
||||||
@@ -171,7 +184,7 @@ public class CombineAddresses
|
|||||||
{
|
{
|
||||||
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
||||||
var isInAll = otherLists.All(list =>
|
var isInAll = otherLists.All(list =>
|
||||||
list.KasPersons.Any(existing => CompareAddresses(existing, person)));
|
list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
|
||||||
|
|
||||||
if (isInAll)
|
if (isInAll)
|
||||||
result.KasPersons.Add(person);
|
result.KasPersons.Add(person);
|
||||||
@@ -198,11 +211,12 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
|
public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, CombineType comb_type,
|
||||||
bool? return_unused, Progress progress = null)
|
bool? return_unused, Progress progress = null)
|
||||||
{
|
{
|
||||||
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
var result = new KasAddressList(await KasAddressList.GenerateName("symmetric_difference"));
|
||||||
var second_result = new KasAddressList(await KasAddressList.GenerateName("symmetric_rest", false));
|
var second_result = new KasAddressList("none");
|
||||||
|
if(return_unused == true) 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);
|
||||||
@@ -217,7 +231,7 @@ public class CombineAddresses
|
|||||||
foreach (var person in list.KasPersons)
|
foreach (var person in list.KasPersons)
|
||||||
{
|
{
|
||||||
// Prüfen, ob schon vorhanden
|
// Prüfen, ob schon vorhanden
|
||||||
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person));
|
var existing = allPersons.FirstOrDefault(p => CompareAddresses(p.person, person, comb_type));
|
||||||
if (existing.person != null)
|
if (existing.person != null)
|
||||||
{
|
{
|
||||||
// Falls schon drin → Vorkommen erhöhen
|
// Falls schon drin → Vorkommen erhöhen
|
||||||
@@ -255,65 +269,6 @@ public class CombineAddresses
|
|||||||
return (result, null);
|
return (result, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// private async Task<KasAddressList> Merge(KasAddressList first, KasAddressList second, int num, int total)
|
|
||||||
// {
|
|
||||||
// foreach (var sec in second.KasPersons)
|
|
||||||
// {
|
|
||||||
// var is_new = true;
|
|
||||||
// foreach (var fi in first.KasPersons)
|
|
||||||
// {
|
|
||||||
// if (fi.refsid == sec.refsid)
|
|
||||||
// {
|
|
||||||
// is_new = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (fi.name == sec.name &&
|
|
||||||
// fi.anrede == sec.anrede &&
|
|
||||||
// fi.anredzus == sec.anredzus &&
|
|
||||||
// fi.namezus == sec.namezus &&
|
|
||||||
// fi.titel == sec.titel &&
|
|
||||||
// fi.adel == sec.adel &&
|
|
||||||
// fi.strasse == sec.strasse &&
|
|
||||||
// fi.strasse2 == sec.strasse2 &&
|
|
||||||
// fi.vorname == sec.vorname &&
|
|
||||||
// fi.ort == sec.ort &&
|
|
||||||
// fi.land == sec.land &&
|
|
||||||
// fi.plz == sec.plz &&
|
|
||||||
// fi.pplz == sec.pplz &&
|
|
||||||
// fi.funktion == sec.funktion &&
|
|
||||||
// fi.funktion2 == sec.funktion2 &&
|
|
||||||
// fi.funktionad == sec.funktionad &&
|
|
||||||
// fi.abteilung == sec.abteilung &&
|
|
||||||
// fi.postfach == sec.postfach &&
|
|
||||||
// fi.name1 == sec.name1 &&
|
|
||||||
// fi.name2 == sec.name2 &&
|
|
||||||
// fi.name3 == sec.name3 &&
|
|
||||||
// fi.name4 == sec.name4 &&
|
|
||||||
// fi.name5 == sec.name5)
|
|
||||||
// {
|
|
||||||
// is_new = false;
|
|
||||||
// break;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// if (is_new) first.KasPersons.Add(sec);
|
|
||||||
// var subperc = second.KasPersons.IndexOf(sec) / second.KasPersons.Count;
|
|
||||||
// var percent = (num + (double)subperc) / total * 100;
|
|
||||||
// await Dispatcher.UIThread.InvokeAsync(() =>
|
|
||||||
// {
|
|
||||||
// if (is_new)
|
|
||||||
// _progress.AddToLog($"Person mit refsid {sec.refsid} ergänzt");
|
|
||||||
// else
|
|
||||||
// _progress.AddToLog($"Person mit refsid {sec.refsid} bereits vorhanden");
|
|
||||||
//
|
|
||||||
// _progress.ChangePercentage(percent);
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// return first;
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Progress
|
public class Progress
|
||||||
|
|||||||
@@ -2,16 +2,16 @@
|
|||||||
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" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
||||||
<Grid>
|
<Grid Margin="10,0,10,10">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="50" />
|
<RowDefinition Height="50" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<StackPanel Grid.Row="0" Orientation="Horizontal">
|
<StackPanel Grid.Row="0" Spacing="10" Orientation="Horizontal">
|
||||||
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
<Button x:Name="BtnSave" Content="Speichern" Click="BtnSave_OnClick" />
|
||||||
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
<Button x:Name="BtnSaveAs" Content="Speichern unter..." Click="BtnSaveAs_OnClick" />
|
||||||
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
<Button x:Name="BtnDelete" Content="Löschen" Click="BtnDelete_OnClick" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<TextBox Grid.Row="1" x:Name="TbContent" />
|
<TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Window>
|
</Window>
|
||||||
@@ -52,7 +52,11 @@ public partial class EditorWindow : Window
|
|||||||
{
|
{
|
||||||
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
||||||
if (result == MessageBoxResult.No) return;
|
if (result == MessageBoxResult.No) return;
|
||||||
|
try
|
||||||
|
{
|
||||||
File.Delete(filename);
|
File.Delete(filename);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
MainWindow._instance.PopulateNavTree();
|
MainWindow._instance.PopulateNavTree();
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user