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

SchlauchlinerView wird angezeigt

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-07 13:43:01 +02:00
parent cae9f38227
commit 3388891134
15 changed files with 120 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
DaSaSo.Domain/Enums/ESewerWindowViewType.cs
View File

@@ -4,6 +4,7 @@
{ {
SewerStammdaten, SewerStammdaten,
SewerDamageList, SewerDamageList,
SewerDamageEdit SewerDamageEdit,
SewerPipeLiner
} }
} }

4
DaSaSo.Domain/Model/SewerDamage.cs
View File

@@ -1,4 +1,6 @@
namespace DaSaSo.Domain.Model using System;
namespace DaSaSo.Domain.Model
{ {
[Flags] [Flags]
public enum EDamageType public enum EDamageType

6
DaSaSo.ViewModel/Factories/SewerWindowViewModelFactory.cs
View File

@@ -13,16 +13,19 @@ namespace DaSaSo.ViewModel.Factories
private CreateViewModel<SewerStammdatenViewModel> _createSewerStammdatenViewModel; private CreateViewModel<SewerStammdatenViewModel> _createSewerStammdatenViewModel;
private CreateViewModel<SewerDamageListViewModel> _createSewerDamageListViewModel; private CreateViewModel<SewerDamageListViewModel> _createSewerDamageListViewModel;
private CreateViewModel<SewerDamageEditViewModel> _createSewerDamageEditViewModel; private CreateViewModel<SewerDamageEditViewModel> _createSewerDamageEditViewModel;
private CreateViewModel<SewerPipeLinerViewModel> _createSewerPipeLinerViewModel;
public SewerWindowViewModelFactory( public SewerWindowViewModelFactory(
CreateViewModel<SewerStammdatenViewModel> createSewerStammdatenViewModel, CreateViewModel<SewerStammdatenViewModel> createSewerStammdatenViewModel,
CreateViewModel<SewerDamageListViewModel> createSewerDamageListViewModel, CreateViewModel<SewerDamageListViewModel> createSewerDamageListViewModel,
CreateViewModel<SewerDamageEditViewModel> createSewerDamageEditViewModel CreateViewModel<SewerDamageEditViewModel> createSewerDamageEditViewModel,
CreateViewModel<SewerPipeLinerViewModel> createSewerPipeLinerViewModel
) )
{ {
_createSewerStammdatenViewModel = createSewerStammdatenViewModel; _createSewerStammdatenViewModel = createSewerStammdatenViewModel;
_createSewerDamageListViewModel = createSewerDamageListViewModel; _createSewerDamageListViewModel = createSewerDamageListViewModel;
_createSewerDamageEditViewModel = createSewerDamageEditViewModel; _createSewerDamageEditViewModel = createSewerDamageEditViewModel;
_createSewerPipeLinerViewModel = createSewerPipeLinerViewModel;
} }
public BaseViewModel CreateViewModel(ESewerWindowViewType viewType) public BaseViewModel CreateViewModel(ESewerWindowViewType viewType)
@@ -32,6 +35,7 @@ namespace DaSaSo.ViewModel.Factories
case ESewerWindowViewType.SewerStammdaten: return _createSewerStammdatenViewModel(); case ESewerWindowViewType.SewerStammdaten: return _createSewerStammdatenViewModel();
case ESewerWindowViewType.SewerDamageList: return _createSewerDamageListViewModel(); case ESewerWindowViewType.SewerDamageList: return _createSewerDamageListViewModel();
case ESewerWindowViewType.SewerDamageEdit: return _createSewerDamageEditViewModel(); case ESewerWindowViewType.SewerDamageEdit: return _createSewerDamageEditViewModel();
case ESewerWindowViewType.SewerPipeLiner: return _createSewerPipeLinerViewModel();
default: default:
throw new ArgumentException("The Viewtype does not have a ViewModel", "viewType"); throw new ArgumentException("The Viewtype does not have a ViewModel", "viewType");
} }

1
DaSaSo.ViewModel/SewerMainListViewModel.cs
View File

@@ -25,6 +25,7 @@ namespace DaSaSo.ViewModel
public ICommand UpdateCurrentSewerViewModelCommand { get; } public ICommand UpdateCurrentSewerViewModelCommand { get; }
public ICommand CloseCommand { get; set; } public ICommand CloseCommand { get; set; }
public ICommand SchadenCommand { get; set; } public ICommand SchadenCommand { get; set; }
public ICommand Schlauchliner { get; set; }
public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel; public BaseViewModel CurrentSewerViewModel => Navigator.CurrentViewModel;
public bool CanSelectDamage => Schaden != null; public bool CanSelectDamage => Schaden != null;

12
DaSaSo.ViewModel/SewerPipeLinerViewModel.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
{
public class SewerPipeLinerViewModel : BaseViewModel
{
}
}

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

@@ -12,6 +12,7 @@ using Microsoft.Win32;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Text; using System.Text;

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

