Compare commits
11 Commits
v0.8.1
..
68541621d9
| Author | SHA1 | Date | |
|---|---|---|---|
| 68541621d9 | |||
| 474b628f0b | |||
| 7fe45ce4e3 | |||
| a46539c3cc | |||
| 72a5630db1 | |||
| 7697edac5e | |||
| 028b9793db | |||
| 2c5f2ed48b | |||
| f0598a39ec | |||
| f9e419d573 | |||
| 56233e6f5c |
@@ -60,6 +60,11 @@ public class KasAddressList //Address-Set
|
|||||||
var id = listItemName.Split(" - ")[0];
|
var id = listItemName.Split(" - ")[0];
|
||||||
return int.Parse(id);
|
return int.Parse(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return Name + " (" + KasPersons.Count + " Einträge)";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPerson
|
public class KasPerson
|
||||||
@@ -188,6 +193,18 @@ public class KasPerson
|
|||||||
|
|
||||||
return highest + base_id + 1;
|
return highest + base_id + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
if (refsid != null && refsid != 0)
|
||||||
|
{
|
||||||
|
return refsid + " - " + name;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return id + " - " + name;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class KasPersonError
|
public class KasPersonError
|
||||||
@@ -212,4 +229,9 @@ public class KasPersonError
|
|||||||
|
|
||||||
return output;
|
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 class Customers
|
||||||
{
|
{
|
||||||
public List<Customer> customers = new();
|
public List<Customer> customers = new();
|
||||||
public int current { get; set; } = 0;
|
public Customer current { get; set; } = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Customer
|
public class Customer
|
||||||
@@ -149,6 +149,11 @@ public class Customer
|
|||||||
|
|
||||||
ID = highestID + 1;
|
ID = highestID + 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString()
|
||||||
|
{
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
public string name { get; set; } = "";
|
public string name { get; set; } = "";
|
||||||
public string description { get; set; } = "";
|
public string description { get; set; } = "";
|
||||||
@@ -158,11 +163,11 @@ public class Customer
|
|||||||
public int ID { get; }
|
public int ID { get; }
|
||||||
|
|
||||||
|
|
||||||
public static int GetIDByCustomerListItem(string item_content)
|
// public static int GetIDByCustomerListItem(string item_content)
|
||||||
{
|
// {
|
||||||
var id = item_content.Split(" - ")[0];
|
// var id = item_content.Split(" - ")[0];
|
||||||
return int.Parse(id);
|
// return int.Parse(id);
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class AddressSets
|
public class AddressSets
|
||||||
|
|||||||
+20
-8
@@ -121,7 +121,7 @@
|
|||||||
FontWeight="Bold" />
|
FontWeight="Bold" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
<Button Width="250" IsEnabled="False"
|
<Button Width="250" IsEnabled="False" Click="BtnShorten_OnClick"
|
||||||
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
HorizontalContentAlignment="Center" x:Name="BtnShorten"
|
||||||
Margin="0,0,0,10">
|
Margin="0,0,0,10">
|
||||||
<StackPanel Orientation="Horizontal">
|
<StackPanel Orientation="Horizontal">
|
||||||
@@ -220,14 +220,18 @@
|
|||||||
</StackPanel>
|
</StackPanel>
|
||||||
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
<Label FontSize="9" Content="Nur Elemente, die NICHT doppelt sind" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center">
|
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="50">
|
||||||
<RadioButton Content="Vergleiche nach refsid" IsChecked="True" x:Name="RbComprefsid"></RadioButton>
|
<StackPanel Orientation="Vertical" >
|
||||||
<RadioButton Content="Vergleiche nach finaler Adresse" IsChecked="False" x:Name="RbCompfinAd"></RadioButton>
|
<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>
|
||||||
<CheckBox HorizontalAlignment="Center" x:Name="CbMergeExportUnmerged" IsChecked="False">Speichere Unverarbeitete in neuem Verteiler</CheckBox>
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
<Grid Grid.Row="2" Margin="20" ColumnDefinitions="*,5*,*" IsVisible="False" x:Name="GrdExportMarginOptions">
|
||||||
@@ -481,12 +485,20 @@
|
|||||||
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
TextChanged="TbSettingsCustomerSenderAddress_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerSenderAddress" />
|
x:Name="TbSettingsCustomerSenderAddress" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*,Auto">
|
||||||
<Label Content="CSV-Trennzeichen" />
|
<Label Content="CSV-Trennzeichen" />
|
||||||
<TextBox Grid.Column="1" Watermark=","
|
<TextBox Grid.Column="1" Watermark=","
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch" Margin="0,0,5,0"
|
||||||
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
TextChanged="TbSettingsCustomerCsvSeparator_OnTextChanged"
|
||||||
x:Name="TbSettingsCustomerCsvSeparator" />
|
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>
|
||||||
<Grid ColumnDefinitions="150,*">
|
<Grid ColumnDefinitions="150,*">
|
||||||
<Label Content="Address-Patch-Info" />
|
<Label Content="Address-Patch-Info" />
|
||||||
|
|||||||
+115
-147
@@ -96,7 +96,28 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
new ResultWindow(result, addresSetID).Show();
|
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");
|
//await MessageBox.Show(_instance, $"{result.Count} Einträge fehlerhaft.", "Fertig");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,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)
|
private void BtnCheck_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
MakeCalcManVisible();
|
MakeCalcManVisible();
|
||||||
@@ -201,7 +201,7 @@ public partial class MainWindow : Window
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
StartAddressCheck(KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItem.ToString()));
|
StartAddressCheck(((KasAddressList)LstCustomerAdressSets.SelectedItem).ID);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnCombine_OnClick(object? sender, RoutedEventArgs e)
|
||||||
@@ -218,41 +218,7 @@ public partial class MainWindow : Window
|
|||||||
GrdExportMarginOptions.IsVisible = false;
|
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)
|
private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
{
|
{
|
||||||
@@ -437,39 +403,7 @@ public partial class MainWindow : Window
|
|||||||
MessageBox.Show(this, "Bitte starten Sie das Programm neu, um die Änderungen wirksam zu machen.", "Achtung");
|
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, CombineAddresses.CombineType comb_type)
|
private async void StartCombine(List<KasAddressList> address_lists, int owner_id, string type, CombineAddresses.CombineType comb_type)
|
||||||
{
|
{
|
||||||
@@ -478,7 +412,7 @@ public partial class MainWindow : Window
|
|||||||
progressWindow.Show(_instance);
|
progressWindow.Show(_instance);
|
||||||
|
|
||||||
var processor = new CombineAddresses(progressWindow);
|
var processor = new CombineAddresses(progressWindow);
|
||||||
var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked);
|
var result = await processor.Perform(address_lists, type, comb_type, CbMergeExportUnmerged.IsChecked, CbMergeDeleteOld.IsChecked);
|
||||||
|
|
||||||
if (result.Item1 != null)
|
if (result.Item1 != null)
|
||||||
result.Item1.owner_id = owner_id;
|
result.Item1.owner_id = owner_id;
|
||||||
@@ -518,7 +452,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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;
|
customer.name = TbSettingsCustomerName.Text;
|
||||||
//Settings.Save();
|
//Settings.Save();
|
||||||
//RefreshCustomerItems();
|
//RefreshCustomerItems();
|
||||||
@@ -528,19 +462,19 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex < 0) return;
|
if (LstSettingsCustomers.SelectedIndex < 0) return;
|
||||||
Settings._instance.customers.current =
|
Settings._instance.customers.current =
|
||||||
Customer.GetIDByCustomerListItem(LstSettingsCustomers.SelectedItems[0].ToString());
|
((Customer)LstSettingsCustomers.SelectedItems[0]);
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
//foreach (var customer in Settings._instance.customers.customers)
|
||||||
if (customer.ID == Settings._instance.customers.current)
|
//if (customer.ID == Settings._instance.customers.current.ID)
|
||||||
{
|
//{
|
||||||
TbSettingsCustomerDescription.Text = customer.description;
|
TbSettingsCustomerDescription.Text = Settings._instance.customers.current.description;
|
||||||
TbSettingsCustomerName.Text = customer.name;
|
TbSettingsCustomerName.Text = Settings._instance.customers.current.name;
|
||||||
TbSettingsCustomerSenderAddress.Text = customer.sender_address;
|
TbSettingsCustomerSenderAddress.Text = Settings._instance.customers.current.sender_address;
|
||||||
TbSettingsCustomerCsvSeparator.Text = customer.separator.ToString();
|
TbSettingsCustomerCsvSeparator.Text = Settings._instance.customers.current.separator.ToString();
|
||||||
if (customer.patch != null)
|
if (Settings._instance.customers.current.patch != null)
|
||||||
TbSettingsCustomerPatchInfo.Text = customer.patch.ToString();
|
TbSettingsCustomerPatchInfo.Text = Settings._instance.customers.current.patch.ToString();
|
||||||
else
|
else
|
||||||
TbSettingsCustomerPatchInfo.Text = "";
|
TbSettingsCustomerPatchInfo.Text = "";
|
||||||
}
|
//}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
private async void EditButton_Click(object? sender, RoutedEventArgs e)
|
||||||
@@ -573,8 +507,8 @@ public partial class MainWindow : Window
|
|||||||
LstSettingsCustomers.Items.Clear();
|
LstSettingsCustomers.Items.Clear();
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
{
|
{
|
||||||
LstCustomers.Items.Add(customer.ID + " - " + customer.name);
|
LstCustomers.Items.Add(customer);
|
||||||
LstSettingsCustomers.Items.Add(customer.ID + " - " + customer.name);
|
LstSettingsCustomers.Items.Add(customer);
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -590,7 +524,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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;
|
customer.description = TbSettingsCustomerDescription.Text;
|
||||||
//Settings.Save();
|
//Settings.Save();
|
||||||
}
|
}
|
||||||
@@ -605,7 +539,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
MakeCalcManVisible();
|
MakeCalcManVisible();
|
||||||
if (LstCustomers.SelectedItems == null || LstCustomers.SelectedIndex == -1) return;
|
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);
|
RefreshAddressSetListItems(customer_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -630,7 +564,7 @@ public partial class MainWindow : Window
|
|||||||
var selected_path = paths[0].Path;
|
var selected_path = paths[0].Path;
|
||||||
|
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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)
|
if (customer.patch == null)
|
||||||
{
|
{
|
||||||
@@ -685,7 +619,7 @@ public partial class MainWindow : Window
|
|||||||
foreach (var k in Settings._instance.addressSets.addresses)
|
foreach (var k in Settings._instance.addressSets.addresses)
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
if (customer.ID == k.owner_id && customer.ID == customer_id)
|
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)
|
private void LstCustomerAdressSets_OnSelectionChanged(object? sender, SelectionChangedEventArgs e)
|
||||||
@@ -704,6 +638,7 @@ public partial class MainWindow : Window
|
|||||||
BtnCheck.IsEnabled = true;
|
BtnCheck.IsEnabled = true;
|
||||||
BtnCombine.IsEnabled = true;
|
BtnCombine.IsEnabled = true;
|
||||||
BtnGenerateLabels.IsEnabled = true;
|
BtnGenerateLabels.IsEnabled = true;
|
||||||
|
BtnShorten.IsEnabled = true;
|
||||||
|
|
||||||
// BtnRepair.IsEnabled = true;
|
// BtnRepair.IsEnabled = true;
|
||||||
// BtnShorten.IsEnabled = true;
|
// BtnShorten.IsEnabled = true;
|
||||||
@@ -732,7 +667,7 @@ public partial class MainWindow : Window
|
|||||||
var selected_path = paths[0].Path;
|
var selected_path = paths[0].Path;
|
||||||
|
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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);
|
customer.patch = AddressPatch.Import(selected_path);
|
||||||
|
|
||||||
|
|
||||||
@@ -746,7 +681,7 @@ public partial class MainWindow : Window
|
|||||||
? TbSettingsCustomerCsvSeparator.Text
|
? TbSettingsCustomerCsvSeparator.Text
|
||||||
: ",";
|
: ",";
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
foreach (var customer in Settings._instance.customers.customers)
|
||||||
if (customer.ID == Settings._instance.customers.current)
|
if (customer.ID == Settings._instance.customers.current.ID)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
customer.separator = Convert.ToChar(sep);
|
customer.separator = Convert.ToChar(sep);
|
||||||
@@ -765,11 +700,10 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
var list = new List<KasAddressList>();
|
var list = new List<KasAddressList>();
|
||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add((KasAddressList)item);
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "difference", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem), "difference", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -781,11 +715,10 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
var list = new List<KasAddressList>();
|
var list = new List<KasAddressList>();
|
||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add((KasAddressList)item);
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "union", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32((LstCustomers.SelectedItem as Customer).ID), "union", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
@@ -798,8 +731,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
var list = new List<KasAddressList>();
|
var list = new List<KasAddressList>();
|
||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add((KasAddressList)item);
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "intersection", GetCombiningTyp());
|
||||||
@@ -827,8 +759,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
var list = new List<KasAddressList>();
|
var list = new List<KasAddressList>();
|
||||||
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
foreach (var item in LstCustomerAdressSets.SelectedItems)
|
||||||
list.Add(Settings._instance.addressSets.GetAddressSetByID(
|
list.Add((KasAddressList)item);
|
||||||
Convert.ToInt32(item.ToString().Split(" - ")[0])));
|
|
||||||
|
|
||||||
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
|
StartCombine(list, Convert.ToInt32(LstCustomers.SelectedItem.ToString().Split(" - ")[0]), "symdiff", GetCombiningTyp());
|
||||||
}
|
}
|
||||||
@@ -850,18 +781,25 @@ public partial class MainWindow : Window
|
|||||||
DefaultExtension = "pdf",
|
DefaultExtension = "pdf",
|
||||||
Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
|
Filters = { new FileDialogFilter { Name = "PDF-Dateien", Extensions = { "pdf" } } }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// hier nach winpafd prüfen
|
||||||
var filePath = await saveDialog.ShowAsync(this);
|
var filePath = await saveDialog.ShowAsync(this);
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(filePath))
|
if (!string.IsNullOrEmpty(filePath))
|
||||||
{
|
{
|
||||||
|
if (Uri.TryCreate(filePath, UriKind.Absolute, out var uri)
|
||||||
|
&& uri.IsFile)
|
||||||
|
{
|
||||||
|
filePath = uri.LocalPath;
|
||||||
|
}
|
||||||
|
|
||||||
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
var builder = new PdfBuilder(Settings._instance.pdfExport);
|
||||||
|
|
||||||
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
|
builder.CreateAddressLabelPdfFromAddressSetWithPlaceholder(
|
||||||
Convert.ToInt32(LstCustomerAdressSets.SelectedItems[0].ToString().Split(" - ")[0]),
|
((KasAddressList)LstCustomerAdressSets.SelectedItem).ID,
|
||||||
"Company Logo/Info",
|
"Company Logo/Info",
|
||||||
filePath
|
filePath
|
||||||
);
|
);
|
||||||
//return true;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -950,7 +888,7 @@ public partial class MainWindow : Window
|
|||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
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;
|
customer.sender_address = TbSettingsCustomerSenderAddress.Text;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1139,23 +1077,27 @@ public partial class MainWindow : Window
|
|||||||
|
|
||||||
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
private async void MnIAdSetRename_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
|
var id = (LstCustomerAdressSets.SelectedItems[0] as KasAddressList).ID;
|
||||||
|
var cus_id = ((Customer)LstCustomers.SelectedItems[0]).ID;
|
||||||
|
var curr_set = new KasAddressList("");
|
||||||
|
foreach (var set in Settings._instance.addressSets.addresses)
|
||||||
|
if (set.ID == id)
|
||||||
|
{
|
||||||
|
curr_set = set;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
if (LstCustomerAdressSets.SelectedItems.Count > 0)
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = await NamingWindow.Show(this);
|
var result = await NamingWindow.Show(this, curr_set.Name);
|
||||||
if (result != null)
|
if (result != null)
|
||||||
{
|
{
|
||||||
var id = KasAddressList.GetIDByAddressSetListItem(LstCustomerAdressSets.SelectedItems[0]
|
curr_set.Name = result;
|
||||||
.ToString());
|
Settings.Save();
|
||||||
var cus_id = Customer.GetIDByCustomerListItem(LstCustomers.SelectedItems[0].ToString());
|
RefreshAddressSetListItems(cus_id);
|
||||||
foreach (var set in Settings._instance.addressSets.addresses)
|
return;
|
||||||
if (set.ID == id)
|
|
||||||
{
|
|
||||||
set.Name = result;
|
|
||||||
Settings.Save();
|
|
||||||
RefreshAddressSetListItems(cus_id);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
@@ -1167,17 +1109,43 @@ public partial class MainWindow : Window
|
|||||||
private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
|
private void BtnDeleteCustomer_OnClick(object? sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
if (LstSettingsCustomers.SelectedIndex == null || LstSettingsCustomers.SelectedIndex == -1) return;
|
||||||
foreach (var customer in Settings._instance.customers.customers)
|
try
|
||||||
if (customer.ID == Settings._instance.customers.current)
|
{
|
||||||
try
|
Settings._instance.customers.customers.Remove((Customer)LstSettingsCustomers.SelectedItem);
|
||||||
{
|
}
|
||||||
Settings._instance.customers.customers.Remove(customer);
|
catch (Exception ex)
|
||||||
break;
|
{
|
||||||
}
|
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
||||||
catch (Exception ex)
|
}
|
||||||
{
|
|
||||||
MessageBox.Show(this, "Unknown Error: " + ex.Message, "Error");
|
|
||||||
}
|
|
||||||
RefreshCustomerItems();
|
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");
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,9 +16,9 @@ public partial class ProgressWindow : Window
|
|||||||
PbProgress.Value = percentage;
|
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();
|
//ScvLog.ScrollToEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+3
-1
@@ -20,7 +20,9 @@
|
|||||||
Margin="10,10,10,10" />
|
Margin="10,10,10,10" />
|
||||||
</Grid>
|
</Grid>
|
||||||
<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
|
<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>
|
</ScrollViewer>
|
||||||
|
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
+12
-4
@@ -32,8 +32,12 @@ public partial class ResultWindow : Window
|
|||||||
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
var result_with_errors = result.Where(p => p.PersonError != null).ToList();
|
||||||
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{result_with_errors.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
StkResults.Children.Clear();
|
// TbResults.Text = "";
|
||||||
foreach (var person in result_with_errors) StkResults.Children.Add(CreatePersonGrid(person));
|
// 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)
|
private Grid CreatePersonGrid(KasPerson person)
|
||||||
@@ -201,8 +205,12 @@ public partial class ResultWindow : Window
|
|||||||
|
|
||||||
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
LblResultCount.Content = $"{temp_result.Count}/{ur_result.Count} Ergebnisse";
|
||||||
|
|
||||||
StkResults.Children.Clear();
|
LbResults.Items.Clear();
|
||||||
foreach (var person in temp_result) StkResults.Children.Add(CreatePersonGrid(person));
|
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.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
@@ -247,7 +248,7 @@ public class AddressCheck
|
|||||||
await Dispatcher.UIThread.InvokeAsync(() =>
|
await Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
{
|
{
|
||||||
if (hasFaults)
|
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);
|
_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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,13 +24,29 @@ public class CombineAddresses
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type, CombineType comb_type,
|
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)
|
bool? exportUnused)
|
||||||
{
|
{
|
||||||
if (type == "difference") return await Difference(address_lists, comb_type, 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 == "union") return await Union(address_lists, comb_type, exportUnused);
|
||||||
if (type == "intersection") return await Intersection(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);
|
if (type == "symdiff") return await SymmetricDifference(address_lists, comb_type, exportUnused);
|
||||||
|
|
||||||
return (null, null);
|
return (null, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user