diff --git a/SewerStammGen.ConsoleApp/Program.cs b/SewerStammGen.ConsoleApp/Program.cs index a86577c..9dd3fbf 100644 --- a/SewerStammGen.ConsoleApp/Program.cs +++ b/SewerStammGen.ConsoleApp/Program.cs @@ -11,7 +11,7 @@ namespace SewerStammGen.ConsoleApp { static void Main(string[] args) { - IProjektDataService projektService = new ProjektDataService(); + IProjektDataService projektService = new ProjektDataService(""); Projekt neuesProjekt = new Projekt() { diff --git a/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj b/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj index 37797e2..a6065b5 100644 --- a/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj +++ b/SewerStammGen.ConsoleApp/SewerStammGen.ConsoleApp.csproj @@ -10,7 +10,6 @@ - diff --git a/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs b/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs index d8d3ab5..689c5e8 100644 --- a/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs +++ b/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs @@ -45,7 +45,7 @@ namespace SewerStammGen.DAL.Services.PostgresqlData throw new NotImplementedException(); } - private Schacht parseSchacht(NpgsqlDataReader? reader) + private Schacht parseSchacht(NpgsqlDataReader reader) { return new Schacht() { diff --git a/SewerStammGen.DAL/SewerStammGen.DAL.csproj b/SewerStammGen.DAL/SewerStammGen.DAL.csproj index 81a76e6..70da3ec 100644 --- a/SewerStammGen.DAL/SewerStammGen.DAL.csproj +++ b/SewerStammGen.DAL/SewerStammGen.DAL.csproj @@ -12,7 +12,6 @@ - diff --git a/SewerStammGen.Shared/Contracts/IExport.cs b/SewerStammGen.Shared/Contracts/IExport.cs index ce7fa52..45e55b6 100644 --- a/SewerStammGen.Shared/Contracts/IExport.cs +++ b/SewerStammGen.Shared/Contracts/IExport.cs @@ -1,4 +1,5 @@ -using System; +using SewerStammGen.Shared.Domain; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -6,8 +7,8 @@ using System.Threading.Tasks; namespace Shared.Contracts { - internal interface IExport + public interface IExport { - bool Export(); + Task Export(List haltungen, List schaechte); } } diff --git a/SewerStammGen.Shared/Domain/Projekt.cs b/SewerStammGen.Shared/Domain/Projekt.cs index e40ff0a..4685a51 100644 --- a/SewerStammGen.Shared/Domain/Projekt.cs +++ b/SewerStammGen.Shared/Domain/Projekt.cs @@ -14,7 +14,7 @@ namespace SewerStammGen.Shared.Domain public string Erstelldatum { get; set; } = String.Empty; public string Strasse { get; set; } = String.Empty; public string Ort { get; set; } = String.Empty; - public Auftraggeber Auftraggeber { get; set; } + public Auftraggeber Auftraggeber { get; set; } = new Auftraggeber(); public EExportType ExportType { get; set; } public EKodierungssystem Kodierungssystem { get; set; } public IList Kanaele { get; set; } = new List(); diff --git a/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs b/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs index 08ed9f2..5b0d54e 100644 --- a/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs +++ b/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs @@ -27,7 +27,6 @@ namespace SewerStammGen.WPF.Commands public override async Task ExecuteAsync(object? parameter) { - Debugger.Break(); _haltungEditViewModel.Model = await _haltungDataService.Update(_haltungEditViewModel.Model); _renavigator.Renavigate(); diff --git a/SewerStammGen.WPF/Commands/ProjectExportCommand.cs b/SewerStammGen.WPF/Commands/ProjectExportCommand.cs new file mode 100644 index 0000000..8a9adb2 --- /dev/null +++ b/SewerStammGen.WPF/Commands/ProjectExportCommand.cs @@ -0,0 +1,29 @@ +using SewerStammGen.Shared.Domain; +using SewerStammGen.WPF.ViewModel.State; +using Shared.Contracts; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace SewerStammGen.WPF.Commands +{ + internal class ProjectExportCommand : AsyncCommandBase + { + private readonly IActualState _actualState; + private readonly IExport _export; + + public ProjectExportCommand(IActualState actualState) + { + _actualState = actualState; + + } + + public override async Task ExecuteAsync(object? parameter) + { + await _export.Export(new List(), new List()); + + } + } +} diff --git a/SewerStammGen.WPF/SewerStammGen.WPF.csproj b/SewerStammGen.WPF/SewerStammGen.WPF.csproj index 02a1759..2af8338 100644 --- a/SewerStammGen.WPF/SewerStammGen.WPF.csproj +++ b/SewerStammGen.WPF/SewerStammGen.WPF.csproj @@ -11,7 +11,6 @@ - diff --git a/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs b/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs index ab3dd86..95227cb 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs +++ b/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs @@ -137,6 +137,7 @@ namespace SewerStammGen.WPF.ViewModel } public ICommand Speichern { get; set; } + public ICommand Abbrechen { get; set; } public HaltungEditViewModel( IHaltungDataService haltungDataService, @@ -153,6 +154,7 @@ namespace SewerStammGen.WPF.ViewModel _model = _actualState.SelectedHaltung; Speichern = new HaltungEditSaveCommand(_haltungDataService, renavigator, this); + Abbrechen = new RelayCommand((x) => Abbruch(renavigator)); ladeVerfuegbareSchaechte(); @@ -160,6 +162,11 @@ namespace SewerStammGen.WPF.ViewModel } + private void Abbruch(IRenavigator renavigator) + { + renavigator.Renavigate(); + } + private async void ladeVerfuegbareSchaechte() { var s = await _schachtDataService.GetAllByProjekt(_actualState.ProjektID); diff --git a/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs b/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs index f61845c..958b261 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs +++ b/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs @@ -24,6 +24,7 @@ namespace SewerStammGen.WPF.ViewModel public ICommand EditCommand { get; set; } public ICommand AddCommand { get; set; } + public ICommand ExportCommand { get; set; } public HaltungListViewModel(IHaltungDataService haltungDataService, IActualState actualState, IRenavigator renavigator ) { @@ -35,6 +36,7 @@ namespace SewerStammGen.WPF.ViewModel EditCommand = new HaltungEditCommand(actualState, renavigator, this); AddCommand = new HaltungAddCommand(); + ExportCommand = new ProjectExportCommand(actualState); LoadHaltungen(); } diff --git a/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs b/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs index f3d279e..a46f572 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs +++ b/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs @@ -1,5 +1,5 @@ using Microsoft.Xaml.Behaviors; -using Syncfusion.UI.Xaml.Grid; +//using Syncfusion.UI.Xaml.Grid; using System; using System.Collections.Generic; using System.Linq; @@ -8,6 +8,7 @@ using System.Threading.Tasks; namespace SewerStammGen.WPF.Views { + /* public class TextBoxFilterAction : TargetedTriggerAction { protected override void Invoke(object parameter) @@ -15,4 +16,5 @@ namespace SewerStammGen.WPF.Views throw new NotImplementedException(); } } + */ } diff --git a/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs b/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs index 36288db..bb809ca 100644 --- a/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs +++ b/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs @@ -9,7 +9,7 @@ namespace SewerStammGen.WPF.ViewModel.State.Navigation { internal class MainWindowNavigator : ObservableObject, IMainWindowNavigator { - private BaseViewModel _currentViewModel; + private BaseViewModel _currentViewModel = new BaseViewModel(); public BaseViewModel CurrentViewModel { get => _currentViewModel; diff --git a/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml b/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml index ba2f732..367227a 100644 --- a/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml +++ b/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml @@ -12,7 +12,7 @@ - + @@ -29,11 +29,9 @@ @@ -53,19 +51,20 @@ - -