diff --git a/DaSaSo.DatabaseConverter/Program.cs b/DaSaSo.DatabaseConverter/Program.cs index 6fe4fac..ffea5a9 100644 --- a/DaSaSo.DatabaseConverter/Program.cs +++ b/DaSaSo.DatabaseConverter/Program.cs @@ -9,17 +9,19 @@ using DaSaSo.Domain.Services; using DaSaSo.Domain.Model; using DaSaSo.EntityFramework.Services; using DaSaSo.EntityFramework; +using System; +using System.Collections.Generic; Console.WriteLine("Hello, World!"); ConvertXML convertXML = new ConvertXML(); convertXML.parseXML(); - WriteToNewDB(convertXML.GetProjekts, convertXML.imprägnierungListe); + //WriteToNewDB(convertXML.GetProjekts, convertXML.imprägnierungListe); Console.WriteLine("Fertig"); Console.ReadLine(); - +/* static void WriteToNewDB(List alteDB, List imprägnierungListe) { DaSaSoDbContextFactory daSaSoDbContextFactory = new DaSaSoDbContextFactory("Host = localhost; Database = dasaso; Username = kansan; Password = kansan"); @@ -33,7 +35,7 @@ static void WriteToNewDB(List alteDB, List imprägnie /*Client dummy = new Client() { Firstname = "NaN" - };*/ + }; avaibleClients.Add(dummy); IEnumerable d = alteDB.Select(s => s.Auftraggeber).Where(m => m != null); var m = d.Select(f => f.Name).Distinct(); @@ -235,3 +237,4 @@ static void WriteToNewDB(List alteDB, List imprägnie } + */ \ No newline at end of file diff --git a/DaSaSo.Domain/Enums/ESewerWindowViewType.cs b/DaSaSo.Domain/Enums/ESewerWindowViewType.cs new file mode 100644 index 0000000..1626b5c --- /dev/null +++ b/DaSaSo.Domain/Enums/ESewerWindowViewType.cs @@ -0,0 +1,8 @@ +namespace DaSaSo.Domain.Enums +{ + public enum ESewerWindowViewType + { + SewerStammdaten, + SewerDamageList + } +} diff --git a/DaSaSo.Domain/Model/SewerObject.cs b/DaSaSo.Domain/Model/SewerObject.cs index 812c75f..f577599 100644 --- a/DaSaSo.Domain/Model/SewerObject.cs +++ b/DaSaSo.Domain/Model/SewerObject.cs @@ -1,4 +1,5 @@ using DaSaSo.Domain.Enums; +using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; namespace DaSaSo.Domain.Model diff --git a/DaSaSo.EntityFramework/DaSaSo.EntityFramework.csproj b/DaSaSo.EntityFramework/DaSaSo.EntityFramework.csproj index 6d63651..93d88e2 100644 --- a/DaSaSo.EntityFramework/DaSaSo.EntityFramework.csproj +++ b/DaSaSo.EntityFramework/DaSaSo.EntityFramework.csproj @@ -6,12 +6,12 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs b/DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs new file mode 100644 index 0000000..bd050d3 --- /dev/null +++ b/DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs @@ -0,0 +1,32 @@ +using DaSaSo.Domain.Enums; +using DaSaSo.ViewModel.Interface; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.Commands +{ + class UpdateCurrentSewerViewModelCommand : AsyncCommandBase + { + private INavigator _navigator; + private readonly IViewModelSewerMainFactory _viewModelFactory; + + public UpdateCurrentSewerViewModelCommand(INavigator navigator, IViewModelSewerMainFactory viewModelFactory) + { + _navigator = navigator; + _viewModelFactory = viewModelFactory; + } + + public override async Task ExecuteAsync(object? parameter) + { + if (parameter is ESewerWindowViewType) + { + ESewerWindowViewType viewType = (ESewerWindowViewType)parameter; + _navigator.CurrentViewModel = _viewModelFactory.CreateViewModel(viewType); + //throw new NotImplementedException(parameter.GetType().ToString()); + } + } + } +} diff --git a/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs b/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs index b996b73..aae6ea7 100644 --- a/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs +++ b/DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs @@ -1,6 +1,8 @@ using DaSaSo.Domain.Enums; using DaSaSo.ViewModel.Enums; using DaSaSo.ViewModel.Interface; +using System; +using System.Threading.Tasks; using System.Windows.Input; namespace DaSaSo.ViewModel.Commands diff --git a/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj b/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj index b7f4dbc..d4933eb 100644 --- a/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj +++ b/DaSaSo.ViewModel/DaSaSo.ViewModel.csproj @@ -6,7 +6,7 @@ - + diff --git a/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs b/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs index b32035c..11e4bbb 100644 --- a/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs +++ b/DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs @@ -1,5 +1,6 @@ using DaSaSo.Domain.Enums; using DaSaSo.ViewModel.Interface; +using System; namespace DaSaSo.ViewModel.Factories { @@ -11,7 +12,7 @@ namespace DaSaSo.ViewModel.Factories private CreateViewModel _createProjektListViewModel; private CreateViewModel _createBuildingsiteListViewModel; private CreateViewModel _createSewerObjectListViewModel; - private CreateViewModel _createSewerMainMenuListViewModel; + private CreateViewModel _createSewerMainMenuListViewModel; public MainWindowViewModelFactory( CreateViewModel createHomeViewModel, @@ -20,7 +21,7 @@ namespace DaSaSo.ViewModel.Factories CreateViewModel createProjektListViewModel, CreateViewModel createBuildingsiteListViewModel, CreateViewModel createSewerObjectListViewModel, - CreateViewModel createSewerMainMenuListViewModel + CreateViewModel createSewerMainMenuListViewModel ) { _createHomeViewModel = createHomeViewModel; diff --git a/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs b/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs new file mode 100644 index 0000000..771b1c9 --- /dev/null +++ b/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs @@ -0,0 +1,37 @@ +using DaSaSo.Domain.Enums; +using DaSaSo.ViewModel.Interface; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.Factories +{ + public class SewerWindowViewModelFactory : IViewModelSewerMainFactory + { + private CreateViewModel _createSewerStammdatenViewModel; + private CreateViewModel _createSewerDamageListViewModel; + + public SewerWindowViewModelFactory( + CreateViewModel createSewerStammdatenViewModel, + CreateViewModel createSewerDamageListViewModel + + ) + { + _createSewerStammdatenViewModel = createSewerStammdatenViewModel; + _createSewerDamageListViewModel = createSewerDamageListViewModel; + } + + public BaseViewModel CreateViewModel(ESewerWindowViewType viewType) + { + switch (viewType) + { + case ESewerWindowViewType.SewerStammdaten: return _createSewerStammdatenViewModel(); + case ESewerWindowViewType.SewerDamageList: return _createSewerDamageListViewModel(); + default: + throw new ArgumentException("The Viewtype does not have a ViewModel", "viewType"); + } + } + } +} diff --git a/DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs b/DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs new file mode 100644 index 0000000..96d3d10 --- /dev/null +++ b/DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.Interface +{ + public interface IMainWindowNavigator : INavigator + { + } +} diff --git a/DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs b/DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs new file mode 100644 index 0000000..87c5d7f --- /dev/null +++ b/DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.Interface +{ + public interface ISewerMainNavigator : INavigator + { + } +} diff --git a/DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs b/DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs new file mode 100644 index 0000000..c0de81b --- /dev/null +++ b/DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs @@ -0,0 +1,14 @@ +using DaSaSo.Domain.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.Interface +{ + public interface IViewModelSewerMainFactory + { + BaseViewModel CreateViewModel(ESewerWindowViewType viewType); + } +} diff --git a/DaSaSo.ViewModel/SewerMainMenuListViewModel.cs b/DaSaSo.ViewModel/SewerDamageListViewModel.cs similarity index 73% rename from DaSaSo.ViewModel/SewerMainMenuListViewModel.cs rename to DaSaSo.ViewModel/SewerDamageListViewModel.cs index 2983d8e..5150424 100644 --- a/DaSaSo.ViewModel/SewerMainMenuListViewModel.cs +++ b/DaSaSo.ViewModel/SewerDamageListViewModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace DaSaSo.ViewModel { - public class SewerMainMenuListViewModel : BaseViewModel + public class SewerDamageListViewModel : BaseViewModel { } } diff --git a/DaSaSo.ViewModel/SewerMainListViewModel.cs b/DaSaSo.ViewModel/SewerMainListViewModel.cs new file mode 100644 index 0000000..6d0a567 --- /dev/null +++ b/DaSaSo.ViewModel/SewerMainListViewModel.cs @@ -0,0 +1,31 @@ +using DaSaSo.ViewModel.Commands; +using DaSaSo.ViewModel.Interface; +using Microsoft.Toolkit.Mvvm.Input; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Input; + +namespace DaSaSo.ViewModel +{ + public class SewerMainListViewModel : BaseViewModel + { + private ISewerMainNavigator _navigator { get; set; } + private IActualProject _actualProject { get; set; } + public ICommand UpdateCurrentSewerViewModelCommand { get; } + public BaseViewModel CurrentSewerViewModel => _navigator.CurrentViewModel; + + public SewerMainListViewModel(ISewerMainNavigator navigator,IActualProject actualProject, IViewModelSewerMainFactory viewModelFactory) + { + _navigator = navigator; + _actualProject = actualProject; + UpdateCurrentSewerViewModelCommand = new UpdateCurrentSewerViewModelCommand(_navigator, viewModelFactory); + _navigator.StateChanged += () => + { + OnPropertyChanged(nameof(CurrentSewerViewModel)); + }; //_navigator_StateChanged; + } + } +} diff --git a/DaSaSo.ViewModel/SewerStammdatenViewModel.cs b/DaSaSo.ViewModel/SewerStammdatenViewModel.cs new file mode 100644 index 0000000..318dd6c --- /dev/null +++ b/DaSaSo.ViewModel/SewerStammdatenViewModel.cs @@ -0,0 +1,65 @@ +using DaSaSo.Domain.Model; +using DaSaSo.ViewModel.Interface; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel +{ + public class SewerStammdatenViewModel : BaseViewModel + { + private readonly IActualProject _actualProject; + private SewerObject _model; + + public string Haltungsname + { + get => _model.ObjektName; + set + { + if(_model.ObjektName != value) + { + _model.ObjektName = value; + OnPropertyChanged(); + } + } + } + public string Oberepunkt { get; set; } + public string Unterepunkt { get; set; } + public string Durchmesser { get; set; } + public string Material { get; set; } + public decimal Leitungslenght { + get => _model.SewerLength; + set + { + if(_model.SewerLength != value) + { + _model.SewerLength = value; + OnPropertyChanged(); + } + } + } + public string Strasse + { + get => _model.StreetName; + set + { + if (_model.StreetName != value) + { + _model.StreetName = value; + OnPropertyChanged(); + } + } + } + public string Ort + { + get;set; + } + public SewerStammdatenViewModel(IActualProject actualProject) + { + _actualProject = actualProject; + _model = actualProject.AktuellSewerObject; + } + } +} diff --git a/DaSaSo.ViewModel/State/Navigation/Navigator.cs b/DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs similarity index 86% rename from DaSaSo.ViewModel/State/Navigation/Navigator.cs rename to DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs index f0aeef2..61c1760 100644 --- a/DaSaSo.ViewModel/State/Navigation/Navigator.cs +++ b/DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs @@ -1,12 +1,13 @@ using DaSaSo.ViewModel.Commands; using DaSaSo.ViewModel.Interface; +using System; using System.ComponentModel; using System.Runtime.CompilerServices; using System.Windows.Input; namespace DaSaSo.ViewModel.State.Navigation { - public class Navigator : ObservableObject, INavigator + public class MainWindowNavigator : ObservableObject, IMainWindowNavigator { private BaseViewModel _currentViewModel; diff --git a/DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs b/DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs new file mode 100644 index 0000000..f115f1a --- /dev/null +++ b/DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs @@ -0,0 +1,25 @@ +using DaSaSo.ViewModel.Interface; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DaSaSo.ViewModel.State.Navigation +{ + public class SewerMainNavigator : ISewerMainNavigator + { + private BaseViewModel _currentViewModel; + public BaseViewModel CurrentViewModel + { + get => _currentViewModel; + set + { + _currentViewModel?.Dispose(); + _currentViewModel = value; + StateChanged?.Invoke(); + } + } + public event Action StateChanged; + } +} diff --git a/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs b/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs index 0a23d1c..d7714d7 100644 --- a/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs +++ b/DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs @@ -9,10 +9,10 @@ namespace DaSaSo.ViewModel.State.Navigation { public class ViewModelDelegateRenavigator : IRenavigator { - private readonly INavigator _navigator; + private readonly IMainWindowNavigator _navigator; - public ViewModelDelegateRenavigator(INavigator navigator) + public ViewModelDelegateRenavigator(IMainWindowNavigator navigator) { _navigator = navigator; } diff --git a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs b/DaSaSo.ViewModel/Window/MainWindowViewModel.cs index 5b21939..6a6fed0 100644 --- a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs +++ b/DaSaSo.ViewModel/Window/MainWindowViewModel.cs @@ -28,7 +28,7 @@ namespace DaSaSo.ViewModel public bool CanSelectBuildingSite { get => _actualProject.AktuellProjekt != null; } public bool CanSelectSewerObjects { get => _actualProject.AktuellBaustelle != null; } - public INavigator _navigator { get; set; } + public IMainWindowNavigator _navigator { get; set; } public ICommand UpdateCurrentViewModelCommand { get; } public BaseViewModel CurrentViewModel => _navigator.CurrentViewModel; @@ -70,7 +70,7 @@ namespace DaSaSo.ViewModel } } - public MainWindowViewModel(INavigator navigator,IViewModelAbstractFactory viewModelFactory, IActualProject actualProject) + public MainWindowViewModel(IMainWindowNavigator navigator,IViewModelAbstractFactory viewModelFactory, IActualProject actualProject) { this._navigator = navigator; this.viewModelFactory = viewModelFactory; @@ -88,12 +88,12 @@ namespace DaSaSo.ViewModel private void _actualProject_SewerObjectChanged(object? sender, EventArgs e) { - throw new NotImplementedException(); + UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.SewerMainMenu); } private void _navigator_StateChanged() { - UpdateCurrentViewModelCommand.Execute(EMainWindowViewType.SewerMainMenu); + OnPropertyChanged(nameof(CurrentViewModel)); } private void _actualProject_BuildingSiteChanged(object? sender, EventArgs e) diff --git a/DaSaSo.Wpf/App.xaml.cs b/DaSaSo.Wpf/App.xaml.cs index dbb7965..51c5d76 100644 --- a/DaSaSo.Wpf/App.xaml.cs +++ b/DaSaSo.Wpf/App.xaml.cs @@ -55,36 +55,55 @@ namespace DaSaSo.Wpf services.AddSingleton(); + services.AddSingleton(); services.AddSingleton>(services => { return () => new ClientEditViewModel( services.GetRequiredService>(), services.GetRequiredService(), new ViewModelDelegateRenavigator( - services.GetRequiredService() + services.GetRequiredService() )); }); services.AddSingleton>(services => { return () => new HomeViewModel(); }); + services.AddSingleton>(services => + { + return () => new SewerStammdatenViewModel( + services.GetRequiredService() + ); + }); + services.AddSingleton>(services => + { + return () => new SewerDamageListViewModel(); + }); + services.AddSingleton>(services => { return () => new ClientListViewModel( services.GetRequiredService>(), services.GetRequiredService(), new ViewModelDelegateRenavigator( - services.GetRequiredService() + services.GetRequiredService() )); }); - + services.AddSingleton>(services => + { + return () => new SewerMainListViewModel( + services.GetRequiredService(), + services.GetRequiredService(), + services.GetRequiredService() + ); + }); services.AddSingleton>(services => { return () => new ProjectListViewModel( services.GetRequiredService>(), services.GetRequiredService(), new ViewModelDelegateRenavigator( - services.GetRequiredService()), + services.GetRequiredService()), services.GetRequiredService() ); @@ -96,7 +115,7 @@ namespace DaSaSo.Wpf services.GetRequiredService>(), services.GetRequiredService(), new ViewModelDelegateRenavigator( - services.GetRequiredService()), + services.GetRequiredService()), services.GetRequiredService() ); }); @@ -112,7 +131,8 @@ namespace DaSaSo.Wpf //services.AddSingleton(); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); + services.AddScoped(); services.AddScoped(); }); diff --git a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml index 6ec4d49..b553646 100644 --- a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml +++ b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml @@ -3,13 +3,15 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" + xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain" + xmlns:local="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="200"> - - + + + diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user index 115079e..e83a250 100644 --- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user +++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user @@ -40,6 +40,9 @@ Code + + Code + @@ -81,6 +84,9 @@ Designer + + Designer + Designer diff --git a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml index a343131..7c6c3f9 100644 --- a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml +++ b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml @@ -3,9 +3,16 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" + xmlns:viewModel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" + xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:Controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerMainListViewModel}" mc:Ignorable="d" + xmlns:views ="clr-namespace:DaSaSo.Wpf.View.SewerObject" d:DesignHeight="450" d:DesignWidth="800"> + + + + + @@ -16,7 +23,7 @@ - + diff --git a/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml new file mode 100644 index 0000000..f59a838 --- /dev/null +++ b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml.cs b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml.cs new file mode 100644 index 0000000..bcdf89e --- /dev/null +++ b/DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml.cs @@ -0,0 +1,28 @@ +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 DaSaSo.Wpf.View.SewerObject +{ + /// + /// Interaction logic for SewerStammdatenView.xaml + /// + public partial class SewerStammdatenView : UserControl + { + public SewerStammdatenView() + { + InitializeComponent(); + } + } +} diff --git a/DaSaSo.Wpf/Window/MainWindow.xaml b/DaSaSo.Wpf/Window/MainWindow.xaml index 759e90f..c952121 100644 --- a/DaSaSo.Wpf/Window/MainWindow.xaml +++ b/DaSaSo.Wpf/Window/MainWindow.xaml @@ -7,11 +7,12 @@ xmlns:ProjektViews="clr-namespace:DaSaSo.Wpf.View.Project" xmlns:BuildingsiteViews="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:SewerObjectViews="clr-namespace:DaSaSo.Wpf.View.SewerObjecte" + xmlns:SewerObjectView="clr-namespace:DaSaSo.Wpf.View.SewerObject" xmlns:controls="clr-namespace:DaSaSo.Wpf.Controls" xmlns:View="clr-namespace:DaSaSo.Wpf.View" xmlns:local="clr-namespace:DaSaSo.Wpf" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:MainWindowViewModel}" mc:Ignorable="d" - Title="Cosysda Sanierungs Software" Height="450" Width="800" WindowState="Maximized"> + Title="Cosysda Sanierungs Software" Height="450" Width="800" WindowState="Maximized" FontSize="20"> @@ -37,6 +38,9 @@ + + +