diff --git a/Elwig/Helpers/Export/ElwigData.cs b/Elwig/Helpers/Export/ElwigData.cs index 2599516..dfa4b8f 100644 --- a/Elwig/Helpers/Export/ElwigData.cs +++ b/Elwig/Helpers/Export/ElwigData.cs @@ -208,7 +208,7 @@ namespace Elwig.Helpers.Export { } if (members.Count > 0) { var n = importNewMembers ? members.Count - duplicateMgNrs.Count : 0; - var o = importDuplicateDeliveries ? duplicateMgNrs.Count : 0; + var o = importDuplicateMembers ? duplicateMgNrs.Count : 0; importedMembers.Add((meta.FileName, meta.ZwstId, meta.Device, n, o, members.Count - n - o, meta.MemberFilters)); } diff --git a/Elwig/Windows/MainWindow.xaml b/Elwig/Windows/MainWindow.xaml index a0036fe..6273cad 100644 --- a/Elwig/Windows/MainWindow.xaml +++ b/Elwig/Windows/MainWindow.xaml @@ -19,7 +19,7 @@ - + diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs index 531b5ca..d7247d5 100644 --- a/Elwig/Windows/MainWindow.xaml.cs +++ b/Elwig/Windows/MainWindow.xaml.cs @@ -95,8 +95,22 @@ namespace Elwig.Windows { // TODO Menu_Database_Export_Click } - private void Menu_Database_Import_Click(object sender, RoutedEventArgs evt) { - // TODO Menu_Database_Import_Click + private async void Menu_Database_Import_Click(object sender, RoutedEventArgs evt) { + try { + var d = new OpenFileDialog() { + Title = "Export-Datei auswählen - Elwig", + DefaultExt = ".zip", + Filter = "ZIP-Datei (*.zip)|*.zip", + Multiselect = true, + }; + if (d.ShowDialog() == true) { + Mouse.OverrideCursor = Cursors.AppStarting; + await ElwigData.Import(d.FileNames, ElwigData.ImportMode.Interactively); + } + } catch (Exception exc) { + MessageBox.Show(exc.Message, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error); + } + Mouse.OverrideCursor = null; } private async void DownloadButton_Click(object sender, RoutedEventArgs evt) {