[chore:] cleanup
This commit is contained in:
+2
-89
@@ -171,27 +171,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();
|
||||||
@@ -218,41 +197,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 +382,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)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user