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

Interktion im WPF erweitert

Browse Source
This commit is contained in:
HuskyTeufel
2021-09-22 16:26:56 +02:00
parent efa52c117c
commit e23f898f14
48 changed files with 1946 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
using DaSaSo.Domain.Model;
using DaSaSo.Domain.Services;
using DaSaSo.Domain.Services.BuildingsiteServices;
using DaSaSo.Domain.Services.ProjectServices;
using DaSaSo.EntityFramework;
using DaSaSo.EntityFramework.Services;
using DaSaSo.ViewModel;
@@ -46,7 +48,8 @@ namespace DaSaSo.Wpf
services.AddSingleton<IDataService<Buildingsite>, BuildingsiteDataService>();
services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
services.AddSingleton<ClientListViewModel>();
services.AddSingleton<IProjectService, ProjectService>();
services.AddSingleton<IBuildingsiteService, BuildingsiteService>();
services.AddSingleton<IViewModelAbstractFactory, MainWindowViewModelFactory>();
@@ -79,7 +82,10 @@ namespace DaSaSo.Wpf
services.GetRequiredService<IDataService<Project>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()));
services.GetRequiredService<INavigator>()),
services.GetRequiredService<IProjectService>()
);
});
services.AddSingleton<CreateViewModel<BuildingsiteListViewModel>>(services =>
@@ -88,7 +94,9 @@ namespace DaSaSo.Wpf
services.GetRequiredService<IDataService<Buildingsite>>(),
services.GetRequiredService<IActualProject>(),
new ViewModelDelegateRenavigator(
services.GetRequiredService<INavigator>()));
services.GetRequiredService<INavigator>()),
services.GetRequiredService<IBuildingsiteService>()
);
});
services.AddSingleton<CreateViewModel<SewerObjectListViewModel>>(services =>

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

@@ -25,6 +25,9 @@
<Compile Update="View\HomeView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\Project\ProjectEditView.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\Project\ProjectListView.xaml.cs">
<SubType>Code</SubType>
</Compile>
@@ -60,6 +63,9 @@
<Page Update="View\HomeView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\Project\ProjectEditView.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\Project\ProjectListView.xaml">
<SubType>Designer</SubType>
</Page>

3
DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml
View File

@@ -3,13 +3,14 @@
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"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.Buildingsites" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:BuildingsiteListViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<StackPanel>
<DataGrid ItemsSource="{Binding Buildingsites}" SelectedItem="{Binding SelectedBuildingsite}" />
<Button Content="Selektiere" Command="{Binding SelectCommand}" />
<Button Content="Hinzufügen" Command="{Binding AddCommand}" />
</StackPanel>
</Grid>
</UserControl>

23
DaSaSo.Wpf/View/Project/ProjectEditView.xaml Normal file
View File

@@ -0,0 +1,23 @@
<UserControl x:Class="DaSaSo.Wpf.View.Project.ProjectEditView"
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.Project" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:ProjectEditViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Label Grid.Column="0" Content="Projektname" />
<TextBox Grid.Column="1" Text="{Binding ProjektName}" />
</Grid>
<Button Content="Speichern" Command="{Binding SaveProjectCommand}" />
</StackPanel>
</Grid>
</UserControl>

28
DaSaSo.Wpf/View/Project/ProjectEditView.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.Project
{
/// <summary>
/// Interaction logic for ProjectEditView.xaml
/// </summary>
public partial class ProjectEditView : UserControl
{
public ProjectEditView()
{
InitializeComponent();
}
}
}

2
DaSaSo.Wpf/View/Project/ProjectListView.xaml
View File

@@ -12,6 +12,8 @@
</DataGrid>
<Button Content="Selektiere" Command="{Binding SelectCommand}" />
<Button Content="Hinzufügen" Command="{Binding AddCommand}" />
<Button Content="Bearbeiten" Command="{Binding EditCommand}" />
</StackPanel>
</Grid>

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

@@ -22,6 +22,9 @@
<DataTemplate DataType="{x:Type viewmodel:ProjectListViewModel}">
<ProjektViews:ProjectListView />
</DataTemplate>
<DataTemplate DataType="{x:Type viewmodel:ProjectEditViewModel}">
<ProjektViews:ProjectEditView />
</DataTemplate>
<DataTemplate DataType="{x:Type viewmodel:HomeViewModel}">
<View:HomeView />
</DataTemplate>