diff --git a/SewerStammGen.DAL/Services/PostgresqlData/HaltungDataService.cs b/SewerStammGen.DAL/Services/PostgresqlData/HaltungDataService.cs index 06642d1..c1438c3 100644 --- a/SewerStammGen.DAL/Services/PostgresqlData/HaltungDataService.cs +++ b/SewerStammGen.DAL/Services/PostgresqlData/HaltungDataService.cs @@ -1,6 +1,7 @@ using Npgsql; using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; +using SewerStammGen.Shared.Enum; using System; using System.Collections.Generic; using System.Diagnostics; @@ -16,9 +17,27 @@ namespace SewerStammGen.DAL.Services.PostgresqlData { } - public Task Create(Kanal entity) + public async Task Create(Kanal entity) { - throw new NotImplementedException(); + string command = "INSERT INTO " + tableName + " (" + + "objektbezeichnung,ref_startschacht_id,ref_endschacht_id," + + "dn,material,haltungslaenge, entwaesserung,ref_projekt_id) VALUES " + + "(@1,@2,@3,@4,@5,@6,@7,@8) RETURNING haltung_id"; + using (var cmd = new NpgsqlCommand(command, conn)) + { + cmd.Parameters.AddWithValue("1", entity.Objektbezeichnung); + cmd.Parameters.AddWithValue("2", entity.StartSchacht.Id); + cmd.Parameters.AddWithValue("3", entity.EndSchacht.Id); + cmd.Parameters.AddWithValue("4", entity.DN); + cmd.Parameters.AddWithValue("5", entity.Material); + cmd.Parameters.AddWithValue("6", entity.Haltungslaenge); + cmd.Parameters.AddWithValue("7", (int)entity.Entwaesserung); + cmd.Parameters.AddWithValue("8", entity.Projekt.Id); + using var reader = await cmd.ExecuteReaderAsync(); + reader.Read(); + entity.Id = reader.GetInt32(0); + } + return entity; } public Task Get(int id) @@ -47,8 +66,11 @@ namespace SewerStammGen.DAL.Services.PostgresqlData { Kanal adding = parseHaltung(reader); - adding.StartSchacht = schaechte.Where(x => x.Id == reader.GetInt32(2)).Last(); - adding.EndSchacht = schaechte.Where(x => x.Id == reader.GetInt32(3)).Last(); + int startSchachtID = reader.GetInt32(2); + int endSchachtID = reader.GetInt32(3); + + adding.StartSchacht = schaechte.Where(x => x.Id == startSchachtID).Last(); + adding.EndSchacht = schaechte.Where(x => x.Id == endSchachtID).Last(); result.Add(adding); } } diff --git a/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs b/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs index a4d0502..81713ef 100644 --- a/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs +++ b/SewerStammGen.DAL/Services/PostgresqlData/SchachtDataService.cs @@ -1,6 +1,7 @@ using Npgsql; using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; +using SewerStammGen.Shared.Enum; using System; using System.Collections.Generic; using System.Linq; diff --git a/SewerStammGen.Shared/Contracts/IImport.cs b/SewerStammGen.Shared/Contracts/IImport.cs index 32fdd15..6f23d54 100644 --- a/SewerStammGen.Shared/Contracts/IImport.cs +++ b/SewerStammGen.Shared/Contracts/IImport.cs @@ -1,4 +1,5 @@ using SewerStammGen.Shared.Domain; +using SewerStammGen.Shared.Enum; using System; using System.Collections.Generic; using System.Linq; diff --git a/SewerStammGen.Shared/Domain/Kanal.cs b/SewerStammGen.Shared/Domain/Kanal.cs index 629c2a9..7a7dc82 100644 --- a/SewerStammGen.Shared/Domain/Kanal.cs +++ b/SewerStammGen.Shared/Domain/Kanal.cs @@ -1,4 +1,5 @@ -using System; +using SewerStammGen.Shared.Enum; +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/SewerStammGen.Shared/Domain/Schacht.cs b/SewerStammGen.Shared/Domain/Schacht.cs index 09be655..b552ac2 100644 --- a/SewerStammGen.Shared/Domain/Schacht.cs +++ b/SewerStammGen.Shared/Domain/Schacht.cs @@ -1,4 +1,5 @@ -using System; +using SewerStammGen.Shared.Enum; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; @@ -19,11 +20,4 @@ namespace SewerStammGen.Shared.Domain public Projekt Projekt { get; set; } = new Projekt(); public EEntwaeserung Entwaesserung { get; set; } } - - public enum EEntwaeserung - { - Regenwasser, - Schmutzwasser, - Mischwasser - } } diff --git a/SewerStammGen.Shared/Enum/EEntwaeserung.cs b/SewerStammGen.Shared/Enum/EEntwaeserung.cs new file mode 100644 index 0000000..c14ba57 --- /dev/null +++ b/SewerStammGen.Shared/Enum/EEntwaeserung.cs @@ -0,0 +1,9 @@ +namespace SewerStammGen.Shared.Enum +{ + public enum EEntwaeserung + { + Regenwasser, + Schmutzwasser, + Mischwasser + } +} diff --git a/SewerStammGen.WPF/App.xaml.cs b/SewerStammGen.WPF/App.xaml.cs deleted file mode 100644 index c68c72c..0000000 --- a/SewerStammGen.WPF/App.xaml.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using SewerStammGen.HostBuilders; -using SewerStammGen.WPF.ViewModel; -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; - -namespace SewerStammGen.WPF -{ - /// - /// Interaction logic for App.xaml - /// - public partial class App : Application - { - private readonly IHost _host; - public App() - { - _host = CreateHostBuilder().Build(); - } - - static IHostBuilder CreateHostBuilder(string[]? args = null) - { - return Host.CreateDefaultBuilder(args) - .AddConfiguration() - .AddServices() - .AddViewModels() - .AddStores(); - - } - - protected override void OnStartup(StartupEventArgs e) - { - Application.Current.DispatcherUnhandledException += Current_DispatcherUnhandledException; - AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; - - _host.Start(); - - - - MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService() }; - window.Show(); - - base.OnStartup(e); - } - - private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e) - { - try - { - Exception ex = (Exception)e.ExceptionObject; - string text = "An application error occured. Please contact the Administrator with the following information:\n\n"; - MessageBox.Show(text + " " + ex.Message + "\n\n" + ex.StackTrace); - } - catch (Exception ex2) - { - MessageBox.Show("Fatal Non-UI error", ex2.Message, MessageBoxButton.OK, MessageBoxImage.Error); - } - } - - private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) - { - throw new NotImplementedException(); - } - } -} diff --git a/SewerStammGen.WPF/Commands/HaltungAddCommand.cs b/SewerStammGen.WPF/Commands/HaltungAddCommand.cs deleted file mode 100644 index 527dcae..0000000 --- a/SewerStammGen.WPF/Commands/HaltungAddCommand.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace SewerStammGen.WPF.Commands -{ - internal class HaltungAddCommand : AsyncCommandBase - { - public HaltungAddCommand() - { - - } - - public override Task ExecuteAsync(object? parameter) - { - throw new NotImplementedException(); - } - } -} diff --git a/SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml.cs b/SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml.cs deleted file mode 100644 index 54bec52..0000000 --- a/SewerStammGen.WPF/Views/Controls/UCMainWindowNavigationBar.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace SewerStammGen.WPF.Views.Controls -{ - /// - /// Interaktionslogik für UCMainWindowNavigationBar.xaml - /// - public partial class UCMainWindowNavigationBar : UserControl - { - public UCMainWindowNavigationBar() - { - InitializeComponent(); - } - } -} diff --git a/SewerStammGen.WPF/Views/UCNormXML.xaml b/SewerStammGen.WPF/Views/UCNormXML.xaml deleted file mode 100644 index d0166d2..0000000 --- a/SewerStammGen.WPF/Views/UCNormXML.xaml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - DIN - EN 13508 - 2: 2003 / Ohne nationale Festlegung - DIN - EN 13508 - 2: 2003 / Nationale Festlegung DWA M 149-2 - DIN - EN 13508 - 2: 2003 / andere nationale Festlegung (Bemerkung erforderlich) - ISYBAU 2001 - ISYBAU 1996 - anderes Kodiersystem (Bemerkung erfolrderlich) - DIN - EN 13508 - 2: 2003 / Nationale Festlegung Arbeitshilfen Abwasser - DIN - EN 13508 - 2: 2011 / Ohne nationale Festlegung - DIN - EN 13508 - 2: 2011 / Nationale Festlegung DWA M 149 - 2 - DIN - EN 13508 - 2: 2011 / Nationale Festlegung Arbeitshilfen Abwasser - - - - Arbeitshilfen Abwasser (ISYBAU 1996/2001) - Arbeitshilfen Abwasser (ISYBAU 2006) - Sonstige Festlegungen - keine Angaben - Arbeitshilfen Abwasser (ISYBAU 2013) - Arbeitshilfen Abwasser (ISYBAU 2017) - - - diff --git a/SewerStammGen.WPF/App.xaml b/StammGenerator/App.xaml similarity index 82% rename from SewerStammGen.WPF/App.xaml rename to StammGenerator/App.xaml index 2514256..d5e64e7 100644 --- a/SewerStammGen.WPF/App.xaml +++ b/StammGenerator/App.xaml @@ -1,13 +1,15 @@ - + + diff --git a/StammGenerator/App.xaml.cs b/StammGenerator/App.xaml.cs new file mode 100644 index 0000000..9667814 --- /dev/null +++ b/StammGenerator/App.xaml.cs @@ -0,0 +1,47 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Hosting; +using StammGenerator.HostBuilders; +using StammGenerator.ViewModel; +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace StammGenerator +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + private readonly IHost _host; + public App() + { + _host = CreateHostBuilder().Build(); + } + + static IHostBuilder CreateHostBuilder(string[]? args = null) + { + return Host.CreateDefaultBuilder(args) + .AddConfiguration() + .AddServices() + .AddViewModels() + .AddStores(); + } + + protected override void OnStartup(StartupEventArgs e) + { + _host.Start(); + + + + MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService() }; + window.Show(); + + base.OnStartup(e); + } + } +} diff --git a/SewerStammGen.WPF/AssemblyInfo.cs b/StammGenerator/AssemblyInfo.cs similarity index 100% rename from SewerStammGen.WPF/AssemblyInfo.cs rename to StammGenerator/AssemblyInfo.cs diff --git a/SewerStammGen.WPF/Commands/AsyncCommandBase.cs b/StammGenerator/Commands/AsyncCommandBase.cs similarity index 96% rename from SewerStammGen.WPF/Commands/AsyncCommandBase.cs rename to StammGenerator/Commands/AsyncCommandBase.cs index b1407a4..606e888 100644 --- a/SewerStammGen.WPF/Commands/AsyncCommandBase.cs +++ b/StammGenerator/Commands/AsyncCommandBase.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal abstract class AsyncCommandBase : ICommand { diff --git a/StammGenerator/Commands/HaltungAddCommand.cs b/StammGenerator/Commands/HaltungAddCommand.cs new file mode 100644 index 0000000..e9f6ec8 --- /dev/null +++ b/StammGenerator/Commands/HaltungAddCommand.cs @@ -0,0 +1,30 @@ +using SewerStammGen.Shared.Domain; +using StammGenerator.Interface; +using StammGenerator.ViewModel; +using System.Threading.Tasks; + +namespace StammGenerator.Commands +{ + internal class HaltungAddCommand : AsyncCommandBase + { + private readonly IActualState actualState; + private readonly IRenavigator renavigator; + + public HaltungAddCommand(IActualState actualState, IRenavigator renavigator) + { + this.actualState = actualState; + this.renavigator = renavigator; + } + + public override async Task ExecuteAsync(object? parameter) + { + Kanal haltung = new Kanal() + { + Id = -1, + Projekt = new Projekt() { Id = actualState.ProjektID }, + }; + actualState.SetHaltung(haltung); + renavigator.Renavigate(); + } + } +} diff --git a/SewerStammGen.WPF/Commands/HaltungEditCommand.cs b/StammGenerator/Commands/HaltungEditCommand.cs similarity index 72% rename from SewerStammGen.WPF/Commands/HaltungEditCommand.cs rename to StammGenerator/Commands/HaltungEditCommand.cs index d610d80..15872f2 100644 --- a/SewerStammGen.WPF/Commands/HaltungEditCommand.cs +++ b/StammGenerator/Commands/HaltungEditCommand.cs @@ -1,14 +1,9 @@ -using SewerStammGen.Shared.Contracts; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class HaltungEditCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs b/StammGenerator/Commands/HaltungEditSaveCommand.cs similarity index 58% rename from SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs rename to StammGenerator/Commands/HaltungEditSaveCommand.cs index 5b0d54e..3a7ecf4 100644 --- a/SewerStammGen.WPF/Commands/HaltungEditSaveCommand.cs +++ b/StammGenerator/Commands/HaltungEditSaveCommand.cs @@ -1,33 +1,36 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using Shared.Contracts; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class HaltungEditSaveCommand : AsyncCommandBase { - private readonly HaltungEditViewModel _haltungEditViewModel; private readonly IHaltungDataService _haltungDataService; private readonly IRenavigator _renavigator; + private readonly Kanal _model; public HaltungEditSaveCommand(IHaltungDataService haltungDataService,IRenavigator renavigator,HaltungEditViewModel haltungEditViewModel) { - this._haltungEditViewModel = haltungEditViewModel; + this._haltungDataService = haltungDataService; this._renavigator = renavigator; + this._model = haltungEditViewModel.Model; } public override async Task ExecuteAsync(object? parameter) { - _haltungEditViewModel.Model = await _haltungDataService.Update(_haltungEditViewModel.Model); + if(_model.Id == -1) // Neu anlegen + { + await _haltungDataService.Create(_model); + } + else + { + await _haltungDataService.Update(_model); + } _renavigator.Renavigate(); } diff --git a/SewerStammGen.WPF/Commands/ProjectExportCommand.cs b/StammGenerator/Commands/ProjectExportCommand.cs similarity index 82% rename from SewerStammGen.WPF/Commands/ProjectExportCommand.cs rename to StammGenerator/Commands/ProjectExportCommand.cs index 8a9adb2..13ce34f 100644 --- a/SewerStammGen.WPF/Commands/ProjectExportCommand.cs +++ b/StammGenerator/Commands/ProjectExportCommand.cs @@ -1,13 +1,11 @@ using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.ViewModel.State; using Shared.Contracts; -using System; +using StammGenerator.Commands; +using StammGenerator.ViewModel; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class ProjectExportCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/ProjektAddCommand.cs b/StammGenerator/Commands/ProjektAddCommand.cs similarity index 85% rename from SewerStammGen.WPF/Commands/ProjektAddCommand.cs rename to StammGenerator/Commands/ProjektAddCommand.cs index b9020ab..48d32ed 100644 --- a/SewerStammGen.WPF/Commands/ProjektAddCommand.cs +++ b/StammGenerator/Commands/ProjektAddCommand.cs @@ -1,15 +1,12 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; -using System; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class ProjektAddCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/ProjektEditCommand.cs b/StammGenerator/Commands/ProjektEditCommand.cs similarity index 82% rename from SewerStammGen.WPF/Commands/ProjektEditCommand.cs rename to StammGenerator/Commands/ProjektEditCommand.cs index aac2301..69d8df3 100644 --- a/SewerStammGen.WPF/Commands/ProjektEditCommand.cs +++ b/StammGenerator/Commands/ProjektEditCommand.cs @@ -1,12 +1,11 @@ using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; using Shared.Contracts; -using System.Runtime.CompilerServices; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class ProjektEditCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/ProjektSelectCommand.cs b/StammGenerator/Commands/ProjektSelectCommand.cs similarity index 84% rename from SewerStammGen.WPF/Commands/ProjektSelectCommand.cs rename to StammGenerator/Commands/ProjektSelectCommand.cs index 5abcaad..ec1f55e 100644 --- a/SewerStammGen.WPF/Commands/ProjektSelectCommand.cs +++ b/StammGenerator/Commands/ProjektSelectCommand.cs @@ -1,9 +1,8 @@ -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; -using System; +using StammGenerator.Commands; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class ProjektSelectCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/SchachtAddCommand.cs b/StammGenerator/Commands/SchachtAddCommand.cs similarity index 70% rename from SewerStammGen.WPF/Commands/SchachtAddCommand.cs rename to StammGenerator/Commands/SchachtAddCommand.cs index 0ed852c..d555bf5 100644 --- a/SewerStammGen.WPF/Commands/SchachtAddCommand.cs +++ b/StammGenerator/Commands/SchachtAddCommand.cs @@ -1,15 +1,10 @@ -using SewerStammGen.Shared.Contracts; -using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using SewerStammGen.Shared.Domain; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { class SchachtAddCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/SchachtDeleteCommand.cs b/StammGenerator/Commands/SchachtDeleteCommand.cs similarity index 79% rename from SewerStammGen.WPF/Commands/SchachtDeleteCommand.cs rename to StammGenerator/Commands/SchachtDeleteCommand.cs index 71ad7ec..25a31fb 100644 --- a/SewerStammGen.WPF/Commands/SchachtDeleteCommand.cs +++ b/StammGenerator/Commands/SchachtDeleteCommand.cs @@ -1,14 +1,11 @@ using SewerStammGen.Shared.Contracts; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { class SchachtDeleteCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/SchachtEditCommand.cs b/StammGenerator/Commands/SchachtEditCommand.cs similarity index 72% rename from SewerStammGen.WPF/Commands/SchachtEditCommand.cs rename to StammGenerator/Commands/SchachtEditCommand.cs index 7ee9013..ba5cc40 100644 --- a/SewerStammGen.WPF/Commands/SchachtEditCommand.cs +++ b/StammGenerator/Commands/SchachtEditCommand.cs @@ -1,14 +1,9 @@ -using SewerStammGen.Shared.Contracts; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using StammGenerator.Commands; +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { class SchachtEditCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Commands/UpdateCurrentViewModelCommand.cs b/StammGenerator/Commands/UpdateCurrentViewModelCommand.cs similarity index 77% rename from SewerStammGen.WPF/Commands/UpdateCurrentViewModelCommand.cs rename to StammGenerator/Commands/UpdateCurrentViewModelCommand.cs index 27bada8..c277223 100644 --- a/SewerStammGen.WPF/Commands/UpdateCurrentViewModelCommand.cs +++ b/StammGenerator/Commands/UpdateCurrentViewModelCommand.cs @@ -1,13 +1,9 @@ -using SewerStammGen.Enum; -using SewerStammGen.WPF.Interface; -using SewerStammGen.WPF.Interface.Navigator; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +using StammGenerator.Commands; +using StammGenerator.Enum; +using StammGenerator.Interface; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Commands +namespace StammGenerator.Commands { internal class UpdateCurrentViewModelCommand : AsyncCommandBase { diff --git a/SewerStammGen.WPF/Views/Converters/EqualValueToParameterConverter.cs b/StammGenerator/Converters/EqualValueToParameterConverter.cs similarity index 93% rename from SewerStammGen.WPF/Views/Converters/EqualValueToParameterConverter.cs rename to StammGenerator/Converters/EqualValueToParameterConverter.cs index 2a91f0c..f0a5d08 100644 --- a/SewerStammGen.WPF/Views/Converters/EqualValueToParameterConverter.cs +++ b/StammGenerator/Converters/EqualValueToParameterConverter.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; -namespace SewerStammGen.WPF.Views.Converters +namespace StammGenerator.Converters { public class EqualValueToParameterConverter : IValueConverter { diff --git a/SewerStammGen.WPF/Views/Converters/EqualValueToEntwaesserungConverter.cs b/StammGenerator/Converters/ValueToEntConverter.cs similarity index 80% rename from SewerStammGen.WPF/Views/Converters/EqualValueToEntwaesserungConverter.cs rename to StammGenerator/Converters/ValueToEntConverter.cs index 2c274bc..80a4041 100644 --- a/SewerStammGen.WPF/Views/Converters/EqualValueToEntwaesserungConverter.cs +++ b/StammGenerator/Converters/ValueToEntConverter.cs @@ -1,4 +1,5 @@ using SewerStammGen.Shared.Domain; +using SewerStammGen.Shared.Enum; using System; using System.Collections.Generic; using System.Globalization; @@ -7,9 +8,9 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Data; -namespace SewerStammGen.WPF.Views.Converters +namespace StammGenerator.Converters { - public class EqualValueToEntwaesserungConverter : IValueConverter + public class ValueToEntConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { @@ -18,6 +19,7 @@ namespace SewerStammGen.WPF.Views.Converters public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + return (EEntwaeserung)parameter; } } diff --git a/SewerStammGen.WPF/Enum/EMainWindowViewType.cs b/StammGenerator/Enum/EMainWindowViewType.cs similarity index 90% rename from SewerStammGen.WPF/Enum/EMainWindowViewType.cs rename to StammGenerator/Enum/EMainWindowViewType.cs index b38d4c1..21d44ff 100644 --- a/SewerStammGen.WPF/Enum/EMainWindowViewType.cs +++ b/StammGenerator/Enum/EMainWindowViewType.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.Enum +namespace StammGenerator.Enum { public enum EMainWindowViewType { diff --git a/SewerStammGen.WPF/HostBuilders/AddConfigurationHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddConfigurationHostBuilderExtensions.cs similarity index 94% rename from SewerStammGen.WPF/HostBuilders/AddConfigurationHostBuilderExtensions.cs rename to StammGenerator/HostBuilders/AddConfigurationHostBuilderExtensions.cs index 790ffcb..4e5491f 100644 --- a/SewerStammGen.WPF/HostBuilders/AddConfigurationHostBuilderExtensions.cs +++ b/StammGenerator/HostBuilders/AddConfigurationHostBuilderExtensions.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.HostBuilders +namespace StammGenerator.HostBuilders { static class AddConfigurationHostBuilderExtensions { diff --git a/SewerStammGen.WPF/HostBuilders/AddDBContextHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddDBContextHostBuilderExtensions.cs similarity index 90% rename from SewerStammGen.WPF/HostBuilders/AddDBContextHostBuilderExtensions.cs rename to StammGenerator/HostBuilders/AddDBContextHostBuilderExtensions.cs index 88078b4..59809c0 100644 --- a/SewerStammGen.WPF/HostBuilders/AddDBContextHostBuilderExtensions.cs +++ b/StammGenerator/HostBuilders/AddDBContextHostBuilderExtensions.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.HostBuilders +namespace StammGenerator.HostBuilders { static class AddDBContextHostBuilderExtensions { diff --git a/SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddServicesHostBuilderExtensions.cs similarity index 67% rename from SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs rename to StammGenerator/HostBuilders/AddServicesHostBuilderExtensions.cs index ac8eb01..10a2994 100644 --- a/SewerStammGen.WPF/HostBuilders/AddServicesHostBuilderExtensions.cs +++ b/StammGenerator/HostBuilders/AddServicesHostBuilderExtensions.cs @@ -2,20 +2,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using SewerStammGen.Shared.Contracts; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State.Navigation; -using Shared.Contracts; - +using StammGenerator.Interface; +using StammGenerator.ViewModel; using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; -namespace SewerStammGen.HostBuilders +namespace StammGenerator.HostBuilders { internal static class AddServicesHostBuilderExtensions { @@ -33,10 +24,10 @@ namespace SewerStammGen.HostBuilders { string? connectionstring = context.Configuration.GetConnectionString("postgresql"); if(connectionstring == null) throw new ArgumentNullException(nameof(connectionstring)); - services.AddSingleton(_=> new DAL.Services.PostgresqlData.ProjektDataService(connectionstring)); - services.AddSingleton(_ => new DAL.Services.PostgresqlData.AuftraggeberDataService(connectionstring)); - services.AddSingleton(_ => new DAL.Services.PostgresqlData.SchachtDataService(connectionstring)); - services.AddSingleton(_ => new DAL.Services.PostgresqlData.HaltungDataService(connectionstring)); + services.AddSingleton(_=> new SewerStammGen.DAL.Services.PostgresqlData.ProjektDataService(connectionstring)); + services.AddSingleton(_ => new SewerStammGen.DAL.Services.PostgresqlData.AuftraggeberDataService(connectionstring)); + services.AddSingleton(_ => new SewerStammGen.DAL.Services.PostgresqlData.SchachtDataService(connectionstring)); + services.AddSingleton(_ => new SewerStammGen.DAL.Services.PostgresqlData.HaltungDataService(connectionstring)); } } diff --git a/SewerStammGen.WPF/HostBuilders/AddStoresHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddStoresHostBuilderExtensions.cs similarity index 69% rename from SewerStammGen.WPF/HostBuilders/AddStoresHostBuilderExtensions.cs rename to StammGenerator/HostBuilders/AddStoresHostBuilderExtensions.cs index 5fe5035..03384bb 100644 --- a/SewerStammGen.WPF/HostBuilders/AddStoresHostBuilderExtensions.cs +++ b/StammGenerator/HostBuilders/AddStoresHostBuilderExtensions.cs @@ -1,13 +1,8 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using SewerStammGen.WPF.ViewModel.State; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using StammGenerator.ViewModel; -namespace SewerStammGen.HostBuilders +namespace StammGenerator.HostBuilders { static class AddStoresHostBuilderExtensions { diff --git a/SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs similarity index 91% rename from SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs rename to StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs index a65f986..bd8a2b0 100644 --- a/SewerStammGen.WPF/HostBuilders/AddViewModelsHostBuilderExtensions.cs +++ b/StammGenerator/HostBuilders/AddViewModelsHostBuilderExtensions.cs @@ -1,22 +1,11 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; -using SewerStammGen.WPF.Commands; -using SewerStammGen.WPF.Interface; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State.Navigation; -using SewerStammGen.WPF.ViewModel.Factories; -using Shared.Contracts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Security; -using System.Text; -using System.Threading.Tasks; -using SewerStammGen.WPF.ViewModel.State; using SewerStammGen.Shared.Contracts; -using SewerStammGen.Shared.Domain; +using StammGenerator.Interface; +using StammGenerator.ViewModel; +using StammGenerator.ViewModel.Factories; -namespace SewerStammGen.HostBuilders +namespace StammGenerator.HostBuilders { static class AddViewModelsHostBuilderExtensions { diff --git a/SewerStammGen.WPF/Interface/IViewModelAbstractFactory.cs b/StammGenerator/Interface/IViewModelAbstractFactory.cs similarity index 70% rename from SewerStammGen.WPF/Interface/IViewModelAbstractFactory.cs rename to StammGenerator/Interface/IViewModelAbstractFactory.cs index 9f0ae4c..1fb4686 100644 --- a/SewerStammGen.WPF/Interface/IViewModelAbstractFactory.cs +++ b/StammGenerator/Interface/IViewModelAbstractFactory.cs @@ -1,12 +1,12 @@ -using SewerStammGen.Enum; -using SewerStammGen.WPF.ViewModel; +using StammGenerator.Enum; +using StammGenerator.ViewModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Interface +namespace StammGenerator.Interface { public interface IViewModelAbstractFactory { diff --git a/SewerStammGen.WPF/Interface/Navigator/IMainWindowNavigator.cs b/StammGenerator/Interface/Navigator/IMainWindowNavigator.cs similarity index 79% rename from SewerStammGen.WPF/Interface/Navigator/IMainWindowNavigator.cs rename to StammGenerator/Interface/Navigator/IMainWindowNavigator.cs index 7bd8303..b15ee96 100644 --- a/SewerStammGen.WPF/Interface/Navigator/IMainWindowNavigator.cs +++ b/StammGenerator/Interface/Navigator/IMainWindowNavigator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Interface.Navigator +namespace StammGenerator.Interface { public interface IMainWindowNavigator : INavigator { diff --git a/SewerStammGen.WPF/Interface/Navigator/INavigator.cs b/StammGenerator/Interface/Navigator/INavigator.cs similarity index 77% rename from SewerStammGen.WPF/Interface/Navigator/INavigator.cs rename to StammGenerator/Interface/Navigator/INavigator.cs index af5762b..ba08f84 100644 --- a/SewerStammGen.WPF/Interface/Navigator/INavigator.cs +++ b/StammGenerator/Interface/Navigator/INavigator.cs @@ -1,11 +1,11 @@ -using SewerStammGen.WPF.ViewModel; +using StammGenerator.ViewModel; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Interface.Navigator +namespace StammGenerator.Interface { public interface INavigator { diff --git a/SewerStammGen.WPF/Interface/Navigator/IRenavigator.cs b/StammGenerator/Interface/Navigator/IRenavigator.cs similarity index 80% rename from SewerStammGen.WPF/Interface/Navigator/IRenavigator.cs rename to StammGenerator/Interface/Navigator/IRenavigator.cs index b9c01f8..8a3bb13 100644 --- a/SewerStammGen.WPF/Interface/Navigator/IRenavigator.cs +++ b/StammGenerator/Interface/Navigator/IRenavigator.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Interface.Navigator +namespace StammGenerator.Interface { public interface IRenavigator { diff --git a/SewerStammGen.WPF/MainWindow.xaml b/StammGenerator/MainWindow.xaml similarity index 78% rename from SewerStammGen.WPF/MainWindow.xaml rename to StammGenerator/MainWindow.xaml index f43dc3f..986abaa 100644 --- a/SewerStammGen.WPF/MainWindow.xaml +++ b/StammGenerator/MainWindow.xaml @@ -1,17 +1,16 @@ - + + xmlns:view="clr-namespace:StammGenerator.Views" + xmlns:viewmodel="clr-namespace:StammGenerator.ViewModel" + + + Title="MainWindow" Height="450" Width="800"> @@ -31,7 +30,7 @@ - + @@ -48,7 +47,8 @@ - + + diff --git a/SewerStammGen.WPF/MainWindow.xaml.cs b/StammGenerator/MainWindow.xaml.cs similarity index 84% rename from SewerStammGen.WPF/MainWindow.xaml.cs rename to StammGenerator/MainWindow.xaml.cs index 70d90ad..ddd2041 100644 --- a/SewerStammGen.WPF/MainWindow.xaml.cs +++ b/StammGenerator/MainWindow.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace SewerStammGen.WPF +namespace StammGenerator { /// /// Interaction logic for MainWindow.xaml @@ -23,8 +23,6 @@ namespace SewerStammGen.WPF public MainWindow() { InitializeComponent(); - - //SewerConnector.DataContext = new ViewModel.SewerConnectorViewModel(); } } } diff --git a/SewerStammGen.WPF/Services/OpenFileDialogService.cs b/StammGenerator/Services/OpenFileDialogService.cs similarity index 94% rename from SewerStammGen.WPF/Services/OpenFileDialogService.cs rename to StammGenerator/Services/OpenFileDialogService.cs index 157fe2c..b2a814e 100644 --- a/SewerStammGen.WPF/Services/OpenFileDialogService.cs +++ b/StammGenerator/Services/OpenFileDialogService.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Services +namespace StammGenerator.Services { internal class OpenFileDialogService { diff --git a/SewerStammGen.WPF/SewerStammGen.WPF.csproj b/StammGenerator/StammGenerator.csproj similarity index 85% rename from SewerStammGen.WPF/SewerStammGen.WPF.csproj rename to StammGenerator/StammGenerator.csproj index 552de0e..5059ef9 100644 --- a/SewerStammGen.WPF/SewerStammGen.WPF.csproj +++ b/StammGenerator/StammGenerator.csproj @@ -8,10 +8,12 @@ - + + + + - diff --git a/SewerStammGen.WPF/SewerStammGen.WPF.csproj.user b/StammGenerator/StammGenerator.csproj.user similarity index 83% rename from SewerStammGen.WPF/SewerStammGen.WPF.csproj.user rename to StammGenerator/StammGenerator.csproj.user index a0c989f..8861091 100644 --- a/SewerStammGen.WPF/SewerStammGen.WPF.csproj.user +++ b/StammGenerator/StammGenerator.csproj.user @@ -13,10 +13,10 @@ Code - + Code - + Code @@ -25,18 +25,15 @@ Code + + Code + Code Code - - Code - - - Code - @@ -48,10 +45,10 @@ Designer - + Designer - + Designer @@ -60,20 +57,14 @@ Designer + + Designer + Designer Designer - - Designer - - - Designer - - - Designer - \ No newline at end of file diff --git a/SewerStammGen.WPF/ViewModel/BaseViewModel.cs b/StammGenerator/ViewModel/BaseViewModel.cs similarity index 89% rename from SewerStammGen.WPF/ViewModel/BaseViewModel.cs rename to StammGenerator/ViewModel/BaseViewModel.cs index 147242c..c07777d 100644 --- a/SewerStammGen.WPF/ViewModel/BaseViewModel.cs +++ b/StammGenerator/ViewModel/BaseViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public delegate TViewModel CreateViewModel() where TViewModel : BaseViewModel; public class BaseViewModel : ObservableObject diff --git a/SewerStammGen.WPF/ViewModel/Factories/MainWindowViewModelFactory.cs b/StammGenerator/ViewModel/Factories/MainWindowViewModelFactory.cs similarity index 94% rename from SewerStammGen.WPF/ViewModel/Factories/MainWindowViewModelFactory.cs rename to StammGenerator/ViewModel/Factories/MainWindowViewModelFactory.cs index 9941d05..6657020 100644 --- a/SewerStammGen.WPF/ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/StammGenerator/ViewModel/Factories/MainWindowViewModelFactory.cs @@ -1,12 +1,13 @@ -using SewerStammGen.Enum; -using SewerStammGen.WPF.Interface; +using StammGenerator; +using StammGenerator.Enum; +using StammGenerator.Interface; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel.Factories +namespace StammGenerator.ViewModel.Factories { public class MainWindowViewModelFactory : IViewModelAbstractFactory { diff --git a/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs b/StammGenerator/ViewModel/Haltung/HaltungEditViewModel.cs similarity index 90% rename from SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs rename to StammGenerator/ViewModel/Haltung/HaltungEditViewModel.cs index aa5ec6d..f693234 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/HaltungEditViewModel.cs +++ b/StammGenerator/ViewModel/Haltung/HaltungEditViewModel.cs @@ -1,20 +1,14 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Commands; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; +using SewerStammGen.Shared.Enum; +using StammGenerator.Commands; +using StammGenerator.Interface; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Controls; -using System.Windows.Data; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { internal class HaltungEditViewModel : BaseViewModel { @@ -22,6 +16,9 @@ namespace SewerStammGen.WPF.ViewModel private readonly IHaltungDataService _haltungDataService; private readonly ISchachtDataService _schachtDataService; private List avaibleSchaechte; + private int _selectedObenIndex; + private int _selectedUntenIndex; + private Kanal _model; public List AvSchaechte { @@ -31,8 +28,19 @@ namespace SewerStammGen.WPF.ViewModel } } - int _selectedObenIndex; - int _selectedUntenIndex; + public EEntwaeserung Entwaeserung + { + get => _model.Entwaesserung; + set + { + if(_model.Entwaesserung != value) + { + _model.Entwaesserung = value; + OnPropertyChanged(); + } + } + } + public int SelectedObenIndex { @@ -63,7 +71,7 @@ namespace SewerStammGen.WPF.ViewModel } } - private Kanal _model; + public Kanal Model { @@ -74,19 +82,7 @@ namespace SewerStammGen.WPF.ViewModel } } - private void RecalculateLength() - { - - double x1 = (double)Model.StartSchacht.DeckelRechtsWert; - double x2 = (double)Model.EndSchacht.DeckelRechtsWert; - double y1 = (double)Model.StartSchacht.DeckelHochWert; - double y2 = (double)Model.EndSchacht.DeckelHochWert; - - - double length = Math.Sqrt(((x1 - x2) * (x1 - x2)) + ((y1 - y2) * (y1 - y2))); - Haltungslaenge = length.ToString(); - OnPropertyChanged(nameof(Haltungslaenge)); - } + public string Haltungsbezeichnung { get => _model.Objektbezeichnung; @@ -162,6 +158,20 @@ namespace SewerStammGen.WPF.ViewModel } + private void RecalculateLength() + { + + double x1 = (double)Model.StartSchacht.DeckelRechtsWert; + double x2 = (double)Model.EndSchacht.DeckelRechtsWert; + double y1 = (double)Model.StartSchacht.DeckelHochWert; + double y2 = (double)Model.EndSchacht.DeckelHochWert; + + + double length = Math.Sqrt(((x1 - x2) * (x1 - x2)) + ((y1 - y2) * (y1 - y2))); + Haltungslaenge = length.ToString(); + OnPropertyChanged(nameof(Haltungslaenge)); + } + private void Abbruch(IRenavigator renavigator) { renavigator.Renavigate(); diff --git a/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs b/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs similarity index 85% rename from SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs rename to StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs index 958b261..4711fef 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/HaltungListViewModel.cs +++ b/StammGenerator/ViewModel/Haltung/HaltungListViewModel.cs @@ -1,17 +1,12 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Commands; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using System; +using StammGenerator.Commands; +using StammGenerator.Interface; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class HaltungListViewModel : BaseViewModel { @@ -35,7 +30,7 @@ namespace SewerStammGen.WPF.ViewModel EditCommand = new HaltungEditCommand(actualState, renavigator, this); - AddCommand = new HaltungAddCommand(); + AddCommand = new HaltungAddCommand(actualState, renavigator); ExportCommand = new ProjectExportCommand(actualState); LoadHaltungen(); diff --git a/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs b/StammGenerator/ViewModel/Haltung/TextBoxFilterAction.cs similarity index 85% rename from SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs rename to StammGenerator/ViewModel/Haltung/TextBoxFilterAction.cs index a46f572..cef4956 100644 --- a/SewerStammGen.WPF/ViewModel/Haltung/TextBoxFilterAction.cs +++ b/StammGenerator/ViewModel/Haltung/TextBoxFilterAction.cs @@ -1,4 +1,4 @@ -using Microsoft.Xaml.Behaviors; +//using Microsoft.Xaml.Behaviors; //using Syncfusion.UI.Xaml.Grid; using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.Views +namespace StammGenerator.Views { /* public class TextBoxFilterAction : TargetedTriggerAction diff --git a/SewerStammGen.WPF/ViewModel/HomeViewModel.cs b/StammGenerator/ViewModel/HomeViewModel.cs similarity index 82% rename from SewerStammGen.WPF/ViewModel/HomeViewModel.cs rename to StammGenerator/ViewModel/HomeViewModel.cs index c6a5604..9f5f36d 100644 --- a/SewerStammGen.WPF/ViewModel/HomeViewModel.cs +++ b/StammGenerator/ViewModel/HomeViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class HomeViewModel : BaseViewModel { diff --git a/SewerStammGen.WPF/ViewModel/MainWindowViewModel.cs b/StammGenerator/ViewModel/MainWindowViewModel.cs similarity index 86% rename from SewerStammGen.WPF/ViewModel/MainWindowViewModel.cs rename to StammGenerator/ViewModel/MainWindowViewModel.cs index d50324d..c59350b 100644 --- a/SewerStammGen.WPF/ViewModel/MainWindowViewModel.cs +++ b/StammGenerator/ViewModel/MainWindowViewModel.cs @@ -1,7 +1,6 @@ -using SewerStammGen.WPF.Commands; -using SewerStammGen.Enum; -using SewerStammGen.WPF.Interface; -using SewerStammGen.WPF.Interface.Navigator; + +using StammGenerator.Enum; + using System; using System.Collections.Generic; using System.Linq; @@ -9,9 +8,12 @@ using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using System.Windows.Input; -using SewerStammGen.WPF.ViewModel.State; -namespace SewerStammGen.WPF.ViewModel +using SewerStammGen.Shared.Domain; +using StammGenerator.Interface; +using StammGenerator.Commands; + +namespace StammGenerator.ViewModel { public class MainWindowViewModel : BaseViewModel { @@ -49,7 +51,8 @@ namespace SewerStammGen.WPF.ViewModel #if DEBUG - _actualState.ProjektID = 5; + + _actualState.SetProjekt(new Projekt() { Id = 5 }); #endif } diff --git a/SewerStammGen.WPF/ViewModel/ObservableObject.cs b/StammGenerator/ViewModel/ObservableObject.cs similarity index 91% rename from SewerStammGen.WPF/ViewModel/ObservableObject.cs rename to StammGenerator/ViewModel/ObservableObject.cs index a142c20..aef3626 100644 --- a/SewerStammGen.WPF/ViewModel/ObservableObject.cs +++ b/StammGenerator/ViewModel/ObservableObject.cs @@ -1,7 +1,7 @@ using System.ComponentModel; using System.Runtime.CompilerServices; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class ObservableObject : INotifyPropertyChanged { diff --git a/SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs b/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs similarity index 88% rename from SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs rename to StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs index 0cecd67..5d4723b 100644 --- a/SewerStammGen.WPF/ViewModel/Projekt/ProjektEditViewModel.cs +++ b/StammGenerator/ViewModel/Projekt/ProjektEditViewModel.cs @@ -1,18 +1,9 @@ using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; using Shared.Contracts; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Security.RightsManagement; -using System.Text; -using System.Threading.Tasks; +using StammGenerator.Interface; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { internal class ProjektEditViewModel : BaseViewModel { diff --git a/SewerStammGen.WPF/ViewModel/Projekt/ProjektListViewModel.cs b/StammGenerator/ViewModel/Projekt/ProjektListViewModel.cs similarity index 88% rename from SewerStammGen.WPF/ViewModel/Projekt/ProjektListViewModel.cs rename to StammGenerator/ViewModel/Projekt/ProjektListViewModel.cs index 89a7c57..f658573 100644 --- a/SewerStammGen.WPF/ViewModel/Projekt/ProjektListViewModel.cs +++ b/StammGenerator/ViewModel/Projekt/ProjektListViewModel.cs @@ -1,19 +1,13 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Commands; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; +using StammGenerator.Commands; +using StammGenerator.Interface; using System; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class ProjektListViewModel : BaseViewModel { diff --git a/SewerStammGen.WPF/ViewModel/RelayCommand.cs b/StammGenerator/ViewModel/RelayCommand.cs similarity index 97% rename from SewerStammGen.WPF/ViewModel/RelayCommand.cs rename to StammGenerator/ViewModel/RelayCommand.cs index af1326e..ed06390 100644 --- a/SewerStammGen.WPF/ViewModel/RelayCommand.cs +++ b/StammGenerator/ViewModel/RelayCommand.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { [Serializable] class RelayCommand : ICommand diff --git a/SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs b/StammGenerator/ViewModel/Schacht/ManholeEditViewModel.cs similarity index 93% rename from SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs rename to StammGenerator/ViewModel/Schacht/ManholeEditViewModel.cs index e673d27..1852b39 100644 --- a/SewerStammGen.WPF/ViewModel/Schacht/ManholeEditViewModel.cs +++ b/StammGenerator/ViewModel/Schacht/ManholeEditViewModel.cs @@ -1,16 +1,10 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using SewerStammGen.Shared.Enum; +using StammGenerator.Interface; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class ManholeEditViewModel : BaseViewModel { @@ -131,6 +125,11 @@ namespace SewerStammGen.WPF.ViewModel } + public ManholeEditViewModel() + { + + } + private async void SaveSchacht() { if (_model.Id == 0) diff --git a/SewerStammGen.WPF/ViewModel/Schacht/ManholeImportViewModel.cs b/StammGenerator/ViewModel/Schacht/ManholeImportViewModel.cs similarity index 85% rename from SewerStammGen.WPF/ViewModel/Schacht/ManholeImportViewModel.cs rename to StammGenerator/ViewModel/Schacht/ManholeImportViewModel.cs index 994ce1e..c96a8d0 100644 --- a/SewerStammGen.WPF/ViewModel/Schacht/ManholeImportViewModel.cs +++ b/StammGenerator/ViewModel/Schacht/ManholeImportViewModel.cs @@ -1,20 +1,13 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.Services; -using SewerStammGen.WPF.ViewModel.State; +using SewerStammGen.Shared.Enum; using Shared.Contracts; -using System; -using System.CodeDom; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using StammGenerator.Interface; +using StammGenerator.Services; using System.Windows.Input; using WWTech_KanalSchnittstelle.Importer; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class ManholeImportViewModel : BaseViewModel { diff --git a/SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs b/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs similarity index 89% rename from SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs rename to StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs index 274d619..cd9fd6b 100644 --- a/SewerStammGen.WPF/ViewModel/Schacht/ManholeListViewModel.cs +++ b/StammGenerator/ViewModel/Schacht/ManholeListViewModel.cs @@ -1,18 +1,12 @@ using SewerStammGen.Shared.Contracts; using SewerStammGen.Shared.Domain; -using SewerStammGen.WPF.Commands; -using SewerStammGen.WPF.Interface.Navigator; -using SewerStammGen.WPF.ViewModel.State; -using Shared.Contracts; -using System; +using StammGenerator.Commands; +using StammGenerator.Interface; using System.Collections.Generic; using System.Collections.ObjectModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Input; -namespace SewerStammGen.WPF.ViewModel +namespace StammGenerator.ViewModel { public class ManholeListViewModel : BaseViewModel { diff --git a/StammGenerator/ViewModel/Schacht/TestHole.cs b/StammGenerator/ViewModel/Schacht/TestHole.cs new file mode 100644 index 0000000..fcb759b --- /dev/null +++ b/StammGenerator/ViewModel/Schacht/TestHole.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StammGenerator.ViewModel +{ + public class TestHole : BaseViewModel + { + } +} diff --git a/SewerStammGen.WPF/ViewModel/State/ActualState.cs b/StammGenerator/ViewModel/State/ActualState.cs similarity index 97% rename from SewerStammGen.WPF/ViewModel/State/ActualState.cs rename to StammGenerator/ViewModel/State/ActualState.cs index 097264b..50cbb2e 100644 --- a/SewerStammGen.WPF/ViewModel/State/ActualState.cs +++ b/StammGenerator/ViewModel/State/ActualState.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel.State +namespace StammGenerator.ViewModel { internal class ActualState : IActualState { diff --git a/SewerStammGen.WPF/ViewModel/State/IActualState.cs b/StammGenerator/ViewModel/State/IActualState.cs similarity index 93% rename from SewerStammGen.WPF/ViewModel/State/IActualState.cs rename to StammGenerator/ViewModel/State/IActualState.cs index 70f7b66..6dfbb57 100644 --- a/SewerStammGen.WPF/ViewModel/State/IActualState.cs +++ b/StammGenerator/ViewModel/State/IActualState.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel.State +namespace StammGenerator.ViewModel { public interface IActualState { diff --git a/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs b/StammGenerator/ViewModel/State/Navigation/MainWindowNavigator.cs similarity index 70% rename from SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs rename to StammGenerator/ViewModel/State/Navigation/MainWindowNavigator.cs index bb809ca..6d5ed16 100644 --- a/SewerStammGen.WPF/ViewModel/State/Navigation/MainWindowNavigator.cs +++ b/StammGenerator/ViewModel/State/Navigation/MainWindowNavigator.cs @@ -1,11 +1,7 @@ -using SewerStammGen.WPF.Interface.Navigator; +using StammGenerator.Interface; using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace SewerStammGen.WPF.ViewModel.State.Navigation +namespace StammGenerator.ViewModel { internal class MainWindowNavigator : ObservableObject, IMainWindowNavigator { diff --git a/SewerStammGen.WPF/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs b/StammGenerator/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs similarity index 73% rename from SewerStammGen.WPF/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs rename to StammGenerator/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs index 8fcb6c9..0e9d8b4 100644 --- a/SewerStammGen.WPF/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs +++ b/StammGenerator/ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs @@ -1,11 +1,6 @@ -using SewerStammGen.WPF.Interface.Navigator; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using StammGenerator.Interface; -namespace SewerStammGen.WPF.ViewModel.State.Navigation +namespace StammGenerator.ViewModel { internal class ViewModelDelegateRenavigator : IRenavigator where TViewModel : BaseViewModel { diff --git a/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml b/StammGenerator/Views/Haltung/HaltungEditView.xaml similarity index 80% rename from SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml rename to StammGenerator/Views/Haltung/HaltungEditView.xaml index 367227a..604d037 100644 --- a/SewerStammGen.WPF/Views/Haltung/HaltungEditView.xaml +++ b/StammGenerator/Views/Haltung/HaltungEditView.xaml @@ -1,12 +1,16 @@ - - + + + @@ -55,16 +59,17 @@ - - - + + + - +