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

Schlauchliner form wird vollständig verwaltet

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-13 11:56:02 +02:00
parent 4ed6826f62
commit adbbc0e528
12 changed files with 169 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,6 +165,7 @@ namespace DaSaSo.Wpf
using (DaSaSoDbContext context = contextFactory.CreateDbContext())
{
context.Database.Migrate();
}
MainWindow? window = new MainWindow() { DataContext = _host.Services.GetRequiredService<MainWindowViewModel>() };
window.Show();

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

@@ -18,7 +18,7 @@
<StackPanel>
<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="Mit Roboter 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}" IsChecked="{Binding Genehmigung}" />
<CheckBox Margin="5" Content="Wasserhaltung wurde eingerichtet" Style="{StaticResource checkBoxCircleSmall}" IsChecked="{Binding WaterBaried}" />

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

@@ -3,7 +3,7 @@
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.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:SewerPipeLinerViewModel}"
xmlns:local="clr-namespace:DaSaSo.Wpf.View.SewerObject.Controls" xmlns:viewmodel="clr-namespace:DaSaSo.ViewModel;assembly=DaSaSo.ViewModel" xmlns:controls="clr-namespace:DaSaSo.ViewModel.Controls;assembly=DaSaSo.ViewModel" d:DataContext="{d:DesignInstance Type=controls:SewerRhebalationControllViewModel}"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
@@ -12,7 +12,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border>
<local:SewerDamagePreparation />
<local:SewerDamagePreparation DataContext="{Binding SewerPreperationControllViewModel}" />
</Border>
<Border Grid.Column="1" BorderBrush="Black" BorderThickness="2">
<Grid Grid.Column="1" Background="LightBlue">
@@ -21,21 +21,23 @@
<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" />
<Label Margin="5" Grid.Column="0" Grid.Row="0" Content="Operator" />
<Label Margin="5" Grid.Column="0" Grid.Row="1" Content="Datum" />
<Label Margin="5" Grid.Column="0" Grid.Row="2" Content="Temperatur Aussen" />
<Label Margin="5" Grid.Column="0" Grid.Row="3" Content="Temperatur Kanal" />
<Label Margin="5" Grid.Column="0" Grid.Row="4" Content="Wetter" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="20" Text="{Binding Operator}" />
<!--<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" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="5" Text="{Binding Bediener}" />
<DatePicker Grid.Column="1" Grid.Row="1" Margin="5" SelectedDate="{Binding Datum}" />
<TextBox Grid.Column="1" Grid.Row="2" Margin="5" Text="{Binding TemperaturAussen}" />
<TextBox Grid.Column="1" Grid.Row="3" Margin="5" Text="{Binding TemperaturSewer}" />
<TextBox Grid.Column="1" Grid.Row="4" Margin="5" Text="{Binding Weather}" />
</Grid>
</Border>
</Grid>

34
DaSaSo.Wpf/View/SewerObject/SewerPipeLinerView.xaml
View File

@@ -9,10 +9,10 @@
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
</Grid.RowDefinitions>
<Border Grid.Row="0">
<controls:SewerRehabilation DataContext="{Binding SewerPreperationControllViewModel}" />
<controls:SewerRehabilation DataContext="{Binding SewerRhebalationControllViewModel}" />
</Border>
<Border BorderBrush="Black" BorderThickness="2" Grid.Row="1">
<Grid Background="LightBlue">
@@ -24,24 +24,24 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</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" />
<Label Margin="10" Grid.Column="0" Grid.Row="0" Content="Geschlossene Ende" />
<Label Margin="10" Grid.Column="0" Grid.Row="1" Content="Preliner verwendet?" />
<Label Margin="10" Grid.Column="0" Grid.Row="2" Content="Liner-Charge" />
<Label Margin="10" Grid.Column="0" Grid.Row="3" Content="Lagerung Temperatur" />
<Label Margin="10" Grid.Column="0" Grid.Row="4" Content="Temperatur beim Einbau" />
<Label Margin="10" Grid.Column="0" Grid.Row="5" Content="Einbaudruck" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="20" Content="Ja" IsChecked="{Binding ClosedEnd}" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="20" Content="Ja" IsChecked="{Binding Preliner}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="20" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="20" Text="{Binding LagerungTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="20" Text="{Binding EinbauTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="20" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="0" Margin="10" Content="Ja" IsChecked="{Binding ClosedEnd}" />
<CheckBox Style="{StaticResource checkBoxCircleSmall}" Grid.Column="1" Grid.Row="1" Margin="10" Content="Ja" IsChecked="{Binding Preliner}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="2" Margin="10" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="3" Margin="10" Text="{Binding LagerungTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="4" Margin="10" Text="{Binding EinbauTemperatur}" />
<TextBox BorderThickness="0" Grid.Column="1" Grid.Row="5" Margin="10" Text="{Binding EinbauDruck}" />
</Grid>
</Border>
</Grid>

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

@@ -49,13 +49,15 @@
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="40" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<controls:MainWindowNavigationBar Grid.Column="0" Grid.Row="0"/>
<ContentControl Grid.Column="1" Grid.Row="0" Content="{Binding CurrentViewModel}" />
<StatusBar FontSize="20" Grid.Row="1" Grid.ColumnSpan="2">
<StatusBarItem FontSize="20" Content="{Binding ClientName}" />
<StatusBarItem FontSize="20" Content="{Binding Projektname}" />
<Separator />
<StatusBarItem FontSize="20" Content="{Binding Projektnummer}" />
<Separator />
<StatusBarItem FontSize="20" Content="{Binding Buildingsitename}" />
</StatusBar>
</Grid>