From 33888911343f358f827451ba824af7185aad8e50 Mon Sep 17 00:00:00 2001
From: HuskyTeufel <damianbodde@googlemail.com>
Date: Thu, 7 Oct 2021 13:43:01 +0200
Subject: [PATCH] SchlauchlinerView wird angezeigt

---
 DaSaSo.Domain/Enums/ESewerWindowViewType.cs   |  3 +-
 DaSaSo.Domain/Model/SewerDamage.cs            |  4 +-
 .../Factories/SewerWindowViewModelFactory.cs  |  6 ++-
 DaSaSo.ViewModel/SewerMainListViewModel.cs    |  1 +
 DaSaSo.ViewModel/SewerPipeLinerViewModel.cs   | 12 +++++
 .../Window/MainWindowViewModel.cs             |  1 +
 .../Controls/SewerObjectNavigationBar.xaml    |  3 +-
 DaSaSo.Wpf/DaSaSo.Wpf.csproj.user             |  4 +-
 .../AddViewModelsHostBuilderExtensions.cs     |  4 ++
 .../Controls/SewerDamagePreparation.xaml      | 14 +++---
 .../Controls/SewerRehabilation.xaml           | 34 ++++++++++---
 DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml    | 20 --------
 .../View/SewerObject/SewerMainView.xaml       |  3 ++
 .../View/SewerObject/SewerPipeLinerView.xaml  | 49 +++++++++++++++++++
 ...ner.xaml.cs => SewerPipeLinerView.xaml.cs} |  4 +-
 15 files changed, 120 insertions(+), 42 deletions(-)
 create mode 100644 DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
 delete mode 100644 DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml
 create mode 100644 DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
 rename DaSaSo.Wpf/View/SewerObject/{Pipeliner.xaml.cs => SewerPipeLinerView.xaml.cs} (85%)

diff --git a/DaSaSo.Domain/Enums/ESewerWindowViewType.cs b/DaSaSo.Domain/Enums/ESewerWindowViewType.cs
index e71ec91..297b600 100644
--- a/DaSaSo.Domain/Enums/ESewerWindowViewType.cs
+++ b/DaSaSo.Domain/Enums/ESewerWindowViewType.cs
@@ -4,6 +4,7 @@
     {
         SewerStammdaten,
         SewerDamageList,
-        SewerDamageEdit
+        SewerDamageEdit,
+        SewerPipeLiner
     }
 }
diff --git a/DaSaSo.Domain/Model/SewerDamage.cs b/DaSaSo.Domain/Model/SewerDamage.cs
index 6661314..041ab5f 100644
--- a/DaSaSo.Domain/Model/SewerDamage.cs
+++ b/DaSaSo.Domain/Model/SewerDamage.cs
@@ -1,4 +1,6 @@
-namespace DaSaSo.Domain.Model
+using System;
+
+namespace DaSaSo.Domain.Model
 {
     [Flags]
     public enum EDamageType
diff --git a/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs b/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
index c64490b..2bc94a2 100644
--- a/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
+++ b/DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
@@ -13,16 +13,19 @@ namespace DaSaSo.ViewModel.Factories
         private CreateViewModel<SewerStammdatenViewModel> _createSewerStammdatenViewModel;
         private CreateViewModel<SewerDamageListViewModel> _createSewerDamageListViewModel;
         private CreateViewModel<SewerDamageEditViewModel> _createSewerDamageEditViewModel;
+        private CreateViewModel<SewerPipeLinerViewModel> _createSewerPipeLinerViewModel;
 
         public SewerWindowViewModelFactory(
             CreateViewModel<SewerStammdatenViewModel> createSewerStammdatenViewModel,
             CreateViewModel<SewerDamageListViewModel> createSewerDamageListViewModel,
-            CreateViewModel<SewerDamageEditViewModel> createSewerDamageEditViewModel
+            CreateViewModel<SewerDamageEditViewModel> createSewerDamageEditViewModel,
+            CreateViewModel<SewerPipeLinerViewModel> createSewerPipeLinerViewModel
             )
         {
             _createSewerStammdatenViewModel = createSewerStammdatenViewModel;
             _createSewerDamageListViewModel = createSewerDamageListViewModel;
             _createSewerDamageEditViewModel = createSewerDamageEditViewModel;
+            _createSewerPipeLinerViewModel = createSewerPipeLinerViewModel;
         }
 
         public BaseViewModel CreateViewModel(ESewerWindowViewType viewType)
@@ -32,6 +35,7 @@ namespace DaSaSo.ViewModel.Factories
                 case ESewerWindowViewType.SewerStammdaten: return _createSewerStammdatenViewModel();
                 case ESewerWindowViewType.SewerDamageList: return _createSewerDamageListViewModel();
                 case ESewerWindowViewType.SewerDamageEdit: return _createSewerDamageEditViewModel();
+                case ESewerWindowViewType.SewerPipeLiner: return _createSewerPipeLinerViewModel();
                 default:
                     throw new ArgumentException("The Viewtype does not have a ViewModel", "viewType");
             }
