From 4f99a38990dc0cdad20c7317c771881bad16f8d1 Mon Sep 17 00:00:00 2001
From: Damian Wessels <damianbodde@gmail.com>
Date: Mon, 24 Apr 2023 13:42:13 +0200
Subject: [PATCH] Export und Import moved

Export und Import funktion sind nun unter Projekteinstellungen aufrufbar
---
 .../AddViewModelsHostBuilderExtensions.cs       | 10 +++++-----
 .../ViewModel/Haltung/HaltungListViewModel.cs   |  5 ++---
 .../ViewModel/Projekt/ProjektEditViewModel.cs   | 17 +++++++++++++++--
 .../ViewModel/Schacht/ManholeListViewModel.cs   | 14 ++++----------
 .../Views/Projekt/ProjektEditView.xaml          |  7 ++++++-
 .../Views/Schacht/SchachtListView.xaml          |  2 +-
 6 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs
index 3eddddf..19981b4 100644
--- a/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs
+++ b/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs
@@ -37,8 +37,7 @@ namespace StammGenerator.HostBuilders
                     return () => new ManholeListViewModel(
                         services.GetRequiredService<ISchachtDataService>(),
                         services.GetRequiredService<ViewModelDelegateRenavigator<ManholeEditViewModel>>(),
-                        services.GetRequiredService<IActualState>(),
-                        services.GetRequiredService<ViewModelDelegateRenavigator<ManholeImportViewModel>>()
+                        services.GetRequiredService<IActualState>()
                         );
                 });
 
@@ -66,8 +65,6 @@ namespace StammGenerator.HostBuilders
                 {
                     return () => new HaltungListViewModel(
                         services.GetRequiredService<IHaltungDataService>(),
-                        services.GetRequiredService<ISchachtDataService>(),
-                        services.GetRequiredService<IProjektDataService>(),
                         services.GetRequiredService<IActualState>(),
                         services.GetRequiredService<ViewModelDelegateRenavigator<HaltungEditViewModel>>()
                         );
@@ -89,8 +86,11 @@ namespace StammGenerator.HostBuilders
                 {
                     return () => new ProjektEditViewModel(
                         services.GetRequiredService<IProjektDataService>(),
+                        services.GetRequiredService<IHaltungDataService>(),
+                        services.GetRequiredService<ISchachtDataService>(),
+                        services.GetRequiredService<IActualState>(),
                         services.GetRequiredService<ViewModelDelegateRenavigator<ProjektListViewModel>>(),
-                        services.GetRequiredService<IActualState>()
+                        services.GetRequiredService<ViewModelDelegateRenavigator<ManholeImportViewModel>>()
                         );
                 });
 
diff --git a/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs b/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs
index 4335711..f17c6c8 100644
--- a/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs
+++ b/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs
@@ -19,9 +19,8 @@ namespace StammGenerator.ViewModel
 
         public ICommand EditCommand { get; set; }
         public ICommand AddCommand { get; set; }
-        public ICommand ExportCommand { get; set; }
 
-        public HaltungListViewModel(IHaltungDataService haltungDataService, ISchachtDataService schachtDataService, IProjektDataService projektDataService, IActualState actualState, IRenavigator renavigator )
+        public HaltungListViewModel(IHaltungDataService haltungDataService, IActualState actualState, IRenavigator renavigator )
         {
             _haltungen = new ObservableCollection<Kanal>();
             _haltungDataService = haltungDataService;
@@ -31,7 +30,7 @@ namespace StammGenerator.ViewModel
 
             EditCommand = new HaltungEditCommand(actualState, renavigator, this);
             AddCommand = new HaltungAddCommand(actualState, renavigator);
-            ExportCommand = new ProjectExportCommand(actualState, haltungDataService, schachtDataService,projektDataService);
+            
 
             LoadHaltungen();
         }
diff --git a/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs b/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs
index ec406ae..43f0851 100644
--- a/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs
+++ b/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs
@@ -1,5 +1,7 @@
-using SewerStammGen.Shared.Domain;
+using SewerStammGen.Shared.Contracts;
+using SewerStammGen.Shared.Domain;
 using Shared.Contracts;
+using StammGenerator.Commands;
 using StammGenerator.Interface;
 using System.Windows.Input;
 
@@ -15,6 +17,9 @@ namespace StammGenerator.ViewModel
         public ProjektSettingsViewModel ProjektSettingsViewModel { get; set; }
 
         public ICommand Speichern { get; set; }
+        public ICommand SchachtImportCommand { get; set; }
+        public ICommand DatenExportCommand { get; set; }
+
         public string ProjektName
         {
             get => _model.Projektname;
@@ -64,7 +69,7 @@ namespace StammGenerator.ViewModel
             }
         }
 
