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

Sewermainview angefangen

Browse Source
This commit is contained in:
Husky
2021-09-25 19:01:47 +02:00
parent 56feac58bb
commit de9c12acef
26 changed files with 395 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DaSaSo.DatabaseConverter/Program.cs
View File

@@ -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<Projekt> alteDB, List<Imprägnierungen> imprägnierungListe)
{
DaSaSoDbContextFactory daSaSoDbContextFactory = new DaSaSoDbContextFactory("Host = localhost; Database = dasaso; Username = kansan; Password = kansan");
@@ -33,7 +35,7 @@ static void WriteToNewDB(List<Projekt> alteDB, List<Imprägnierungen> imprägnie
/*Client dummy = new Client()
{
Firstname = "NaN"
};*/
};
avaibleClients.Add(dummy);
IEnumerable<Auftraggeber> 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<Projekt> alteDB, List<Imprägnierungen> imprägnie
}
*/

8
DaSaSo.Domain/Enums/ESewerWindowViewType.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace DaSaSo.Domain.Enums
{
public enum ESewerWindowViewType
{
SewerStammdaten,
SewerDamageList
}
}

1
DaSaSo.Domain/Model/SewerObject.cs
View File

@@ -1,4 +1,5 @@
using DaSaSo.Domain.Enums;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
namespace DaSaSo.Domain.Model

6
DaSaSo.EntityFramework/DaSaSo.EntityFramework.csproj
View File

@@ -6,12 +6,12 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-preview.7.21378.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-preview.7.21378.4">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0-rc.1.21452.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-rc.1.21452.10">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-preview7" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.0-rc.1" />
</ItemGroup>
<ItemGroup>

32
DaSaSo.ViewModel/Commands/UpdateCurrentSewerViewModelCommand.cs Normal file
View File

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

2
DaSaSo.ViewModel/Commands/UpdateCurrentViewModelCommand.cs
View File

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

2
DaSaSo.ViewModel/DaSaSo.ViewModel.csproj
View File

@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.0-rc1" />
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.0" />
</ItemGroup>
<ItemGroup>

5
DaSaSo.ViewModel/Factories/MainWindowViewModelFactory.cs
View File

@@ -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<ProjectListViewModel> _createProjektListViewModel;
private CreateViewModel<BuildingsiteListViewModel> _createBuildingsiteListViewModel;
private CreateViewModel<SewerObjectListViewModel> _createSewerObjectListViewModel;
private CreateViewModel<SewerMainMenuListViewModel> _createSewerMainMenuListViewModel;
private CreateViewModel<SewerMainListViewModel> _createSewerMainMenuListViewModel;
public MainWindowViewModelFactory(
CreateViewModel<HomeViewModel> createHomeViewModel,
@@ -20,7 +21,7 @@ namespace DaSaSo.ViewModel.Factories
CreateViewModel<ProjectListViewModel> createProjektListViewModel,
CreateViewModel<BuildingsiteListViewModel> createBuildingsiteListViewModel,
CreateViewModel<SewerObjectListViewModel> createSewerObjectListViewModel,
CreateViewModel<SewerMainMenuListViewModel> createSewerMainMenuListViewModel
CreateViewModel<SewerMainListViewModel> createSewerMainMenuListViewModel
)
{
_createHomeViewModel = createHomeViewModel;

37
DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs Normal file
View File

@@ -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<SewerStammdatenViewModel> _createSewerStammdatenViewModel;
private CreateViewModel<SewerDamageListViewModel> _createSewerDamageListViewModel;
public SewerWindowViewModelFactory(
CreateViewModel<SewerStammdatenViewModel> createSewerStammdatenViewModel,
CreateViewModel<SewerDamageListViewModel> 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");
}
}
}
}

12
DaSaSo.ViewModel/Interface/IMainWindowNavigator.cs Normal file
View File

@@ -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
{
}
}

12
DaSaSo.ViewModel/Interface/ISewerMainNavigator.cs Normal file
View File

@@ -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
{
}
}

14
DaSaSo.ViewModel/Interface/IViewModelSewerMainFactory.cs Normal file
View File

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

2
DaSaSo.ViewModel/SewerMainMenuListViewModel.cs → DaSaSo.ViewModel/SewerDamageListViewModel.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace DaSaSo.ViewModel
{
public class SewerMainMenuListViewModel : BaseViewModel
public class SewerDamageListViewModel : BaseViewModel
{
}
}

31
DaSaSo.ViewModel/SewerMainListViewModel.cs Normal file
View File

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

65
DaSaSo.ViewModel/SewerStammdatenViewModel.cs Normal file
View File

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

3
DaSaSo.ViewModel/State/Navigation/Navigator.cs → DaSaSo.ViewModel/State/Navigation/MainWindowNavigator.cs
View File

@@ -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;

25
DaSaSo.ViewModel/State/Navigation/SewerMainNavigator.cs Normal file
View File

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

4
DaSaSo.ViewModel/State/Navigation/ViewModelDelegateRenavigator.cs
View File

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

8
DaSaSo.ViewModel/Window/MainWindowViewModel.cs
View File

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

32
DaSaSo.Wpf/App.xaml.cs
View File