diff --git a/DaSaSo.ViewModel/SewerMainListViewModel.cs b/DaSaSo.ViewModel/SewerMainListViewModel.cs
index 82d335f..b0db390 100644
--- a/DaSaSo.ViewModel/SewerMainListViewModel.cs
+++ b/DaSaSo.ViewModel/SewerMainListViewModel.cs
@@ -25,6 +25,7 @@ namespace DaSaSo.ViewModel
         public ICommand UpdateCurrentSewerViewModelCommand { get; }
         public ICommand CloseCommand { get; set; }
         public ICommand SchadenCommand { get; set; }
+        public ICommand Schlauchliner { get; set; }
         public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
 
         public bool CanSelectDamage => Schaden != null;
diff --git a/DaSaSo.ViewModel/SewerPipeLinerViewModel.cs b/DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
new file mode 100644
index 0000000..78afb00
--- /dev/null
+++ b/DaSaSo.ViewModel/SewerPipeLinerViewModel.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DaSaSo.ViewModel
+{
+    public class SewerPipeLinerViewModel : BaseViewModel
+    {
+    }
+}
diff --git a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs b/DaSaSo.ViewModel/Window/MainWindowViewModel.cs
index 2cf65b5..1f7fd33 100644
--- a/DaSaSo.ViewModel/Window/MainWindowViewModel.cs
+++ b/DaSaSo.ViewModel/Window/MainWindowViewModel.cs
@@ -12,6 +12,7 @@ using Microsoft.Win32;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
diff --git a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
index 22a810a..6b8a8ac 100644
--- a/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
+++ b/DaSaSo.Wpf/Controls/SewerObjectNavigationBar.xaml
@@ -6,7 +6,7 @@
              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">
+             d:DesignHeight="607.5" d:DesignWidth="200">
     <Grid>
         <StackPanel>
             <RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" />
@@ -14,6 +14,7 @@
             
             <RadioButton Content="Schließen" Style="{StaticResource ToggleButtonList}" Command="{Binding CloseCommand}" Margin="20" />
             <RadioButton Content="{Binding Schaden.Distance,FallbackValue='Damage'}" Command="{Binding UpdateCurrentSewerViewModelCommand}" IsEnabled="{Binding CanSelectDamage}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerDamageEdit}" Style="{StaticResource ToggleButtonList}" Margin="20" />
+            <RadioButton Content="Schlauchliner" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerPipeLiner}" Margin="20" />
         </StackPanel>
         
 
diff --git a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
index eedbcf0..993faf3 100644
--- a/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
+++ b/DaSaSo.Wpf/DaSaSo.Wpf.csproj.user
@@ -46,7 +46,7 @@
     <Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
-    <Compile Update="View\SewerObject\Pipeliner.xaml.cs">
+    <Compile Update="View\SewerObject\SewerPipeLinerView.xaml.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs">
@@ -108,7 +108,7 @@
     <Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
       <SubType>Designer</SubType>
     </Page>
-    <Page Update="View\SewerObject\Pipeliner.xaml">
+    <Page Update="View\SewerObject\SewerPipeLinerView.xaml">
       <SubType>Designer</SubType>
     </Page>
     <Page Update="View\SewerObject\SewerDamageEditView.xaml">
diff --git a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
index b0c3dda..68e1337 100644
--- a/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
+++ b/DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
@@ -88,6 +88,10 @@ namespace DaSaSo.Wpf.HostBuilders
                         services.GetRequiredService<IActualProject>()
                         );
                 });