@@ -6,7 +6,7 @@
xmlns:nav="clr-namespace:DaSaSo.Domain.Enums;assembly=DaSaSo.Domain" 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}" 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" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="200"> d:DesignHeight="607.5" d:DesignWidth="200">
<Grid> <Grid>
<StackPanel> <StackPanel>
<RadioButton Content="Stammdaten" Style="{StaticResource ToggleButtonList}" Command="{Binding UpdateCurrentSewerViewModelCommand}" CommandParameter="{x:Static nav:ESewerWindowViewType.SewerStammdaten}" Margin="20" /> <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="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="{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> </StackPanel>

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

@@ -46,7 +46,7 @@
<Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs"> <Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Update="View\SewerObject\Pipeliner.xaml.cs"> <Compile Update="View\SewerObject\SewerPipeLinerView.xaml.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs"> <Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs">
@@ -108,7 +108,7 @@
<Page Update="View\SewerObject\Controls\SewerRehabilation.xaml"> <Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Update="View\SewerObject\Pipeliner.xaml"> <Page Update="View\SewerObject\SewerPipeLinerView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Update="View\SewerObject\SewerDamageEditView.xaml"> <Page Update="View\SewerObject\SewerDamageEditView.xaml">

4
DaSaSo.Wpf/HostBuilders/AddViewModelsHostBuilderExtensions.cs
View File

@@ -88,6 +88,10 @@ namespace DaSaSo.Wpf.HostBuilders
services.GetRequiredService<IActualProject>() services.GetRequiredService<IActualProject>()
); );
}); });
services.AddTransient<CreateViewModel<SewerPipeLinerViewModel>>(services =>
{
return () => new SewerPipeLinerViewModel();
});
services.AddTransient<CreateViewModel<ClientListViewModel>>(services => services.AddTransient<CreateViewModel<ClientListViewModel>>(services =>
{ {

14
DaSaSo.Wpf/View/SewerObject/Controls/SewerDamagePreparation.xaml
View File

@@ -16,13 +16,13 @@
</Border> </Border>
<Border BorderBrush="Black" Grid.Row="1" BorderThickness="2" Margin="3"> <Border BorderBrush="Black" Grid.Row="1" BorderThickness="2" Margin="3">
<StackPanel> <StackPanel>
<CheckBox Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" /> <CheckBox Margin="5" Content="HD Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding HD}" />
<CheckBox Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" /> <CheckBox Margin="5" Content="Mechanisch Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Mechanisch}" />
<CheckBox Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" /> <CheckBox Margin="5" Content="Mit Roborter Gereinigt" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Roboter}" />
<CheckBox Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" /> <CheckBox Margin="5" Content="Schadstelle Fäkalienfrei" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding Faekalienfrei}" />
<CheckBox Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" /> <CheckBox Margin="5" Content="Genehmigung wurde eingeholt" Style="{StaticResource checkBoxCircleSmall}" />
<CheckBox Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" /> <CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" />
<CheckBox Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" /> <CheckBox Margin="5" Content="Es wurde nach StVO abgesichert" Style="{StaticResource checkBoxCircleSmall}" />
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>

34
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml
View File

@@ -11,12 +11,32 @@
<ColumnDefinition /> <ColumnDefinition />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<local:SewerDamagePreparation /> <Border>
<StackPanel Grid.Column="1"> <local:SewerDamagePreparation />
<Label Content="Operator" /> </Border>
<Label Content="Datum" /> <Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
<Label Content="Temperatur Aussen" /> <Grid Grid.Column="1" Background="LightBlue">
<Label Content="Temperatur Kanal" /> <Grid.RowDefinitions>
</StackPanel> <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> </Grid>
</UserControl> </UserControl>

20
DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml
View File

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

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

@@ -18,6 +18,9 @@
<DataTemplate DataType="{x:Type viewmodel:SewerDamageEditViewModel}"> <DataTemplate DataType="{x:Type viewmodel:SewerDamageEditViewModel}">
<views:SewerDamageEditView /> <views:SewerDamageEditView />
</DataTemplate> </DataTemplate>
<DataTemplate DataType="{x:Type viewmodel:SewerPipeLinerViewModel}">
<views:SewerPipeLinerView />
</DataTemplate>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" /> <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>

49
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml Normal file
View File

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

4
DaSaSo.Wpf/View/SewerObject/Pipeliner.xaml.cs → DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml.cs
View File

@@ -18,9 +18,9 @@ namespace DaSaSo.Wpf.View.SewerObject
/// <summary> /// <summary>
/// Interaction logic for Pipeliner.xaml /// Interaction logic for Pipeliner.xaml
/// </summary> /// </summary>
public partial class Pipeliner : UserControl public partial class SewerPipeLinerView : UserControl
{ {
public Pipeliner() public SewerPipeLinerView()
{ {
InitializeComponent(); InitializeComponent();
} }