Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7fe45ce4e3 | |||
| a46539c3cc | |||
| 72a5630db1 | |||
| 7697edac5e | |||
| 028b9793db | |||
| 2c5f2ed48b | |||
| f0598a39ec | |||
| f9e419d573 | |||
| 56233e6f5c | |||
| 488830cdad | |||
| 52fbefb803 | |||
| c5aabc2a02 | |||
| 4a9f9a1ff0 | |||
| fab14eb107 | |||
| 2dcc1bd657 | |||
| 3767fece48 | |||
| 842608e96f | |||
| d9ee3e2fc9 | |||
| 80d1498cc7 | |||
| de2f453553 | |||
| 7e168c4d0f | |||
| 9becedbd97 | |||
| 16982c3d95 | |||
| 93771dd110 | |||
| 3e14731429 |
@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
|
||||
var id = listItemName.Split(" - ")[0];
|
||||
return int.Parse(id);
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return Name + " (" + KasPersons.Count + " Einträge)";
|
||||
}
|
||||
}
|
||||
|
||||
public class KasPerson
|
||||
@@ -188,6 +193,18 @@ public class KasPerson
|
||||
|
||||
return highest + base_id + 1;
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
if (refsid != null && refsid != 0)
|
||||
{
|
||||
return refsid + " - " + name;
|
||||
}
|
||||
else
|
||||
{
|
||||
return id + " - " + name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class KasPersonError
|
||||
@@ -212,4 +229,9 @@ public class KasPersonError
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
public string ToString(KasPerson person)
|
||||
{
|
||||
return "ID:"+person.id + "; Name: " +person.name +"; Errors: " + GetString();
|
||||
}
|
||||
}
|
||||
|
||||
+11
-6
@@ -135,7 +135,7 @@ public class Global
|
||||
public class Customers
|
||||
{
|
||||
public List<Customer> customers = new();
|
||||
public int current { get; set; } = 0;
|
||||
public Customer current { get; set; } = null;
|
||||
}
|
||||
|
||||
public class Customer
|
||||
@@ -150,6 +150,11 @@ public class Customer
|
||||
ID = highestID + 1;
|
||||
}
|
||||
|
||||
public override string ToString()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public string name { get; set; } = "";
|
||||
public string description { get; set; } = "";
|
||||
public string sender_address { get; set; } = "";
|
||||
@@ -158,11 +163,11 @@ public class Customer
|
||||
public int ID { get; }
|
||||
|
||||
|
||||
public static int GetIDByCustomerListItem(string item_content)
|
||||
{
|
||||
var id = item_content.Split(" - ")[0];
|
||||
return int.Parse(id);
|
||||
}
|
||||
// public static int GetIDByCustomerListItem(string item_content)
|
||||
// {
|
||||
// var id = item_content.Split(" - ")[0];
|
||||
// return int.Parse(id);
|
||||
// }
|
||||
}
|
||||
|
||||
public class AddressSets
|
||||
|
||||
+28
-8
@@ -121,7 +121,7 @@
|
||||
FontWeight="Bold" />
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Width="250" IsEnabled="False"
|
||||
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
||||
Margin="0,0,0,10">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
@@ -220,10 +220,18 @@
|
||||
</StackPanel>
|
||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||
</StackPanel>
|
||||
|
||||
</Button>
|
||||
</StackPanel>
|
||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
|
||||
<StackPanel Orientation="Vertical" >
|
||||
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
||||
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Vertical">
|
||||
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
||||
<CheckBox HorizontalAlignment="Left" x:Name="CbMergeDeleteOld" IsChecked="False">Lösche ursprüngliche Sets</CheckBox>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||
@@ -327,8 +335,12 @@
|
||||
<Grid ColumnDefinitions="300,*">
|
||||
<Border Grid.Column="0" Background="#FFF" BorderBrush="#DDD" BorderThickness="0,0,1,0">
|
||||
<StackPanel>
|
||||
<Button Content="+ Hinzufügen" Margin="10" x:Name="BtnWikiAddFile"
|
||||
Click="BtnWikiAddFile_OnClick" />
|
||||
<StackPanel Spacing="10" Orientation="Horizontal" Margin="10">
|
||||
<Button Content="+ Datei" x:Name="BtnWikiAddFile"
|
||||
Click="BtnWikiAddFile_OnClick" />
|
||||
<Button Content="+ Ordner" x:Name="BtnWikiAddFolder"
|
||||
Click="BtnWikiAddFolder_OnClick" />
|
||||
</StackPanel>
|
||||
<ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<TreeView Name="NavTree" Margin="10" />
|
||||
</ScrollViewer>
|
||||
@@ -473,12 +485,20 @@
|
||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||
x:Name="TbSettingsCustomerSenderAddress" />
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="150,*">
|
||||
<Grid ColumnDefinitions="150,*,Auto">
|
||||
<Label Content="CSV-Trennzeichen" />
|
||||
<TextBox Grid.Column="1" Watermark=","
|
||||
HorizontalAlignment="Stretch"
|
||||
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
||||
x:Name="TbSettingsCustomerCsvSeparator" />
|
||||
<StackPanel Grid.Column="2" Orientation="Horizontal" Spacing="5">
|
||||
<Button Click="ChangeCSVDivider" Content=","></Button>
|
||||
<Button Click="ChangeCSVDivider" Content=";"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="TAB"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="|"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content="SPACE"></Button>
|
||||
<Button Click="ChangeCSVDivider" Content=":"></Button>
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
<Grid ColumnDefinitions="150,*">
|
||||
<Label Content="Address-Patch-Info" />
|
||||
@@ -505,7 +525,7 @@
|
||||
VerticalContentAlignment="Center" />
|
||||
</StackPanel>
|
||||
</Button>
|
||||
<Button Background="#99963434" HorizontalAlignment="Stretch"
|
||||
<Button Background="#99963434" HorizontalAlignment="Stretch" x:Name="BtnDeleteCustomer" Click="BtnDeleteCustomer_OnClick"
|
||||
HorizontalContentAlignment="Center">
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<LucideIcon Kind="Trash" Width="16" Height="16" Size="16" />
|
||||
|
||||
+247
-139
@@ -96,10 +96,31 @@ public partial class MainWindow : Window
|
||||
|
||||
new ResultWindow(result, addresSetID).Show();
|
||||
|
||||
Settings.Save();
|
||||
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
|
||||
private async void StartAddressShortener(KasAddressList set)
|
||||
{
|
||||
//var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
|
||||
var progressWindow = new ProgressWindow();
|
||||
|
||||
progressWindow.Show(_instance);
|
||||
|
||||
var processor = new AddressShortener(progressWindow);
|
||||
await processor.Perform(set);
|
||||
|
||||
// foreach (var item in result)
|
||||
// {
|
||||
// }
|
||||
|
||||
progressWindow.Close();
|
||||
Settings.Save();
|
||||
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||
}
|
||||
|
||||
// private async void StartAddressRepair(Uri path)
|
||||
// {
|
||||
// var addresses = DataImport.ImportKasAddressList(path); // Ihr Code hier
|
||||
@@ -125,12 +146,34 @@ public partial class MainWindow : Window
|
||||
|
||||
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)
|
||||
{
|
||||
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)
|
||||
@@ -149,27 +192,6 @@ public partial class MainWindow : Window
|
||||
}
|
||||
}
|
||||
|
||||
private async void BtnChooseFile_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
var topLevel = GetTopLevel(this);
|
||||
var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
{
|
||||
Title = "KAS-CSV-Datei auswählen",
|
||||
AllowMultiple = false,
|
||||
FileTypeFilter = new[]
|
||||
{
|
||||
new FilePickerFileType(".csv-Datei")
|
||||
{
|
||||
Patterns = new[] { "*.csv" }
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (file == null) return;
|
||||
//TbFilename.Text = file[0].Path.ToString();
|
||||
filePath = file[0].Path;
|
||||
}
|
||||
|
||||
private void BtnCheck_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
MakeCalcManVisible();
|
||||
@@ -179,7 +201,7 @@ public partial class MainWindow : Window
|
||||
return;
|
||||
}
|
||||
|
||||
StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
|
||||
StartAddressCheck(((KasAddressList)LstCustomerAdressSets.SelectedItem).ID);
|
||||
}
|
||||
|
||||
private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
|
||||
@@ -196,41 +218,7 @@ public partial class MainWindow : Window
|
||||
GrdExportMarginOptions.IsVisible = false;
|
||||
}
|
||||
|
||||
private async void StartCombine(Uri path)
|
||||
{
|
||||
MakeCalcManVisible();
|
||||
var addresses = await DataImport.ImportKasAddressList(path);
|
||||
var progressWindow = new ProgressWindow();
|
||||
var address_list = new List<KasAddressList> { addresses.Item2 };
|
||||
|
||||
var topLevel = GetTopLevel(this);
|
||||
var file = await topLevel!.StorageProvider.OpenFilePickerAsync(new FilePickerOpenOptions
|
||||
{
|
||||
Title = "Weitere KAS-CSV-Dateien auswählen",
|
||||
AllowMultiple = true,
|
||||
FileTypeFilter = new[]
|
||||
{
|
||||
new FilePickerFileType(".csv-Dateien")
|
||||
{
|
||||
Patterns = new[] { "*.csv" }
|
||||
//Patterns = new[] { "*" }
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
if (file == null) return;
|
||||
|
||||
//filePath = file[0].Path;
|
||||
foreach (var f in file) address_list.Add((await DataImport.ImportKasAddressList(f.Path)).Item2);
|
||||
|
||||
progressWindow.Show(_instance);
|
||||
|
||||
var processor = new CombineAddresses(progressWindow);
|
||||
//var result = await processor.Perform(address_list);
|
||||
|
||||
|
||||
progressWindow.Close();
|
||||
}
|
||||
|
||||
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||
{
|
||||
@@ -260,12 +248,20 @@ public partial class MainWindow : Window
|
||||
}
|
||||
}
|
||||
|
||||
public void PopulateNavTree()
|
||||
public void PopulateNavTree(string? expandToPath = null, string? selectPath = null)
|
||||
{
|
||||
var roots = _wikiService.GetRootItems();
|
||||
var nodes = new List<TreeViewItem>();
|
||||
foreach (var r in roots) nodes.Add(BuildNode(r));
|
||||
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)
|
||||
@@ -278,6 +274,63 @@ public partial class MainWindow : Window
|
||||
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)
|
||||
{
|
||||
var path = Global._instance.wiki_storage_path;
|
||||
@@ -350,48 +403,16 @@ public partial class MainWindow : Window
|
||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
||||
}
|
||||
|
||||
private async Task<string> OpenSettingsSaveAsDialog()
|
||||
{
|
||||
var settingsFileName = "KAS-Adress-Liste";
|
||||
|
||||
try
|
||||
{
|
||||
var filePicker = new SaveFileDialog
|
||||
{
|
||||
Title = "Datei speichern...",
|
||||
InitialFileName = $"{settingsFileName}.csv",
|
||||
DefaultExtension = ".csv",
|
||||
Filters = new List<FileDialogFilter>
|
||||
{
|
||||
new() { Name = "CSV-Datei", Extensions = { "csv" } }
|
||||
}
|
||||
};
|
||||
|
||||
var settingsSavePath = await filePicker.ShowAsync(this);
|
||||
if (settingsSavePath == null)
|
||||
{
|
||||
}
|
||||
|
||||
return settingsSavePath;
|
||||
//SettingsManager.Save(settingsSavePath);
|
||||
//Logger.Log("Settings saved at " + settingsSavePath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
//Logger.Log("Saving file not successful: " + ex.Message, Logger.LogType.Error);
|
||||
await MessageBox.Show(this, ex.Message, "Fehler beim Speichern der Datei");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
progressWindow.Show(_instance);
|
||||
|
||||
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, CbMergeDeleteOld.IsChecked);
|
||||
|
||||
if (result.Item1 != null)
|
||||
result.Item1.owner_id = owner_id;
|
||||
@@ -431,7 +452,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Settings._instance.customers.current)
|
||||
if (customer.ID == Settings._instance.customers.current.ID)
|
||||
customer.name = TbSettingsCustomerName.Text;
|
||||
//Settings.Save();
|
||||
//RefreshCustomerItems();
|
||||
@@ -441,19 +462,19 @@ public partial class MainWindow : Window
|
||||
{
|
||||
if (LstSettingsCustomers.SelectedIndex < 0) return;
|
||||
Settings._instance.customers.current =
|
||||
Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString());
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Settings._instance.customers.current)
|
||||
{
|
||||
TbSettingsCustomerDescription.Text = customer.description;
|
||||
TbSettingsCustomerName.Text = customer.name;
|
||||
TbSettingsCustomerSenderAddress.Text = customer.sender_address;
|
||||
TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
|
||||
if (customer.patch != null)
|
||||
TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
|
||||
((Customer)LstSettingsCustomers.SelectedItems[0]);
|
||||
//foreach (var customer in Settings._instance.customers.customers)
|
||||
//if (customer.ID == Settings._instance.customers.current.ID)
|
||||
//{
|
||||
TbSettingsCustomerDescription.Text = Settings._instance.customers.current.description;
|
||||
TbSettingsCustomerName.Text = Settings._instance.customers.current.name;
|
||||
TbSettingsCustomerSenderAddress.Text = Settings._instance.customers.current.sender_address;
|
||||
TbSettingsCustomerCsvSeparator.Text = Settings._instance.customers.current.separator.ToString();
|
||||
if (Settings._instance.customers.current.patch != null)
|
||||
TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
|
||||
else
|
||||
TbSettingsCustomerPatchInfo.Text = "";
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
||||
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
||||
@@ -486,8 +507,8 @@ public partial class MainWindow : Window
|
||||
LstSettingsCustomers.Items.Clear();
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
{
|
||||
LstCustomers.Items.Add(customer.ID + " - " + customer.name);
|
||||
LstSettingsCustomers.Items.Add(customer.ID + " - " + customer.name);
|
||||
LstCustomers.Items.Add(customer);
|
||||
LstSettingsCustomers.Items.Add(customer);
|
||||
}
|
||||
|
||||
try
|
||||
@@ -503,7 +524,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Settings._instance.customers.current)
|
||||
if (customer.ID == Settings._instance.customers.current.ID)
|
||||
customer.description = TbSettingsCustomerDescription.Text;
|
||||
//Settings.Save();
|
||||
}
|
||||
@@ -518,7 +539,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
MakeCalcManVisible();
|
||||
if (LstCustomers.SelectedItems == null || LstCustomers.SelectedIndex == -1) return;
|
||||
var customer_id = int.Parse(LstCustomers.SelectedItem.ToString().Split(" - ")[0]);
|
||||
var customer_id = ((Customer)LstCustomers.SelectedItem).ID;
|
||||
RefreshAddressSetListItems(customer_id);
|
||||
}
|
||||
|
||||
@@ -543,7 +564,7 @@ public partial class MainWindow : Window
|
||||
var selected_path = paths[0].Path;
|
||||
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString()))
|
||||
if (customer == ((Customer)LstCustomers.SelectedItems[0]))
|
||||
{
|
||||
if (customer.patch == null)
|
||||
{
|
||||
@@ -598,7 +619,7 @@ public partial class MainWindow : Window
|
||||
foreach (var k in Settings._instance.addressSets.addresses)
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == k.owner_id && customer.ID == customer_id)
|
||||
LstCustomerAdressSets.Items.Add(k.ID + " - " + k.Name + " (" + k.KasPersons.Count + " Einträge)");
|
||||
LstCustomerAdressSets.Items.Add(k);
|
||||
}
|
||||
|
||||
private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||
@@ -617,6 +638,7 @@ public partial class MainWindow : Window
|
||||
BtnCheck.IsEnabled = true;
|
||||
BtnCombine.IsEnabled = true;
|
||||
BtnGenerateLabels.IsEnabled = true;
|
||||
BtnShorten.IsEnabled = true;
|
||||
|
||||
// BtnRepair.IsEnabled = true;
|
||||
// BtnShorten.IsEnabled = true;
|
||||
@@ -645,7 +667,7 @@ public partial class MainWindow : Window
|
||||
var selected_path = paths[0].Path;
|
||||
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString()))
|
||||
if (customer.ID == ((Customer)LstSettingsCustomers.SelectedItems[0]).ID)
|
||||
customer.patch = AddressPatch.Import(selected_path);
|
||||
|
||||
|
||||
@@ -659,7 +681,7 @@ public partial class MainWindow : Window
|
||||
? TbSettingsCustomerCsvSeparator.Text
|
||||
: ",";
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Settings._instance.customers.current)
|
||||
if (customer.ID == Settings._instance.customers.current.ID)
|
||||
try
|
||||
{
|
||||
customer.separator = Convert.ToChar(sep);
|
||||
@@ -678,11 +700,10 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var list = new List<KasAddressList>();
|
||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||
list.Add((KasAddressList)item);
|
||||
try
|
||||
{
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference");
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -694,11 +715,10 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var list = new List<KasAddressList>();
|
||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||
list.Add((KasAddressList)item);
|
||||
try
|
||||
{
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union");
|
||||
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -711,11 +731,10 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var list = new List<KasAddressList>();
|
||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||
list.Add((KasAddressList)item);
|
||||
try
|
||||
{
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection");
|
||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
||||
}
|
||||
catch
|
||||
{
|
||||
@@ -723,14 +742,26 @@ 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)
|
||||
{
|
||||
var list = new List<KasAddressList>();
|
||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
||||
list.Add((KasAddressList)item);
|
||||
|
||||
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)
|
||||
@@ -756,8 +787,8 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
||||
|
||||
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
|
||||
Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
|
||||
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder((
|
||||
(KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
|
||||
"Company Logo/Info",
|
||||
filePath
|
||||
);
|
||||
@@ -850,7 +881,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||
foreach (var customer in Settings._instance.customers.customers)
|
||||
if (customer.ID == Settings._instance.customers.current)
|
||||
if (customer.ID == Settings._instance.customers.current.ID)
|
||||
customer.sender_address = TbSettingsCustomerSenderAddress.Text;
|
||||
}
|
||||
|
||||
@@ -991,18 +1022,52 @@ public partial class MainWindow : Window
|
||||
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");
|
||||
}
|
||||
if (string.IsNullOrWhiteSpace(result)) return;
|
||||
|
||||
result = result.Trim();
|
||||
if (!result.EndsWith(".md", StringComparison.OrdinalIgnoreCase)) result += ".md";
|
||||
|
||||
if (!Directory.Exists(Global._instance.wiki_storage_path))
|
||||
Directory.CreateDirectory(Global._instance.wiki_storage_path);
|
||||
|
||||
try
|
||||
{
|
||||
var targetDirectory = GetSelectedWikiTargetDirectory();
|
||||
Directory.CreateDirectory(targetDirectory);
|
||||
var newFilePath = Path.Combine(targetDirectory, result);
|
||||
File.WriteAllText(newFilePath, "");
|
||||
PopulateNavTree(targetDirectory, newFilePath);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||
}
|
||||
}
|
||||
|
||||
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)
|
||||
{
|
||||
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
||||
@@ -1013,7 +1078,7 @@ public partial class MainWindow : Window
|
||||
{
|
||||
var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
|
||||
.ToString());
|
||||
var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
|
||||
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||
foreach (var set in Settings._instance.addressSets.addresses)
|
||||
if (set.ID == id)
|
||||
{
|
||||
@@ -1029,4 +1094,47 @@ public partial class MainWindow : Window
|
||||
MessageBox.Show(this, ex.StackTrace, "Fehler");
|
||||
}
|
||||
}
|
||||
|
||||
private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||
try
|
||||
{
|
||||
Settings._instance.customers.customers.Remove((Customer)LstSettingsCustomers.SelectedItem);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
||||
}
|
||||
RefreshCustomerItems();
|
||||
}
|
||||
|
||||
private void BtnShorten_OnClick(object? sender, RoutedEventArgs e)
|
||||
{
|
||||
MakeCalcManVisible();
|
||||
if (LstCustomerAdressSets.SelectedIndex == -1)
|
||||
{
|
||||
MessageBox.Show(null, "Bitte zunächst ein Adress-Set auswählen", "Kein Adress-Set ausgewählt");
|
||||
return;
|
||||
}
|
||||
|
||||
StartAddressShortener((KasAddressList)LstCustomerAdressSets.SelectedItem);
|
||||
}
|
||||
|
||||
private void ChangeCSVDivider(object sender, RoutedEventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
string div = (sender as Button).Content as string;
|
||||
if (div == "TAB") div = "\t";
|
||||
if (div == "SPACE") div = " ";
|
||||
TbSettingsCustomerCsvSeparator.Text = div;
|
||||
Settings.Save();
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("Error while parsing");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
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"
|
||||
mc:Ignorable="d" SizeToContent="WidthAndHeight" WindowStartupLocation="CenterScreen" Topmost="True"
|
||||
x:Class="Logof_Client.NamingWindow"
|
||||
Title="NamingWindow">
|
||||
<StackPanel Orientation="Vertical">
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia.Controls;
|
||||
|
||||
@@ -45,6 +46,7 @@ public partial class NamingWindow : Window
|
||||
if (parent != null)
|
||||
wind.ShowDialog(parent);
|
||||
else wind.Show();
|
||||
wind.Focus();
|
||||
|
||||
return tcs.Task;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
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...">
|
||||
<Grid>
|
||||
<!-- <ScrollViewer x:Name="ScvLog"> -->
|
||||
|
||||
@@ -16,9 +16,9 @@ public partial class ProgressWindow : Window
|
||||
PbProgress.Value = percentage;
|
||||
}
|
||||
|
||||
public void AddToLog(string message)
|
||||
public void AddToLog(string message, string percent)
|
||||
{
|
||||
TbLog.Text = message;
|
||||
TbLog.Text = message + $"\n{percent}%";
|
||||
//ScvLog.ScrollToEnd();
|
||||
}
|
||||
}
|
||||
+3
-1
@@ -20,7 +20,9 @@
|
||||
Margin="10,10,10,10" />
|
||||
</Grid>
|
||||
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" />
|
||||
<!-- <TextBlock x:Name="TbResults"></TextBlock> -->
|
||||
<ListBox x:Name="LbResults"></ListBox>
|
||||
<!-- <StackPanel x:Name="StkResults" Orientation="Vertical" Margin="10" /> -->
|
||||
</ScrollViewer>
|
||||
|
||||
</Grid>
|
||||
|
||||
+12
-4
@@ -32,8 +32,12 @@ public partial class ResultWindow : Window
|
||||
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
||||
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
||||
|
||||
StkResults.Children.Clear();
|
||||
foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
||||
// TbResults.Text = "";
|
||||
// foreach (var person in result_with_errors) TbResults.Text += person.PersonError.GetString()+"\n";
|
||||
LbResults.Items.Clear();
|
||||
foreach (var person in result_with_errors) LbResults.Items.Add(person.PersonError.ToString(person));
|
||||
// StkResults.Children.Clear();
|
||||
// foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
||||
}
|
||||
|
||||
private Grid CreatePersonGrid(KasPerson person)
|
||||
@@ -201,8 +205,12 @@ public partial class ResultWindow : Window
|
||||
|
||||
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
||||
|
||||
StkResults.Children.Clear();
|
||||
foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
||||
LbResults.Items.Clear();
|
||||
foreach (var person in temp_result) LbResults.Items.Add(person.PersonError.ToString(person));
|
||||
// TbResults.Text = "";
|
||||
// foreach (var person in temp_result) TbResults.Text += person.PersonError.GetString() +"\n";
|
||||
// StkResults.Children.Clear();
|
||||
// foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
@@ -247,7 +248,7 @@ public class AddressCheck
|
||||
await Dispatcher.UIThread.InvokeAsync(() =>
|
||||
{
|
||||
if (hasFaults)
|
||||
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
|
||||
_progress.AddToLog($"Person mit id {person.id} ist fehlerhaft", Convert.ToInt32(percent).ToString());
|
||||
|
||||
_progress.ChangePercentage(percent);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using System.Threading.Tasks.Dataflow;
|
||||
|
||||
namespace Logof_Client;
|
||||
|
||||
public class AddressShortener(ProgressWindow progressWindow)
|
||||
{
|
||||
private readonly ProgressWindow _progress = progressWindow;
|
||||
|
||||
public async Task Perform(KasAddressList list)
|
||||
{
|
||||
// find doubled addresses by refsid
|
||||
List<int> doubled_ids = new List<int>();
|
||||
for (int i = 0; i < list.KasPersons.Count; i++)
|
||||
{
|
||||
var address = list.KasPersons[i];
|
||||
for (int j = 0; j < list.KasPersons.Count; j++)
|
||||
{
|
||||
if (i == j) continue;
|
||||
var sec_address = list.KasPersons[j];
|
||||
|
||||
if (address.refsid == sec_address.refsid && !doubled_ids.Contains(address.refsid) && address.refsid != 0)
|
||||
{
|
||||
doubled_ids.Add(address.refsid);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// delete doubled addresses by refsid
|
||||
foreach (int id in doubled_ids)
|
||||
{
|
||||
// does this remove both of the doubled addresses?
|
||||
list.KasPersons.Remove(list.KasPersons.FirstOrDefault(x => x.refsid == id));
|
||||
}
|
||||
|
||||
List<int> toRemove = new List<int>();
|
||||
foreach (var address in list.KasPersons)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.NoPLZorPPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
|
||||
address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
} else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PlzNotUsable) &&
|
||||
address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
else if (address.PersonError.errors.Contains(AddressCheck.ErrorTypes.PPlzNotUsable) &&
|
||||
address.PersonError.warnings.Contains(AddressCheck.WarningTypes.NoPLZ))
|
||||
{
|
||||
toRemove.Add(address.id);
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
Console.WriteLine("PersonError not accessible: " + address.id);
|
||||
}
|
||||
}
|
||||
|
||||
// delete doubled addresses by refsid
|
||||
foreach (int id in toRemove)
|
||||
{
|
||||
// does this remove both of the doubled addresses?
|
||||
list.KasPersons.Remove(list.KasPersons.Find(x => x.id == id));
|
||||
}
|
||||
|
||||
//return null;
|
||||
}
|
||||
}
|
||||
+52
-80
@@ -16,14 +16,37 @@ public class CombineAddresses
|
||||
_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? deleteOld)
|
||||
{
|
||||
var result = await Execute(address_lists,type,comb_type,exportUnused);
|
||||
|
||||
if (deleteOld == true)
|
||||
{
|
||||
foreach (var list in address_lists)
|
||||
{
|
||||
Settings._instance.addressSets.addresses.Remove(list);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
|
||||
}
|
||||
|
||||
private async Task<(KasAddressList, KasAddressList)> Execute(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
||||
bool? exportUnused)
|
||||
{
|
||||
if (type == "difference") return await Difference(address_lists, exportUnused);
|
||||
if (type == "union") return await Union(address_lists, exportUnused);
|
||||
if (type == "intersection") return await Intersection(address_lists, exportUnused);
|
||||
if (type == "symdiff") return await SymmetricDifference(address_lists, exportUnused);
|
||||
|
||||
if (type == "difference") return await Difference(address_lists, comb_type, exportUnused);
|
||||
if (type == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||
if (type == "intersection") return await Intersection(address_lists, comb_type, exportUnused);
|
||||
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
||||
return (null, null);
|
||||
}
|
||||
|
||||
@@ -35,10 +58,12 @@ public class CombineAddresses
|
||||
/// <param name="second">Second address to compare</param>
|
||||
/// <param name="only_refsid">If true, only a refsid-check will be done</param>
|
||||
/// <returns></returns>
|
||||
public bool CompareAddresses(KasPerson first, KasPerson second, bool only_refsid = false)
|
||||
public bool CompareAddresses(KasPerson first, KasPerson second, CombineType comb_type)
|
||||
{
|
||||
if (first.refsid == second.refsid) return true;
|
||||
if (!only_refsid)
|
||||
// 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 (comb_type == CombineType.final_adress)
|
||||
if (first.name == second.name &&
|
||||
first.anrede == second.anrede &&
|
||||
first.anredzus == second.anredzus &&
|
||||
@@ -67,7 +92,7 @@ public class CombineAddresses
|
||||
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,
|
||||
Progress? progress = null)
|
||||
{
|
||||
@@ -85,11 +110,13 @@ public class CombineAddresses
|
||||
for (var i = 1; i < address_lists.Count; i++)
|
||||
restUnion.AddRange(address_lists[i].KasPersons);
|
||||
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)
|
||||
{
|
||||
var isDouble = restUnion.Any(p => CompareAddresses(person, p));
|
||||
var isDouble = restUnion.Any(p => CompareAddresses(person, p, comb_type));
|
||||
if (!isDouble)
|
||||
result.KasPersons.Add(person);
|
||||
else
|
||||
@@ -108,11 +135,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)
|
||||
{
|
||||
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)
|
||||
return (result, null);
|
||||
@@ -123,7 +152,7 @@ public class CombineAddresses
|
||||
foreach (var list in address_lists)
|
||||
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);
|
||||
else
|
||||
second_result.KasPersons.Add(person);
|
||||
@@ -150,11 +179,12 @@ public class CombineAddresses
|
||||
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)
|
||||
{
|
||||
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)
|
||||
return (result, null);
|
||||
@@ -170,7 +200,7 @@ public class CombineAddresses
|
||||
{
|
||||
// Prüfen, ob Person in *allen* anderen Listen vorkommt
|
||||
var isInAll = otherLists.All(list =>
|
||||
list.KasPersons.Any(existing => CompareAddresses(existing, person)));
|
||||
list.KasPersons.Any(existing => CompareAddresses(existing, person, comb_type)));
|
||||
|
||||
if (isInAll)
|
||||
result.KasPersons.Add(person);
|
||||
@@ -197,11 +227,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)
|
||||
{
|
||||
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)
|
||||
return (result, null);
|
||||
@@ -216,7 +247,7 @@ public class CombineAddresses
|
||||
foreach (var person in list.KasPersons)
|
||||
{
|
||||
// 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)
|
||||
{
|
||||
// Falls schon drin → Vorkommen erhöhen
|
||||
@@ -254,65 +285,6 @@ public class CombineAddresses
|
||||
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
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
x:Class="Logof_Client.Wiki.EditorWindow"
|
||||
Title="Wiki Editor" MinWidth="600" MinHeight="350" WindowState="Maximized">
|
||||
<Grid>
|
||||
<Grid Margin="10,0,10,10">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="50" />
|
||||
<RowDefinition Height="*" />
|
||||
</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="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" />
|
||||
<TextBox AcceptsTab="True" AcceptsReturn="True" Grid.Row="1" x:Name="TbContent" />
|
||||
</Grid>
|
||||
</Window>
|
||||
@@ -52,7 +52,11 @@ public partial class EditorWindow : Window
|
||||
{
|
||||
var result = await MessageBox.Show(null, "Sicher?", "Sicher?", MessageBoxButton.YesNo);
|
||||
if (result == MessageBoxResult.No) return;
|
||||
File.Delete(filename);
|
||||
try
|
||||
{
|
||||
File.Delete(filename);
|
||||
} catch {}
|
||||
|
||||
MainWindow._instance.PopulateNavTree();
|
||||
Close();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user