+                services.AddTransient<CreateViewModel<SewerPipeLinerViewModel>>(services =>
+                {
+                    return () => new SewerPipeLinerViewModel();
+                });
 
                 services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
                 {
diff --git a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
index 8eeb780..c7d8438 100644
--- a/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
@@ -16,13 +16,13 @@
         </Border>
         <Border BorderBrush="Black" Grid.Row="1" BorderThickness="2" Margin="3">
             <StackPanel>
-                <CheckBox Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
-                <CheckBox Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
-                <CheckBox Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
-                <CheckBox Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
-                <CheckBox Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" />
-                <CheckBox Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" />
-                <CheckBox Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" />
+                <CheckBox Margin="5" Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
+                <CheckBox Margin="5" Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
+                <CheckBox Margin="5" Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
+                <CheckBox Margin="5" Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
+                <CheckBox Margin="5" Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" />
+                <CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" />
+                <CheckBox Margin="5" Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" />
             </StackPanel>
         </Border>
     </Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml b/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
index b0fdb13..eafd879 100644
--- a/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
@@ -11,12 +11,32 @@
             <ColumnDefinition />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <local:SewerDamagePreparation />
-        <StackPanel Grid.Column="1">
-            <Label Content="Operator" />
-            <Label Content="Datum" />
-            <Label Content="Temperatur Aussen" />
-            <Label Content="Temperatur Kanal" />
-        </StackPanel>
+        <Border>
+            <local:SewerDamagePreparation />
+        </Border>
+        <Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
+            <Grid Grid.Column="1" Background="LightBlue">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Operator" />
+                <Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Datum" />
+                <Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
+                <Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
+
+                <TextBox Grid.Column="1" Grid.Row="0" Margin="20" />
+                <!--<TextBox Grid.Column="1" Grid.Row="1" Margin="20" />-->
+                <DatePicker Grid.Column="1" Grid.Row="1" Margin="20" />
+                <TextBox Grid.Column="1" Grid.Row="2" Margin="20" />
+                <TextBox Grid.Column="1" Grid.Row="3" Margin="20" />
+            </Grid>
+        </Border>
     </Grid>
 </UserControl>
diff --git a/DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml b/DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml
deleted file mode 100644
index d7a083d..0000000
--- a/DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml
+++ /dev/null
@@ -1,20 +0,0 @@
-<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Pipeliner"
-             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>
-        <StackPanel>
-            <Label Content="Geschlossene Ende" />
-            <Label Content="Liner-Charge" />
-            <Label Content="Lagerung Temperatur" />
-            <Label Content="Temperatur beim Einbau" />
-            <Label Content="Einbaudruck" />
-            <Label Content="Preliner verwendet?" />
-        </StackPanel>
-            
-    </Grid>
-</UserControl>
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
index d0de1eb..ec1603e 100644
--- a/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
+++ b/DaSaSo.Wpf/View/SewerObject/SewerMainView.xaml
@@ -18,6 +18,9 @@
         <DataTemplate DataType="{x:Type viewmodel:SewerDamageEditViewModel}">
             <views:SewerDamageEditView />
         </DataTemplate>
+        <DataTemplate DataType="{x:Type viewmodel:SewerPipeLinerViewModel}">
+            <views:SewerPipeLinerView />
+        </DataTemplate>
         <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
     </UserControl.Resources>
     <Grid>
diff --git a/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
new file mode 100644
index 0000000..b886844
--- /dev/null
+++ b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
@@ -0,0 +1,49 @@
+<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.SewerPipeLinerView"
+             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"
+             xmlns:controls="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <Border Grid.Row="0">
+            <controls:SewerRehabilation />
+        </Border>
+        <Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
+        <Grid Background="LightBlue">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="auto" />
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+
+            <Label Margin="20" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
+            <Label Margin="20" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
+            <Label Margin="20" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
+            <Label Margin="20" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
+            <Label Margin="20" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
+            <Label Margin="20" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
+
+            <CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="20" Content="Ja" />
+            <CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="20" Content="Ja" />
+            <TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="20" />
+            <TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="20" />
+            <TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="20" />
+            <TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="20" />
+            </Grid>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml.cs b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml.cs
similarity index 85%
rename from DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml.cs
rename to DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml.cs
index 320c8d9..6dbb265 100644
--- a/DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml.cs
+++ b/DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml.cs
@@ -18,9 +18,9 @@ namespace DaSaSo.Wpf.View.SewerObject
     /// <summary>
     /// Interaction logic for Pipeliner.xaml
     /// </summary>
-    public partial class Pipeliner : UserControl
+    public partial class SewerPipeLinerView : UserControl
     {
-        public Pipeliner()
+        public SewerPipeLinerView()
         {
             InitializeComponent();
         }