@@ -55,36 +55,55 @@ namespace DaSaSo.Wpf
services.AddSingleton<IViewModelAbstractFactory, MainWindowViewModelFactory>();
services.AddSingleton<IViewModelSewerMainFactory, SewerWindowViewModelFactory>();
services.AddSingleton<CreateViewModel<ClientEditViewModel>>(services =>
{
return () => new ClientEditViewModel(
services.GetRequiredService<IDataService<Client>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()
services.GetRequiredService<IMainWindowNavigator>()
));
});
services.AddSingleton<CreateViewModel<HomeViewModel>>(services =>
{
return () => new HomeViewModel();
});
services.AddSingleton<CreateViewModel<SewerStammdatenViewModel>>(services =>
{
return () => new SewerStammdatenViewModel(
services.GetRequiredService<IActualProject>()
);
});
services.AddSingleton<CreateViewModel<SewerDamageListViewModel>>(services =>
{
return () => new SewerDamageListViewModel();
});
services.AddSingleton<CreateViewModel<ClientListViewModel>>(services =>
{
return () => new ClientListViewModel(
services.GetRequiredService<IDataService<Client>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()
services.GetRequiredService<IMainWindowNavigator>()
));
});
services.AddSingleton<CreateViewModel<SewerMainListViewModel>>(services =>
{
return () => new SewerMainListViewModel(
services.GetRequiredService<ISewerMainNavigator>(),
services.GetRequiredService<IActualProject>(),
services.GetRequiredService<IViewModelSewerMainFactory>()
);
});
services.AddSingleton<CreateViewModel<ProjectListViewModel>>(services =>
{
return () => new ProjectListViewModel(
services.GetRequiredService<IDataService<Project>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()),
services.GetRequiredService<IMainWindowNavigator>()),
services.GetRequiredService<IProjectService>()
);
@@ -96,7 +115,7 @@ namespace DaSaSo.Wpf
services.GetRequiredService<IDataService<Buildingsite>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()),
services.GetRequiredService<IMainWindowNavigator>()),
services.GetRequiredService<IBuildingsiteService>()
);
});
@@ -112,7 +131,8 @@ namespace DaSaSo.Wpf
//services.AddSingleton<INavigator, Navigator>();
services.AddScoped<IActualProject, ActualProject>();
services.AddScoped<INavigator, Navigator>();
services.AddScoped<IMainWindowNavigator, MainWindowNavigator>();
services.AddScoped<ISewerMainNavigator, SewerMainNavigator>();
services.AddScoped<MainWindowViewModel>();
});

8
DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
View File

@@ -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">
<Grid>
<StackPanel>
<RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Margin="20" />
<RadioButton Content="Schäden" Style="{StaticResource ToggleButtonList}" Margin="20" />
<RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
<RadioButton Content="Schäden" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerDamageList}" Margin="20" />
<RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
</StackPanel>
</Grid>

6
DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
View File

@@ -40,6 +40,9 @@
<Compile Update="View\SewerObject\SewerMainView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\SewerStammdatenView.xaml.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<Page Update="Controls\MainWindowNavigationBar.xaml">
@@ -81,6 +84,9 @@
<Page Update="View\SewerObject\SewerMainView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\SewerStammdatenView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="Window\MainWindow.xaml">
<SubType>Designer</SubType>
</Page>

11
DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
View File

@@ -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">
<UserControl.Resources>
<DataTemplate DataType="{x:Type viewmodel:SewerStammdatenViewModel}">
<views:SewerStammdatenView />
</DataTemplate>
</UserControl.Resources>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
@@ -16,7 +23,7 @@
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Controls:SewerObjectNavigationBar Grid.Column="0" />
<ContentControl Grid.Column="1" />
<ContentControl Grid.Column="1" Content="{Binding CurrentSewerViewModel}" />
<StatusBar Grid.Row="1" Grid.ColumnSpan="2">
<StatusBarItem Content="Dada" />
</StatusBar>

55
DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml Normal file
View File

@@ -0,0 +1,55 @@
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.SewerStammdatenView"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
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"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Haltungsname" Margin="20" />
<Label Grid.Column="0" Grid.Row="1" Content="Punkt Oben" Margin="20" />
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Unten" Margin="20" />
<Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" Margin="20" />
<Label Grid.Column="0" Grid.Row="4" Content="Material" Margin="20" />
<Label Grid.Column="0" Grid.Row="5" Content="Leitungslänge" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Haltungsname }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Oberepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Unterepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Durchmesser }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Material }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Leitungslength }" Margin="20" />
</Grid>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Strasse" Margin="20" />
<Label Grid.Row="1" Grid.Column="0" Content="Ort" Margin="20" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Strasse}" Margin="20"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
</Grid>
</Grid>
</UserControl>

28
DaSaSo.Wpf/View/SewerObject/SewerStammdatenView.xaml.cs Normal file
View File

@@ -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
{
/// <summary>
/// Interaction logic for SewerStammdatenView.xaml
/// </summary>
public partial class SewerStammdatenView : UserControl
{
public SewerStammdatenView()
{
InitializeComponent();
}
}
}

6
DaSaSo.Wpf/Window/MainWindow.xaml
View File

@@ -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">
<Window.Resources>
<DataTemplate DataType="{x:Type viewmodel:ClientListViewModel}">
<ClientViews:ClientListView />
@@ -37,6 +38,9 @@
<DataTemplate DataType="{x:Type viewmodel:SewerObjectListViewModel}">
<SewerObjectViews:SewerObjecteListView />
</DataTemplate>
<DataTemplate DataType="{x:Type viewmodel:SewerMainListViewModel}">
<SewerObjectView:SewerMainView />
</DataTemplate>
</Window.Resources>
<Grid>
<Grid.ColumnDefinitions>