Objectliste angefangen

DaSaSo.Wpf/App.xaml.cs

@@ -43,6 +43,7 @@ namespace DaSaSo.Wpf
                     services.AddSingleton<IDataService<Client>, ClientDataService>();
                     services.AddSingleton<IDataService<Project>, ProjectDataService>();
                     services.AddSingleton<IDataService<Buildingsite>, BuildingsiteDataService>();
+                    services.AddSingleton<IDataService<SewerObject>, SewerObjectDataService>();
                     services.AddSingleton<ClientListViewModel>();
 
 
@@ -89,6 +90,14 @@ namespace DaSaSo.Wpf
                                 services.GetRequiredService<INavigator>()));
                     });
 
+                    services.AddSingleton<CreateViewModel<SewerObjectListViewModel>>(services =>
+                    {
+                        return () => new SewerObjectListViewModel(
+                            services.GetRequiredService<IDataService<SewerObject>>(),
+                            services.GetRequiredService<IActualProject>()
+                            );
+                    });
+
                     //services.AddSingleton<INavigator, Navigator>();
                     services.AddScoped<IActualProject, ActualProject>();
                     services.AddScoped<INavigator, Navigator>();

DaSaSo.Wpf/DaSaSo.Wpf.csproj.user

@@ -25,6 +25,9 @@
     <Compile Update="View\Project\ProjectListView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Update="View\SewerObjecte\SewerObjecteListView.xaml.cs">
+      <SubType>Code</SubType>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Update="Controls\NavigationBar.xaml">
@@ -51,6 +54,9 @@
     <Page Update="View\Project\ProjectListView.xaml">
       <SubType>Designer</SubType>
     </Page>
+    <Page Update="View\SewerObjecte\SewerObjecteListView.xaml">
+      <SubType>Designer</SubType>
+    </Page>
     <Page Update="Window\MainWindow.xaml">
       <SubType>Designer</SubType>
     </Page>

DaSaSo.Wpf/Sampledata/SewerObjectListSampleData.cs

@@ -0,0 +1,50 @@
+using DaSaSo.Domain.DesignModel;
+using DaSaSo.Domain.Model;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.Wpf.Sampledata
+{
+    
+
+    public class SewerObjectListSampleData
+    {
+        public ObservableCollection<SewerObjectsToStreet> SewerObjects { get; private set; }
+        public SewerObjectListSampleData()
+        {
+            SewerObjects = new ObservableCollection<SewerObjectsToStreet>();
+            List<SewerObject> _objecte = new List<SewerObject>();
+            
+            _objecte.Add(new SewerObject()
+            {
+                DN = 200,
+                Material = "STZ",
+                ObjektName = "SW01",
+                PointFrom = "SW01",
+                PointTo = "SW02",
+                StreetName = "Barenberg"
+            });
+            _objecte.Add(
+            new SewerObject()
+            {
+                DN = 200,
+                Material = "STZ",
+                ObjektName = "SW01",
+                PointFrom = "SW01",
+                PointTo = "SW02",
+                StreetName = "Barenberg"
+            });
+
+            SewerObjects.Add(new SewerObjectsToStreet()
+            {
+                Streetname = "Barenberg",
+                SewerObjects = _objecte
+            });
+
+        }
+    }
+}

DaSaSo.Wpf/View/Buildingsites/BuildingSiteListView.xaml

@@ -7,6 +7,9 @@
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid>
-        <DataGrid ItemsSource="{Binding Buildingsites}" />
+        <StackPanel>
+            <DataGrid ItemsSource="{Binding Buildingsites}" SelectedItem="{Binding SelectedBuildingsite}" />
+            <Button Content="Selektiere" Command="{Binding SelectCommand}" />
+        </StackPanel>
     </Grid>
 </UserControl>

DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml

@@ -0,0 +1,39 @@
+<UserControl x:Class="DaSaSo.Wpf.View.SewerObjecte.SewerObjecteListView"
+             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:model="clr-namespace:DaSaSo.Domain.Model;assembly=DaSaSo.Domain"
+             xmlns:dsmodel="clr-namespace:DaSaSo.Domain.DesignModel;assembly=DaSaSo.Domain"
+             xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObjecte"
+             xmlns:ds="clr-namespace:DaSaSo.Wpf.Sampledata"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <d:UserControl.DataContext>
+        <ds:SewerObjectListSampleData />
+    </d:UserControl.DataContext>
+    <Grid>
+        <StackPanel>
+            <TreeView ItemsSource="{Binding SewerObjects}" SelectedValuePath="{Binding Testme}">
+                <TreeView.Resources>
+                    <HierarchicalDataTemplate DataType="{x:Type dsmodel:SewerObjectsToStreet}" ItemsSource="{Binding SewerObjects}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Streetname}" />
+                        </StackPanel>
+                    </HierarchicalDataTemplate>
+
+
+                    <DataTemplate DataType="{x:Type model:SewerObject}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Text="{Binding Material}" />
+                        </StackPanel>
+                    </DataTemplate>
+                    <Style TargetType="{x:Type TreeViewItem}">
+                        <Setter Property="IsSelected" Value="{Binding IsSelected}"/>
+                    </Style>
+                </TreeView.Resources>
+            </TreeView>
+            <Button Content="Bearbeiten" Command="{Binding Bearbeiten}" />
+        </StackPanel>
+    </Grid>
+</UserControl>

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

DaSaSo.Wpf/Window/MainWindow.xaml

@@ -6,6 +6,7 @@
         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:SewerObjectViews="clr-namespace:DaSaSo.Wpf.View.SewerObjecte"
         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}"
@@ -27,6 +28,9 @@
         <DataTemplate DataType="{x:Type viewmodel:BuildingsiteListViewModel}">
             <BuildingsiteViews:BuildingSiteListView />
         </DataTemplate>
+        <DataTemplate DataType="{x:Type viewmodel:SewerObjectListViewModel}">
+            <SewerObjectViews:SewerObjecteListView />
+        </DataTemplate>
     </Window.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -41,6 +45,8 @@
         <ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding Navigator.CurrentViewModel}" />
         <StatusBar Grid.Row="1" Grid.ColumnSpan="2">
             <StatusBarItem Content="{Binding ClientName}" />
+            <StatusBarItem Content="{Binding Projektname}" />
+            <StatusBarItem Content="{Binding Buildingsitename}" />
         </StatusBar>
     </Grid>
 </Window>