Buildingsite list hinzugefügt

This commit is contained in:
HuskyTeufel
2021-09-15 20:06:55 +02:00
parent e0c9839275
commit 4123cc7aba
18 changed files with 754 additions and 33 deletions

View File

@@ -42,6 +42,7 @@ namespace DaSaSo.Wpf
services.AddSingleton<DaSaSoDbContextFactory>(new DaSaSoDbContextFactory(connectionString));
services.AddSingleton<IDataService<Client>, ClientDataService>();
services.AddSingleton<IDataService<Project>, ProjectDataService>();
services.AddSingleton<IDataService<Buildingsite>, BuildingsiteDataService>();
services.AddSingleton<ClientListViewModel>();
@@ -79,6 +80,15 @@ namespace DaSaSo.Wpf
services.GetRequiredService<INavigator>()));
});
services.AddSingleton<CreateViewModel<BuildingsiteListViewModel>>(services =>
{
return () => new BuildingsiteListViewModel(
services.GetRequiredService<IDataService<Buildingsite>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()));
});
//services.AddSingleton<INavigator, Navigator>();
services.AddScoped<IActualProject, ActualProject>();
services.AddScoped<INavigator, Navigator>();

View File

@@ -10,6 +10,9 @@
<Compile Update="Controls\NavigationBar.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\Buildingsites\BuildingSiteListView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\Client\ClientEditView.xaml.cs">
<SubType>Code</SubType>
</Compile>
@@ -33,6 +36,9 @@
<Page Update="Styles\Navigation_Style.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\Buildingsites\BuildingSiteListView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\Client\ClientEditView.xaml">
<SubType>Designer</SubType>
</Page>

View File

@@ -0,0 +1,12 @@
<UserControl x:Class="DaSaSo.Wpf.View.Buildingsites.BuildingSiteListView"
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.Buildingsites"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<DataGrid ItemsSource="{Binding Buildingsites}" />
</Grid>
</UserControl>

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

View File

@@ -7,8 +7,12 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<DataGrid ItemsSource="{Binding Projekte}">
</DataGrid>
<StackPanel>
<DataGrid IsReadOnly="True" ItemsSource="{Binding Projekte}" SelectedItem="{Binding SelectedProject}">
</DataGrid>
<Button Content="Selektiere" Command="{Binding SelectCommand}" />
</StackPanel>
</Grid>
</UserControl>

View File

@@ -5,6 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ClientViews="clr-namespace:DaSaSo.Wpf.View.Client"
xmlns:ProjektViews="clr-namespace:DaSaSo.Wpf.View.Project"
xmlns:BuildingsiteViews="clr-namespace:DaSaSo.Wpf.View.Buildingsites"
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}"
@@ -23,6 +24,9 @@
<DataTemplate DataType="{x:Type viewmodel:HomeViewModel}">
<View:HomeView />
</DataTemplate>
<DataTemplate DataType="{x:Type viewmodel:BuildingsiteListViewModel}">
<BuildingsiteViews:BuildingSiteListView />
</DataTemplate>
</Window.Resources>
<Grid>
<Grid.ColumnDefinitions>

View File

@@ -1,5 +1,5 @@
{
"ConnectionStrings": {
"default": "Host = localhoste; Database = dasaso; Username = kansan; Password = kansan"
"default": "Host = localhost; Database = dasaso; Username = kansan; Password = kansan"
}
}