Schäden können nun hinzugefügt werden
This commit is contained in:
@@ -31,8 +31,11 @@
|
||||
|
||||
<Label Grid.Row="0" Content="Entfernung" />
|
||||
<TextBox Grid.Row="0" Grid.Column="1" Text="{Binding Entfernung}" />
|
||||
<CheckBox Grid.Row="1" Grid.ColumnSpan="2" Content="Wurzel / Inkrustation / Ablagerungen" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding WurzelInkrustationAblagerungen}" />
|
||||
<CheckBox Grid.Row="2" Grid.ColumnSpan="2" Content="Einragende Stutzen" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding EinragendeStutzen}" />
|
||||
<CheckBox Grid.Row="3" Grid.ColumnSpan="2" Content="Riss / Bruch / Scherbe" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding RissBruchScherbe}" />
|
||||
<StackPanel Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="2">
|
||||
<CheckBox Content="Wurzel / Inkrustation / Ablagerungen" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding WurzelInkrustationAblagerungen}" />
|
||||
<CheckBox Content="Einragende Stutzen" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding EinragendeStutzen}" />
|
||||
<CheckBox Content="Riss / Bruch / Scherbe" Style="{StaticResource checkBoxCircle}" IsChecked="{Binding RissBruchScherbe}" />
|
||||
</StackPanel>
|
||||
<Button Grid.Row="3" Grid.ColumnSpan="2" Name="Speichern" Content="Speichern" Click="Speichern_Click" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
using System;
|
||||
using KanSan.Base.Models;
|
||||
using KanSan.ViewModel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using System.Windows;
|
||||
@@ -18,9 +20,24 @@ namespace KanSan.UI
|
||||
/// </summary>
|
||||
public partial class UCSchaedenEdit : UserControl
|
||||
{
|
||||
public UCSchaedenEdit()
|
||||
public event EventHandler SpeichernClicked;
|
||||
public UCSchaedenEdit(Schaeden schaeden)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = new SchaedenEditViewModel(schaeden);
|
||||
}
|
||||
|
||||
protected virtual void OnSpeichernClick(EventArgs e)
|
||||
{
|
||||
EventHandler handler = SpeichernClicked;
|
||||
if (handler != null)
|
||||
handler(this, e);
|
||||
}
|
||||
|
||||
private void Speichern_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
(DataContext as SchaedenEditViewModel).Speichern();
|
||||
OnSpeichernClick(EventArgs.Empty);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,6 +37,6 @@
|
||||
<DataGridCheckBoxColumn Header="Einragende
Stutzen" Width="auto" IsReadOnly="True" ElementStyle="{StaticResource checkBoxCircleSmall}" Binding="{Binding StutzenEinragend}" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
<Button Grid.Row="1">Neue Schaden Hinzufügen</Button>
|
||||
<Button Grid.Row="1" Name="NewSchaden" Click="NewSchaden_Click" Content="Neue Schäden Hinzufügen" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@@ -20,10 +20,31 @@ namespace KanSan.UI
|
||||
/// </summary>
|
||||
public partial class UCSchaedenList : UserControl
|
||||
{
|
||||
public event EventHandler<SelectSchaedenEventArgs> SchaedenSelected;
|
||||
public UCSchaedenList(Sewer actualSelectedSewer)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = new SchaedenListViewModel(actualSelectedSewer);
|
||||
}
|
||||
|
||||
protected virtual void OnClickSchaedenSelect(SelectSchaedenEventArgs e)
|
||||
{
|
||||
EventHandler<SelectSchaedenEventArgs> handler = SchaedenSelected;
|
||||
if (handler != null)
|
||||
handler(this, e);
|
||||
}
|
||||
|
||||
private void NewSchaden_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
OnClickSchaedenSelect(
|
||||
new SelectSchaedenEventArgs()
|
||||
{
|
||||
schaeden = (DataContext as SchaedenListViewModel).NeueSchaden()
|
||||
});
|
||||
}
|
||||
}
|
||||
public class SelectSchaedenEventArgs : EventArgs
|
||||
{
|
||||
public Schaeden schaeden { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
using KanSan.Base.Models;
|
||||
using KanSan.ViewModel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
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 KanSan.UI
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaktionslogik für UCSewerMainMenu.xaml
|
||||
/// </summary>
|
||||
public partial class UCSewerMainMenu : UserControl
|
||||
{
|
||||
public event EventHandler<SewerMainMenuItemSelectedEventArgs> SewerMainMenuSelected;
|
||||
|
||||
protected virtual void OnSewerMenuSelected(SewerMainMenuItemSelectedEventArgs e)
|
||||
{
|
||||
EventHandler<SewerMainMenuItemSelectedEventArgs> handler = SewerMainMenuSelected;
|
||||
if (handler != null)
|
||||
handler(this, e);
|
||||
}
|
||||
|
||||
public UCSewerMainMenu(Sewer objekt)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = new SewerMainMenuViewModel(objekt);
|
||||
Style style = this.FindResource("ToggelButtonList") as Style;
|
||||
|
||||
RadioButton radioButton = new RadioButton();
|
||||
radioButton.Name = "Schlauch122123";
|
||||
radioButton.Content = "Schlauchliner";
|
||||
radioButton.Style = style;
|
||||
radioButton.Checked += rbSewerMenuItem_Checked;
|
||||
|
||||
MenuItems.Children.Add(radioButton);
|
||||
}
|
||||
|
||||
private void rbSewerMenuItem_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
RadioButton radioButton = (RadioButton)sender;
|
||||
if (radioButton == null) return;
|
||||
//Debugger.Break();
|
||||
ESewerMainMenuCommand command = ESewerMainMenuCommand.NONE;
|
||||
if (radioButton.Name.Equals("rbStammdaten")) command = ESewerMainMenuCommand.STAMMDATEN;
|
||||
else if (radioButton.Name.Equals("rbSchaeden")) command = ESewerMainMenuCommand.SCHAEDEN;
|
||||
|
||||
OnSewerMenuSelected(new SewerMainMenuItemSelectedEventArgs()
|
||||
{
|
||||
Command = command
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
public enum ESewerMainMenuCommand
|
||||
{
|
||||
NONE,
|
||||
STAMMDATEN,
|
||||
SCHAEDEN,
|
||||
SANIERUNG,
|
||||
SCHAEDENEDIT
|
||||
}
|
||||
public class SewerMainMenuItemSelectedEventArgs : EventArgs
|
||||
{
|
||||
public ESewerMainMenuCommand Command { get; set; }
|
||||
public int Parameter { get; set; }
|
||||
}
|
||||
}
|
||||
@@ -15,14 +15,24 @@
|
||||
</ResourceDictionary>
|
||||
</UserControl.Resources>
|
||||
<Grid>
|
||||
|
||||
<StackPanel Name="MenuItems">
|
||||
<TextBlock Text="{Binding Path=(self:SewerMainMenuViewModel.ObjektBezeichnung)}" />
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="150" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="23*" />
|
||||
<RowDefinition Height="277*" />
|
||||
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding Path=(self:SewerMainMenuViewModel.ObjektBezeichnung)}" />
|
||||
<StackPanel Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" Name="MenuItems">
|
||||
|
||||
<RadioButton Name="rbStammdaten" Checked="rbSewerMenuItem_Checked" Style="{StaticResource ToggelButtonList}" Content="Stammdaten" />
|
||||
<RadioButton Name="rbSchaeden" Checked="rbSewerMenuItem_Checked" Style="{StaticResource ToggelButtonList}" Content="Schäden" />
|
||||
<RadioButton Name="rbSchlauch1" Checked="rbSewerMenuItem_Checked" Style="{StaticResource ToggelButtonList}" Content="Schlauchliner" />
|
||||
<RadioButton Name="rbSchachtAnb1" Checked="rbSewerMenuItem_Checked" Style="{StaticResource ToggelButtonList}" Content="Schachtanbindung 1" />
|
||||
<RadioButton Name="Kurzliner1" Checked="rbSewerMenuItem_Checked" Style="{StaticResource ToggelButtonList}" Content="Kurzliner" />
|
||||
</StackPanel>
|
||||
<ContentControl Grid.Column="1" Grid.Row="1" Grid.RowSpan="2" Name="ObjektContentcontroller" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
78
KanSan/UI/UCSewerMainWindow.xaml.cs
Normal file
78
KanSan/UI/UCSewerMainWindow.xaml.cs
Normal file
@@ -0,0 +1,78 @@
|
||||
using KanSan.Base.Models;
|
||||
using KanSan.ViewModel;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Text;
|
||||
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 KanSan.UI
|
||||
{
|
||||
/// <summary>
|
||||
/// Interaktionslogik für UCSewerMainMenu.xaml
|
||||
/// </summary>
|
||||
public partial class UCSewerMainMenu : UserControl
|
||||
{
|
||||
public UCSewerMainMenu(Sewer objekt)
|
||||
{
|
||||
InitializeComponent();
|
||||
this.DataContext = new SewerMainMenuViewModel(objekt);
|
||||
UI.UCObjektEdit uCObjektEdit = new UCObjektEdit(objekt);
|
||||
ObjektContentcontroller.Content = uCObjektEdit;
|
||||
|
||||
Style style = this.FindResource("ToggelButtonList") as Style;
|
||||
|
||||
RadioButton radioButton = new RadioButton();
|
||||
radioButton.Name = "Schlauch122123";
|
||||
radioButton.Content = "Schlauchliner";
|
||||
radioButton.Style = style;
|
||||
radioButton.Checked += rbSewerMenuItem_Checked;
|
||||
|
||||
MenuItems.Children.Add(radioButton);
|
||||
}
|
||||
|
||||
private void rbSewerMenuItem_Checked(object sender, RoutedEventArgs e)
|
||||
{
|
||||
RadioButton btn = (RadioButton)sender;
|
||||
if (btn == null) return;
|
||||
switch(btn.Name)
|
||||
{
|
||||
case "rbStammdaten":
|
||||
UI.UCObjektEdit uCObjektEdit = new UCObjektEdit((DataContext as SewerMainMenuViewModel).Objekt);
|
||||
ObjektContentcontroller.Content = uCObjektEdit;
|
||||
break;
|
||||
case "rbSchaeden":
|
||||
UI.UCSchaedenList uCSchaedenList = new UCSchaedenList((DataContext as SewerMainMenuViewModel).Objekt);
|
||||
uCSchaedenList.SchaedenSelected += UCSchaedenList_SchaedenSelected;
|
||||
ObjektContentcontroller.Content = uCSchaedenList;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void UCSchaedenList_SchaedenSelected(object sender, SelectSchaedenEventArgs e)
|
||||
{
|
||||
rbSchaeden.IsChecked = true;
|
||||
UI.UCSchaedenEdit uCSchaedenEdit = new UCSchaedenEdit(e.schaeden);
|
||||
uCSchaedenEdit.SpeichernClicked += UCSchaedenEdit_SpeichernClicked;
|
||||
ObjektContentcontroller.Content = uCSchaedenEdit;
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
|
||||
private void UCSchaedenEdit_SpeichernClicked(object sender, EventArgs e)
|
||||
{
|
||||
UI.UCSchaedenList uCSchaedenList = new UCSchaedenList((DataContext as SewerMainMenuViewModel).Objekt);
|
||||
uCSchaedenList.SchaedenSelected += UCSchaedenList_SchaedenSelected;
|
||||
ObjektContentcontroller.Content = uCSchaedenList;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user