-        public ProjektEditViewModel(IDataService<Projekt> dataService, IRenavigator renavigator, IActualState actualState)
+        public ProjektEditViewModel(IProjektDataService dataService,IHaltungDataService haltungDataService, ISchachtDataService schachtDataService,  IActualState actualState, IRenavigator renavigator, IRenavigator navigatetoImport)
         {
             _dataService = dataService;
             _renavigator = renavigator;
@@ -77,6 +82,14 @@ namespace StammGenerator.ViewModel
 
 
             LoadProjekt();
+
+            SchachtImportCommand = new RelayCommand((x) =>
+            {
+                navigatetoImport.Renavigate();
+            });
+
+            DatenExportCommand = new ProjectExportCommand(actualState, haltungDataService, schachtDataService, dataService);
+            
         }
 
         private async void LoadProjekt()
diff --git a/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs b/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs
index cd9fd6b..517748d 100644
--- a/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs
+++ b/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs
@@ -13,7 +13,7 @@ namespace StammGenerator.ViewModel
         private readonly ISchachtDataService _schachtDataService;
         private readonly ObservableCollection<Schacht> _schaechte;
         private readonly IActualState _actualState;
-        private readonly IRenavigator renavigateToImport;
+        
 
         public ObservableCollection<Schacht> Schaechte { get => _schaechte; }
 
@@ -22,26 +22,20 @@ namespace StammGenerator.ViewModel
         public ICommand AddSchachtCommand { get; set; }
         public ICommand EditSchachtCommand { get; set; }
         public ICommand DeleteSchachtCommand { get; set; }
-        public ICommand ImportSchachtCommand { get; set; }
-
+       
         
 
-        public ManholeListViewModel(ISchachtDataService schachtDataService, IRenavigator renavigator ,IActualState actualState, IRenavigator navigatetoImport)
+        public ManholeListViewModel(ISchachtDataService schachtDataService, IRenavigator renavigator ,IActualState actualState)
         {
             _schachtDataService = schachtDataService;
             _actualState = actualState;
 
             _schaechte = new ObservableCollection<Schacht>();
-            renavigateToImport = navigatetoImport;
+
 
             AddSchachtCommand = new SchachtAddCommand(actualState,renavigator);
             EditSchachtCommand = new SchachtEditCommand(actualState, renavigator,this);
             DeleteSchachtCommand = new SchachtDeleteCommand(schachtDataService, actualState, renavigator, this);
-            ImportSchachtCommand = new RelayCommand((x) =>
-            {
-                navigatetoImport.Renavigate();
-            });
-
             
             LoadSchaechte();
         }
diff --git a/StammGenerator/Views/Projekt/ProjektEditView.xaml b/StammGenerator/Views/Projekt/ProjektEditView.xaml
index ac4b25c..0ac5aaf 100644
--- a/StammGenerator/Views/Projekt/ProjektEditView.xaml
+++ b/StammGenerator/Views/Projekt/ProjektEditView.xaml
@@ -37,7 +37,12 @@
         <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Strasse}" />
         <TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Ort}" />
 
-        <Button Grid.ColumnSpan="2" Grid.Row="4" Content="Speichern" Command="{Binding Speichern}" />
+        <StackPanel Grid.ColumnSpan="2" Grid.Row="4">
+            <Button Content="Speichern" Command="{Binding Speichern}" />
+            <Button Content="Schächte aus CSV Importieren" Command="{Binding SchachtImportCommand}" />
+            <Button Content="Projektdaten nach Schnittstelle exportieren" Command="{Binding DatenExportCommand}" />
+        </StackPanel>
+        
 
         <ContentPresenter Grid.Column="3" Grid.RowSpan="6" Content="{Binding ProjektSettingsViewModel}" />
         
diff --git a/StammGenerator/Views/Schacht/SchachtListView.xaml b/StammGenerator/Views/Schacht/SchachtListView.xaml
index 2aa1888..6e7216d 100644
--- a/StammGenerator/Views/Schacht/SchachtListView.xaml
+++ b/StammGenerator/Views/Schacht/SchachtListView.xaml
@@ -26,7 +26,7 @@
             <Button Content="Schacht hinzufügen" Command="{Binding AddSchachtCommand}" />
             <Button Content="Schacht Editieren"  Command="{Binding EditSchachtCommand}" />
             <Button Content="Schacht Löschen"    Command="{Binding DeleteSchachtCommand}" />
-            <Button Content="Schächte aus CSV Laden" Command="{Binding ImportSchachtCommand}" />
+            <!--<Button Content="Schächte aus CSV Laden" Command="{Binding ImportSchachtCommand}" />-->
         </StackPanel>
     </Grid>
 </UserControl>