Husky/SewerGenerator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Export und Import moved

Browse Source 
Export und Import funktion sind nun unter Projekteinstellungen aufrufbar
This commit is contained in:
Damian Wessels
2023-04-24 13:42:13 +02:00
parent 76731c3464
commit 4f99a38990
6 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs
View File

@@ -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();
}

17
StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs
View File

@@ -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()

14
StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs
View File

@@ -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();
}