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

Model geupdated

Browse Source
This commit is contained in:
HuskyTeufel
2021-10-06 19:52:32 +02:00
parent b48c012c18
commit cae9f38227
21 changed files with 1104 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,6 +43,12 @@
<Compile Update="View\SewerObject\Controls\SewerDamagePreparation.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\Controls\SewerRehabilation.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\Pipeliner.xaml.cs">
<SubType>Code</SubType>
</Compile>
<Compile Update="View\SewerObject\SewerDamageEditView.xaml.cs">
<SubType>Code</SubType>
</Compile>
@@ -99,6 +105,12 @@
<Page Update="View\SewerObject\Controls\SewerDamagePreparation.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\Controls\SewerRehabilation.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\Pipeliner.xaml">
<SubType>Designer</SubType>
</Page>
<Page Update="View\SewerObject\SewerDamageEditView.xaml">
<SubType>Designer</SubType>
</Page>

1
DaSaSo.Wpf/Sampledata/SewerDamageListSampleData.cs
View File

@@ -16,7 +16,6 @@ namespace DaSaSo.Wpf.Sampledata
Damages.Add(new SewerDamage()
{
DamageType = EDamageType.Bruch | EDamageType.EinrageneStutzen,
PreparationType = EPreparationType.CleanedHD | EPreparationType.CleanedRoboter,
Distance = 12.5m
});

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

@@ -20,6 +20,9 @@
<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}" />
</StackPanel>
</Border>
</Grid>

22
DaSaSo.Wpf/View/SewerObject/Controls/SewerRehabilation.xaml Normal file
View File

@@ -0,0 +1,22 @@
<UserControl x:Class="DaSaSo.Wpf.View.SewerObject.Controls.SewerRehabilation"
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.Controls"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<Grid.ColumnDefinitions>
<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>
</Grid>
</UserControl>

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

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

@@ -8,10 +8,12 @@
d:DesignHeight="450" d:DesignWidth="800">
<Grid>
<StackPanel>
<Label Content="Operator" />
<Label Content="Datum" />
<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>

2
DaSaSo.Wpf/View/SewerObject/SewerDamageEditView.xaml
View File

@@ -17,7 +17,7 @@
<RowDefinition />
</Grid.RowDefinitions>
<selfControls:SewerDamage Grid.Column="0" Grid.Row="0" DataContext="{Binding damageControllViewModel}" Margin="3" />
<selfControls:SewerDamagePreparation Grid.Column="1" Grid.Row="0" DataContext="{Binding preperationControllViewModel}" Margin="3" />
<!--<selfControls:SewerDamagePreparation Grid.Column="1" Grid.Row="0" DataContext="{Binding preperationControllViewModel}" Margin="3" />-->
<Grid Grid.Row="1" Grid.Column="0">
<Grid.ColumnDefinitions>
<ColumnDefinition />

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

@@ -27,19 +27,22 @@
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Column="0" Grid.Row="0" Content="Haltungsname" Margin="20" />
<Label Grid.Column="0" Grid.Row="1" Content="Punkt Oben" Margin="20" />
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Unten" Margin="20" />
<Label Grid.Column="0" Grid.Row="3" Content="Durchmesser" Margin="20" />
<Label Grid.Column="0" Grid.Row="4" Content="Material" Margin="20" />
<Label Grid.Column="0" Grid.Row="5" Content="Leitungslänge" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Haltungsname }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Oberepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Unterepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Durchmesser }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Material }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Leitungslength }" Margin="20" />
<Label Grid.Column="0" Grid.Row="0" Content="Sanierung ID" Margin="20" />
<Label Grid.Column="0" Grid.Row="1" Content="Haltungsname" Margin="20" />
<Label Grid.Column="0" Grid.Row="2" Content="Punkt Oben" Margin="20" />
<Label Grid.Column="0" Grid.Row="3" Content="Punkt Unten" Margin="20" />
<Label Grid.Column="0" Grid.Row="4" Content="Durchmesser" Margin="20" />
<Label Grid.Column="0" Grid.Row="5" Content="Material" Margin="20" />
<Label Grid.Column="0" Grid.Row="6" Content="Leitungslänge" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="0" Text="{Binding Sanierungsid}" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="1" Text="{Binding Haltungsname }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="2" Text="{Binding Oberepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="3" Text="{Binding Unterepunkt }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="4" Text="{Binding Durchmesser }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="5" Text="{Binding Material }" Margin="20" />
<TextBox Grid.Column="1" Grid.Row="6" Text="{Binding Leitungslength }" Margin="20" />
</Grid>
<Grid Grid.Column="1">
<Grid.ColumnDefinitions>
@@ -49,11 +52,14 @@
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto" />
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Strasse" Margin="20" />
<Label Grid.Row="1" Grid.Column="0" Content="Ort" Margin="20" />
<Label Grid.Row="1" Grid.Column="0" Content="Hausnummer" Margin="20" />
<Label Grid.Row="2" Grid.Column="0" Content="Ort" Margin="20" />
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Strasse}" Margin="20"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
<TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Hausnummer}" Margin="20" />
<TextBox Grid.Row="2" Grid.Column="1" Text="{Binding Ort}" Margin="20"/>
</Grid>
<Button Grid.Row="1" Grid.ColumnSpan="2" FontSize="20" Content="Speichern" Command="{Binding SaveCommand}" />
</Grid>

17
DaSaSo.Wpf/View/SewerObjecte/SewerObjecteListView.xaml
View File

@@ -26,8 +26,21 @@
<DataTemplate DataType="{x:Type model:SewerObject}">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding ObjektName}" />
<TextBlock Text="{Binding Material}" />
<TextBlock Text="SanID [" />
<TextBlock Text="{Binding SanNummer}" Foreground="Red" />
<TextBlock Text="] Hausnummer [" />
<TextBlock Text="{Binding Hausnummer}" Foreground="Red" />
<TextBlock Text="] Haltung [" />
<!--<TextBlock Text="[" />-->
<TextBlock Foreground="Blue" Text="{Binding ObjektName}" />
<TextBlock Text="] DN [" />
<TextBlock Text="{Binding DN}" Foreground="Blue" />
<TextBlock Text="]" />
<!--
<TextBlock Text="] Material [" />
<TextBlock Text="{Binding Material}" Foreground="Blue" />
<TextBlock Text="]" />
-->
</StackPanel>
</DataTemplate>
<Style TargetType="{x:Type TreeViewItem}">