From 0dad7ba59950198f6c171bfce185e9e81953f926 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Wed, 18 Sep 2024 17:29:12 +0200
Subject: [PATCH 01/22] Style

---
 BeWo/DebugConfig.cs                           |  2 +-
 .../Wohnhilfe/CustomerWohnhilfeControl.xaml   | 53 +++++++++---------
 .../CustomerWohnhilfeControl.xaml.cs          |  6 --
 .../Detail/CustomerVermittlungArbeitView.xaml | 56 +++++++++++--------
 BeWo/View/Detail/CustomerWohnhilfeView.xaml   |  6 +-
 5 files changed, 62 insertions(+), 61 deletions(-)

diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 036d37d9a..e5cb9cf9f 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -22,7 +22,7 @@ namespace BeWo
             {
                 #if DEBUG
 
-                return _CurrentConfig ?? (_CurrentConfig = FeatureWohnheimWohneinheit);
+                return _CurrentConfig ?? (_CurrentConfig = FeatureCustomerWohnhilfe);
 
                 #endif
 
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 79270631e..d9d1d4303 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -17,9 +17,8 @@
     x:Name="root_usercontrol"
     d:DataContext="{d:DesignInstance d:Type=viewmodel:CustomerWohnhilfeVM,
                                      IsDesignTimeCreatable=True}"
-    d:DesignHeight="1450"
-    d:DesignWidth="1800"
     SizeChanged="UserControl_SizeChanged"
+    HorizontalAlignment="Stretch"
     mc:Ignorable="d cs">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -46,7 +45,7 @@
         <Grid x:Name="grid">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition x:Name="grid_secondcolumn" Width="2*" />
+                <ColumnDefinition x:Name="grid_secondcolumn" Width="10*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto" />
@@ -68,8 +67,7 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition x:Name="grid_bund_column" Width="*" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -178,10 +176,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -310,8 +308,7 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition x:Name="grid_sozialstruktur_column" Width="*" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -336,14 +333,14 @@
                     <Label Grid.Row="0" Grid.Column="0">K0110 Bundesland</Label>
                     <ComboBox
                         Grid.Row="0"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding BundeslandTypes}"
                         SelectedValue="{Binding Bundesland}" />
 
                     <Label Grid.Row="1" Grid.Column="0">K0120 Art des Hilfefelds</Label>
                     <StackPanel
                         Grid.Row="1"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         Orientation="Horizontal">
                         <RadioButton GroupName="Art" IsChecked="{Binding IsWohnungslosenhilfeSafe}">Wohnungslosenhilfe</RadioButton>
                         <RadioButton GroupName="Art" IsChecked="{Binding IsStraffaligenhilfeSafe}">Straffälligenhilfe</RadioButton>
@@ -352,27 +349,27 @@
                     <Label Grid.Row="2" Grid.Column="0">K0130 Art des Hilfeangebots</Label>
                     <ComboBox
                         Grid.Row="2"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding ArtDesHilfeangebotsTypes}"
                         SelectedValue="{Binding ArtDesHilfeangebots}" />
 
                     <Label Grid.Row="3" Grid.Column="0">K0140 Betreuungsbeginn</Label>
                     <dxe:DateEdit
                         Grid.Row="3"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         EditValue="{Binding Path=Betreuungsbeginn, UpdateSourceTrigger=PropertyChanged}" />
 
                     <Label Grid.Row="4" Grid.Column="0">K0150 Betreuungsende</Label>
                     <dxe:DateEdit
                         Grid.Row="4"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         EditValue="{Binding Path=Betreuungsende, UpdateSourceTrigger=PropertyChanged}"
                         ShowClearButton="True" />
 
                     <Label Grid.Row="5" Grid.Column="0">K0160 Betreuungsdauer in Tagen</Label>
                     <dxe:TextEdit
                         Grid.Row="5"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         Height="23"
                         Margin="3"
                         dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
@@ -384,7 +381,7 @@
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
                         Grid.Row="6"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding ArtDerBeendigungTypes}"
                         SelectedValue="{Binding ArtDerBeendigung}" />
 
@@ -392,67 +389,67 @@
                     <dxe:DateEdit
                         x:Name="Dateedit"
                         Grid.Row="7"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         EditValue="{Binding Path=Geburtsdatum, UpdateSourceTrigger=PropertyChanged}" />
 
                     <Label Grid.Row="8" Grid.Column="0">G1020 Geschlechtsidentität</Label>
                     <ComboBox
                         Grid.Row="8"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding GeschlechtidentitatTypes}"
                         SelectedValue="{Binding Geschlechtidentitat}" />
 
                     <Label Grid.Row="9" Grid.Column="0">G1030 Staatsangehörigkeit</Label>
                     <ComboBox
                         Grid.Row="9"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding StaatsangehorigkeitTypes}"
                         SelectedValue="{Binding Staatsangehorigkeit}" />
 
                     <Label Grid.Row="10" Grid.Column="0">G1040 Aufenthaltsstatus</Label>
                     <ComboBox
                         Grid.Row="10"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding AufenthaltsstatusTypes}"
                         SelectedValue="{Binding Aufenthaltsstatus}" />
 
                     <Label Grid.Row="11" Grid.Column="0">G1050 Migrationshintergrund</Label>
                     <ComboBox
                         Grid.Row="11"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding WohnhilfeBoolDataTypes}"
                         SelectedValue="{Binding Migrationshintergrund}" />
 
                     <Label Grid.Row="12" Grid.Column="0">W1060 Höchster erreichter Schulabschluss</Label>
                     <ComboBox
                         Grid.Row="12"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding HochsterSchulabschlussTypes}"
                         SelectedValue="{Binding HochsterSchulabschluss}" />
 
                     <Label Grid.Row="13" Grid.Column="0">G1070 Familienstand</Label>
                     <ComboBox
                         Grid.Row="13"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding FamilienstandTypes}"
                         SelectedValue="{Binding Familienstand}" />
 
                     <Label Grid.Row="14" Grid.Column="0">G1080 Haushaltsstruktur</Label>
                     <ComboBox
                         Grid.Row="14"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         ItemsSource="{Binding HaushaltsstrukturTypes}"
                         SelectedValue="{Binding Haushaltsstruktur}" />
 
                     <Label
                         Grid.Row="15"
                         Grid.Column="0"
-                        Grid.ColumnSpan="3">
+                        Grid.ColumnSpan="2">
                         G1090 Eigene minderjährige Kinder außerhalb der Haushaltsstruktur
                     </Label>
                     <ComboBox
                         Grid.Row="16"
-                        Grid.Column="2"
+                        Grid.Column="1"
                         Margin="3,-2,3,3"
                         ItemsSource="{Binding WohnhilfeBoolDataTypes}"
                         SelectedValue="{Binding EigeneMindKinderAuserhalbHaushaltsstruktur}" />
@@ -469,10 +466,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="300" />
+                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
index ef694e262..d26716b6a 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
@@ -97,9 +97,6 @@ namespace BeWo.View.Controls.Wohnhilfe
         {
             grid_secondcolumn.Width = new GridLength(2, GridUnitType.Star);
 
-            grid_bund_column.Width = new GridLength(1, GridUnitType.Star);
-            grid_sozialstruktur_column.Width = new GridLength(1, GridUnitType.Star);
-
             Grid.SetColumn(groupbox_2, 1);
             Grid.SetRow(groupbox_2, 0);
             Grid.SetColumn(groupbox_3, 0);
@@ -112,9 +109,6 @@ namespace BeWo.View.Controls.Wohnhilfe
         {
             grid_secondcolumn.Width = new GridLength(0);
 
-            grid_bund_column.Width = new GridLength(0);
-            grid_sozialstruktur_column.Width = new GridLength(0);
-
             Grid.SetColumn(groupbox_2, 0);
             Grid.SetRow(groupbox_2, 1);
             Grid.SetColumn(groupbox_3, 0);
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index 441c6113b..033f8d46b 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -1,11 +1,14 @@
-<UserControl x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
-             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:BeWo.View.Detail" xmlns:controls="clr-namespace:BeWo.View.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.View.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BeWo.View.Detail"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -15,31 +18,38 @@
     </UserControl.Resources>
     <Grid>
         <Grid DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <Button Content="Neuen Fall hinzufügen" Command="{Binding AddVMCommand}">
-                </Button>
+            <StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
+                <Button Command="{Binding AddVMCommand}" Content="Neuen Fall hinzufügen" />
             </StackPanel>
-            <TabControl Grid.Row="1" Margin="5" 
-                        ItemsSource="{Binding VMList}" 
-                        SelectedItem="{Binding SelectedVM}" x:Name="tabcontrol_NotizenKategorien" 
-                        Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
+            <TabControl
+                x:Name="tabcontrol_NotizenKategorien"
+                Grid.Row="1"
+                Margin="5"
+                ItemsSource="{Binding VMList}"
+                SelectedItem="{Binding SelectedVM}"
+                Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
                 <TabControl.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
                             <Label Content="{Binding Displayname}" />
-                            <Button VerticalAlignment="Center" Height="20"
-                                    Tag="{Binding}"
-                                    ToolTip="Wohnhilfe entfernen"
-                                    Style="{DynamicResource CloseButtonStyle}"
-                                    Command="{Binding Path=DataContext.DeleteSelectedVMCommand, RelativeSource={RelativeSource AncestorType=TabControl}}">
+                            <Button
+                                Height="20"
+                                VerticalAlignment="Center"
+                                Command="{Binding Path=DataContext.DeleteSelectedVMCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
+                                Style="{DynamicResource CloseButtonStyle}"
+                                Tag="{Binding}"
+                                ToolTip="Wohnhilfe entfernen">
                                 <Button.Visibility>
-                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
+                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding Path="PermissionCustomerWohnhilfeDelete" ElementName="root_control" />
+                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeDelete" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>
@@ -49,7 +59,7 @@
                 <TabControl.ContentTemplate>
                     <DataTemplate>
                         <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-                            <controls:CustomerVermittlungArbeitControl/>
+                            <controls:CustomerVermittlungArbeitControl />
                         </ScrollViewer>
                     </DataTemplate>
                 </TabControl.ContentTemplate>
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index f9174da6a..8d83cd123 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -34,7 +34,7 @@
                     <Button.Visibility>
                         <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
                             <Binding Path="VMList.Count" Converter="{StaticResource CollectionCountToBoolConverter}"/>
-                            <Binding Path="PermissionCustomerWohnhilfeEdit" ElementName="root_control" />
+                            <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
                         </MultiBinding>
                     </Button.Visibility>
                 </Button>
@@ -42,7 +42,7 @@
                     <Button.Visibility>
                         <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
                             <Binding Path="VMList.Count" Converter="{StaticResource CollectionCountToBoolConverter}"/>
-                            <Binding Path="PermissionCustomerWohnhilfeCreate" ElementName="root_control" />
+                            <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
                         </MultiBinding>
                     </Button.Visibility>
                 </Button>
@@ -77,7 +77,7 @@
                                 <Button.Visibility>
                                     <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding Path="PermissionCustomerWohnhilfeDelete" ElementName="root_control" />
+                                        <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>

From 4ec2e40615f51e63ba5562fa3c79d81253e8d6e7 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Wed, 18 Sep 2024 17:42:37 +0200
Subject: [PATCH 02/22] final touch

---
 BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml    | 4 ++--
 BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index d9d1d4303..c1d1b434d 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -44,8 +44,8 @@
         VerticalScrollBarVisibility="Auto">
         <Grid x:Name="grid">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition x:Name="grid_secondcolumn" Width="10*" />
+                <ColumnDefinition Width="3*" />
+                <ColumnDefinition x:Name="grid_secondcolumn" Width="7*" />
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="auto" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
index d26716b6a..abde96f2b 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
@@ -95,7 +95,7 @@ namespace BeWo.View.Controls.Wohnhilfe
 
         private void SetLarge()
         {
-            grid_secondcolumn.Width = new GridLength(2, GridUnitType.Star);
+            grid_secondcolumn.Width = new GridLength(7, GridUnitType.Star);
 
             Grid.SetColumn(groupbox_2, 1);
             Grid.SetRow(groupbox_2, 0);

From 2a23ad2ca16c1da45350cbe88654ef44563ebdaa Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Thu, 19 Sep 2024 15:34:32 +0200
Subject: [PATCH 03/22] Neue Style Struktur

---
 BeWo/BeWo.csproj                              |  71 ++++
 BeWo/DebugConfig.cs                           |   6 +-
 BeWo/Styles/Colors/Colors.xaml                |   4 +
 BeWo/Styles/ControlStyles/ButtonStyles.xaml   | 139 ++++++++
 BeWo/Styles/ControlStyles/CheckBoxStyles.xaml |   7 +
 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml | 145 ++++++++
 .../ControlStyles/CustomControlsStyles.xaml   |   9 +
 BeWo/Styles/ControlStyles/DateEditStyles.xaml |  42 +++
 BeWo/Styles/ControlStyles/LabelStyles.xaml    |  18 +
 BeWo/Styles/ControlStyles/ListBoxStyles.xaml  |  27 ++
 .../ControlStyles/NullItemComboBoxStyles.xaml | 146 ++++++++
 .../ControlStyles/RadioButtonStyles.xaml      |   7 +
 BeWo/Styles/ControlStyles/TextBoxStyles.xaml  |  67 ++++
 BeWo/Styles/ControlStyles/TextEditStyles.xaml |  34 ++
 .../ControlStyles/ToggleButtonStyles.xaml     | 149 ++++++++
 .../DataTemplates/ControlTemplates.xaml       |  92 +++++
 BeWo/Styles/DataTemplates/DataTemplates.xaml  |   6 +
 BeWo/Styles/ModernOrangeBlack.xaml            |  43 +++
 BeWo/Styles/OrangeBlack.xaml                  |   4 +-
 BeWo/Styles/PrototypeStyles.xaml              | 317 -----------------
 .../CustomerVermittlungArbeitControl.xaml     |   2 +-
 .../Wohnhilfe/CustomerWohnhilfeControl.xaml   |  43 ++-
 .../Detail/CustomerVermittlungArbeitView.xaml |   2 +-
 BeWo/View/Detail/CustomerWohnhilfeView.xaml   |   2 +-
 .../WohneinheitBelegungEditControl.xaml       |   6 +-
 .../WohneinheitBelegungEditPopup.xaml         |   4 +-
 .../WohneinheitBelegungWindow.xaml            |  30 +-
 .../Wohneinheit/WohneinheitEditPopup.xaml     |  27 +-
 .../Wohneinheit/WohneinheitEditPopup.xaml.cs  |  12 +-
 .../WohneinheitGrundrissControl.xaml          |  55 +++
 .../WohneinheitGrundrissControl.xaml.cs       |  87 +++++
 .../WohneinheitGrundrissModalPopup.xaml       |  98 ++----
 .../WohneinheitGrundrissModalPopup.xaml.cs    |  62 +---
 .../WohneinheitVerwaltungViewV1.xaml          |   4 +-
 .../WohneinheitVerwaltungViewV1.xaml.cs       |   4 +-
 .../WohneinheitVerwaltungViewV2.xaml          | 324 +++++++++---------
 .../ListViewModel/WohneinheitListVM.cs        |   5 +-
 37 files changed, 1431 insertions(+), 669 deletions(-)
 create mode 100644 BeWo/Styles/Colors/Colors.xaml
 create mode 100644 BeWo/Styles/ControlStyles/ButtonStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/CheckBoxStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/CustomControlsStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/DateEditStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/LabelStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/ListBoxStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/TextBoxStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/TextEditStyles.xaml
 create mode 100644 BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml
 create mode 100644 BeWo/Styles/DataTemplates/ControlTemplates.xaml
 create mode 100644 BeWo/Styles/DataTemplates/DataTemplates.xaml
 create mode 100644 BeWo/Styles/ModernOrangeBlack.xaml
 create mode 100644 BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
 create mode 100644 BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 25e82a4ef..53c36d97a 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -269,6 +269,70 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Styles\Colors\Colors.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\CheckBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ComboBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\CustomControlsStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\DateEditStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\LabelStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ListBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\NullItemComboBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\RadioButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\TextBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\TextEditStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ControlStyles\ToggleButtonStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\DataTemplates\ControlTemplates.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\DataTemplates\DataTemplates.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\ModernOrangeBlack.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\PrototypeStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -367,6 +431,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="View\Detail\Wohneinheit\WohneinheitGrundrissControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="View\Detail\Wohneinheit\WohneinheitGrundrissModalPopup.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1260,6 +1328,9 @@
     <Compile Include="View\Detail\Wohneinheit\WohneinheitBelegungWindow.xaml.cs">
       <DependentUpon>WohneinheitBelegungWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="View\Detail\Wohneinheit\WohneinheitGrundrissControl.xaml.cs">
+      <DependentUpon>WohneinheitGrundrissControl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="View\Detail\Wohneinheit\WohneinheitGrundrissModalPopup.xaml.cs">
       <DependentUpon>WohneinheitGrundrissModalPopup.xaml</DependentUpon>
     </Compile>
diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index e5cb9cf9f..fcf3a8142 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -22,7 +22,7 @@ namespace BeWo
             {
                 #if DEBUG
 
-                return _CurrentConfig ?? (_CurrentConfig = FeatureCustomerWohnhilfe);
+                return _CurrentConfig ?? (_CurrentConfig = Feature_Customer_Wohnhilfe);
 
                 #endif
 
@@ -42,14 +42,14 @@ namespace BeWo
             AutoLogin = true
         };
 
-        public static DebugConfig FeatureCustomerWohnhilfe => new DebugConfig()
+        public static DebugConfig Feature_Customer_Wohnhilfe => new DebugConfig()
         {
             DebugConfigMode = DebugConfigMode.FeatureCustomerWohnhilfe,
             AutoLogin = true,
             SelectView = UIContext.Customer
         };
 
-        public static DebugConfig FeatureWohnheimWohneinheit => new DebugConfig()
+        public static DebugConfig Feature_Wohnheim_Wohneinheit => new DebugConfig()
         {
             DebugConfigMode = DebugConfigMode.FeatureWohnheimWohneinheit,
             AutoLogin = true,
diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
new file mode 100644
index 000000000..87e38a3b3
--- /dev/null
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="TextBoxBorderBrush" Color="#FF86878F" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ButtonStyles.xaml b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
new file mode 100644
index 000000000..abe9b7e68
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
@@ -0,0 +1,139 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--Base-->
+    <Style x:Key="BaseButton" TargetType="{x:Type Button}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="25" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Foreground" Value="#FFFFFFFF" />
+        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="FontSize" Value="12" />
+    </Style>
+
+    <Style
+        x:Key="PrimaryButton"
+        BasedOn="{StaticResource BaseButton}"
+        TargetType="{x:Type Button}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border
+                        x:Name="border"
+                        Padding="0,0,0,0"
+                        BorderBrush="#FF000000"
+                        BorderThickness="1,1,1,1"
+                        CornerRadius="4,4,4,4">
+                        <Border.Background>
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#FF000000" />
+                                <GradientStop Offset="1" Color="#FF262626" />
+                            </LinearGradientBrush>
+                        </Border.Background>
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="0.5*" />
+                                <RowDefinition Height="0.5*" />
+                            </Grid.RowDefinitions>
+                            <Border
+                                x:Name="glow"
+                                Grid.RowSpan="2"
+                                Width="Auto"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,4,4"
+                                Opacity="0">
+                                <Border.Background>
+                                    <RadialGradientBrush>
+                                        <RadialGradientBrush.RelativeTransform>
+                                            <TransformGroup>
+                                                <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                <SkewTransform AngleX="0" AngleY="0" />
+                                                <RotateTransform Angle="0" />
+                                                <TranslateTransform X="-0.368" Y="-0.152" />
+                                            </TransformGroup>
+                                        </RadialGradientBrush.RelativeTransform>
+                                        <GradientStop Offset="0" Color="#B28DBDFF" />
+                                        <GradientStop Offset="1" Color="#008DBDFF" />
+                                    </RadialGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                x:Name="shine"
+                                Grid.Row="0"
+                                Width="Auto"
+                                Margin="0,0,0,0"
+                                HorizontalAlignment="Stretch"
+                                CornerRadius="4,4,0,0">
+                                <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                        <GradientStop Offset="0" Color="#99FFFFFF" />
+                                        <GradientStop Offset="1" Color="#33FFFFFF" />
+                                    </LinearGradientBrush>
+                                </Border.Background>
+                            </Border>
+                            <Border
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Margin="0,0,0,0">
+                                <ContentPresenter
+                                    Width="Auto"
+                                    Margin="3,0,3,0"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center" />
+                            </Border>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#998DBDFF" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="border" Property="Background" Value="#FF808080" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style
+        x:Key="HideDisabledButton"
+        BasedOn="{StaticResource PrimaryButton}"
+        TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml b/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml
new file mode 100644
index 000000000..9a8a06781
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/CheckBoxStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="CheckBoxBase" TargetType="{x:Type CheckBox}">
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
new file mode 100644
index 000000000..d6b503b32
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -0,0 +1,145 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:BeWo.Converter"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+
+    <!--  ComboBox  -->
+    <Style x:Key="PrimaryComboBox" TargetType="ComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="#FF000000" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="#FF8AC5FF" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="NoWrapComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    
+    <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
+    <DataTemplate x:Key="ListItemView">
+        <TextBlock
+            Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
+            ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
+    </DataTemplate>
+    <Style
+        x:Key="EnumTranslationComboBox"
+        BasedOn="{StaticResource PrimaryComboBox}"
+        TargetType="ComboBox">
+        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml b/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml
new file mode 100644
index 000000000..2ec4715c5
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/CustomControlsStyles.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:uc="clr-namespace:BeWo.View.Controls">
+    <Style x:Key="BaseCustomerSelectionControl" TargetType="{x:Type uc:CustomerSelectionControl}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="32" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/DateEditStyles.xaml b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
new file mode 100644
index 000000000..be8854fb6
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
@@ -0,0 +1,42 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxei="http://schemas.devexpress.com/winfx/2008/xaml/editors/internal"
+    xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys">
+    <Style
+        x:Key="BaseDateEdit"
+        BasedOn="{StaticResource {x:Type dxe:DateEdit}}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+    </Style>
+    <Style
+        x:Key="PrimaryDateEdit"
+        BasedOn="{StaticResource BaseDateEdit}"
+        TargetType="{x:Type dxe:DateEdit}">
+        <Style.Resources>
+            <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
+                <dx:ToggleStateButton
+                    x:Name="PART_Item"
+                    Margin="2"
+                    dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
+                    IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
+                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                <DataTemplate.Triggers>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="True">
+                        <Setter TargetName="PART_Item" Property="IsChecked" Value="{Binding Path=(dxe:BaseEdit.OwnerEdit).IsPopupOpen, RelativeSource={RelativeSource Self}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                    </DataTrigger>
+                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
+                        <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
+                    </DataTrigger>
+                </DataTemplate.Triggers>
+            </DataTemplate>
+        </Style.Resources>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/LabelStyles.xaml b/BeWo/Styles/ControlStyles/LabelStyles.xaml
new file mode 100644
index 000000000..3b69cc776
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/LabelStyles.xaml
@@ -0,0 +1,18 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseLabel" TargetType="Label">
+        <Setter Property="IsEnabled" Value="True" />
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+
+    <Style x:Key="Header1" TargetType="Label">
+        <Setter Property="TextElement.FontSize" Value="16" />
+        <Setter Property="TextElement.Foreground" Value="{StaticResource TabItemHotTextBrush}" />
+        <Setter Property="TextElement.FontFamily" Value="Microsoft Sans Serif" />
+        <Setter Property="Padding" Value="3,0,3,0" />
+        <Setter Property="MinHeight" Value="20" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Margin" Value="3,-6,3,6" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ListBoxStyles.xaml b/BeWo/Styles/ControlStyles/ListBoxStyles.xaml
new file mode 100644
index 000000000..db8eee48f
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ListBoxStyles.xaml
@@ -0,0 +1,27 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  ListBoxItems  -->
+    <Style x:Key="PhotoListBoxItem" TargetType="ListBoxItem">
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Style.Resources>
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.HighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+            <SolidColorBrush
+                x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey}"
+                Opacity="0.4"
+                Color="AliceBlue" />
+        </Style.Resources>
+    </Style>
+
+    <!--  ListBox  -->
+    <Style x:Key="PhotoListBox" TargetType="{x:Type ListBox}">
+        <Setter Property="Foreground" Value="Black" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="MinHeight" Value="100" />
+        <Setter Property="MaxHeight" Value="800" />
+        <Setter Property="IsSynchronizedWithCurrentItem" Value="True" />
+        <Setter Property="SelectionMode" Value="Single" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource PhotoListBoxItem}" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
new file mode 100644
index 000000000..4d3cbe084
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
@@ -0,0 +1,146 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
+
+    <!--  NullItemComboBox  -->
+    <Style x:Key="PrimaryNullItemComboBox" TargetType="uc:NullItemComboBox">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+        <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource TextBoxBorderBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type uc:NullItemComboBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border
+                            x:Name="Bd"
+                            Padding="1"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid Grid.IsSharedSizeScope="true">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="1" />
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                                </Grid.ColumnDefinitions>
+                                <Border
+                                    x:Name="SelectedItemBorder"
+                                    Grid.ColumnSpan="2"
+                                    Margin="2,1,20,1">
+                                    <ContentPresenter
+                                        Margin="3,0"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        Content="{TemplateBinding SelectionBoxItem}"
+                                        ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                        ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                </Border>
+                                <ToggleButton
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="3"
+                                    IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                                <Label
+                                    x:Name="label_nullText"
+                                    Grid.Column="0"
+                                    Grid.ColumnSpan="2"
+                                    Margin="5,3,20,3"
+                                    Padding="0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Content="{TemplateBinding NullText}"
+                                    IsHitTestVisible="False"
+                                    Visibility="Hidden" />
+                            </Grid>
+                        </Border>
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="true"
+                            Focusable="false"
+                            IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                            Placement="Bottom"
+                            PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                            <Microsoft_Windows_Themes:SystemDropShadowChrome
+                                x:Name="Shdw"
+                                MinWidth="{TemplateBinding ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Color="Transparent">
+                                <Border
+                                    x:Name="DropDownBorder"
+                                    Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                    BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                                    BorderThickness="1">
+                                    <ScrollViewer>
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Border>
+                            </Microsoft_Windows_Themes:SystemDropShadowChrome>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelectionBoxHighlighted" Value="true" />
+                                <Condition Property="IsDropDownOpen" Value="false" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelectionBoxHighlighted" Value="true">
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                            <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                            <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="false">
+                            <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="true">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+                        </Trigger>
+                        <Trigger Property="SelectedItem" Value="{x:Null}">
+                            <Setter TargetName="label_nullText" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsEditable" Value="true">
+                <Setter Property="IsTabStop" Value="false" />
+                <Setter Property="Padding" Value="0,1" />
+                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style
+        x:Key="EnumTranslationNullItemComboBox"
+        BasedOn="{StaticResource PrimaryNullItemComboBox}"
+        TargetType="{x:Type uc:NullItemComboBox}">
+        <Setter Property="ItemTemplate" Value="{DynamicResource ListItemView}" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
new file mode 100644
index 000000000..0227101bb
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
@@ -0,0 +1,7 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--Base-->
+    <Style x:Key="BaseRadioButton" TargetType="RadioButton">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextBoxStyles.xaml b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
new file mode 100644
index 000000000..03f97a58e
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/TextBoxStyles.xaml
@@ -0,0 +1,67 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="TextBoxBase" TargetType="{x:Type TextBox}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+    </Style>
+
+    <Style
+        x:Key="TextBoxNoticeBase"
+        BasedOn="{StaticResource TextBoxBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="AcceptsReturn" Value="True" />
+        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
+    </Style>
+    <Style
+        x:Key="TextBoxNotice"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MaxHeight" Value="150" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeLarge"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MaxHeight" Value="300" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="150" />
+        <Setter Property="Height" Value="150" />
+        <Setter Property="MaxHeight" Value="150" />
+    </Style>
+    <Style
+        x:Key="TextBoxNoticeSmallExtended"
+        BasedOn="{StaticResource TextBoxNoticeBase}"
+        TargetType="{x:Type TextBox}">
+        <Setter Property="MinHeight" Value="75" />
+        <Setter Property="MaxHeight" Value="75" />
+    </Style>
+
+    <Style x:Key="ComboBoxEditableTextBox" TargetType="{x:Type TextBox}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <ScrollViewer
+                        x:Name="PART_ContentHost"
+                        Background="Transparent"
+                        Focusable="false"
+                        HorizontalScrollBarVisibility="Hidden"
+                        VerticalScrollBarVisibility="Hidden" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
new file mode 100644
index 000000000..149f315ae
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -0,0 +1,34 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+    <Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Height" Value="23" />
+    </Style>
+    <Style
+        x:Key="TextEditYear"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="0000" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+    </Style>
+    <Style
+        x:Key="TextEditQm"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.00 qm" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+    </Style>
+    <Style
+        x:Key="TextEditCurrency"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="######0.## $" />
+        <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml b/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml
new file mode 100644
index 000000000..1829f1fff
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/ToggleButtonStyles.xaml
@@ -0,0 +1,149 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="ComboBoxTransparentButtonStyle" TargetType="{x:Type ToggleButton}">
+        <Setter Property="MinWidth" Value="0" />
+        <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Width" Value="Auto" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="ClickMode" Value="Press" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Timeline1">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="1.3"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="Timeline2">
+                            <DoubleAnimationUsingKeyFrames
+                                BeginTime="00:00:00"
+                                Storyboard.TargetName="glow"
+                                Storyboard.TargetProperty="(UIElement.Opacity)">
+                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="border"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
+                                Duration="0:0:0.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Border
+                            x:Name="border"
+                            Grid.Column="1"
+                            Width="{DynamicResource {x:Static SystemParameters.ScrollWidthKey}}"
+                            Margin="0,0,0,0"
+                            Padding="0,0,0,0"
+                            BorderBrush="#FF000000"
+                            BorderThickness="1,1,1,1"
+                            CornerRadius="4,4,4,4">
+                            <Border.Background>
+                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Offset="0" Color="#FF000000" />
+                                    <GradientStop Offset="1" Color="#FF262626" />
+                                </LinearGradientBrush>
+                            </Border.Background>
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="0.5*" />
+                                    <RowDefinition Height="0.5*" />
+                                </Grid.RowDefinitions>
+                                <Border
+                                    x:Name="glow"
+                                    Grid.RowSpan="2"
+                                    Width="Auto"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,3,3"
+                                    Opacity="0">
+                                    <Border.Background>
+                                        <RadialGradientBrush>
+                                            <RadialGradientBrush.RelativeTransform>
+                                                <TransformGroup>
+                                                    <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
+                                                    <SkewTransform AngleX="0" AngleY="0" />
+                                                    <RotateTransform Angle="0" />
+                                                    <TranslateTransform X="-0.368" Y="-0.152" />
+                                                </TransformGroup>
+                                            </RadialGradientBrush.RelativeTransform>
+                                            <GradientStop Offset="0" Color="#B28DBDFF" />
+                                            <GradientStop Offset="1" Color="#008DBDFF" />
+                                        </RadialGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <Border
+                                    x:Name="shine"
+                                    Grid.Row="0"
+                                    Width="Auto"
+                                    Margin="0,0,0,0"
+                                    HorizontalAlignment="Stretch"
+                                    CornerRadius="3,3,0,0">
+                                    <Border.Background>
+                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                            <GradientStop Offset="0" Color="#99FFFFFF" />
+                                            <GradientStop Offset="1" Color="#33FFFFFF" />
+                                        </LinearGradientBrush>
+                                    </Border.Background>
+                                </Border>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontFamily="Webdings"
+                                    FontSize="9"
+                                    Text="6"
+                                    TextWrapping="Wrap">
+                                    <TextBlock.Foreground>
+                                        <SolidColorBrush Color="{DynamicResource {x:Static SystemColors.ControlColorKey}}" />
+                                    </TextBlock.Foreground>
+                                </TextBlock>
+                            </Grid>
+                        </Border>
+
+                        <!-- <ToggleButton x:Name="Chrome" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Style="{StaticResource ComboBoxReadonlyToggleButton}" Grid.ColumnSpan="2" IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"/>-->
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
+                            <Setter TargetName="border" Property="Background" Value="#99FFA500" />
+                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/DataTemplates/ControlTemplates.xaml b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
new file mode 100644
index 000000000..c80f0ce16
--- /dev/null
+++ b/BeWo/Styles/DataTemplates/ControlTemplates.xaml
@@ -0,0 +1,92 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    <Style x:Key="ComboBoxFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle
+                        Margin="4,4,21,4"
+                        SnapsToDevicePixels="true"
+                        Stroke="Black"
+                        StrokeDashArray="1 2"
+                        StrokeThickness="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--  Control Templates  -->
+    <ControlTemplate x:Key="ComboBoxEditableTemplate" TargetType="{x:Type ComboBox}">
+        <Grid SnapsToDevicePixels="true">
+            <Border
+                x:Name="Bd"
+                Padding="1"
+                Background="{TemplateBinding Background}"
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+                <Grid Grid.IsSharedSizeScope="true">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" SharedSizeGroup="ComboBoxButton" />
+                    </Grid.ColumnDefinitions>
+                    <TextBox
+                        x:Name="PART_EditableTextBox"
+                        Grid.Column="1"
+                        Margin="{TemplateBinding Padding}"
+                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                        VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                        IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxEditableTextBox}" />
+                    <ToggleButton
+                        Grid.Column="0"
+                        Grid.ColumnSpan="3"
+                        Background="{x:Null}"
+                        IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                        Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                </Grid>
+            </Border>
+            <Popup
+                x:Name="PART_Popup"
+                AllowsTransparency="true"
+                Focusable="false"
+                IsOpen="{Binding Path=IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                Placement="Bottom"
+                PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}">
+                <Microsoft_Windows_Themes:SystemDropShadowChrome
+                    x:Name="Shdw"
+                    MinWidth="{TemplateBinding ActualWidth}"
+                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                    Color="Transparent">
+                    <Border
+                        x:Name="DropDownBorder"
+                        Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                        BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
+                        BorderThickness="1">
+                        <ScrollViewer>
+                            <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </Microsoft_Windows_Themes:SystemDropShadowChrome>
+            </Popup>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="HasItems" Value="false">
+                <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                <Setter TargetName="Bd" Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+            </Trigger>
+            <Trigger Property="IsGrouping" Value="true">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="false" />
+            </Trigger>
+            <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
+                <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
+                <Setter TargetName="Shdw" Property="Color" Value="#71000000" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/DataTemplates/DataTemplates.xaml b/BeWo/Styles/DataTemplates/DataTemplates.xaml
new file mode 100644
index 000000000..2e8f8179a
--- /dev/null
+++ b/BeWo/Styles/DataTemplates/DataTemplates.xaml
@@ -0,0 +1,6 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:BeWo.Converter">
+    
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ModernOrangeBlack.xaml b/BeWo/Styles/ModernOrangeBlack.xaml
new file mode 100644
index 000000000..945963d94
--- /dev/null
+++ b/BeWo/Styles/ModernOrangeBlack.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:uc="clr-namespace:BeWo.View.Controls">
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="Colors\Colors.xaml" />
+
+        <ResourceDictionary Source="DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="DataTemplates\DataTemplates.xaml" />
+
+        <ResourceDictionary Source="ControlStyles\ButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CheckBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ComboBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\CustomControlsStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\DateEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\LabelStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ListBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\RadioButtonStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextBoxStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\TextEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\ToggleButtonStyles.xaml" />
+
+        <!--  Benötigt TextBoxStyles + ToggleButtonStyles  -->
+        <ResourceDictionary Source="ControlStyles\NullItemComboBoxStyles.xaml" />
+
+    </ResourceDictionary.MergedDictionaries>
+
+    <!--  Default Styles  -->
+    <Style BasedOn="{StaticResource HideDisabledButton}" TargetType="Button" />
+    <Style BasedOn="{StaticResource CheckBoxBase}" TargetType="CheckBox" />
+    <Style BasedOn="{StaticResource NoWrapComboBox}" TargetType="ComboBox" />
+    <Style BasedOn="{StaticResource BaseCustomerSelectionControl}" TargetType="uc:CustomerSelectionControl" />
+    <Style BasedOn="{StaticResource PrimaryDateEdit}" TargetType="dxe:DateEdit" />
+    <Style BasedOn="{StaticResource BaseLabel}" TargetType="Label" />
+    <Style BasedOn="{StaticResource PrimaryNullItemComboBox}" TargetType="controls:NullItemComboBox" />
+    <Style BasedOn="{StaticResource BaseRadioButton}" TargetType="RadioButton" />
+    <Style BasedOn="{StaticResource TextBoxBase}" TargetType="TextBox" />
+    <Style BasedOn="{StaticResource BaseTextEdit}" TargetType="dxe:TextEdit" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/OrangeBlack.xaml b/BeWo/Styles/OrangeBlack.xaml
index e7eff565a..8830a0f09 100644
--- a/BeWo/Styles/OrangeBlack.xaml
+++ b/BeWo/Styles/OrangeBlack.xaml
@@ -1367,13 +1367,13 @@
                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                         IsReadOnly="{Binding Path=IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                        Style="{StaticResource ComboBoxEditableTextBox}" />
+                        Style="{DynamicResource ComboBoxEditableTextBox}" />
                     <ToggleButton
                         Grid.Column="0"
                         Grid.ColumnSpan="3"
                         Background="{x:Null}"
                         IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                        Style="{StaticResource ComboBoxTransparentButtonStyle}" />
+                        Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
                 </Grid>
             </Border>
             <Popup
diff --git a/BeWo/Styles/PrototypeStyles.xaml b/BeWo/Styles/PrototypeStyles.xaml
index 23c6122e9..4d80e9a27 100644
--- a/BeWo/Styles/PrototypeStyles.xaml
+++ b/BeWo/Styles/PrototypeStyles.xaml
@@ -9,321 +9,4 @@
     xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys"
     xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
-
-    <Style x:Key="ButtonGrayDisabledStyle" TargetType="{x:Type Button}">
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Height" Value="25" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Foreground" Value="#FFFFFFFF" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="Timeline1">
-                            <DoubleAnimationUsingKeyFrames
-                                BeginTime="00:00:00"
-                                Storyboard.TargetName="glow"
-                                Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="1" />
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="Timeline2">
-                            <DoubleAnimationUsingKeyFrames
-                                BeginTime="00:00:00"
-                                Storyboard.TargetName="glow"
-                                Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.3000000" Value="0" />
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Border
-                        x:Name="border"
-                        Padding="0,0,0,0"
-                        BorderBrush="#FF000000"
-                        BorderThickness="1,1,1,1"
-                        CornerRadius="4,4,4,4">
-                        <Border.Background>
-                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                <GradientStop Offset="0" Color="#FF000000" />
-                                <GradientStop Offset="1" Color="#FF262626" />
-                            </LinearGradientBrush>
-                        </Border.Background>
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="0.5*" />
-                                <RowDefinition Height="0.5*" />
-                            </Grid.RowDefinitions>
-                            <Border
-                                x:Name="glow"
-                                Grid.RowSpan="2"
-                                Width="Auto"
-                                HorizontalAlignment="Stretch"
-                                CornerRadius="4,4,4,4"
-                                Opacity="0">
-                                <Border.Background>
-                                    <RadialGradientBrush>
-                                        <RadialGradientBrush.RelativeTransform>
-                                            <TransformGroup>
-                                                <ScaleTransform ScaleX="1.702" ScaleY="2.243" />
-                                                <SkewTransform AngleX="0" AngleY="0" />
-                                                <RotateTransform Angle="0" />
-                                                <TranslateTransform X="-0.368" Y="-0.152" />
-                                            </TransformGroup>
-                                        </RadialGradientBrush.RelativeTransform>
-                                        <GradientStop Offset="0" Color="#B28DBDFF" />
-                                        <GradientStop Offset="1" Color="#008DBDFF" />
-                                    </RadialGradientBrush>
-                                </Border.Background>
-                            </Border>
-                            <Border
-                                x:Name="shine"
-                                Grid.Row="0"
-                                Width="Auto"
-                                Margin="0,0,0,0"
-                                HorizontalAlignment="Stretch"
-                                CornerRadius="4,4,0,0">
-                                <Border.Background>
-                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                        <GradientStop Offset="0" Color="#99FFFFFF" />
-                                        <GradientStop Offset="1" Color="#33FFFFFF" />
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                            </Border>
-                            <Border
-                                Grid.Row="0"
-                                Grid.RowSpan="2"
-                                Margin="0,0,0,0">
-                                <ContentPresenter
-                                    Width="Auto"
-                                    Margin="3,0,3,0"
-                                    HorizontalAlignment="Center"
-                                    VerticalAlignment="Center" />
-                            </Border>
-                        </Grid>
-                    </Border>
-
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter TargetName="shine" Property="Opacity" Value="0.4" />
-                            <Setter TargetName="border" Property="Background" Value="#998DBDFF" />
-                            <Setter TargetName="glow" Property="Visibility" Value="Hidden" />
-                            <Setter TargetName="border" Property="BorderBrush" Value="#FF0C0C0C" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource Timeline1}" />
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard x:Name="Timeline2_BeginStoryboard" Storyboard="{StaticResource Timeline2}" />
-                            </Trigger.ExitActions>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter TargetName="border" Property="Background" Value="#FF808080" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="FontFamily" Value="Microsoft Sans Serif" />
-        <Setter Property="FontSize" Value="12" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="Margin" Value="3" />
-    </Style>
-
-    <Style x:Key="TitleLabel" TargetType="Label">
-        <Setter Property="TextElement.FontSize" Value="16" />
-        <Setter Property="TextElement.Foreground" Value="{StaticResource TabItemHotTextBrush}" />
-        <Setter Property="TextElement.FontFamily" Value="Microsoft Sans Serif" />
-        <Setter Property="Padding" Value="3,0,3,0" />
-        <Setter Property="MinHeight" Value="20" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="Margin" Value="3,-6,3,6" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="uc:NullItemComboBox">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="23" />
-        <Setter Property="ItemTemplate">
-            <Setter.Value>
-                <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
-                </DataTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="{x:Type CheckBox}">
-        <Setter Property="Margin" Value="5" />
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-    </Style>
-
-    <!--<Style TargetType="dxe:DateEdit" BasedOn="{StaticResource {x:Type dxe:DateEdit}}" x:Shared="False">
-            <Setter Property="Margin" Value="3"/>
-            <Setter Property="Height" Value="23"/>
-            <Setter Property="AllowDefaultButton" Value="False"/>
-            <Setter Property="Buttons">
-                <Setter.Value>
-                    <dxe:ButtonInfoCollection >
-                        <dxe:ButtonInfo IsDefaultButton="True" x:Shared="False">
-                            <dxe:ButtonInfo.Template>
-                                <DataTemplate>
-                                    <ToggleButton x:Name="PART_Item" Style="{StaticResource ComboBoxTransparentButtonStyle}"/>
-                                </DataTemplate>
-                            </dxe:ButtonInfo.Template>
-                        </dxe:ButtonInfo>
-                    </dxe:ButtonInfoCollection>
-                </Setter.Value>
-            </Setter>
-        </Style>-->
-    <Style BasedOn="{StaticResource {x:Type dxe:DateEdit}}" TargetType="{x:Type dxe:DateEdit}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="1" />
-        <Setter Property="Height" Value="23" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Style.Resources>
-            <DataTemplate x:Key="{dxet:ButtonsThemeKey ResourceKey=ToggleButtonInfoTemplate, IsThemeIndependent=True}">
-                <dx:ToggleStateButton
-                    x:Name="PART_Item"
-                    Margin="2"
-                    dxei:SetIsCheckedToButtonInfoBehavior.IsEnabled="True"
-                    IsChecked="{Binding Path=IsChecked, Mode=TwoWay}"
-                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
-                <DataTemplate.Triggers>
-                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="True">
-                        <Setter TargetName="PART_Item" Property="IsChecked" Value="{Binding Path=(dxe:BaseEdit.OwnerEdit).IsPopupOpen, RelativeSource={RelativeSource Self}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-                    </DataTrigger>
-                    <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
-                        <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
-                    </DataTrigger>
-                </DataTemplate.Triggers>
-            </DataTemplate>
-        </Style.Resources>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type dxe:TextEdit}}" TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="23" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type Button}}" TargetType="{x:Type Button}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Visibility" Value="Visible" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsEnabled}" Value="False">
-                <Setter Property="Visibility" Value="Collapsed" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="{x:Type Label}">
-        <Setter Property="IsEnabled" Value="True" />
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-    <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type TextBox}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-    </Style>
-    <Style TargetType="RadioButton">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-    </Style>
-
-    <DataTemplate x:Key="ListItemView">
-        <TextBlock
-            Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
-            TextWrapping="NoWrap"
-            ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
-    </DataTemplate>
-    <Style
-        x:Key="EnumTranslationNullItemComboBox"
-        BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}"
-        TargetType="{x:Type uc:NullItemComboBox}">
-        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
-    </Style>
-    <Style
-        x:Key="EnumTranslationComboBox"
-        BasedOn="{StaticResource {x:Type ComboBox}}"
-        TargetType="{x:Type ComboBox}">
-        <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
-    </Style>
-
-    <Style
-        x:Key="TextEditYearStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="0000" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-    </Style>
-    <Style
-        x:Key="TextEditQmStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="######0.00 qm" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-    </Style>
-    <Style
-        x:Key="TextEditCurrencyStyle"
-        BasedOn="{StaticResource {x:Type dxe:TextEdit}}"
-        TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="######0.## $" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
-        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeBaseStyle"
-        BasedOn="{StaticResource {x:Type TextBox}}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="23" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="AcceptsReturn" Value="True" />
-        <Setter Property="VerticalScrollBarVisibility" Value="Auto" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MaxHeight" Value="150" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeLargeStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MaxHeight" Value="300" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeExtendedStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="150" />
-        <Setter Property="Height" Value="150" />
-        <Setter Property="MaxHeight" Value="150" />
-    </Style>
-    <Style
-        x:Key="TextBoxNoticeSmallExtendedStyle"
-        BasedOn="{StaticResource TextBoxNoticeBaseStyle}"
-        TargetType="{x:Type TextBox}">
-        <Setter Property="MinHeight" Value="75" />
-        <Setter Property="MaxHeight" Value="75" />
-    </Style>
-
-    <Style TargetType="{x:Type control:CustomerSelectionControl}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Height" Value="32" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 968f03f22..61488d697 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -20,7 +20,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource ObjectEditGroupBox}" TargetType="{x:Type GroupBox}">
                 <Setter Property="Margin" Value="15" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index c1d1b434d..64be906c8 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -15,15 +15,15 @@
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     xmlns:wohnhilfe="clr-namespace:BeWo.View.Controls.Wohnhilfe"
     x:Name="root_usercontrol"
+    HorizontalAlignment="Stretch"
     d:DataContext="{d:DesignInstance d:Type=viewmodel:CustomerWohnhilfeVM,
                                      IsDesignTimeCreatable=True}"
     SizeChanged="UserControl_SizeChanged"
-    HorizontalAlignment="Stretch"
     mc:Ignorable="d cs">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style BasedOn="{StaticResource ObjectEditGroupBox}" TargetType="{x:Type GroupBox}">
                 <Setter Property="Margin" Value="15" />
@@ -35,7 +35,6 @@
             </Style>
             <Style BasedOn="{StaticResource EnumTranslationNullItemComboBox}" TargetType="{x:Type uc:NullItemComboBox}" />
             <Style BasedOn="{StaticResource EnumTranslationComboBox}" TargetType="{x:Type ComboBox}" />
-
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer
@@ -67,7 +66,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -176,10 +178,16 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -197,7 +205,7 @@
                         Grid.Row="0"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         zu Beginn
                     </Label>
                     <Rectangle
@@ -212,7 +220,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         am Ende
                     </Label>
 
@@ -308,7 +316,10 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition Width="*" MinWidth="100" MaxWidth="400"/>
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -466,10 +477,16 @@
                 <Grid>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition Width="auto" />
-                        <ColumnDefinition  Width="*" MinWidth="100" MaxWidth="400" />
+                        <ColumnDefinition
+                            Width="*"
+                            MinWidth="100"
+                            MaxWidth="400" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto" />
@@ -483,7 +500,7 @@
                         Grid.Row="0"
                         Grid.Column="0"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         zu Beginn
                     </Label>
                     <Rectangle
@@ -498,7 +515,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         Grid.ColumnSpan="2"
-                        Style="{StaticResource TitleLabel}">
+                        Style="{StaticResource Header1}">
                         am Ende
                     </Label>
 
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index 033f8d46b..bea38e4af 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -12,7 +12,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index 8d83cd123..f3c2a873d 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -17,7 +17,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
index b902c3659..2de4d58cd 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditControl.xaml
@@ -17,7 +17,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -91,7 +91,7 @@
                 Grid.Row="5"
                 Grid.Column="2"
                 Grid.ColumnSpan="5"
-                Style="{StaticResource TextBoxNoticeLargeStyle}"
+                Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding Path=WohneinheitBelegungListVM.CurrentVM.Kommentar, UpdateSourceTrigger=PropertyChanged}" />
             <StackPanel
                 x:Name="stackpanel_buttons"
@@ -105,7 +105,7 @@
                     Margin="3"
                     Click="Save_Button_Click"
                     IsEnabled="{Binding Path=WohneinheitBelegungListVM.CurrentVM.CanSave, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource ButtonGrayDisabledStyle}">
+                    Style="{StaticResource PrimaryButton}">
                     Hinzufügen
                 </Button>
                 <Button
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
index 6fe8cada8..25fb91a3e 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungEditPopup.xaml
@@ -14,7 +14,7 @@
     <Popup.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Popup.Resources>
@@ -89,7 +89,7 @@
                 Grid.Row="5"
                 Grid.Column="2"
                 Grid.ColumnSpan="5"
-                Style="{StaticResource TextBoxNoticeLargeStyle}"
+                Style="{StaticResource TextBoxNoticeLarge}"
                 Text="{Binding Path=WohneinheitBelegungListVM.CurrentVM.Kommentar, UpdateSourceTrigger=PropertyChanged}" />
                 <StackPanel
                 Grid.Row="7"
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
index 012dd0db6..63b1300f6 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitBelegungWindow.xaml
@@ -1,20 +1,20 @@
-<dx:ThemedWindow x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitBelegungWindow"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
-        xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
-        mc:Ignorable="d"
-        Title="WohneinheitBelegungWindow" SizeToContent="WidthAndHeight"
-                 Height="400">
+<dx:ThemedWindow
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitBelegungWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="WohneinheitBelegungWindow"
+    Height="400"
+    SizeToContent="WidthAndHeight"
+    mc:Ignorable="d">
     <dxmvvm:Interaction.Behaviors>
         <dxmvvm:CurrentWindowService ClosingCommand="{Binding WindowClosingCommand}" />
     </dxmvvm:Interaction.Behaviors>
-    <Grid
-                HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch">
-        <local:WohneinheitBelegungEditControl DataContext="{Binding}"/>
+    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+        <local:WohneinheitBelegungEditControl DataContext="{Binding}" />
     </Grid>
 </dx:ThemedWindow>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
index 263162751..76dc67ae7 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml
@@ -5,7 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
     xmlns:local="clr-namespace:BeWo.View.Controls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="clr-namespace:BeWo.ViewModel.ListViewModel" 
+    d:DataContext="{d:DesignInstance Type=viewmodel:WohneinheitListVM}"
     Width="500"
     Closed="Popup_Closed"
     Opened="Popup_Opened"
@@ -15,7 +16,7 @@
     <Popup.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Popup.Resources>
@@ -74,7 +75,7 @@
                     Grid.Row="2"
                     Grid.Column="1"
                     EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditYearStyle}" />
+                    Style="{StaticResource TextEditYear}" />
 
                 <Label
                     Grid.Row="3"
@@ -92,7 +93,7 @@
                     Grid.Row="4"
                     Grid.Column="1"
                     EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditQmStyle}" />
+                    Style="{StaticResource TextEditQm}" />
 
                 <Label Grid.Row="5">
                     Kaution
@@ -101,7 +102,7 @@
                     Grid.Row="5"
                     Grid.Column="1"
                     EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditCurrencyStyle}" />
+                    Style="{StaticResource TextEditCurrency}" />
 
                 <Grid Grid.Row="6" Grid.ColumnSpan="2">
                     <Grid.RowDefinitions>
@@ -123,7 +124,7 @@
                         Grid.Row="0"
                         Grid.Column="1"
                         EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="1">
                         Heizung
@@ -132,7 +133,7 @@
                         Grid.Row="1"
                         Grid.Column="1"
                         EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="2">
                         Strom
@@ -141,7 +142,7 @@
                         Grid.Row="2"
                         Grid.Column="1"
                         EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="0" Grid.Column="2">
                         Betriebskosten
@@ -150,7 +151,7 @@
                         Grid.Row="0"
                         Grid.Column="3"
                         EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="1" Grid.Column="2">
                         Sonstige Kosten
@@ -159,7 +160,7 @@
                         Grid.Row="1"
                         Grid.Column="3"
                         EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
 
                     <Label Grid.Row="2" Grid.Column="2">
                         Brutto
@@ -169,21 +170,21 @@
                         Grid.Column="3"
                         EditValue="{Binding Path=Brutto, Mode=OneWay}"
                         IsReadOnly="True"
-                        Style="{StaticResource TextEditCurrencyStyle}" />
+                        Style="{StaticResource TextEditCurrency}" />
                 </Grid>
 
                 <Label Grid.Row="7" Content="Möbilierung" />
                 <TextBox
                     Grid.Row="7"
                     Grid.Column="1"
-                    Style="{StaticResource TextBoxNoticeStyle}"
+                    Style="{StaticResource TextBoxNotice}"
                     Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label Grid.Row="8" Content="Notiz" />
                 <TextBox
                     Grid.Row="8"
                     Grid.Column="1"
-                    Style="{StaticResource TextBoxNoticeExtendedStyle}"
+                    Style="{StaticResource TextBoxNoticeExtended}"
                     Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
                 <StackPanel
                     Grid.Row="9"
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
index 85d0f902d..a12fe9164 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitEditPopup.xaml.cs
@@ -24,17 +24,7 @@ namespace BeWo.View.Detail.Wohneinheit
     /// </summary>
     public partial class WohneinheitEditPopup : Popup
     {
-        public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(
-            "ViewModel", typeof(WohneinheitListVM),
-                typeof(WohneinheitEditPopup),
-  new PropertyMetadata(null)
-            );
-
-        public WohneinheitListVM ViewModel
-        {
-            get => (WohneinheitListVM)GetValue(ViewModelProperty);
-            set => SetValue(ViewModelProperty, value);
-        }
+        public WohneinheitListVM ViewModel => DataContext as WohneinheitListVM;
 
         public bool AddMode { get; set; }
 
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
new file mode 100644
index 000000000..ec437bf02
--- /dev/null
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
@@ -0,0 +1,55 @@
+<UserControl
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <GroupBox
+            Margin="10"
+            Header="Grundrissverwaltung"
+            Style="{StaticResource ObjectEditGroupBox}">
+            <ListBox
+                Name="PhotosListBox"
+                ItemsSource="{Binding VMList}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                SelectedIndex="0"
+                Style="{StaticResource PhotoListBox}">
+                <ListBox.ContextMenu>
+                    <ContextMenu>
+                        <MenuItem Click="MenuItem_Add_Click" Header="Hinzufügen" />
+                        <MenuItem Click="MenuItem_Del_Click" Header="Löschen" />
+                    </ContextMenu>
+                </ListBox.ContextMenu>
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid Columns="3" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel MouseDown="StackPanel_MouseDown">
+                            <Image
+                                Height="150"
+                                Source="{Binding Original}"
+                                Stretch="Uniform" />
+                            <Label HorizontalAlignment="Center" Content="{Binding Filename}" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </GroupBox>
+    </Grid>
+</UserControl>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
new file mode 100644
index 000000000..8125a72a7
--- /dev/null
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
@@ -0,0 +1,87 @@
+using BeWo.Core;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using System;
+using System.Collections.Generic;
+using System.IO;
+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 BeWo.View.Detail.Wohneinheit
+{
+	/// <summary>
+	/// Interaktionslogik für WohneinheitGrundrissControl.xaml
+	/// </summary>
+	public partial class WohneinheitGrundrissControl : UserControl
+	{
+        public ImageListVM ViewModel => DataContext as ImageListVM;
+
+		public WohneinheitGrundrissControl()
+		{
+			InitializeComponent();
+        }
+
+        private void MenuItem_Add_Click(object sender, RoutedEventArgs e)
+        {
+            var dialog = new Microsoft.Win32.OpenFileDialog();
+            dialog.Title = "Wähle einen Grundriss aus";
+            dialog.Filter = "ALL supported Graphics| *.jpeg; *.jpg;*.png;";
+
+            // Show open file dialog box
+            bool? result = dialog.ShowDialog();
+
+            if (result != true)
+                return;
+
+            var info = new FileInfo(dialog.FileName);
+
+            if (!info.Exists)
+                return;
+
+            var vm = new ImageVM();
+
+            vm.Filename = info.Name;
+            vm.Fullname = info.FullName;
+            vm.Original = File.ReadAllBytes(info.FullName);
+
+            ViewModel.VMList.Add(vm);
+        }
+
+        private void MenuItem_Del_Click(object sender, RoutedEventArgs e)
+        {
+            var t = PhotosListBox.SelectedItem as ImageVM;
+
+            if (t is null)
+                return;
+
+            ViewModel.VMList.Remove(t);
+        }
+
+        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            var stackpanel = sender as StackPanel;
+
+            var image = stackpanel?.Children?[0] as Image;
+
+            var image_source = image?.Source;
+
+            if (image_source is object)
+            {
+                if (e.ClickCount >= 2)
+                {
+                    BeWoUtils.ShowImageForm(image_source);
+                }
+            }
+        }
+    }
+}
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
index 94381ecfb..c75aeef55 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml
@@ -1,73 +1,39 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissModalPopup"
-             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:BeWo.View.Detail.Wohneinheit"
-             xmlns:localView="clr-namespace:BeWo.View"
-             mc:Ignorable="d">
+<localView:BeWoView
+    x:Class="BeWo.View.Detail.Wohneinheit.WohneinheitGrundrissModalPopup"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BeWo.View.Detail.Wohneinheit"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d">
     <localView:BeWoView.Resources>
-        <Style TargetType="{x:Type ListBox}" x:Key="PhotoListBoxStyle">
-            <Setter Property="Foreground" Value="Black" />
-            <Setter Property="Margin" Value="5" />
-            <Setter Property="MinHeight" Value="100" />
-            <Setter Property="MaxHeight" Value="800" />
-            <Setter Property="IsSynchronizedWithCurrentItem" Value="True" />
-            <Setter Property="SelectionMode" Value="Single" />
-        </Style>
-        <Style TargetType="ListBoxItem">
-            <Style.Resources>
-                <!--SelectedItem with focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="LightBlue" Opacity=".4"/>
-                <!--SelectedItem without focus-->
-                <SolidColorBrush x:Key="{x:Static SystemColors.InactiveSelectionHighlightBrushKey }" Color="LightBlue" Opacity=".4"/>
-            </Style.Resources>
-        </Style>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </localView:BeWoView.Resources>
     <GroupBox Width="1400" Style="{StaticResource PopUpWindowStyle}">
-    <GroupBox.Header>
-        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
-            <Image Source="..\..\..\Ressources\Icons\CoinsDisabled.png" Height="28" />
-            <TextBox Margin="10,4,0,0" Background="{x:Null}" Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
-                        FontSize="20" BorderBrush="{x:Null}" VerticalAlignment="Stretch" BorderThickness="0,0,0,0"
-                        Padding="0,0,0,0" />
-        </StackPanel>
-    </GroupBox.Header>
+        <GroupBox.Header>
+            <StackPanel
+                Margin="0,0,0,0"
+                VerticalAlignment="Center"
+                Orientation="Horizontal">
+                <Image Height="28" Source="..\..\..\Ressources\Icons\CoinsDisabled.png" />
+                <TextBox
+                    Margin="10,4,0,0"
+                    Padding="0,0,0,0"
+                    VerticalAlignment="Stretch"
+                    Background="{x:Null}"
+                    BorderBrush="{x:Null}"
+                    BorderThickness="0,0,0,0"
+                    FontSize="20"
+                    Foreground="{DynamicResource MainGroupBoxForegroundBrush}" />
+            </StackPanel>
+        </GroupBox.Header>
         <Grid Background="{StaticResource ObjectEditBackgroundBrush}">
-            <GroupBox Margin="10" Header="Grundrissverwaltung" Style="{StaticResource ObjectEditGroupBox}">
-                <ListBox
-                        Name="PhotosListBox"
-                        ItemsSource="{Binding}"
-                        Style="{StaticResource PhotoListBoxStyle}"
-                        ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                        ScrollViewer.VerticalScrollBarVisibility="Auto"
-                        SelectedIndex="0">
-                    <ListBox.ContextMenu>
-                        <ContextMenu>
-                            <MenuItem Header="Hinzufügen" Click="MenuItem_Add_Click" />
-                            <MenuItem Header="Löschen" Click="MenuItem_Del_Click" />
-                        </ContextMenu>
-                    </ListBox.ContextMenu>
-                    <ListBox.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <UniformGrid Columns="3"/>
-                        </ItemsPanelTemplate>
-                    </ListBox.ItemsPanel>
-                    <ListBox.ItemTemplate>
-                        <DataTemplate>
-                            <StackPanel MouseDown="StackPanel_MouseDown">
-                                <Image Source="{Binding Original}" Height="150" Stretch="Uniform"></Image>
-                                <Label Content="{Binding Filename}" HorizontalAlignment="Center"/>
-                            </StackPanel>
-                        </DataTemplate>
-                    </ListBox.ItemTemplate>
-                    <ListBox.ItemContainerStyle>
-                        <Style TargetType="ListBoxItem">
-                            <Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
-                        </Style>
-                    </ListBox.ItemContainerStyle>
-                </ListBox>
-            </GroupBox>
+            <local:WohneinheitGrundrissControl />
         </Grid>
     </GroupBox>
 </localView:BeWoView>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
index 5fb24859d..921cf2cf9 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissModalPopup.xaml.cs
@@ -26,74 +26,18 @@ namespace BeWo.View.Detail.Wohneinheit
     /// </summary>
     public partial class WohneinheitGrundrissModalPopup : BeWoView
     {
-        public ImageListVM Images { get; set; }
-
-        public WohneinheitGrundrissModalPopup(ImageListVM images)
+        public WohneinheitGrundrissModalPopup()
         {
             InitializeComponent();
 
-            this.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
+            CommandBindings.Add(new CommandBinding(ApplicationCommands.Close,
                                                         (s, e) =>
                                                         {
                                                             BeWoApp.MainControl.CloseCurrentPopUp();
+                                                            e.Handled = true;
                                                         }));
-
-            Images = images;
-
-            DataContext = Images.VMList;
         }
 
-        private void MenuItem_Add_Click(object sender, RoutedEventArgs e)
-        {
-            var dialog = new Microsoft.Win32.OpenFileDialog();
-            dialog.Title = "Wähle einen Grundriss aus";
-            dialog.Filter = "ALL supported Graphics| *.jpeg; *.jpg;*.png;";
 
-            // Show open file dialog box
-            bool? result = dialog.ShowDialog();
-
-            if (result != true)
-                return;
-
-            var info = new FileInfo(dialog.FileName);
-
-            if (!info.Exists)
-                return;
-
-            var vm = new ImageVM();
-
-            vm.Filename = info.Name;
-            vm.Fullname = info.FullName;
-            vm.Original = File.ReadAllBytes(info.FullName);
-
-            Images.VMList.Add(vm);
-        }
-
-        private void MenuItem_Del_Click(object sender, RoutedEventArgs e)
-        {
-            var t = PhotosListBox.SelectedItem as ImageVM;
-
-            if (t is null)
-                return;
-
-            Images.VMList.Remove(t);
-        }
-
-        private void StackPanel_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            var stackpanel = sender as StackPanel;
-
-            var image = stackpanel?.Children?[0] as Image;
-
-            var image_source = image?.Source;
-
-            if (image_source is object)
-            {
-                if(e.ClickCount >= 2)
-                {
-                    BeWoUtils.ShowImageForm(image_source);
-                }
-            }
-        }
     }
 }
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
index 72813014a..96eb91ee0 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml
@@ -18,7 +18,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -219,7 +219,7 @@
                     </dxg:GridControl.View>
                 </dxg:GridControl>
 
-                <local:WohneinheitEditPopup x:Name="popup_newWohneinheit" ViewModel="{Binding}" />
+                <local:WohneinheitEditPopup x:Name="popup_newWohneinheit" />
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
index 4dd47a16e..cff6df0a9 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV1.xaml.cs
@@ -95,7 +95,9 @@ namespace BeWo.View.Detail.Wohneinheit
 
             var vm = datagrid_wohneinheiten.GetCurrentValue<WohneinheitVM>();
 
-            var control = new WohneinheitGrundrissModalPopup(vm.ImageListVM);
+            var control = new WohneinheitGrundrissModalPopup();
+
+            control.DataContext = vm.ImageListVM;
 
             BeWoApp.MainControl.ShowControlAsModalPopup(control);
 
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
index 69f6f2016..a3c021bd6 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
@@ -16,7 +16,7 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="..\..\..\Styles\PrototypeStyles.xaml" />
+                <ResourceDictionary Source="..\..\..\Styles\ModernOrangeBlack.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -28,7 +28,7 @@
                 </Style>
                 <Style
                     x:Key="TextEditCurrencyStyleManage"
-                    BasedOn="{StaticResource TextEditCurrencyStyle}"
+                    BasedOn="{StaticResource TextEditCurrency}"
                     TargetType="{x:Type dxe:TextEdit}">
                     <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
                 </Style>
@@ -83,174 +83,182 @@
                             ToolTip="Wohneinheit entfernen" />
                     </StackPanel>
                 </Grid>
-                <GroupBox
-                    x:Name="groupbox_newWohneinheit"
+                <ScrollViewer
                     Grid.Column="2"
                     Margin="5"
                     DataContext="{Binding SelectedVM}"
-                    Header="Allgemeine Informationen"
-                    Style="{StaticResource ObjectEditGroupBox}"
+                    VerticalScrollBarVisibility="Visible"
+                    Padding="5"
                     Visibility="{Binding Path=., Converter={StaticResource ObjectVisibilityConverter}}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="2*" />
-                        </Grid.ColumnDefinitions>
+                    <StackPanel Orientation="Vertical">
+                        <GroupBox
+                            x:Name="groupbox_newWohneinheit"
+                            Header="Allgemeine Informationen"
+                            Style="{StaticResource ObjectEditGroupBox}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="2*" />
+                                </Grid.ColumnDefinitions>
 
-                        <Label Grid.Row="0">
-                            Wohnungsname
-                        </Label>
-                        <TextBox
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Wohnname, UpdateSourceTrigger=PropertyChanged}" />
-                        <Label Grid.Row="1">
-                            Zimmername
-                        </Label>
-                        <TextBox
-                            Grid.Row="1"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Zimmername, UpdateSourceTrigger=PropertyChanged}" />
-                        <Label Grid.Row="2">
-                            Baujahr
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="2"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextEditYearStyle}" />
+                                <Label Grid.Row="0">
+                                    Wohnungsname
+                                </Label>
+                                <TextBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Wohnname, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label Grid.Row="1">
+                                    Zimmername
+                                </Label>
+                                <TextBox
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Zimmername, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label Grid.Row="2">
+                                    Baujahr
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=Baujahr, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextEditYear}" />
 
-                        <Label
-                            Grid.Row="3"
-                            Grid.Column="0"
-                            Content="Stock" />
-                        <TextBox
-                            Grid.Row="3"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Text="{Binding Path=Stock, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Content="Stock" />
+                                <TextBox
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Text="{Binding Path=Stock, UpdateSourceTrigger=PropertyChanged}" />
 
-                        <Label Grid.Row="4">
-                            Fläche
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="4"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextEditQmStyle}" />
+                                <Label Grid.Row="4">
+                                    Fläche
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=QM, UpdateSourceTrigger=PropertyChanged}"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextEditQm}" />
 
-                        <Label Grid.Row="5">
-                            Kaution
-                        </Label>
-                        <dxe:TextEdit
-                            Grid.Row="5"
-                            Grid.Column="1"
-                            EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
-                            Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                <Label Grid.Row="5">
+                                    Kaution
+                                </Label>
+                                <dxe:TextEdit
+                                    Grid.Row="5"
+                                    Grid.Column="1"
+                                    EditValue="{Binding Path=Kaution, UpdateSourceTrigger=PropertyChanged}"
+                                    Style="{StaticResource TextEditCurrencyStyleManage}" />
 
-                        <Grid Grid.Row="6" Grid.ColumnSpan="2">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="7*" />
-                                <ColumnDefinition Width="15*" />
-                                <ColumnDefinition Width="12*" />
-                                <ColumnDefinition Width="15*" />
-                            </Grid.ColumnDefinitions>
+                                <Grid Grid.Row="6" Grid.ColumnSpan="2">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="7*" />
+                                        <ColumnDefinition Width="15*" />
+                                        <ColumnDefinition Width="12*" />
+                                        <ColumnDefinition Width="15*" />
+                                    </Grid.ColumnDefinitions>
 
-                            <Label Grid.Row="0">
-                                Miete
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="0"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="1" Grid.Column="0">
-                                Heizung
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="2" Grid.Column="0">
-                                Strom
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="0" Grid.Column="2">
-                                Betriebskosten
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="0"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="1" Grid.Column="2">
-                                Sonstige Kosten
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="1"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
-                                Style="{StaticResource TextEditCurrencyStyleManage}" />
-                            <Label Grid.Row="2" Grid.Column="2">
-                                Brutto
-                            </Label>
-                            <dxe:TextEdit
-                                Grid.Row="2"
-                                Grid.Column="3"
-                                EditValue="{Binding Path=Brutto, Mode=OneWay}"
-                                IsReadOnly="True"
-                                Style="{StaticResource TextEditCurrencyStyle}" />
-                        </Grid>
+                                    <Label Grid.Row="0">
+                                        Miete
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Miete, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="1" Grid.Column="0">
+                                        Heizung
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Heizung, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="2" Grid.Column="0">
+                                        Strom
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="2"
+                                        Grid.Column="1"
+                                        EditValue="{Binding Path=Strom, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="0" Grid.Column="2">
+                                        Betriebskosten
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="0"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=Betriebskosten, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="1" Grid.Column="2">
+                                        Sonstige Kosten
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="1"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=SonstigeKosten, UpdateSourceTrigger=PropertyChanged}"
+                                        Style="{StaticResource TextEditCurrencyStyleManage}" />
+                                    <Label Grid.Row="2" Grid.Column="2">
+                                        Brutto
+                                    </Label>
+                                    <dxe:TextEdit
+                                        Grid.Row="2"
+                                        Grid.Column="3"
+                                        EditValue="{Binding Path=Brutto, Mode=OneWay}"
+                                        IsReadOnly="True"
+                                        Style="{StaticResource TextEditCurrency}" />
+                                </Grid>
 
-                        <Label
-                            Grid.Row="7"
-                            Grid.Column="0"
-                            Content="Möbilierung" />
-                        <TextBox
-                            Grid.Row="7"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextBoxNoticeStyle}"
-                            Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
+                                <Label
+                                    Grid.Row="7"
+                                    Grid.Column="0"
+                                    Content="Möbilierung" />
+                                <TextBox
+                                    Grid.Row="7"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextBoxNoticeExtended}"
+                                    Text="{Binding Path=Mobilierung, UpdateSourceTrigger=PropertyChanged}" />
+
+                                <Label
+                                    Grid.Row="8"
+                                    Grid.Column="0"
+                                    Content="Notiz" />
+                                <TextBox
+                                    Grid.Row="8"
+                                    Grid.Column="1"
+                                    IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                                    Style="{StaticResource TextBoxNoticeExtended}"
+                                    Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
+                            </Grid>
+                        </GroupBox>
+                        <local:WohneinheitGrundrissControl DataContext="{Binding ImageListVM}" />
+                    </StackPanel>
+                </ScrollViewer>
 
-                        <Label
-                            Grid.Row="8"
-                            Grid.Column="0"
-                            Content="Notiz" />
-                        <TextBox
-                            Grid.Row="8"
-                            Grid.Column="1"
-                            IsReadOnly="{Binding DataContext.PermissionWohneinheitManage, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
-                            Style="{StaticResource TextBoxNoticeExtendedStyle}"
-                            Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
-                    </Grid>
-                </GroupBox>
             </Grid>
         </GroupBox>
     </Grid>
diff --git a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
index 8fe39f327..3fcecef65 100644
--- a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
@@ -22,9 +22,12 @@ namespace BeWo.ViewModel.ListViewModel
         public bool PermissionWohneinheitGalleryView { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_View);
         public bool PermissionWohneinheitGalleryManage { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_Manage);
 
+        /// <summary>
+        /// Designer
+        /// </summary>
         public WohneinheitListVM() : base(null)
         {
-
+            VMList.Add(new WohneinheitVM());
         }
 
         public WohneinheitListVM(List<WohneinheitDC> pDCs) : base(pDCs)

From b9fd6c803f2f9b58ff6800b0df09e3c0030e8529 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Fri, 20 Sep 2024 12:21:40 +0200
Subject: [PATCH 04/22] TextBlock Trimming funkt nicht mehr, todo

---
 BeWo/Styles/Colors/Colors.xaml                |  8 ++-
 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml | 36 ++++++++---
 .../ControlStyles/NullItemComboBoxStyles.xaml |  6 +-
 BeWo/Styles/ControlStyles/TextEditStyles.xaml | 53 +++++++++++----
 .../CustomerVermittlungArbeitControl.xaml     | 64 ++++++++++---------
 .../Wohnhilfe/CustomerWohnhilfeControl.xaml   | 10 +--
 .../Detail/CustomerVermittlungArbeitView.xaml |  2 +-
 7 files changed, 117 insertions(+), 62 deletions(-)

diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
index 87e38a3b3..6d82f9f5d 100644
--- a/BeWo/Styles/Colors/Colors.xaml
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -1,4 +1,8 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <SolidColorBrush x:Key="TextBoxBorderBrush" Color="#FF86878F" />
+
+
+    <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFFDC784" />
+    <SolidColorBrush x:Key="ControlSelectedBackgroundBrush" Color="#FFFFD86C" />
+    <SolidColorBrush x:Key="ControlMouseOverBackgroundBrush" Color="#FFDCA158" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
index d6b503b32..0cb037971 100644
--- a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -1,11 +1,16 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:BeWo.Converter"
-    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero">
+    xmlns:Microsoft_Windows_Themes="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero"
+    xmlns:conv="clr-namespace:BeWo.Converter">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\DataTemplates\ControlTemplates.xaml" />
+        <ResourceDictionary Source="..\ControlStyles\ToggleButtonStyles.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
 
     <!--  ComboBox  -->
-    <Style x:Key="PrimaryComboBox" TargetType="ComboBox">
+    <Style x:Key="BaseComboBox" TargetType="ComboBox">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
         <Setter Property="FocusVisualStyle" Value="{DynamicResource ComboBoxFocusVisual}" />
@@ -16,14 +21,20 @@
         <Setter Property="Padding" Value="1" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
+    </Style>
+    <Style
+        x:Key="PrimaryComboBox"
+        BasedOn="{StaticResource BaseComboBox}"
+        TargetType="ComboBox">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ComboBox}">
                     <Grid SnapsToDevicePixels="true">
                         <Border
                             x:Name="Bd"
+                            MaxWidth="{TemplateBinding MaxWidth}"
                             Padding="1"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
@@ -48,10 +59,9 @@
                                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                                 </Border>
                                 <ToggleButton
-                                    Grid.Column="0"
                                     Grid.ColumnSpan="3"
                                     IsChecked="{Binding Path=IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                    Style="{DynamicResource ComboBoxTransparentButtonStyle}" />
+                                    Style="{StaticResource ComboBoxTransparentButtonStyle}" />
                             </Grid>
                         </Border>
                         <Popup
@@ -87,7 +97,7 @@
                             <Setter Property="Foreground" Value="#FF000000" />
                         </MultiTrigger>
                         <Trigger Property="IsSelectionBoxHighlighted" Value="true">
-                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="#FF8AC5FF" />
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource ControlSelectedBackgroundBrush}" />
                         </Trigger>
                         <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
                             <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
@@ -111,7 +121,7 @@
             <Trigger Property="IsEditable" Value="true">
                 <Setter Property="IsTabStop" Value="false" />
                 <Setter Property="Padding" Value="0,1" />
-                <Setter Property="Template" Value="{DynamicResource ComboBoxEditableTemplate}" />
+                <Setter Property="Template" Value="{StaticResource ComboBoxEditableTemplate}" />
             </Trigger>
         </Style.Triggers>
     </Style>
@@ -128,11 +138,16 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <conv:EnumTranslationConverter x:Key="EnumTranslationConverter" />
     <DataTemplate x:Key="ListItemView">
         <TextBlock
+            x:Name="textblock"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
             Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
+            TextTrimming="CharacterEllipsis"
+            TextWrapping="NoWrap"
+            MaxWidth="300"
             ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
     </DataTemplate>
     <Style
@@ -140,6 +155,7 @@
         BasedOn="{StaticResource PrimaryComboBox}"
         TargetType="ComboBox">
         <Setter Property="ItemTemplate" Value="{StaticResource ListItemView}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="MaxWidth" Value="400" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
index 4d3cbe084..49dc57942 100644
--- a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
@@ -102,10 +102,10 @@
                                 <Condition Property="IsSelectionBoxHighlighted" Value="true" />
                                 <Condition Property="IsDropDownOpen" Value="false" />
                             </MultiTrigger.Conditions>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                            <Setter Property="Foreground" Value="#FF000000" />
                         </MultiTrigger>
                         <Trigger Property="IsSelectionBoxHighlighted" Value="true">
-                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                            <Setter TargetName="SelectedItemBorder" Property="Background" Value="{DynamicResource ControlSelectedBackgroundBrush}" />
                         </Trigger>
                         <Trigger SourceName="PART_Popup" Property="HasDropShadow" Value="true">
                             <Setter TargetName="Shdw" Property="Margin" Value="0,0,5,5" />
@@ -142,5 +142,7 @@
         BasedOn="{StaticResource PrimaryNullItemComboBox}"
         TargetType="{x:Type uc:NullItemComboBox}">
         <Setter Property="ItemTemplate" Value="{DynamicResource ListItemView}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="MaxWidth" Value="400" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index 149f315ae..dc7d25b10 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -1,34 +1,63 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
+    
+    <!--  Base  -->
     <Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
     </Style>
     <Style
-        x:Key="TextEditYear"
+        x:Key="BaseNumberMaskTextEdit"
         BasedOn="{StaticResource BaseTextEdit}"
         TargetType="{x:Type dxe:TextEdit}">
-        <Setter Property="Mask" Value="0000" />
         <Setter Property="MaskType" Value="Numeric" />
         <Setter Property="MaskUseAsDisplayFormat" Value="True" />
     </Style>
+
+    <!--  Special  -->
+    <Style
+        x:Key="TextEditYear"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="0000" />
+    </Style>
     <Style
         x:Key="TextEditQm"
-        BasedOn="{StaticResource BaseTextEdit}"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
         TargetType="{x:Type dxe:TextEdit}">
         <Setter Property="Mask" Value="######0.00 qm" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
     </Style>
     <Style
         x:Key="TextEditCurrency"
-        BasedOn="{StaticResource BaseTextEdit}"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
         TargetType="{x:Type dxe:TextEdit}">
         <Setter Property="Mask" Value="######0.## $" />
-        <Setter Property="MaskType" Value="Numeric" />
-        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+    <Style
+        x:Key="TextEditHours"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.## Std" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+
+    <!--  Numbers  -->
+    <Style
+        x:Key="TextEditNumberDecimal"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.##" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
+    <Style
+        x:Key="TextEditNumberDecimalNullable"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="#########.##" />
         <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 61488d697..4f9cf67ca 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -7,14 +7,16 @@
     xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerGemeinnutzigeArbeitVM}"
     d:DesignHeight="1450"
     d:DesignWidth="1800"
     mc:Ignorable="d">
     <d:DesignerProperties.DesignStyle>
         <Style TargetType="UserControl">
             <Setter Property="Background" Value="White" />
-            <Setter Property="Height" Value="1366" />
-            <Setter Property="Width" Value="768" />
+            <Setter Property="Height" Value="768" />
+            <Setter Property="Width" Value="1366" />
         </Style>
     </d:DesignerProperties.DesignStyle>
     <UserControl.Resources>
@@ -26,6 +28,18 @@
                 <Setter Property="Margin" Value="15" />
                 <Setter Property="Padding" Value="10,7,7,5" />
             </Style>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type dxe:DateEdit}}" TargetType="{x:Type dxe:DateEdit}">
+                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type dxe:TextEdit}}" TargetType="{x:Type dxe:TextEdit}">
+                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="{x:Type uc:NullItemComboBox}">
+                <Setter Property="IsEnabled" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root_grid}" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid HorizontalAlignment="Stretch">
@@ -80,8 +94,8 @@
                 <TextBox
                     Grid.Row="0"
                     Grid.Column="1"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
                     Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
+
                 <Label
                     Grid.Row="1"
                     Grid.Column="0"
@@ -90,8 +104,8 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
                     ShowClearButton="False" />
+                
                 <Label
                     Grid.Row="2"
                     Grid.Column="0"
@@ -100,9 +114,9 @@
                     x:Name="comboBox_Auftragsherkunft"
                     Grid.Row="2"
                     Grid.Column="1"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
                     ItemsSource="{Binding Path=Auftragsherkunfte}"
                     SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}" />
+                
                 <Label
                     Grid.Row="3"
                     Grid.Column="0"
@@ -111,9 +125,9 @@
                     x:Name="comboBox_Vermittlungsgrundlage"
                     Grid.Row="3"
                     Grid.Column="1"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
                     ItemsSource="{Binding Path=Vermittlungsgrundlagen}"
                     SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
+                
                 <Label
                     Grid.Row="4"
                     Grid.Column="0"
@@ -121,12 +135,8 @@
                 <dxe:TextEdit
                     Grid.Row="4"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.##"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}" />
+                
                 <Label
                     Grid.Row="5"
                     Grid.Column="0"
@@ -134,12 +144,10 @@
                 <dxe:TextEdit
                     Grid.Row="5"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    Style="{StaticResource TextEditCurrency}"
+                    IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
+                
                 <Label
                     Grid.Row="6"
                     Grid.Column="0"
@@ -147,12 +155,9 @@
                 <dxe:TextEdit
                     Grid.Row="6"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=HoheDerGeldstrafe, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="True"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    Style="{StaticResource TextEditCurrency}"
+                    IsReadOnly="True" />
+                
                 <Label
                     Grid.Row="7"
                     Grid.Column="0"
@@ -160,12 +165,10 @@
                 <dxe:TextEdit
                     Grid.Row="7"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Std"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    Style="{StaticResource TextEditHours}"
+                    IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
+                
                 <Label
                     Grid.Row="8"
                     Grid.Column="0"
@@ -173,8 +176,8 @@
                 <TextBox
                     Grid.Row="8"
                     Grid.Column="1"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
                     Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
+                
                 <Label
                     Grid.Row="9"
                     Grid.Column="0"
@@ -183,7 +186,6 @@
                     Grid.Row="9"
                     Grid.Column="1"
                     EditValue="{Binding Path=Termin, UpdateSourceTrigger=PropertyChanged}"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
                     Mask="G"
                     MaskUseAsDisplayFormat="True"
                     ShowClearButton="True">
@@ -211,7 +213,7 @@
                 <TextBox
                     Grid.Row="11"
                     Grid.Column="1"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
+                    IsReadOnly="{Binding DataContext.PermissionFalldatenEdit, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
                     Text="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}" />
                 <Label
                     Grid.Row="12"
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 64be906c8..9af697f7d 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -41,7 +41,7 @@
         x:Name="scrollviewer"
         HorizontalScrollBarVisibility="Auto"
         VerticalScrollBarVisibility="Auto">
-        <Grid x:Name="grid">
+        <Grid x:Name="grid" ScrollViewer.HorizontalScrollBarVisibility="Disabled">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="3*" />
                 <ColumnDefinition x:Name="grid_secondcolumn" Width="7*" />
@@ -175,7 +175,7 @@
                 Grid.ColumnSpan="1"
                 DataContext="{Binding BereichEinkommenUndArbeitVM}"
                 Header="Bereich Einkommen und Arbeit">
-                <Grid>
+                <Grid HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition
@@ -313,7 +313,7 @@
                 Grid.Column="0"
                 DataContext="{Binding BereichSozialstrukturVM}"
                 Header="Bereich Sozialstruktur">
-                <Grid>
+                <Grid HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition
@@ -341,6 +341,8 @@
                         <RowDefinition Height="auto" />
                     </Grid.RowDefinitions>
 
+                    <Border x:Name="b" Grid.Column="1" Visibility="Hidden"/>
+
                     <Label Grid.Row="0" Grid.Column="0">K0110 Bundesland</Label>
                     <ComboBox
                         Grid.Row="0"
@@ -474,7 +476,7 @@
                 Grid.ColumnSpan="1"
                 DataContext="{Binding BereichSozialeKontakteVM}"
                 Header="Bereich Soziale Kontakte">
-                <Grid>
+                <Grid HorizontalAlignment="Stretch">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="auto" />
                         <ColumnDefinition
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index bea38e4af..dbb3c9688 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -49,7 +49,7 @@
                                 <Button.Visibility>
                                     <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeDelete" />
+                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>

From 30bf436a888f1483cc06d02312d227c54c1fd006 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Fri, 20 Sep 2024 13:05:47 +0200
Subject: [PATCH 05/22] Vermittlung Arbeit - Recht + Styles

---
 BeWo/Styles/ControlStyles/TextEditStyles.xaml |  9 +-
 .../CustomerVermittlungArbeitControl.xaml     | 97 +++++++++----------
 .../CustomerVermittlungArbeitControl.xaml.cs  |  2 +
 .../Detail/CustomerVermittlungArbeitView.xaml |  3 +-
 BeWo/View/Detail/CustomerView.xaml.cs         |  1 +
 BeWo/ViewModel/CustomerVM.cs                  |  4 +
 .../ListViewModel/AbstractDCListMapperVM.cs   |  2 +-
 7 files changed, 65 insertions(+), 53 deletions(-)

diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index dc7d25b10..98a1c219f 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors">
-    
+
     <!--  Base  -->
     <Style x:Key="BaseTextEdit" TargetType="{x:Type dxe:TextEdit}">
         <Setter Property="Margin" Value="3" />
@@ -44,6 +44,13 @@
         <Setter Property="Mask" Value="########0.## Std" />
         <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
     </Style>
+    <Style
+        x:Key="TextEditDays"
+        BasedOn="{StaticResource BaseNumberMaskTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="Mask" Value="########0.## Tage" />
+        <Setter Property="dxe:NumericMaskOptions.AlwaysShowDecimalSeparator" Value="False" />
+    </Style>
 
     <!--  Numbers  -->
     <Style
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 4f9cf67ca..8f0c77932 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -8,6 +8,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    x:Name="root"
     d:DataContext="{d:DesignInstance Type=viewmodel:CustomerGemeinnutzigeArbeitVM}"
     d:DesignHeight="1450"
     d:DesignWidth="1800"
@@ -28,17 +29,9 @@
                 <Setter Property="Margin" Value="15" />
                 <Setter Property="Padding" Value="10,7,7,5" />
             </Style>
-            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
-                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
-            </Style>
-            <Style BasedOn="{StaticResource {x:Type dxe:DateEdit}}" TargetType="{x:Type dxe:DateEdit}">
-                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
-            </Style>
-            <Style BasedOn="{StaticResource {x:Type dxe:TextEdit}}" TargetType="{x:Type dxe:TextEdit}">
-                <Setter Property="IsReadOnly" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
-            </Style>
-            <Style BasedOn="{StaticResource {x:Type uc:NullItemComboBox}}" TargetType="{x:Type uc:NullItemComboBox}">
-                <Setter Property="IsEnabled" Value="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root_grid}" />
+            <Style BasedOn="{StaticResource CheckBoxBase}" TargetType="CheckBox">
+                <Setter Property="IsHitTestVisible" Value="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}" />
+                <Setter Property="Focusable" Value="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}" />
             </Style>
         </ResourceDictionary>
     </UserControl.Resources>
@@ -94,6 +87,7 @@
                 <TextBox
                     Grid.Row="0"
                     Grid.Column="1"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
 
                 <Label
@@ -104,8 +98,9 @@
                     Grid.Row="1"
                     Grid.Column="1"
                     EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     ShowClearButton="False" />
-                
+
                 <Label
                     Grid.Row="2"
                     Grid.Column="0"
@@ -114,9 +109,10 @@
                     x:Name="comboBox_Auftragsherkunft"
                     Grid.Row="2"
                     Grid.Column="1"
+                    IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
                     ItemsSource="{Binding Path=Auftragsherkunfte}"
                     SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}" />
-                
+
                 <Label
                     Grid.Row="3"
                     Grid.Column="0"
@@ -125,9 +121,10 @@
                     x:Name="comboBox_Vermittlungsgrundlage"
                     Grid.Row="3"
                     Grid.Column="1"
+                    IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
                     ItemsSource="{Binding Path=Vermittlungsgrundlagen}"
                     SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
-                
+
                 <Label
                     Grid.Row="4"
                     Grid.Column="0"
@@ -135,8 +132,9 @@
                 <dxe:TextEdit
                     Grid.Row="4"
                     Grid.Column="1"
-                    EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}" />
-                
+                    EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+
                 <Label
                     Grid.Row="5"
                     Grid.Column="0"
@@ -145,9 +143,9 @@
                     Grid.Row="5"
                     Grid.Column="1"
                     EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditCurrency}"
-                    IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
-                
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditCurrency}" />
+
                 <Label
                     Grid.Row="6"
                     Grid.Column="0"
@@ -155,9 +153,10 @@
                 <dxe:TextEdit
                     Grid.Row="6"
                     Grid.Column="1"
-                    Style="{StaticResource TextEditCurrency}"
-                    IsReadOnly="True" />
-                
+                    EditValue="{Binding Path=HoheDerGeldstrafe, UpdateSourceTrigger=PropertyChanged}"
+                    IsReadOnly="True"
+                    Style="{StaticResource TextEditCurrency}" />
+
                 <Label
                     Grid.Row="7"
                     Grid.Column="0"
@@ -166,9 +165,9 @@
                     Grid.Row="7"
                     Grid.Column="1"
                     EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
-                    Style="{StaticResource TextEditHours}"
-                    IsReadOnly="{Binding DataContext.PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}" />
-                
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditHours}" />
+
                 <Label
                     Grid.Row="8"
                     Grid.Column="0"
@@ -176,8 +175,9 @@
                 <TextBox
                     Grid.Row="8"
                     Grid.Column="1"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
-                
+
                 <Label
                     Grid.Row="9"
                     Grid.Column="0"
@@ -186,6 +186,7 @@
                     Grid.Row="9"
                     Grid.Column="1"
                     EditValue="{Binding Path=Termin, UpdateSourceTrigger=PropertyChanged}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Mask="G"
                     MaskUseAsDisplayFormat="True"
                     ShowClearButton="True">
@@ -193,6 +194,7 @@
                         <dxe:DateEditNavigatorWithTimePickerStyleSettings />
                     </dxe:DateEdit.StyleSettings>
                 </dxe:DateEdit>
+
                 <Label
                     Grid.Row="10"
                     Grid.Column="0"
@@ -202,10 +204,11 @@
                     Grid.Row="10"
                     Grid.Column="1"
                     HorizontalAlignment="Stretch"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
+                    IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
                     ItemsSource="{Binding Path=FalldatenBearbeitungsstatusTypes}"
                     SelectedValue="{Binding Path=FalldatenBearbeitungsstatus}"
                     Style="{StaticResource EnumTranslationNullItemComboBox}" />
+
                 <Label
                     Grid.Row="11"
                     Grid.Column="0"
@@ -213,8 +216,9 @@
                 <TextBox
                     Grid.Row="11"
                     Grid.Column="1"
-                    IsReadOnly="{Binding DataContext.PermissionFalldatenEdit, Converter={StaticResource BoolReverseConverter}, ElementName=root_grid}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Text="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}" />
+
                 <Label
                     Grid.Row="12"
                     Grid.Column="0"
@@ -222,8 +226,9 @@
                 <TextBox
                     Grid.Row="12"
                     Grid.Column="1"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Text="{Binding Path=Verlauf, UpdateSourceTrigger=PropertyChanged}" />
+
                 <Label
                     Grid.Row="13"
                     Grid.Column="0"
@@ -231,12 +236,10 @@
                 <dxe:TextEdit
                     Grid.Row="13"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=AbgeleisteteStunden, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Std"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditHours}" />
+
                 <Label
                     Grid.Row="14"
                     Grid.Column="0"
@@ -244,12 +247,10 @@
                 <dxe:TextEdit
                     Grid.Row="14"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=ErsparteHafttage, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Tage"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditDays}"/>
+
                 <Label
                     Grid.Row="15"
                     Grid.Column="0"
@@ -257,12 +258,10 @@
                 <dxe:TextEdit
                     Grid.Row="15"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=GeleisteteRatenzahlung, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditCurrency}"/>
+
                 <Label
                     Grid.Row="16"
                     Grid.Column="0"
@@ -270,12 +269,10 @@
                 <dxe:TextEdit
                     Grid.Row="16"
                     Grid.Column="1"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                     EditValue="{Binding Path=GeleisteteEinmalzahlung, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditCurrency}" />
+
                 <Label
                     Grid.Row="17"
                     Grid.Column="0"
@@ -286,7 +283,7 @@
                     Height="92"
                     MaxHeight="184"
                     AcceptsReturn="True"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                     Text="{Binding Path=Bemerkung, UpdateSourceTrigger=PropertyChanged}"
                     TextWrapping="Wrap"
                     VerticalScrollBarVisibility="Auto" />
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs
index 59c8f7784..184edc28d 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml.cs
@@ -20,6 +20,8 @@ namespace BeWo.View.Controls
     /// </summary>
     public partial class CustomerVermittlungArbeitControl : UserControl
     {
+        public bool PermissionCustomerGemeinnutzigeArbeitManage { get; } = BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_GemeinnutzigeArbeit_Manage);
+
         public CustomerVermittlungArbeitControl()
         {
             InitializeComponent();
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index dbb3c9688..cfdc9f390 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -1,4 +1,5 @@
 <UserControl
+    x:Name="root"
     x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -49,7 +50,7 @@
                                 <Button.Visibility>
                                     <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
+                                        <Binding ElementName="root" Path="PermissionCustomerWohnhilfeManage" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index f5a109e44..581d7345e 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -279,6 +279,7 @@ namespace BeWo.View.Detail
             if(DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureCustomerWohnhilfe)
             {
                 tabroot.SelectedItem = tabitem_gemeinnutzigearbeit;
+                tabroot.SelectedItem = tabitem_wohnhilfe;
             }
 #endif
         }
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index e9392d879..0c3aac7d7 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -2037,7 +2037,11 @@ namespace BeWo.ViewModel
 
 			CustomerWohnhilfeListVM = new CustomerWohnhilfeListVM(this, pDataContract.CustomerWohnhilfeDC ?? (pDataContract.CustomerWohnhilfeDC = new List<CustomerWohnhilfeDC>()));
 
+			CustomerWohnhilfeListVM.AddNewVMToListAndSelect(false);
+
 			CustomerGemeinnutzigeArbeitListVM = new CustomerGemeinnutzigeArbeitListVM(pDataContract.CustomerGemeinnutzigeArbeitDC ?? (pDataContract.CustomerGemeinnutzigeArbeitDC = new List<FalldatenDC>()));
+
+			CustomerGemeinnutzigeArbeitListVM.AddNewVMToListAndSelect(false);
 		}
 	    protected override CustomerDC MapToDataContract(CustomerDC pDataContract, bool doCommit)
 		{
diff --git a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
index 7b970873f..18e55cc55 100644
--- a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
@@ -184,7 +184,7 @@ namespace BeWo.ViewModel.ListViewModel
             // Wichtig! NewVM, wenn _NewVM null ist
             var vm = NewVM;
 
-            _VMList.Add(vm);
+            VMList.Add(vm);
 
             // _VMList.Sort();
             if (select)

From f79cfff8ec1c6d114ee0c69510af7622f96875d2 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Fri, 20 Sep 2024 13:23:52 +0200
Subject: [PATCH 06/22] Grundrisse Rechte

---
 BeWo/Styles/ControlStyles/LabelStyles.xaml            |  1 +
 .../Wohneinheit/WohneinheitGrundrissControl.xaml      |  1 +
 .../Wohneinheit/WohneinheitGrundrissControl.xaml.cs   | 11 ++++++++++-
 .../Wohneinheit/WohneinheitVerwaltungViewV2.xaml      |  2 +-
 BeWo/ViewModel/ListViewModel/ImageListVM.cs           |  3 ++-
 BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs     |  1 -
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/BeWo/Styles/ControlStyles/LabelStyles.xaml b/BeWo/Styles/ControlStyles/LabelStyles.xaml
index 3b69cc776..5e6432acc 100644
--- a/BeWo/Styles/ControlStyles/LabelStyles.xaml
+++ b/BeWo/Styles/ControlStyles/LabelStyles.xaml
@@ -4,6 +4,7 @@
         <Setter Property="Margin" Value="3" />
         <Setter Property="Padding" Value="3" />
         <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="TextElement.Foreground" Value="#FF000000" />
     </Style>
 
     <Style x:Key="Header1" TargetType="Label">
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
index ec437bf02..bd92a0cdc 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml
@@ -26,6 +26,7 @@
                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                 SelectedIndex="0"
+                ContextMenuOpening="PhotosListBox_ContextMenuOpening"
                 Style="{StaticResource PhotoListBox}">
                 <ListBox.ContextMenu>
                     <ContextMenu>
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
index 8125a72a7..07d81c641 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitGrundrissControl.xaml.cs
@@ -1,6 +1,7 @@
 using BeWo.Core;
 using BeWo.ViewModel;
 using BeWo.ViewModel.ListViewModel;
+using BS.Shared;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -24,6 +25,8 @@ namespace BeWo.View.Detail.Wohneinheit
 	/// </summary>
 	public partial class WohneinheitGrundrissControl : UserControl
 	{
+        public bool PermissionWohneinheitGalleryManage { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_Manage);
+
         public ImageListVM ViewModel => DataContext as ImageListVM;
 
 		public WohneinheitGrundrissControl()
@@ -83,5 +86,11 @@ namespace BeWo.View.Detail.Wohneinheit
                 }
             }
         }
-    }
+
+		private void PhotosListBox_ContextMenuOpening(object sender, ContextMenuEventArgs e)
+		{
+            if (!PermissionWohneinheitGalleryManage)
+                e.Handled = true;
+		}
+	}
 }
diff --git a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
index a3c021bd6..9b6df1ae7 100644
--- a/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
+++ b/BeWo/View/Detail/Wohneinheit/WohneinheitVerwaltungViewV2.xaml
@@ -255,7 +255,7 @@
                                     Text="{Binding Path=Zusatznotiz, UpdateSourceTrigger=PropertyChanged}" />
                             </Grid>
                         </GroupBox>
-                        <local:WohneinheitGrundrissControl DataContext="{Binding ImageListVM}" />
+                        <local:WohneinheitGrundrissControl Visibility="{Binding Path=DataContext.PermissionWohneinheitGalleryView, ElementName=root_grid,Converter={StaticResource BoolVisibilityConverter}}" DataContext="{Binding ImageListVM}" />
                     </StackPanel>
                 </ScrollViewer>
 
diff --git a/BeWo/ViewModel/ListViewModel/ImageListVM.cs b/BeWo/ViewModel/ListViewModel/ImageListVM.cs
index 39f4b1601..5ba26a451 100644
--- a/BeWo/ViewModel/ListViewModel/ImageListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/ImageListVM.cs
@@ -1,4 +1,5 @@
-using BS.Shared.DataContracts;
+using BS.Shared;
+using BS.Shared.DataContracts;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
index 3fcecef65..5a3fa946f 100644
--- a/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/WohneinheitListVM.cs
@@ -20,7 +20,6 @@ namespace BeWo.ViewModel.ListViewModel
         public bool PermissionWohneinheitManage { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Manage);
 
         public bool PermissionWohneinheitGalleryView { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_View);
-        public bool PermissionWohneinheitGalleryManage { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.WohnheimView_Wohneinheit_Gallery_Manage);
 
         /// <summary>
         /// Designer

From b9eebc1f28b0c388c640bb7d40e7ef72196d3d17 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 10:37:42 +0200
Subject: [PATCH 07/22] Combobox Dropdown Button visible

---
 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
index 0cb037971..a9390cd92 100644
--- a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -147,7 +147,7 @@
             Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
             TextTrimming="CharacterEllipsis"
             TextWrapping="NoWrap"
-            MaxWidth="300"
+            MaxWidth="362"
             ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
     </DataTemplate>
     <Style

From 3f3183487019fcc50adbeb6809222b785d7bcd61 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 11:23:02 +0200
Subject: [PATCH 08/22] Customer Wohnhilfe Style + Permissions

---
 BeWo/Styles/ControlStyles/ButtonStyles.xaml   |  2 +-
 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml |  2 +-
 BeWo/Styles/ControlStyles/DateEditStyles.xaml |  3 +
 .../ControlStyles/RadioButtonStyles.xaml      |  2 +-
 BeWo/Styles/DataTemplates/DataTemplates.xaml  |  4 +-
 BeWo/Styles/PrototypeStyles.xaml              |  3 +-
 .../Wohnhilfe/CustomerWohnhilfeControl.xaml   | 59 +++++++++----------
 .../CustomerWohnhilfeControl.xaml.cs          |  6 +-
 BeWo/View/Detail/CustomerView.xaml.cs         |  3 +-
 BeWo/View/Detail/CustomerWohnhilfeView.xaml   |  2 +-
 ...stomerWohnhilfeBereichSozialeKontakteVM.cs | 11 +++-
 11 files changed, 54 insertions(+), 43 deletions(-)

diff --git a/BeWo/Styles/ControlStyles/ButtonStyles.xaml b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
index abe9b7e68..74e604440 100644
--- a/BeWo/Styles/ControlStyles/ButtonStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ButtonStyles.xaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--Base-->
+    <!--  Base  -->
     <Style x:Key="BaseButton" TargetType="{x:Type Button}">
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="25" />
diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
index a9390cd92..e325b91fa 100644
--- a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -143,11 +143,11 @@
     <DataTemplate x:Key="ListItemView">
         <TextBlock
             x:Name="textblock"
+            MaxWidth="362"
             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
             Text="{Binding Path=., Converter={StaticResource EnumTranslationConverter}}"
             TextTrimming="CharacterEllipsis"
             TextWrapping="NoWrap"
-            MaxWidth="362"
             ToolTip="{Binding Path=Text, RelativeSource={RelativeSource Self}}" />
     </DataTemplate>
     <Style
diff --git a/BeWo/Styles/ControlStyles/DateEditStyles.xaml b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
index be8854fb6..14a231b62 100644
--- a/BeWo/Styles/ControlStyles/DateEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
@@ -35,6 +35,9 @@
                     <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
                         <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
                     </DataTrigger>
+                    <DataTrigger Binding="{Binding Path=IsReadOnly}" Value="True">
+                        <Setter TargetName="PART_Item" Property="IsHitTestVisible" Value="False" />
+                    </DataTrigger>
                 </DataTemplate.Triggers>
             </DataTemplate>
         </Style.Resources>
diff --git a/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
index 0227101bb..70e0a0711 100644
--- a/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
+++ b/BeWo/Styles/ControlStyles/RadioButtonStyles.xaml
@@ -1,5 +1,5 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!--Base-->
+    <!--  Base  -->
     <Style x:Key="BaseRadioButton" TargetType="RadioButton">
         <Setter Property="Margin" Value="3" />
         <Setter Property="VerticalAlignment" Value="Top" />
diff --git a/BeWo/Styles/DataTemplates/DataTemplates.xaml b/BeWo/Styles/DataTemplates/DataTemplates.xaml
index 2e8f8179a..f19035920 100644
--- a/BeWo/Styles/DataTemplates/DataTemplates.xaml
+++ b/BeWo/Styles/DataTemplates/DataTemplates.xaml
@@ -1,6 +1,4 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:BeWo.Converter">
-    
-</ResourceDictionary>
\ No newline at end of file
+    xmlns:conv="clr-namespace:BeWo.Converter" />
\ No newline at end of file
diff --git a/BeWo/Styles/PrototypeStyles.xaml b/BeWo/Styles/PrototypeStyles.xaml
index 4d80e9a27..51f1000ac 100644
--- a/BeWo/Styles/PrototypeStyles.xaml
+++ b/BeWo/Styles/PrototypeStyles.xaml
@@ -8,5 +8,4 @@
     xmlns:dxei="http://schemas.devexpress.com/winfx/2008/xaml/editors/internal"
     xmlns:dxet="http://schemas.devexpress.com/winfx/2008/xaml/editors/themekeys"
     xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
-    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls">
-</ResourceDictionary>
\ No newline at end of file
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls" />
\ No newline at end of file
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 9af697f7d..78172cc68 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -14,7 +14,7 @@
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     xmlns:wohnhilfe="clr-namespace:BeWo.View.Controls.Wohnhilfe"
-    x:Name="root_usercontrol"
+    x:Name="root"
     HorizontalAlignment="Stretch"
     d:DataContext="{d:DesignInstance d:Type=viewmodel:CustomerWohnhilfeVM,
                                      IsDesignTimeCreatable=True}"
@@ -33,8 +33,20 @@
             <Style x:Key="StackpanelDetailsStyle" TargetType="{x:Type StackPanel}">
                 <Setter Property="Margin" Value="40,-1,0,3" />
             </Style>
-            <Style BasedOn="{StaticResource EnumTranslationNullItemComboBox}" TargetType="{x:Type uc:NullItemComboBox}" />
-            <Style BasedOn="{StaticResource EnumTranslationComboBox}" TargetType="{x:Type ComboBox}" />
+            <Style BasedOn="{StaticResource EnumTranslationNullItemComboBox}" TargetType="{x:Type uc:NullItemComboBox}">
+                <Setter Property="IsEnabled" Value="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root}" />
+            </Style>
+            <Style BasedOn="{StaticResource EnumTranslationComboBox}" TargetType="{x:Type ComboBox}">
+                <Setter Property="IsEnabled" Value="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root}" />
+            </Style>
+            <Style BasedOn="{StaticResource BaseRadioButton}" TargetType="RadioButton">
+                <Setter Property="IsHitTestVisible" Value="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root}" />
+                <Setter Property="Focusable" Value="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root}" />
+            </Style>
+            <Style BasedOn="{StaticResource PrimaryDateEdit}" TargetType="{x:Type dxe:DateEdit}">
+                <Setter Property="IsReadOnly" Value="{Binding PermissionCustomerWohnhilfeManage, Converter={StaticResource BoolReverseConverter}, Mode=OneTime, ElementName=root}" />
+                <Setter Property="ShowEditorButtons" Value="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, ElementName=root}" />
+            </Style>
         </ResourceDictionary>
     </UserControl.Resources>
     <ScrollViewer
@@ -99,37 +111,24 @@
                     <dxe:TextEdit
                         Grid.Row="2"
                         Grid.Column="2"
-                        Height="23"
-                        Margin="3"
-                        dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=AlterAmStichtag, UpdateSourceTrigger=PropertyChanged}"
-                        Mask="#########"
-                        MaskType="Numeric"
-                        MaskUseAsDisplayFormat="True" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
 
                     <Label Grid.Row="3" Grid.Column="0">B1040 Haushaltsgröße</Label>
                     <dxe:TextEdit
                         Grid.Row="3"
                         Grid.Column="2"
-                        Height="23"
-                        Margin="3"
-                        dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=Haushaltsgrosse, UpdateSourceTrigger=PropertyChanged}"
-                        Mask="N0"
-                        MaskType="Numeric"
-                        MaskUseAsDisplayFormat="True" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
 
                     <Label Grid.Row="4" Grid.Column="0">B1050 BerichtseinheitID</Label>
                     <dxe:TextEdit
                         Grid.Row="4"
                         Grid.Column="2"
-                        Height="23"
-                        Margin="3"
-                        dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=BerichtseinheitID, UpdateSourceTrigger=PropertyChanged}"
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                         Mask="00000000000"
-                        MaskType="Numeric"
-                        MaskUseAsDisplayFormat="True" />
+                        Style="{StaticResource BaseNumberMaskTextEdit}" />
 
                     <Label Grid.Row="5" Grid.Column="0">B1060 Unterbringungsort</Label>
                     <uc:NullItemComboBox
@@ -142,11 +141,10 @@
                     <dxe:TextEdit
                         Grid.Row="6"
                         Grid.Column="2"
-                        dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=OrtDerEinrichtung, UpdateSourceTrigger=PropertyChanged}"
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
                         Mask="00000000"
-                        MaskType="Numeric"
-                        MaskUseAsDisplayFormat="True" />
+                        Style="{StaticResource BaseNumberMaskTextEdit}" />
 
                     <Label Grid.Row="7" Grid.Column="0">B1080 Angebot</Label>
                     <uc:NullItemComboBox
@@ -230,6 +228,7 @@
                         Grid.Column="1"
                         ItemsSource="{Binding EinkommenssituationTypes}"
                         SelectedValue="{Binding BeginnEinkommenssituation}" />
+
                     <Label Grid.Row="1" Grid.Column="3">W2030 Einkommenssituation</Label>
                     <ComboBox
                         Grid.Row="1"
@@ -243,6 +242,7 @@
                         Grid.Column="1"
                         ItemsSource="{Binding AufstockungEinkommenTypes}"
                         SelectedValue="{Binding BeginnAufstockungEinkommen}" />
+
                     <Label Grid.Row="2" Grid.Column="3">W2040 Aufstockung des Einkommens</Label>
                     <ComboBox
                         Grid.Row="2"
@@ -256,6 +256,7 @@
                         Grid.Column="1"
                         ItemsSource="{Binding WohnhilfeBoolDataTypes}"
                         SelectedValue="{Binding BeginnEigenesBankkonto}" />
+
                     <Label Grid.Row="3" Grid.Column="3">W2060 Eigenes Bankkonto</Label>
                     <ComboBox
                         x:Name="Combobox"
@@ -341,7 +342,10 @@
                         <RowDefinition Height="auto" />
                     </Grid.RowDefinitions>
 
-                    <Border x:Name="b" Grid.Column="1" Visibility="Hidden"/>
+                    <Border
+                        x:Name="b"
+                        Grid.Column="1"
+                        Visibility="Hidden" />
 
                     <Label Grid.Row="0" Grid.Column="0">K0110 Bundesland</Label>
                     <ComboBox
@@ -383,13 +387,8 @@
                     <dxe:TextEdit
                         Grid.Row="5"
                         Grid.Column="1"
-                        Height="23"
-                        Margin="3"
-                        dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
                         EditValue="{Binding Path=BetreuungsdauerInTagen, UpdateSourceTrigger=PropertyChanged}"
-                        Mask="#######"
-                        MaskType="Numeric"
-                        MaskUseAsDisplayFormat="True" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"/>
 
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
index abde96f2b..ee893de17 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml.cs
@@ -21,6 +21,8 @@ namespace BeWo.View.Controls.Wohnhilfe
     /// </summary>
     public partial class CustomerWohnhilfeControl : UserControl
     {
+        public bool PermissionCustomerWohnhilfeManage { get; } = BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_Wohnhilfe_Manage);
+
         public bool IsLarge
         {
             get { return (bool)GetValue(IsLargeProperty); }
@@ -51,9 +53,9 @@ namespace BeWo.View.Controls.Wohnhilfe
         {
             InitializeComponent();
 
-            root_usercontrol.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+            root.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
 
-            var size = root_usercontrol.DesiredSize;
+            var size = root.DesiredSize;
 
             MinWidthGrid = size.Width;
         }
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 581d7345e..faf3b7284 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index f3c2a873d..eca4bd76a 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -65,7 +65,7 @@
                                 <Button.Visibility>
                                     <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding Path="PermissionCustomerWohnhilfeEdit" ElementName="root_control" />
+                                        <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>
diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
index dc04fad58..07a301565 100644
--- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
+++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
@@ -9,6 +9,8 @@ namespace BeWo.ViewModel.Wohnhilfe
 {
     public class CustomerWohnhilfeBereichSozialeKontakteVM : AbstractDCMapperVM<CustomerWohnhilfeBereichSozialeKontakteDC>
     {
+        public bool PermissionCustomerWohnhilfeManage { get; } = BeWoApp.HasLoggedOnUserRight(BS.Shared.UserRightType.Customer_Wohnhilfe_Manage);
+
         private bool _CanEditBeginnKontakt;
         private bool _CanEditEndeKontakt;
 
@@ -41,7 +43,8 @@ namespace BeWo.ViewModel.Wohnhilfe
 
         public CustomerWohnhilfeBereichSozialeKontakteVM(CustomerWohnhilfeBereichSozialeKontakteDC dc) : base(dc, dc.Oid == null)
         {
-
+            _CanEditBeginnKontakt &= PermissionCustomerWohnhilfeManage;
+            _CanEditEndeKontakt &= PermissionCustomerWohnhilfeManage;
         }
 
         public IEnumerable<WohnhilfeBoolData> WohnhilfeBoolDataTypes => Utils.GetAllEnumValues<WohnhilfeBoolData>();
@@ -57,6 +60,9 @@ namespace BeWo.ViewModel.Wohnhilfe
                 if (!AreDifferent(_CanEditBeginnKontakt, value))
                     return;
 
+                if (!PermissionCustomerWohnhilfeManage)
+                    return;
+
                 _CanEditBeginnKontakt = value;
 
                 //if (!value)
@@ -81,6 +87,9 @@ namespace BeWo.ViewModel.Wohnhilfe
                 if (!AreDifferent(_CanEditEndeKontakt, value))
                     return;
 
+                if (!PermissionCustomerWohnhilfeManage)
+                    return;
+
                 _CanEditEndeKontakt = value;
 
                 //if (!value)

From 38fc0e6d0dd6431be011b3bc7cffdf958274ddb7 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 11:32:10 +0200
Subject: [PATCH 09/22] Format + Design Mode Permission Notice

---
 BeWo/BeWoApp.xaml.cs                        | 771 ++++++++++----------
 BeWo/View/Detail/CustomerWohnhilfeView.xaml | 141 ++--
 2 files changed, 471 insertions(+), 441 deletions(-)

diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 68ff9b797..d84e52073 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -40,8 +40,8 @@ namespace BeWo
 	///     Interaction logic for App.xaml
 	/// </summary>
 	public partial class BeWoApp : INotifyPropertyChanged
-    {
-        private static DebugMessageLogView _DebugMessageLogView;
+	{
+		private static DebugMessageLogView _DebugMessageLogView;
 
 
 		private static FrameworkElement _lockedContent;
@@ -49,8 +49,8 @@ namespace BeWo
 		public static LoginControl LoginControl;
 
 		public static MainControl MainControl;
-	    public static string ShortVersion = "3.22";
-        public static string Version = "Version 3.22.4";
+		public static string ShortVersion = "3.22";
+		public static string Version = "Version 3.22.4";
 
 		public static int RenderTier = 0;
 
@@ -64,13 +64,13 @@ namespace BeWo
 
 		internal static string UserPassword = string.Empty;
 
-	    internal static string TwoFactorPin = string.Empty;
+		internal static string TwoFactorPin = string.Empty;
 
-        internal static string chatServerURL = string.Empty;
+		internal static string chatServerURL = string.Empty;
 
 		private static AppSettings _AppSettings;
 
-	    private static CompactEmployeeDC _CompactLoggedOnEmployee;
+		private static CompactEmployeeDC _CompactLoggedOnEmployee;
 		private static EmployeeDC _LoggedOnEmployee;
 
 		private static UserDC _LoggedOnUser;
@@ -80,39 +80,39 @@ namespace BeWo
 		private static int _LockUITime = 30;
 		private static List<Window> OpenDevExpressEditForms = new List<Window>();
 
-        private static DocumentWatcher _DocumentWatcher;
+		private static DocumentWatcher _DocumentWatcher;
 
-        internal static PasswortSecurityStrength PasswortStrength;
+		internal static PasswortSecurityStrength PasswortStrength;
 
 		public static BeWoApp CurrentBeWo => Current as BeWoApp;
 
-        public static Dictionary<string, string> ICD10Diagnosis { get; set; }
+		public static Dictionary<string, string> ICD10Diagnosis { get; set; }
 
 		public static EmployeeDC LoggedOnEmployee
 		{
 			get => _LoggedOnEmployee;
 
-            set => _LoggedOnEmployee = value;
-        }
+			set => _LoggedOnEmployee = value;
+		}
 
-	    public static long? LoggedOnEmployeeOid => _LoggedOnEmployee?.EmployeeOid;
+		public static long? LoggedOnEmployeeOid => _LoggedOnEmployee?.EmployeeOid;
 
-	    public static CompactEmployeeDC CompactLoggedOnEmployee
-	    {
-            get => _CompactLoggedOnEmployee;
+		public static CompactEmployeeDC CompactLoggedOnEmployee
+		{
+			get => _CompactLoggedOnEmployee;
 
-	        set => _CompactLoggedOnEmployee = value;
-	    }
+			set => _CompactLoggedOnEmployee = value;
+		}
 
 		public ObservableCollection<UserRightType> LoggedOnUsersRights => LoggedOnUser?.GetGrantedRights().ToObservableCollection();
 
-        public DocumentWatcher DocumentWatcher => _DocumentWatcher ?? (_DocumentWatcher = new DocumentWatcher());
+		public DocumentWatcher DocumentWatcher => _DocumentWatcher ?? (_DocumentWatcher = new DocumentWatcher());
 
-        public static string ServerAddress
+		public static string ServerAddress
 		{
 			get => _ServerAddress;
 
-            set
+			set
 			{
 				//if (_ServerAddress != null && _ServerAddress.Equals(value))
 				//    return;
@@ -138,7 +138,7 @@ namespace BeWo
 		{
 			get => _LoggedOnUser;
 
-		    set
+			set
 			{
 				_LoggedOnUser = value;
 				if (_LoggedOnUser != null)
@@ -150,9 +150,9 @@ namespace BeWo
 						{
 							_LoggedOnEmployee = r;
 
-                            ServiceFacade.DoEmployeeServiceAsync(s => s.LoadCompactEmployee(value.Employee.EmployeeOid), r2 => { _CompactLoggedOnEmployee = r2; });
+							ServiceFacade.DoEmployeeServiceAsync(s => s.LoadCompactEmployee(value.Employee.EmployeeOid), r2 => { _CompactLoggedOnEmployee = r2; });
 
-						    MainControl?.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() => MainControl.InitOffeneTermine()));
+							MainControl?.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() => MainControl.InitOffeneTermine()));
 						});
 				}
 
@@ -164,50 +164,50 @@ namespace BeWo
 		{
 			get => _Mandator;
 
-		    set
+			set
 			{
 				_Mandator = value;
 
-			    bool showDatevFields                          = false;
-			    bool isServiceRecordNoticeMandatory           = true;
-                bool isPasswordSecurityActiv                  = false;
-			    bool showServiceRecordsDistanceFields         = false;
-                bool showHilfeplanBezeichnung                 = false;
-                bool showArbeitszeiten                        = false;
-                bool showCustomerDistanceFields               = false;
-			    bool showAdditionalService                    = false;
-			    bool showRoundedDurationInEmployeeAnalysis    = true;
-			    bool showTeamNews                             = false;
-                bool showMarker                               = false;
-			    bool showAnnualReport                         = false;
-			    int maxDaysEditServiceRecordsAllowed          = 0;
-                int hilfeplanAuslaufAuswahl                   = 3;
-                int anzTageZeiterfassErfolgt                  = 0;
-			    int zeiterfassungsSchwellwert                 = 80;
-                bool printerSettingsUseLandscape              = false;
-			    bool printerSettingsUseMargins                = false;
-			    bool printerSettingsUsePaperKind              = false;
-                var hideServiceRecordInsertedByAndInsertedOn  = false;
-                bool isEndDateVisible                         = false;
-			    bool isOnlyYearMonthVisible                   = false;
-			    bool isZeiterfassDateNormal                   = true;
-			    int lastSelectedStundenkontoIntervall         = 3;
-			    bool showSignatures                           = false;
-			    bool showBetrag = false;
-			    bool showRtfTextfield                         = false;
-			    bool showPivotGrid                            = false;
-			    bool showUrlaubsplanung                       = false;
-			    bool dontShowSpitzabrechnung                  = false;
-			    bool showDienstplanung                        = false;
-                var showEmployeeSignature                     = false;
-                var showMultipleResourceColors                = false;
-                var showInfoButtonInCalender				  = false;
+				bool showDatevFields = false;
+				bool isServiceRecordNoticeMandatory = true;
+				bool isPasswordSecurityActiv = false;
+				bool showServiceRecordsDistanceFields = false;
+				bool showHilfeplanBezeichnung = false;
+				bool showArbeitszeiten = false;
+				bool showCustomerDistanceFields = false;
+				bool showAdditionalService = false;
+				bool showRoundedDurationInEmployeeAnalysis = true;
+				bool showTeamNews = false;
+				bool showMarker = false;
+				bool showAnnualReport = false;
+				int maxDaysEditServiceRecordsAllowed = 0;
+				int hilfeplanAuslaufAuswahl = 3;
+				int anzTageZeiterfassErfolgt = 0;
+				int zeiterfassungsSchwellwert = 80;
+				bool printerSettingsUseLandscape = false;
+				bool printerSettingsUseMargins = false;
+				bool printerSettingsUsePaperKind = false;
+				var hideServiceRecordInsertedByAndInsertedOn = false;
+				bool isEndDateVisible = false;
+				bool isOnlyYearMonthVisible = false;
+				bool isZeiterfassDateNormal = true;
+				int lastSelectedStundenkontoIntervall = 3;
+				bool showSignatures = false;
+				bool showBetrag = false;
+				bool showRtfTextfield = false;
+				bool showPivotGrid = false;
+				bool showUrlaubsplanung = false;
+				bool dontShowSpitzabrechnung = false;
+				bool showDienstplanung = false;
+				var showEmployeeSignature = false;
+				var showMultipleResourceColors = false;
+				var showInfoButtonInCalender = false;
 
 
 
 
 				AppSettings.ShowAdvisedAttendedFlag = false;
-                var timeRecordingMenuName = string.Empty;
+				var timeRecordingMenuName = string.Empty;
 
 				if (_Mandator != null)
 				{
@@ -230,32 +230,32 @@ namespace BeWo
 					AppSettings.SetStartTimeToEndTimeAfterSave = val != null && val.Equals("1");
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsServiceRecordNoticeMandatory);
-					if(val != null && val.Equals("0"))
+					if (val != null && val.Equals("0"))
 					{
 						isServiceRecordNoticeMandatory = false;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsPasswordSecurityActiv);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						isPasswordSecurityActiv = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsEndDateVisible);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						isEndDateVisible = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsOnlyYearMonthVisible);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						isOnlyYearMonthVisible = true;
 					}
 
 					AppSettings.EinheitZeiterfassung = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.EinheitZeiterfassung);
 					if (String.IsNullOrEmpty(AppSettings.EinheitZeiterfassung))
-                    {
+					{
 						AppSettings.EinheitZeiterfassung = "0";
 					}
 					if (AppSettings.EinheitZeiterfassung == "0")
@@ -268,7 +268,7 @@ namespace BeWo
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.IsZeiterfassDateNormal);
-					if(val != null && val.Equals("0"))
+					if (val != null && val.Equals("0"))
 					{
 						isZeiterfassDateNormal = false;
 					}
@@ -276,59 +276,59 @@ namespace BeWo
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.MaxDaysEditServiceRecordsAllowed);
 					int result;
-					if(Int32.TryParse(val, out result))
+					if (Int32.TryParse(val, out result))
 					{
 						maxDaysEditServiceRecordsAllowed = result;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.HilfeplanAuslaufAuswahl);
 					int resultplan;
-					if(Int32.TryParse(val, out resultplan))
+					if (Int32.TryParse(val, out resultplan))
 					{
 						hilfeplanAuslaufAuswahl = resultplan;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.LastSelectedStundenkontoIntervall);
 					int resultinterval;
-					if(Int32.TryParse(val, out resultinterval))
+					if (Int32.TryParse(val, out resultinterval))
 					{
 						lastSelectedStundenkontoIntervall = resultinterval;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.AnzTageZeiterfassErfolgt);
 					int resultzeitplan;
-					if(Int32.TryParse(val, out resultzeitplan))
+					if (Int32.TryParse(val, out resultzeitplan))
 					{
 						anzTageZeiterfassErfolgt = resultzeitplan;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ZeiterfassungsSchwellwert);
 					int resultschwell;
-					if(Int32.TryParse(val, out resultschwell))
+					if (Int32.TryParse(val, out resultschwell))
 					{
 						zeiterfassungsSchwellwert = resultschwell;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowDistanceFields);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showServiceRecordsDistanceFields = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowBetrag);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showBetrag = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowHilfeplanBezeichnung);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showHilfeplanBezeichnung = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowArbeitszeiten);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showArbeitszeiten = true;
 					}
@@ -339,31 +339,31 @@ namespace BeWo
 
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowTeamNews);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showTeamNews = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowPivotGrid);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showPivotGrid = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowUrlaubsplanung);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showUrlaubsplanung = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.DontShowSpitzabrechnung);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						dontShowSpitzabrechnung = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowDienstplanung);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showDienstplanung = true;
 					}
@@ -406,80 +406,80 @@ namespace BeWo
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMarker);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showMarker = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowAnnualReport);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showAnnualReport = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowCustomerDistanceFields);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showCustomerDistanceFields = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowAdditionalService);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showAdditionalService = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowRoundedDurationInEmployeeAnalysis);
-					if(val != null && val.Equals("0"))
+					if (val != null && val.Equals("0"))
 					{
 						showRoundedDurationInEmployeeAnalysis = false;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowDatevFields);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showDatevFields = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.PrinterSettingsUseLandscape);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						printerSettingsUseLandscape = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.PrinterSettingsUseMargins);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						printerSettingsUseMargins = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.PrinterSettingsUsePaperKind);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						printerSettingsUsePaperKind = true;
 					}
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						hideServiceRecordInsertedByAndInsertedOn = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowSignature);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showSignatures = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowRtfTextfield);
-					if(val != null && val.Equals("1"))
+					if (val != null && val.Equals("1"))
 					{
 						showRtfTextfield = true;
 					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowEmployeeSignature);
-					if(val != null && val.Equals("1"))
-                    {
-                        showEmployeeSignature = true;
-                    }
+					if (val != null && val.Equals("1"))
+					{
+						showEmployeeSignature = true;
+					}
 
-                    val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMultipleResourceColors);
-                    if(val != null && val.Equals("1"))
-                    {
-                        showMultipleResourceColors = true;
-                    }
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowMultipleResourceColors);
+					if (val != null && val.Equals("1"))
+					{
+						showMultipleResourceColors = true;
+					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowKlientenBetreuungszeiten);
 					if (val != null && val.Equals("1"))
@@ -512,10 +512,10 @@ namespace BeWo
 					AppSettings.ShowAIInternal = val != null && val.Equals("1");
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.MoKSessionTimeout);
-                    if(int.TryParse(val, out var sessionTimeout))
-                    {
-                        AppSettings.MoKSessionTimeout = sessionTimeout;
-                    }
+					if (int.TryParse(val, out var sessionTimeout))
+					{
+						AppSettings.MoKSessionTimeout = sessionTimeout;
+					}
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ServiceRecordAllowChangeHours);
 					if (val != null)
@@ -529,8 +529,8 @@ namespace BeWo
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowImportAbschlagszahlungen);
 					AppSettings.ShowImportAbschlagszahlungen = val != null && val.Equals("1");
 
-                    val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowPersehImport);
-                    AppSettings.ShowPersehImport = val != null && val.Equals("1");
+					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowPersehImport);
+					AppSettings.ShowPersehImport = val != null && val.Equals("1");
 
 					val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.DontUpdateApprovalPeriodDates);
 					AppSettings.DontUpdateApprovalPeriodDates = val != null && val.Equals("1");
@@ -602,41 +602,41 @@ namespace BeWo
 				//showInfoButtonInCalender = true;
 #endif
 
-				AppSettings.ShowDatevFields                          = showDatevFields;
-				AppSettings.IsServiceRecordNoticeMandatory           = isServiceRecordNoticeMandatory;
-                AppSettings.IsPasswordSecurityActiv                  = isPasswordSecurityActiv;
-                AppSettings.IsEndDateVisible                         = isEndDateVisible;
-			    AppSettings.IsOnlyYearMonthVisible                   = isOnlyYearMonthVisible;
-			    AppSettings.IsZeiterfassDateNormal                   = isZeiterfassDateNormal;
-				AppSettings.MaxDaysEditServiceRecordsAllowed         = maxDaysEditServiceRecordsAllowed;
-                AppSettings.HilfeplanAuslaufAuswahl                  = hilfeplanAuslaufAuswahl;
-			    AppSettings.LastSelectedStundenkontoIntervall        = lastSelectedStundenkontoIntervall;
-                AppSettings.AnzTageZeiterfassErfolgt                 = anzTageZeiterfassErfolgt;
-			    AppSettings.ZeiterfassungsSchwellwert                = zeiterfassungsSchwellwert;
-                AppSettings.TimeRecordingMenuName                    = timeRecordingMenuName;
-				AppSettings.ShowDistanceFields                       = showServiceRecordsDistanceFields;
-			    AppSettings.ShowBetrag								 = showBetrag;
-                AppSettings.ShowHilfeplanBezeichnung                 = showHilfeplanBezeichnung;
-                AppSettings.ShowArbeitszeiten                        = showArbeitszeiten;
-                AppSettings.ShowSignatures                           = showSignatures;
-			    AppSettings.ShowRtfTextfield                         = showRtfTextfield;
-				AppSettings.ShowCustomerDistanceFields               = showCustomerDistanceFields;
-				AppSettings.ShowAdditionalService                    = showAdditionalService;
-				AppSettings.ShowRoundedDurationInEmployeeAnalysis    = showRoundedDurationInEmployeeAnalysis;
+				AppSettings.ShowDatevFields = showDatevFields;
+				AppSettings.IsServiceRecordNoticeMandatory = isServiceRecordNoticeMandatory;
+				AppSettings.IsPasswordSecurityActiv = isPasswordSecurityActiv;
+				AppSettings.IsEndDateVisible = isEndDateVisible;
+				AppSettings.IsOnlyYearMonthVisible = isOnlyYearMonthVisible;
+				AppSettings.IsZeiterfassDateNormal = isZeiterfassDateNormal;
+				AppSettings.MaxDaysEditServiceRecordsAllowed = maxDaysEditServiceRecordsAllowed;
+				AppSettings.HilfeplanAuslaufAuswahl = hilfeplanAuslaufAuswahl;
+				AppSettings.LastSelectedStundenkontoIntervall = lastSelectedStundenkontoIntervall;
+				AppSettings.AnzTageZeiterfassErfolgt = anzTageZeiterfassErfolgt;
+				AppSettings.ZeiterfassungsSchwellwert = zeiterfassungsSchwellwert;
+				AppSettings.TimeRecordingMenuName = timeRecordingMenuName;
+				AppSettings.ShowDistanceFields = showServiceRecordsDistanceFields;
+				AppSettings.ShowBetrag = showBetrag;
+				AppSettings.ShowHilfeplanBezeichnung = showHilfeplanBezeichnung;
+				AppSettings.ShowArbeitszeiten = showArbeitszeiten;
+				AppSettings.ShowSignatures = showSignatures;
+				AppSettings.ShowRtfTextfield = showRtfTextfield;
+				AppSettings.ShowCustomerDistanceFields = showCustomerDistanceFields;
+				AppSettings.ShowAdditionalService = showAdditionalService;
+				AppSettings.ShowRoundedDurationInEmployeeAnalysis = showRoundedDurationInEmployeeAnalysis;
 				AppSettings.HideServiceRecordInsertedByAndInsertedOn = hideServiceRecordInsertedByAndInsertedOn;
-				AppSettings.ShowTeamNews                             = showTeamNews;
-				AppSettings.ShowMarker                               = showMarker;
-				AppSettings.ShowAnnualReport                         = showAnnualReport;
-				AppSettings.PrinterSettingsUseLandscape              = printerSettingsUseLandscape;
-				AppSettings.PrinterSettingsUseMargins                = printerSettingsUseMargins;
-				AppSettings.PrinterSettingsUsePaperKind              = printerSettingsUsePaperKind;
-			    AppSettings.ShowPivotGrid                            = showPivotGrid;
-			    AppSettings.ShowUrlaubsplanung                       = showUrlaubsplanung;
-			    AppSettings.DontShowSpitzabrechnung                  = dontShowSpitzabrechnung;
-			    AppSettings.ShowDienstplanung                        = showDienstplanung;
-                AppSettings.ShowEmployeeSignature	                 = showEmployeeSignature;
-                AppSettings.ShowMultipleResourceColors				 = showMultipleResourceColors;
-                AppSettings.ShowInfoButtonInCalender				 = showInfoButtonInCalender;
+				AppSettings.ShowTeamNews = showTeamNews;
+				AppSettings.ShowMarker = showMarker;
+				AppSettings.ShowAnnualReport = showAnnualReport;
+				AppSettings.PrinterSettingsUseLandscape = printerSettingsUseLandscape;
+				AppSettings.PrinterSettingsUseMargins = printerSettingsUseMargins;
+				AppSettings.PrinterSettingsUsePaperKind = printerSettingsUsePaperKind;
+				AppSettings.ShowPivotGrid = showPivotGrid;
+				AppSettings.ShowUrlaubsplanung = showUrlaubsplanung;
+				AppSettings.DontShowSpitzabrechnung = dontShowSpitzabrechnung;
+				AppSettings.ShowDienstplanung = showDienstplanung;
+				AppSettings.ShowEmployeeSignature = showEmployeeSignature;
+				AppSettings.ShowMultipleResourceColors = showMultipleResourceColors;
+				AppSettings.ShowInfoButtonInCalender = showInfoButtonInCalender;
 
 				BS.Shared.Settings.ApplicationSettings.SupportConceptExpirationLimitInMonths = AppSettings.HilfeplanAuslaufAuswahl;
 			}
@@ -654,16 +654,16 @@ namespace BeWo
 #endif
 
 				if (!String.IsNullOrEmpty(ServerAddress) && String.IsNullOrEmpty(url))
-                {
+				{
 					url = ServerAddress.ToLower();
 				}
-				
 
-                if (url.IndexOf("localhost") < 0)
+
+				if (url.IndexOf("localhost") < 0)
 				{
 					int i;
 
-					
+
 					if (Int32.TryParse(url, out i))
 						url = "app" + url;
 
@@ -671,17 +671,17 @@ namespace BeWo
 					{
 						url += ".bewoplaner.de";
 					}
-					
-                    //if (url.IndexOf("/service45") < 0)
-                    //{
-                    //	url += "/service45";
-                    //}
-                    if (url.IndexOf("/service") < 0)
-                    {
-                        url += "/service";
-                    }
 
-                    return new Uri(String.Format("https://{0}", url));
+					//if (url.IndexOf("/service45") < 0)
+					//{
+					//	url += "/service45";
+					//}
+					if (url.IndexOf("/service") < 0)
+					{
+						url += "/service";
+					}
+
+					return new Uri(String.Format("https://{0}", url));
 				}
 				return new Uri(url);
 			}
@@ -693,7 +693,7 @@ namespace BeWo
 			{
 				var lockTime = _Mandator.Settings.SplitToKeyValuePairList(";", "=").FirstOrDefault(f => f.Key.Equals(SettingsKeys.TimeUntilUILock)).Value;
 
-				if(_LoggedOnUser != null && lockTime != null)
+				if (_LoggedOnUser != null && lockTime != null)
 				{
 					return Convert.ToInt32(lockTime);
 				}
@@ -706,11 +706,11 @@ namespace BeWo
 				_LockUITime = value;
 
 				if (_LoggedOnUser == null)
-                {
-                    return;
-                }
+				{
+					return;
+				}
 
-                AutoLockUI.LockUITime = value;
+				AutoLockUI.LockUITime = value;
 				AutoLockUI.StopTimer();
 				AutoLockUI.StartAutoLockUIOption();
 			}
@@ -759,14 +759,14 @@ namespace BeWo
 			return Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 		}
 
-        private static void CheckOldBSPathAndCopyFiles(string companyFilePathBS, string companyFilePathOS)
-        {
-            if (Directory.Exists(companyFilePathBS))
-            {
+		private static void CheckOldBSPathAndCopyFiles(string companyFilePathBS, string companyFilePathOS)
+		{
+			if (Directory.Exists(companyFilePathBS))
+			{
 				var bsFiles = Directory.GetFiles(companyFilePathBS);
 
 				if (bsFiles.Length > 0)
-                {
+				{
 					var osFiles = Directory.GetFiles(companyFilePathOS);
 					if (osFiles.Length == 0)
 					{
@@ -777,21 +777,28 @@ namespace BeWo
 
 						Directory.Delete(companyFilePathBS);
 					}
-					
-                }
-				
+
+				}
+
 				//var p = Directory.GetParent(companyFilePathBS);
 				//Directory.Delete(Directory.GetParent(companyFilePathBS).FullName);
 			}
-        }
+		}
 
 		internal static bool HasLoggedOnUserRight(UserRightType right)
-        {
+		{
+#if DEBUG
+			bool designTime = DesignerProperties.GetIsInDesignMode(new DependencyObject());
+
+			if (designTime)
+				return true;
+#endif
+
 			if (LoggedOnUser is null)
 				return false;
 
 			return LoggedOnUser.HasRight(right);
-        }
+		}
 
 		internal static bool HasLoggedOnUserRight(UserRightType[] pRight)
 		{
@@ -818,31 +825,31 @@ namespace BeWo
 			return false;
 		}
 
-        internal static void SaveAppSettings()
+		internal static void SaveAppSettings()
 		{
 			if (_AppSettings != null && _LoggedOnUser != null && _AppSettings.IsDirty)
 			{
 				_AppSettings.IsDirty = false;
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.WindowStateType, ((int) _AppSettings.WindowState).ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, ((int) _AppSettings.LastSelectedServiceRecordTimeInterval).ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterInZeiterfassung, ((int)_AppSettings.CustomerFilterInZeiterfassung).ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterSupportConcepts, ((int)_AppSettings.CustomerFilterSupportConcepts).ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterCustomers, ((int)_AppSettings.CustomerFilterCustomers).ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ShowExpiredSupportConcepts, _AppSettings.ShowExpiredSupportConcepts ? "1" : "0", _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ShowServiceRecordGridControl, _AppSettings.ShowServiceRecordGridControl ? "1" : "0", _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.StartupPanelMaximized, _AppSettings.StartupPanelMaximized, _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn, _AppSettings.HideServiceRecordInsertedByAndInsertedOn ? "1" : "0", _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.DocumentationFontSize, _AppSettings.DocumentationFontSize.ToString(), _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ZeigeNurMeineTermine, _AppSettings.ZeigeNurMeineTermine ? "1" : "0", _LoggedOnUser.Settings);
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, _AppSettings.LastSelectedServiceRecordTimeIntervalDays.ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.WindowStateType, ((int)_AppSettings.WindowState).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, ((int)_AppSettings.LastSelectedServiceRecordTimeInterval).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterInZeiterfassung, ((int)_AppSettings.CustomerFilterInZeiterfassung).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterSupportConcepts, ((int)_AppSettings.CustomerFilterSupportConcepts).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterCustomers, ((int)_AppSettings.CustomerFilterCustomers).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ShowExpiredSupportConcepts, _AppSettings.ShowExpiredSupportConcepts ? "1" : "0", _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ShowServiceRecordGridControl, _AppSettings.ShowServiceRecordGridControl ? "1" : "0", _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.StartupPanelMaximized, _AppSettings.StartupPanelMaximized, _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.HideServiceRecordInsertedByAndInsertedOn, _AppSettings.HideServiceRecordInsertedByAndInsertedOn ? "1" : "0", _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.DocumentationFontSize, _AppSettings.DocumentationFontSize.ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ZeigeNurMeineTermine, _AppSettings.ZeigeNurMeineTermine ? "1" : "0", _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, _AppSettings.LastSelectedServiceRecordTimeIntervalDays.ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordMonth, _AppSettings.LastSelectedServiceRecordMonth.ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastKassenSortOrder, _AppSettings.LastKassenSortOrder.ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, ((int)_AppSettings.LetzteZeiterfassungsDauer).ToString(), _LoggedOnUser.Settings);
-				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, ((int) _AppSettings.SchedulerViewType).ToString(), _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, ((int)_AppSettings.SchedulerViewType).ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerTimelineViewDayCount, (_AppSettings.SchedulerTimelineViewDayCount).ToString(), _LoggedOnUser.Settings);
 				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerDayViewDayCount, _AppSettings.SchedulerDayViewDayCount.ToString(), _LoggedOnUser.Settings);
 
-                string val = string.Empty;
+				string val = string.Empty;
 				if (_AppSettings.StartupPanelOrder != null)
 				{
 					foreach (string item in _AppSettings.StartupPanelOrder)
@@ -856,7 +863,7 @@ namespace BeWo
 					}
 				}
 
-			    UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.StartupPanelOrder, val, _LoggedOnUser.Settings);
+				UserSettingsUtils.SetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.StartupPanelOrder, val, _LoggedOnUser.Settings);
 
 				ServiceFacade.DoUserServiceAsync(s => s.UpdateUserSettings(_LoggedOnUser.UserOid.Value, _LoggedOnUser.Settings), ReloadSettings, false);
 			}
@@ -866,24 +873,24 @@ namespace BeWo
 		{
 			if (MainControl != null)
 			{
-				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() =>
-				{
-					UserControl exControl = null;
-					if (showDetails && BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(BS.Shared.UserRightType.Support_View))
-					{
-						exControl = new ExceptionMessageBoxWithSupportMail(ex);
-					}
-					else
-					{
-						exControl = new ExceptionMessageBox(message, ex, showDetails);
-					}
+				MainControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() =>
+			   {
+				   UserControl exControl = null;
+				   if (showDetails && BeWoApp.LoggedOnUser != null && BeWoApp.LoggedOnUser.HasRight(BS.Shared.UserRightType.Support_View))
+				   {
+					   exControl = new ExceptionMessageBoxWithSupportMail(ex);
+				   }
+				   else
+				   {
+					   exControl = new ExceptionMessageBox(message, ex, showDetails);
+				   }
 
-					MainControl.ShowControlAsModalPopup(exControl);
-				}));
+				   MainControl.ShowControlAsModalPopup(exControl);
+			   }));
 			}
 			else if (LoginControl != null)
 			{
-				LoginControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action) (() => LoginControl.ShowControlAsModalPopUp(new ExceptionMessageBox(message, ex, showDetails))));
+				LoginControl.Dispatcher.BeginInvoke(DispatcherPriority.Normal, (Action)(() => LoginControl.ShowControlAsModalPopUp(new ExceptionMessageBox(message, ex, showDetails))));
 			}
 			else
 			{
@@ -892,19 +899,19 @@ namespace BeWo
 		}
 
 		internal void FirePropertyChanged(string pPropertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(pPropertyName));
-        }
+		{
+			PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(pPropertyName));
+		}
 
 		public static void InitAutoUILocking()
 		{
-			EventManager.RegisterClassHandler(typeof (Window), UIElement.PreviewMouseDownEvent, new MouseButtonEventHandler(OnPreviewMouseDown));
-			EventManager.RegisterClassHandler(typeof (Window), UIElement.PreviewKeyDownEvent, new KeyEventHandler(OnPreviewKeyDown));
+			EventManager.RegisterClassHandler(typeof(Window), UIElement.PreviewMouseDownEvent, new MouseButtonEventHandler(OnPreviewMouseDown));
+			EventManager.RegisterClassHandler(typeof(Window), UIElement.PreviewKeyDownEvent, new KeyEventHandler(OnPreviewKeyDown));
 
 			var settingsKeyValuePairList = _Mandator.Settings.SplitToKeyValuePairList(";", "=").ToList();
 
 			var x = settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals(SettingsKeys.TimeUntilUILock)).Value ?? "NULL";
-            
+
 			var y = _LockUITime;
 
 			AutoLockUI.LockUITime = Convert.ToInt32(settingsKeyValuePairList.FirstOrDefault(f => f.Key.Equals(SettingsKeys.TimeUntilUILock)).Value ?? LockUITime.ToString());
@@ -922,22 +929,22 @@ namespace BeWo
 			//    new FrameworkPropertyMetadata { DefaultValue = 30 });
 
 			RenderTier = RenderCapability.Tier >> 16;
-		    
-			// Die Sprache für alle Threads auf Deutsch stellen.
-            var cultureInfo = CultureInfo.CreateSpecificCulture("de-DE");
-            Thread.CurrentThread.CurrentUICulture = cultureInfo;
-            Thread.CurrentThread.CurrentCulture = cultureInfo;
-            CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
-            CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
 
-            base.OnStartup(e);
+			// Die Sprache für alle Threads auf Deutsch stellen.
+			var cultureInfo = CultureInfo.CreateSpecificCulture("de-DE");
+			Thread.CurrentThread.CurrentUICulture = cultureInfo;
+			Thread.CurrentThread.CurrentCulture = cultureInfo;
+			CultureInfo.DefaultThreadCurrentCulture = cultureInfo;
+			CultureInfo.DefaultThreadCurrentUICulture = cultureInfo;
+
+			base.OnStartup(e);
 			//AppDomain.CurrentDomain.UnhandledException += (s, ex) => ShowError(null, ex.ExceptionObject as Exception, true);
-			
+
 			Dispatcher.UnhandledException += (s, ex)
 				=>
 			{
-				if (ex.Exception == null || String.IsNullOrEmpty(ex.Exception.Message) || 
-					(!ex.Exception.ToString().Contains("DevExpress.Xpf.Bars.Customization.CustomizationControl.OnLoaded") 
+				if (ex.Exception == null || String.IsNullOrEmpty(ex.Exception.Message) ||
+					(!ex.Exception.ToString().Contains("DevExpress.Xpf.Bars.Customization.CustomizationControl.OnLoaded")
 					&& !ex.Exception.ToString().Contains("DevExpress.Xpf.Grid.Native.SelectionStrategyCellBase.IsCellSelected")))
 
 				{
@@ -946,7 +953,7 @@ namespace BeWo
 				ex.Handled = true;
 			};
 
-			FrameworkElement.LanguageProperty.OverrideMetadata(typeof (FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
+			FrameworkElement.LanguageProperty.OverrideMetadata(typeof(FrameworkElement), new FrameworkPropertyMetadata(XmlLanguage.GetLanguage(CultureInfo.CurrentCulture.IetfLanguageTag)));
 		}
 
 		private static void ReloadSettings(List<SettingsDC> settings)
@@ -963,47 +970,47 @@ namespace BeWo
 				var settings = _LoggedOnUser.Settings;
 
 				var val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.WindowStateType, settings);
-			    if (int.TryParse(val, out var result))
+				if (int.TryParse(val, out var result))
 				{
-					_AppSettings.WindowState = (AppSettings.WindowStateType) result;
+					_AppSettings.WindowState = (AppSettings.WindowStateType)result;
 				}
 
-                val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, settings);
-                if(int.TryParse(val, out result))
-                {
-                    _AppSettings.SchedulerViewType = (SchedulerViewType) result;
-                }
+				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerViewType, settings);
+				if (int.TryParse(val, out result))
+				{
+					_AppSettings.SchedulerViewType = (SchedulerViewType)result;
+				}
 
-                val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerTimelineViewDayCount, settings);
-                if(int.TryParse(val, out result))
-                {
-                    _AppSettings.SchedulerTimelineViewDayCount = result;
-                }
-			    val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerDayViewDayCount, settings);
-			    if (int.TryParse(val, out result))
-			    {
-			        _AppSettings.SchedulerDayViewDayCount = result;
-			    }
-                val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, settings);
-				if(int.TryParse(val, out result))
+				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerTimelineViewDayCount, settings);
+				if (int.TryParse(val, out result))
+				{
+					_AppSettings.SchedulerTimelineViewDayCount = result;
+				}
+				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerDayViewDayCount, settings);
+				if (int.TryParse(val, out result))
+				{
+					_AppSettings.SchedulerDayViewDayCount = result;
+				}
+				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, settings);
+				if (int.TryParse(val, out result))
 				{
 					_AppSettings.LastSelectedServiceRecordTimeInterval = (ServiceRecordTimeInterval)result;
 				}
 
 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterInZeiterfassung, settings);
-				if(int.TryParse(val, out result))
+				if (int.TryParse(val, out result))
 				{
 					_AppSettings.CustomerFilterInZeiterfassung = (CustomerFilterEnum)result;
 				}
 
 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterSupportConcepts, settings);
-				if(int.TryParse(val, out result))
+				if (int.TryParse(val, out result))
 				{
 					_AppSettings.CustomerFilterSupportConcepts = (CustomerFilterEnum)result;
 				}
 
 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.CustomerFilterCustomers, settings);
-				if(int.TryParse(val, out result))
+				if (int.TryParse(val, out result))
 				{
 					_AppSettings.CustomerFilterCustomers = (CustomerFilterEnum)result;
 				}
@@ -1026,7 +1033,7 @@ namespace BeWo
 				_AppSettings.ZeigeNurMeineTermine = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.ZeigeNurMeineTermine, settings) == "1";
 
 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, settings);
-				if(val != null)
+				if (val != null)
 				{
 					_AppSettings.LastSelectedServiceRecordTimeIntervalDays = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeIntervalDays, settings));
 				}
@@ -1044,7 +1051,7 @@ namespace BeWo
 				}
 
 				val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, settings);
-				if(val != null)
+				if (val != null)
 				{
 					var x = Convert.ToInt32(UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LetzteZeiterfassungsDauer, settings));
 					_AppSettings.LetzteZeiterfassungsDauer = x == 0 ? ZeiterfassungsDauer.Minuten : ZeiterfassungsDauer.Stunden;
@@ -1056,7 +1063,7 @@ namespace BeWo
 					_AppSettings.StartupPanelOrder = new List<string>();
 					var panels = val.Split('|');
 
-					foreach(var item in panels)
+					foreach (var item in panels)
 					{
 						_AppSettings.StartupPanelOrder.Add(item);
 					}
@@ -1064,67 +1071,67 @@ namespace BeWo
 
 				_AppSettings.IsDirty = false;
 			}
-            
+
 		}
 
 		private void BtnOpenServiceRecordView_Click(object sender, RoutedEventArgs e)
 		{
-            if (!(sender is Button btn))
-            {
-                return;
-            }
+			if (!(sender is Button btn))
+			{
+				return;
+			}
 
-            if (!(btn.Tag is CompactSupportConceptDC dc))
-            {
-                return;
-            }
+			if (!(btn.Tag is CompactSupportConceptDC dc))
+			{
+				return;
+			}
 
-            MainControl?.NavigateToServiceRecordView(dc.SupportConceptOid);
-        }
+			MainControl?.NavigateToServiceRecordView(dc.SupportConceptOid);
+		}
 
 		private void Togglebutton_maximise_Checked(object sender, RoutedEventArgs e)
-        {
-            MainControl?.Maximize();
-        }
+		{
+			MainControl?.Maximize();
+		}
 
 		private void Togglebutton_maximise_Unchecked(object sender, RoutedEventArgs e)
-        {
-            MainControl?.Minimize();
-        }
-
-        private void TogglebuttonChat_maximise_Unchecked(object sender, RoutedEventArgs e)
-        {
-            MainControl.HomeView.ServiceChatView?.Normal();
-        }
-
-        private void TogglebuttonChat_maximise_Checked(object sender, RoutedEventArgs e)
-        {
-            MainControl.HomeView.ServiceChatView?.Maximize();
-        }
-
-        private void TogglebuttonChat_Minimize_Checked(object sender, RoutedEventArgs e)
-        {
-            MainControl.HomeView.ServiceChatView?.Minimize();
-        }
-
-        private void FrameLeftMouseDown(object sender, MouseButtonEventArgs e)
 		{
-			var border = (Border) sender;
-			var borderParent = (Grid) border.Parent;
+			MainControl?.Minimize();
+		}
+
+		private void TogglebuttonChat_maximise_Unchecked(object sender, RoutedEventArgs e)
+		{
+			MainControl.HomeView.ServiceChatView?.Normal();
+		}
+
+		private void TogglebuttonChat_maximise_Checked(object sender, RoutedEventArgs e)
+		{
+			MainControl.HomeView.ServiceChatView?.Maximize();
+		}
+
+		private void TogglebuttonChat_Minimize_Checked(object sender, RoutedEventArgs e)
+		{
+			MainControl.HomeView.ServiceChatView?.Minimize();
+		}
+
+		private void FrameLeftMouseDown(object sender, MouseButtonEventArgs e)
+		{
+			var border = (Border)sender;
+			var borderParent = (Grid)border.Parent;
 			var template = borderParent.TemplatedParent;
 			var parent = new Window();
 
-			var x = (FrameworkElement) template;
+			var x = (FrameworkElement)template;
 			if (x != null)
 			{
 				var y = new FrameworkElement();
 				while (y != null)
 				{
-					y = (FrameworkElement) x.Parent;
+					y = (FrameworkElement)x.Parent;
 					if (y != null)
-                    {
-                        x = y;
-                    }
+					{
+						x = y;
+					}
 				}
 
 				if (x is Window window)
@@ -1137,11 +1144,11 @@ namespace BeWo
 
 		private static void AutoLockUIDoAutoLockUIEvent()
 		{
-		    //if (UserName.Equals("BSAdmin"))
-		    //{
-      //          AutoLockUI.StartAutoLockUIOption();
-      //          return;
-		    //}
+			//if (UserName.Equals("BSAdmin"))
+			//{
+			//          AutoLockUI.StartAutoLockUIOption();
+			//          return;
+			//}
 
 			if (CurrentBeWo.MainWindow?.Content is LockedPage)
 			{
@@ -1157,47 +1164,47 @@ namespace BeWo
 				return;
 			}
 
-		    var openWindowCollection = Current.Windows;
-		    foreach(var blubb in openWindowCollection)
-		    {
-		        var abc = (Window) blubb;
+			var openWindowCollection = Current.Windows;
+			foreach (var blubb in openWindowCollection)
+			{
+				var abc = (Window)blubb;
 
-		        if(!abc.Title.Equals("BeWoPlaner") && blubb.GetType() == typeof(WindowContentHolder))
-		        {
-		            abc.Close();
-                }
+				if (!abc.Title.Equals("BeWoPlaner") && blubb.GetType() == typeof(WindowContentHolder))
+				{
+					abc.Close();
+				}
 				else if (abc.Title.IndexOf("Popup") >= 0)
 				{
 					abc.Close();
 				}
 			}
 
-            MainControl.HideCurrentModalViewWindows();
+			MainControl.HideCurrentModalViewWindows();
 
-            var lockedPage = new LockedPage();
+			var lockedPage = new LockedPage();
 			lockedPage.ButtonLogin.Click += UnlockBeWoPlaner;
 
-            if(CurrentBeWo?.MainWindow != null)
-            {
-                CurrentBeWo.MainWindow.Content = lockedPage;
+			if (CurrentBeWo?.MainWindow != null)
+			{
+				CurrentBeWo.MainWindow.Content = lockedPage;
 
-                Current.Dispatcher.Invoke(new Action(() => CurrentBeWo.MainWindow?.Activate()));
-            }
+				Current.Dispatcher.Invoke(new Action(() => CurrentBeWo.MainWindow?.Activate()));
+			}
 
-            AutoLockUI.StartAutoLockUIOption();
+			AutoLockUI.StartAutoLockUIOption();
 		}
 
 		private static void UnlockBeWoPlaner(object sender, RoutedEventArgs e)
 		{
-			var lbtn = (Button) sender;
+			var lbtn = (Button)sender;
 
-			var lbtnParent = (Grid) lbtn.Parent;
+			var lbtnParent = (Grid)lbtn.Parent;
 			var mainWindowUIElements = new UIElement[lbtnParent.Children.Count];
 			lbtnParent.Children.CopyTo(mainWindowUIElements, 0);
 
 			var elementList = mainWindowUIElements.ToList();
-			var username = ((TextBox) elementList.Where(el => el is TextBox textBox && textBox.Name.Equals("TextBoxUsername")).ToList()[0]).Text;
-			var password = ((PasswordBox) elementList.Where(el => el is PasswordBox passwordBox && passwordBox.Name.Equals("PasswordBoxPassword")).ToList()[0]).Password;
+			var username = ((TextBox)elementList.Where(el => el is TextBox textBox && textBox.Name.Equals("TextBoxUsername")).ToList()[0]).Text;
+			var password = ((PasswordBox)elementList.Where(el => el is PasswordBox passwordBox && passwordBox.Name.Equals("PasswordBoxPassword")).ToList()[0]).Password;
 
 			if (string.IsNullOrEmpty(username) || !username.Equals(_LoggedOnUser.LoginName, StringComparison.OrdinalIgnoreCase))
 			{
@@ -1205,9 +1212,9 @@ namespace BeWo
 				return;
 			}
 
-            username = $"{username}//Version=Sperrung aufgehoben";
+			username = $"{username}//Version=Sperrung aufgehoben";
 
-            ServiceFacade.DoUserServiceAsync(u => u.IsUserValidTwoFactor(username, password, BeWoApp.TwoFactorPin, ""), r =>
+			ServiceFacade.DoUserServiceAsync(u => u.IsUserValidTwoFactor(username, password, BeWoApp.TwoFactorPin, ""), r =>
 			{
 				if (!r.Equals(UserValidationResult.UserValid))
 				{
@@ -1215,18 +1222,18 @@ namespace BeWo
 					return;
 				}
 
-			    AutoLockUI.HasJustBeenUnlocked = true;
+				AutoLockUI.HasJustBeenUnlocked = true;
 
-                Current.Dispatcher.Invoke(delegate
-                {
-                    if(CurrentBeWo?.MainWindow != null)
-                    {
-                        CurrentBeWo.MainWindow.Content = _lockedContent;
-                    }
+				Current.Dispatcher.Invoke(delegate
+				{
+					if (CurrentBeWo?.MainWindow != null)
+					{
+						CurrentBeWo.MainWindow.Content = _lockedContent;
+					}
 
-                    MainControl.ShowCurrentModalViewWindowsAgain();
-                });
-            }, true);
+					MainControl.ShowCurrentModalViewWindowsAgain();
+				});
+			}, true);
 		}
 
 		private static void OnPreviewMouseDown(object sender, MouseButtonEventArgs e)
@@ -1241,98 +1248,98 @@ namespace BeWo
 
 		private void Hyperlink_Hilfeplan_Reaktivieren_Click(object sender, RoutedEventArgs e)
 		{
-			var scNavView = (SupportConceptNavigationView) MainControl.ActiveView;
+			var scNavView = (SupportConceptNavigationView)MainControl.ActiveView;
 
 			if (scNavView != null)
 			{
-				var supportConcept = (CompactSupportConceptDC) ((Hyperlink) sender).Tag;
+				var supportConcept = (CompactSupportConceptDC)((Hyperlink)sender).Tag;
 				scNavView.MainNavigationView_OnReactivateObject(supportConcept);
 			}
 		}
 		private void Hyperlink_Hilfeplan_AusArchivHolen_Click(object sender, RoutedEventArgs e)
 		{
-			var scNavView = (SupportConceptNavigationView) MainControl.ActiveView;
+			var scNavView = (SupportConceptNavigationView)MainControl.ActiveView;
 
 			if (scNavView != null)
 			{
-				var supportConcept = (CompactSupportConceptDC) ((Hyperlink) sender).Tag;
+				var supportConcept = (CompactSupportConceptDC)((Hyperlink)sender).Tag;
 				scNavView.MainNavigationView_AusArchivHolen(supportConcept);
 			}
 		}
 
-        public static void GetChatServerUrlAsync(Action<string> callback)
-        {
-            if (string.IsNullOrWhiteSpace(chatServerURL))
-            {
-                var tenant = Tenant;
+		public static void GetChatServerUrlAsync(Action<string> callback)
+		{
+			if (string.IsNullOrWhiteSpace(chatServerURL))
+			{
+				var tenant = Tenant;
 
 #if DEBUG
 				tenant = "5473568546";
 #endif
 
-                var login = new Login(tenant, serverUrl =>
-                {
-                    if (!string.IsNullOrWhiteSpace(serverUrl))
-                    {
-                        callback(serverUrl);
-                    }
-                }, errorMessage =>
-                {
-                        MessageBox.Show(errorMessage, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
-                });
-            }
-            else
-            {
+				var login = new Login(tenant, serverUrl =>
+				{
+					if (!string.IsNullOrWhiteSpace(serverUrl))
+					{
+						callback(serverUrl);
+					}
+				}, errorMessage =>
+				{
+					MessageBox.Show(errorMessage, "Fehler", MessageBoxButton.OK, MessageBoxImage.Error);
+				});
+			}
+			else
+			{
 				callback?.Invoke(chatServerURL);
-            }
-        }
-        public static void Cleanup()
-	    {
-            _lockedContent = null;
-	        LoginControl = null;
-	        MainControl = null;
-	        _AppSettings = null;
-	        _CompactLoggedOnEmployee = null;
-	        _LoggedOnEmployee = null;
-	        _LoggedOnUser = null;
-	        _Mandator = null;
-            
-        }
+			}
+		}
+		public static void Cleanup()
+		{
+			_lockedContent = null;
+			LoginControl = null;
+			MainControl = null;
+			_AppSettings = null;
+			_CompactLoggedOnEmployee = null;
+			_LoggedOnEmployee = null;
+			_LoggedOnUser = null;
+			_Mandator = null;
 
-	    //public static void InitBlubb()
-	    //{
-	    //    var timer = new System.Threading.Timer(
-	    //        e => MainControl.AufOffeneTerminePruefen(), null ,TimeSpan.Zero, TimeSpan.FromMinutes(1)
-	    //        );
-	    //}
+		}
 
-        public static void LogMessage(string message)
-        {
+		//public static void InitBlubb()
+		//{
+		//    var timer = new System.Threading.Timer(
+		//        e => MainControl.AufOffeneTerminePruefen(), null ,TimeSpan.Zero, TimeSpan.FromMinutes(1)
+		//        );
+		//}
+
+		public static void LogMessage(string message)
+		{
 #if DEBUG
-			if(_DebugMessageLogView == null)
-            {
-                _DebugMessageLogView = new DebugMessageLogView();
-            }
+			if (_DebugMessageLogView == null)
+			{
+				_DebugMessageLogView = new DebugMessageLogView();
+			}
 
-            _DebugMessageLogView.Closed += (s, e) => { _DebugMessageLogView = null; };
+			_DebugMessageLogView.Closed += (s, e) => { _DebugMessageLogView = null; };
 
-            _DebugMessageLogView.Show();
-            _DebugMessageLogView.LogMessage(message);
+			_DebugMessageLogView.Show();
+			_DebugMessageLogView.LogMessage(message);
 #endif
 		}
 
-        public static void LogMessage(string message, Color customColor)
-        {
+		public static void LogMessage(string message, Color customColor)
+		{
 #if DEBUG
-            if(_DebugMessageLogView == null)
-            {
-                _DebugMessageLogView = new DebugMessageLogView();
-            }
+			if (_DebugMessageLogView == null)
+			{
+				_DebugMessageLogView = new DebugMessageLogView();
+			}
 
-            _DebugMessageLogView.Closed += (s, e) => { _DebugMessageLogView = null; };
+			_DebugMessageLogView.Closed += (s, e) => { _DebugMessageLogView = null; };
 
-            _DebugMessageLogView.Show();
-            _DebugMessageLogView.LogMessage(message, customColor);
+			_DebugMessageLogView.Show();
+			_DebugMessageLogView.LogMessage(message, customColor);
 #endif
 		}
 	}
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index eca4bd76a..73ef891eb 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -1,19 +1,22 @@
-<UserControl x:Class="BeWo.View.Detail.CustomerWohnhilfeView"
-             x:Name="root_control"
-             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:BeWo.View.Detail"
-             xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
-             xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
-             xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-             xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors" 
-             xmlns:wohnhilfe="clr-namespace:BeWo.View.Controls.Wohnhilfe" 
-             xmlns:converter="clr-namespace:BeWo.Converter"
-             mc:Ignorable="d" 
-             d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM, IsDesignTimeCreatable=true}"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="BeWo.View.Detail.CustomerWohnhilfeView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converter="clr-namespace:BeWo.Converter"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:local="clr-namespace:BeWo.View.Detail"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    xmlns:wohnhilfe="clr-namespace:BeWo.View.Controls.Wohnhilfe"
+    x:Name="root_control"
+    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM,
+                                     IsDesignTimeCreatable=true}"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -27,57 +30,70 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-                <Button Content="Neue Wohnhilfe hinzufügen" Command="{Binding AddVMCommand}">
-                </Button>
-                <Button Content="Übertragen" ToolTip="Daten aus den Stammdaten in aktuelle Wohnhilfe übernehmen" Command="{Binding InsertDetailsCommand}">
+            <StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
+                <Button Command="{Binding AddVMCommand}" Content="Neue Wohnhilfe hinzufügen" />
+                <Button
+                    Command="{Binding InsertDetailsCommand}"
+                    Content="Ãœbertragen"
+                    ToolTip="Daten aus den Stammdaten in aktuelle Wohnhilfe übernehmen">
                     <Button.Visibility>
-                        <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
-                            <Binding Path="VMList.Count" Converter="{StaticResource CollectionCountToBoolConverter}"/>
-                            <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
+                        <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
+                            <Binding Converter="{StaticResource CollectionCountToBoolConverter}" Path="VMList.Count" />
+                            <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
                         </MultiBinding>
                     </Button.Visibility>
                 </Button>
-                <Button Content="Kopieren" ToolTip="Aktuelle Wohnhilfe kopieren" Command="{Binding CopySelectedVMCommand}">
+                <Button
+                    Command="{Binding CopySelectedVMCommand}"
+                    Content="Kopieren"
+                    ToolTip="Aktuelle Wohnhilfe kopieren">
                     <Button.Visibility>
-                        <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
-                            <Binding Path="VMList.Count" Converter="{StaticResource CollectionCountToBoolConverter}"/>
-                            <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
+                        <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
+                            <Binding Converter="{StaticResource CollectionCountToBoolConverter}" Path="VMList.Count" />
+                            <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
                         </MultiBinding>
                     </Button.Visibility>
                 </Button>
             </StackPanel>
-            <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <CheckBox x:Name="checkbox_size" IsChecked="{Binding Path=IsLarge, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">Groß</CheckBox>
             </StackPanel>
-            <TabControl Grid.Row="1" Margin="5" 
-                        ItemsSource="{Binding VMList}" 
-                        SelectedItem="{Binding SelectedVM}" x:Name="tabcontrol_NotizenKategorien" 
-                        Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
+            <TabControl
+                x:Name="tabcontrol_NotizenKategorien"
+                Grid.Row="1"
+                Margin="5"
+                ItemsSource="{Binding VMList}"
+                SelectedItem="{Binding SelectedVM}"
+                Visibility="{Binding VMList.Count, Converter={StaticResource CollectionCountToVisibilityConverter}}">
                 <TabControl.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
                             <Label Content="{Binding Displayname}" />
-                            <Button VerticalAlignment="Center" Height="20"
-                                    ToolTip="Wohnhilfe umbenennen"
-                                    Content="!" FontFamily="Wingdings"
-                                    Click="Wohnhilfe_Display_Edit_Button_Click">
+                            <Button
+                                Height="20"
+                                VerticalAlignment="Center"
+                                Click="Wohnhilfe_Display_Edit_Button_Click"
+                                Content="!"
+                                FontFamily="Wingdings"
+                                ToolTip="Wohnhilfe umbenennen">
                                 <Button.Visibility>
-                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
+                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
+                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>
-                            <Button VerticalAlignment="Center" Height="20"
-                                    Tag="{Binding}"
-                                    ToolTip="Wohnhilfe entfernen"
-                                    Style="{DynamicResource CloseButtonStyle}"
-                                    Command="{Binding Path=DataContext.DeleteSelectedVMCommand, RelativeSource={RelativeSource AncestorType=TabControl}}">
+                            <Button
+                                Height="20"
+                                VerticalAlignment="Center"
+                                Command="{Binding Path=DataContext.DeleteSelectedVMCommand, RelativeSource={RelativeSource AncestorType=TabControl}}"
+                                Style="{DynamicResource CloseButtonStyle}"
+                                Tag="{Binding}"
+                                ToolTip="Wohnhilfe entfernen">
                                 <Button.Visibility>
-                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter }">
+                                    <MultiBinding Converter="{StaticResource BoolVisibilityMultiConverter}">
                                         <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType={x:Type TabItem}}" />
-                                        <Binding Path="PermissionCustomerWohnhilfeManage" ElementName="root_control" />
+                                        <Binding ElementName="root_control" Path="PermissionCustomerWohnhilfeManage" />
                                     </MultiBinding>
                                 </Button.Visibility>
                             </Button>
@@ -86,23 +102,30 @@
                 </TabControl.ItemTemplate>
                 <TabControl.ContentTemplate>
                     <DataTemplate>
-                        <wohnhilfe:CustomerWohnhilfeControl 
-                            ParentWidth="{Binding Path=ActualWidth, ElementName=tabcontrol_NotizenKategorien}"
-                            IsLarge="{Binding DataContext.IsLarge, ElementName=tabcontrol_NotizenKategorien, Mode=TwoWay}" />
+                        <wohnhilfe:CustomerWohnhilfeControl IsLarge="{Binding DataContext.IsLarge, ElementName=tabcontrol_NotizenKategorien, Mode=TwoWay}" ParentWidth="{Binding Path=ActualWidth, ElementName=tabcontrol_NotizenKategorien}" />
                     </DataTemplate>
                 </TabControl.ContentTemplate>
             </TabControl>
-            <Popup x:Name="popup_Wohnhilfe_Displayname_Edit" 
-                   Placement="Mouse" 
-                   StaysOpen="False" 
-                   Focusable="False"
-                   Opened="popup_Wohnhilfe_Displayname_Edit_Opened">
-                <Border Background="White" 
-                        Padding="3" 
-                        BorderThickness="1" 
-                        BorderBrush="Gray"  
-                        Focusable="False">
-                    <TextBox x:Name="txt_Wohnhilfe_Displayname_Edit" Width="200" Grid.Row="0" Grid.Column="0" Height="23" Margin="3" Text="{Binding Path=SelectedVM.Displayname, UpdateSourceTrigger=PropertyChanged}" />
+            <Popup
+                x:Name="popup_Wohnhilfe_Displayname_Edit"
+                Focusable="False"
+                Opened="popup_Wohnhilfe_Displayname_Edit_Opened"
+                Placement="Mouse"
+                StaysOpen="False">
+                <Border
+                    Padding="3"
+                    Background="White"
+                    BorderBrush="Gray"
+                    BorderThickness="1"
+                    Focusable="False">
+                    <TextBox
+                        x:Name="txt_Wohnhilfe_Displayname_Edit"
+                        Grid.Row="0"
+                        Grid.Column="0"
+                        Width="200"
+                        Height="23"
+                        Margin="3"
+                        Text="{Binding Path=SelectedVM.Displayname, UpdateSourceTrigger=PropertyChanged}" />
                 </Border>
             </Popup>
         </Grid>

From a5afc2108108bcaf1e7d97e48b364c9d1e7d6b1b Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 12:23:43 +0200
Subject: [PATCH 10/22] Bye bye Falldaten

---
 BeWo/BeWo.csproj                              |   12 +-
 BeWo/MainControl.xaml                         |  742 ++--
 BeWo/Styles/ControlStyles/DateEditStyles.xaml |    3 -
 .../CustomerVermittlungArbeitControl.xaml     |    6 +-
 BeWo/View/Detail/CustomerFalldatenView.xaml   |  523 ---
 .../View/Detail/CustomerFalldatenView.xaml.cs |   85 -
 BeWo/View/Detail/CustomerView.xaml            | 3589 +++++++++++++----
 BeWo/View/Detail/CustomerView.xaml.cs         |   13 -
 BeWo/ViewModel/CustomerFalldatenVM.cs         |  606 ---
 BeWo/ViewModel/CustomerVM.cs                  |   34 +-
 ...itVM.cs => CustomerVermittlungArbeitVM.cs} |   30 +-
 ....cs => CustomerVermittlungArbeitListVM.cs} |    4 +-
 Data/Data.csproj                              |    4 -
 Data/Entities/Customer.cs                     |    2 -
 Data/Entities/CustomerFalldaten.cs            |  460 ---
 Data/Mappings/Customer.hbm.xml                |    1 -
 Data/Mappings/CustomerFalldaten.hbm.xml       |   51 -
 ...anges_2024_09_23 CustomerFalldatenDrop.txt |    6 +
 Service/DCEntityMapper/CustomerDC_Customer.cs |   22 -
 .../FalldatenDC_CustomerFalldaten.cs          |  125 -
 Service/DCEntityMapper/MapperFactory.cs       |    5 -
 Service/Service.csproj                        |    1 -
 Shared/Core/EnumTranslations.cs               |    6 +-
 Shared/DataContracts/CustomerDC.cs            |    3 +-
 .../CustomerGemeinnutzigeArbeitDC.cs          |   12 -
 .../CustomerVermittlungArbeitDC.cs            |   51 +
 Shared/FalldatenDC.cs                         |   69 -
 Shared/Shared.csproj                          |    3 +-
 28 files changed, 3389 insertions(+), 3079 deletions(-)
 delete mode 100644 BeWo/View/Detail/CustomerFalldatenView.xaml
 delete mode 100644 BeWo/View/Detail/CustomerFalldatenView.xaml.cs
 delete mode 100644 BeWo/ViewModel/CustomerFalldatenVM.cs
 rename BeWo/ViewModel/{CustomerGemeinnutzigeArbeitVM.cs => CustomerVermittlungArbeitVM.cs} (94%)
 rename BeWo/ViewModel/ListViewModel/{CustomerGemeinnutzigeArbeitListVM.cs => CustomerVermittlungArbeitListVM.cs} (89%)
 delete mode 100644 Data/Entities/CustomerFalldaten.cs
 delete mode 100644 Data/Mappings/CustomerFalldaten.hbm.xml
 create mode 100644 Model/Changes_2024_09_23 CustomerFalldatenDrop.txt
 delete mode 100644 Service/DCEntityMapper/FalldatenDC_CustomerFalldaten.cs
 delete mode 100644 Shared/DataContracts/CustomerGemeinnutzigeArbeitDC.cs
 create mode 100644 Shared/DataContracts/CustomerVermittlungArbeitDC.cs
 delete mode 100644 Shared/FalldatenDC.cs

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 53c36d97a..257f736b7 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -419,10 +419,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="View\Detail\CustomerFalldatenView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="View\Detail\Wohneinheit\WohneinheitBelegungEditControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -1177,10 +1173,9 @@
     <Compile Include="ViewModel\AdditionalServiceGroupOfPeopleVM.cs" />
     <Compile Include="ViewModel\AdditionalServiceRegionVM.cs" />
     <Compile Include="ViewModel\AdditionalServiceVM.cs" />
-    <Compile Include="ViewModel\CustomerFalldatenVM.cs" />
-    <Compile Include="ViewModel\CustomerGemeinnutzigeArbeitVM.cs" />
+    <Compile Include="ViewModel\CustomerVermittlungArbeitVM.cs" />
     <Compile Include="ViewModel\ListViewModel\AbstractListVM.cs" />
-    <Compile Include="ViewModel\ListViewModel\CustomerGemeinnutzigeArbeitListVM.cs" />
+    <Compile Include="ViewModel\ListViewModel\CustomerVermittlungArbeitListVM.cs" />
     <Compile Include="ViewModel\Wohnhilfe\CustomerWohnhilfeBereichBundVM.cs" />
     <Compile Include="ViewModel\Wohnhilfe\CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs" />
     <Compile Include="ViewModel\Wohnhilfe\CustomerWohnhilfeBereichSozialeKontakteVM.cs" />
@@ -1319,9 +1314,6 @@
     <Compile Include="View\Detail\Wohneinheit\WohneinheitEditPopup.xaml.cs">
       <DependentUpon>WohneinheitEditPopup.xaml</DependentUpon>
     </Compile>
-    <Compile Include="View\Detail\CustomerFalldatenView.xaml.cs">
-      <DependentUpon>CustomerFalldatenView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="View\Detail\Wohneinheit\WohneinheitBelegungEditControl.xaml.cs">
       <DependentUpon>WohneinheitBelegungEditControl.xaml</DependentUpon>
     </Compile>
diff --git a/BeWo/MainControl.xaml b/BeWo/MainControl.xaml
index e5de4b7c2..3aeae28f1 100644
--- a/BeWo/MainControl.xaml
+++ b/BeWo/MainControl.xaml
@@ -1,27 +1,42 @@
-<UserControl x:Class="BeWo.MainControl"
-             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:localView="clr-namespace:BeWo.View" 
-             xmlns:r="clr-namespace:BeWo.Security"
-             xmlns:BeWo="clr-namespace:BeWo"
-             xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
-             Background="{DynamicResource ApplicationBackground}"
-             SnapsToDevicePixels="True" 
-             RenderTransformOrigin="0.5,0.5"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300">
+<UserControl
+    x:Class="BeWo.MainControl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:BeWo="clr-namespace:BeWo"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:r="clr-namespace:BeWo.Security"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    Background="{DynamicResource ApplicationBackground}"
+    RenderTransformOrigin="0.5,0.5"
+    SnapsToDevicePixels="True"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <Storyboard x:Key="OnLoadedStoryboard" Completed="OnLoadedStoryboard_Completed">
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="toolbarRoot"
-                    Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
-                <SplineDoubleKeyFrame KeyTime="00:00:00.5000000" Value="-5" KeySpline="0,1,1,1" />
-                <SplineDoubleKeyFrame KeyTime="00:00:01" Value="0" KeySpline="0.35,0.5,0.5,0.9" />
+            <DoubleAnimationUsingKeyFrames
+                BeginTime="00:00:00"
+                Storyboard.TargetName="toolbarRoot"
+                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.Y)">
+                <SplineDoubleKeyFrame
+                    KeySpline="0,1,1,1"
+                    KeyTime="00:00:00.5000000"
+                    Value="-5" />
+                <SplineDoubleKeyFrame
+                    KeySpline="0.35,0.5,0.5,0.9"
+                    KeyTime="00:00:01"
+                    Value="0" />
             </DoubleAnimationUsingKeyFrames>
-            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="image"
-                    Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
-                <SplineDoubleKeyFrame KeyTime="00:00:00.5000000" Value="0" KeySpline="0,1,1,1" />
+            <DoubleAnimationUsingKeyFrames
+                BeginTime="00:00:00"
+                Storyboard.TargetName="image"
+                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[3].(TranslateTransform.X)">
+                <SplineDoubleKeyFrame
+                    KeySpline="0,1,1,1"
+                    KeyTime="00:00:00.5000000"
+                    Value="0" />
             </DoubleAnimationUsingKeyFrames>
         </Storyboard>
     </UserControl.Resources>
@@ -35,11 +50,16 @@
     </UserControl.RenderTransform>
     <UserControl.Triggers>
         <EventTrigger RoutedEvent="FrameworkElement.Loaded">
-            <BeginStoryboard Storyboard="{StaticResource OnLoadedStoryboard}" x:Name="OnLoaded1_BeginStoryboard" />
+            <BeginStoryboard x:Name="OnLoaded1_BeginStoryboard" Storyboard="{StaticResource OnLoadedStoryboard}" />
         </EventTrigger>
     </UserControl.Triggers>
-    <Grid x:Name="grid_main" Width="Auto" Height="Auto" Margin="0,0,0,0" HorizontalAlignment="Stretch"
-            Grid.IsSharedSizeScope="True">
+    <Grid
+        x:Name="grid_main"
+        Width="Auto"
+        Height="Auto"
+        Margin="0,0,0,0"
+        HorizontalAlignment="Stretch"
+        Grid.IsSharedSizeScope="True">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
@@ -50,11 +70,23 @@
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
         <!--<Frame x:Name="chatFrame" Grid.Column="2" Grid.Row="0" />-->
-        <TextBlock HorizontalAlignment="Center" Width="Auto" Margin="5,2,0,0">
-            <Hyperlink NavigateUri="https://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
+        <TextBlock
+            Width="Auto"
+            Margin="5,2,0,0"
+            HorizontalAlignment="Center">
+            <Hyperlink
+                Foreground="Transparent"
+                NavigateUri="https://www.bewoplaner.de"
+                RequestNavigate="Hyperlink_OnRequestNavigate"
+                TargetName="newWindow">
                 <InlineUIContainer>
-                    <Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png" Width="130"
-                            Style="{StaticResource toolbarImageStyle}" RenderTransformOrigin="0.5,0.5" x:Name="image">
+                    <Image
+                        x:Name="image"
+                        Width="130"
+                        HorizontalAlignment="Left"
+                        RenderTransformOrigin="0.5,0.5"
+                        Source="Ressources\Icons\bewoplaner_logo_small.png"
+                        Style="{StaticResource toolbarImageStyle}">
                         <Image.RenderTransform>
                             <TransformGroup>
                                 <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -68,7 +100,7 @@
             </Hyperlink>
         </TextBlock>
 
-      <!--<TextBlock HorizontalAlignment="Right" Width="Auto" Margin="0,2,5,0" Grid.Column="2">
+        <!--<TextBlock HorizontalAlignment="Right" Width="Auto" Margin="0,2,5,0" Grid.Column="2">
         <Hyperlink NavigateUri="http://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" RequestNavigate="Hyperlink_OnRequestNavigate">
           <InlineUIContainer>
             <Image HorizontalAlignment="Left" Source="Ressources\Icons\bewoplaner_logo_small.png"
@@ -78,19 +110,34 @@
           </InlineUIContainer>
         </Hyperlink>
       </TextBlock>-->
-      
-        <BeWo:BSLogoControl Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" Grid.RowSpan="2" Width="1000" Height="1000"
-                VerticalAlignment="Bottom" HorizontalAlignment="Right" Margin="0,0,-300,-250" x:Name="bSLogoControl"
-                RenderTransformOrigin="0.5,0.5">
+
+        <BeWo:BSLogoControl
+            x:Name="bSLogoControl"
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Width="1000"
+            Height="1000"
+            Margin="0,0,-300,-250"
+            HorizontalAlignment="Right"
+            VerticalAlignment="Bottom"
+            RenderTransformOrigin="0.5,0.5">
             <BeWo:BSLogoControl.OpacityMask>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#29000000" Offset="0" />
-                    <GradientStop Color="#29000000" Offset="1" />
+                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                    <GradientStop Offset="0" Color="#29000000" />
+                    <GradientStop Offset="1" Color="#29000000" />
                 </LinearGradientBrush>
             </BeWo:BSLogoControl.OpacityMask>
         </BeWo:BSLogoControl>
-        <Grid x:Name="DetailFrame" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" Grid.RowSpan="2"
-                RenderTransformOrigin="0.5,0.5" Margin="140,35,140,85">
+        <Grid
+            x:Name="DetailFrame"
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="140,35,140,85"
+            RenderTransformOrigin="0.5,0.5">
             <Grid.RenderTransform>
                 <TransformGroup>
                     <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -100,16 +147,24 @@
                 </TransformGroup>
             </Grid.RenderTransform>
             <Grid.OpacityMask>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FF000000" Offset="0" />
-                    <GradientStop Color="#D8FFFFFF" Offset="1" />
+                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                    <GradientStop Offset="0" Color="#FF000000" />
+                    <GradientStop Offset="1" Color="#D8FFFFFF" />
                 </LinearGradientBrush>
             </Grid.OpacityMask>
             <!-- Border x:Name="detailPlaceHolder" Background="#FFB55252" CornerRadius="5,5,5,5"></Border-->
         </Grid>
-        <Grid x:Name="toolbarRoot" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="3" HorizontalAlignment="Stretch"
-                VerticalAlignment="Bottom" Width="Auto" RenderTransformOrigin="0.5,0.5" MouseEnter="toolbarRoot_MouseEnter"
-                MouseLeave="toolbarRoot_MouseLeave">
+        <Grid
+            x:Name="toolbarRoot"
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Width="Auto"
+            HorizontalAlignment="Stretch"
+            VerticalAlignment="Bottom"
+            MouseEnter="toolbarRoot_MouseEnter"
+            MouseLeave="toolbarRoot_MouseLeave"
+            RenderTransformOrigin="0.5,0.5">
             <Grid.RenderTransform>
                 <TransformGroup>
                     <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -118,7 +173,10 @@
                     <TranslateTransform X="0" Y="100" />
                 </TransformGroup>
             </Grid.RenderTransform>
-            <Border Name="toolbarBord" Height="80" RenderTransformOrigin="0.5,0.5">
+            <Border
+                Name="toolbarBord"
+                Height="80"
+                RenderTransformOrigin="0.5,0.5">
                 <Border.RenderTransform>
                     <TransformGroup>
                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -131,24 +189,31 @@
                     <Canvas Width="100" Height="100">
                         <Path Data="M0,100 L5,0 L95,0 L100,100 Z" StrokeThickness="1">
                             <Path.Fill>
-                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                    <GradientStop Color="#66000000" Offset="0" />
-                                    <GradientStop Color="#CC080808" Offset="1" />
+                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Offset="0" Color="#66000000" />
+                                    <GradientStop Offset="1" Color="#CC080808" />
                                 </LinearGradientBrush>
                             </Path.Fill>
                         </Path>
-                        <Rectangle Width="100" Height="132" Fill="#FF98C1FF" Canvas.Top="8">
+                        <Rectangle
+                            Canvas.Top="8"
+                            Width="100"
+                            Height="132"
+                            Fill="#FF98C1FF">
                             <Rectangle.OpacityMask>
                                 <RadialGradientBrush>
-                                    <GradientStop Color="#3FFFFFFF" Offset="0.29" />
-                                    <GradientStop Color="#00FFFFFF" Offset="0.875" />
+                                    <GradientStop Offset="0.29" Color="#3FFFFFFF" />
+                                    <GradientStop Offset="0.875" Color="#00FFFFFF" />
                                 </RadialGradientBrush>
                             </Rectangle.OpacityMask>
                         </Rectangle>
                     </Canvas>
                 </Viewbox>
             </Border>
-			<Grid x:Name="toolbarContent" RenderTransformOrigin="0.5,0.5" Loaded="ToolbarContent_OnLoaded">
+            <Grid
+                x:Name="toolbarContent"
+                Loaded="ToolbarContent_OnLoaded"
+                RenderTransformOrigin="0.5,0.5">
                 <Grid.RenderTransform>
                     <TransformGroup>
                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -157,12 +222,28 @@
                         <TranslateTransform X="0" Y="0" />
                     </TransformGroup>
                 </Grid.RenderTransform>
-                <StackPanel x:Name="HomeButtonPanel" Orientation="Vertical" Grid.Row="1" HorizontalAlignment="Left"
-                        VerticalAlignment="Top" Margin="10,0,0,0">
-                    <Button Margin="0,9,0,0" Name="btn_home" Click="btn_home_Click" Width="40" Height="40">
-                        <Image Source="Ressources\Icons\Home.png" Stretch="Fill" StretchDirection="Both"></Image>
+                <StackPanel
+                    x:Name="HomeButtonPanel"
+                    Grid.Row="1"
+                    Margin="10,0,0,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Orientation="Vertical">
+                    <Button
+                        Name="btn_home"
+                        Width="40"
+                        Height="40"
+                        Margin="0,9,0,0"
+                        Click="btn_home_Click">
+                        <Image
+                            Source="Ressources\Icons\Home.png"
+                            Stretch="Fill"
+                            StretchDirection="Both" />
                     </Button>
-                    <Label Content="{t:Translate Home}" FontSize="12" Foreground="#FFDBDBDB"></Label>
+                    <Label
+                        Content="{t:Translate Home}"
+                        FontSize="12"
+                        Foreground="#FFDBDBDB" />
                 </StackPanel>
                 <!--<StackPanel x:Name="HomeButtonPanel" Orientation="Vertical" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10,0,0,0" >
 	            <Button Margin="0,10,0,0"  Click="button_Home" Width="40" Height="40">
@@ -176,36 +257,65 @@
 	            </Button>
 	            <Label Content="Abmelden" FontSize="12" Foreground="#FFDBDBDB"></Label>
 	        </StackPanel>-->
-                <ScrollViewer x:Name="toolbarScrollViewer" ScrollChanged="toolbarScrollViewer_ScrollChanged"
-                        HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled"
-                        HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="80,0,80,0" Height="80">
+                <ScrollViewer
+                    x:Name="toolbarScrollViewer"
+                    Height="80"
+                    Margin="80,0,80,0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Center"
+                    HorizontalScrollBarVisibility="Auto"
+                    ScrollChanged="toolbarScrollViewer_ScrollChanged"
+                    VerticalScrollBarVisibility="Disabled">
                     <ScrollViewer.Template>
                         <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                            <Grid Margin="3 0">
+                            <Grid Margin="3,0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="17" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="17" />
                                 </Grid.ColumnDefinitions>
-                                <Button Content="3" FontFamily="Webdings" Command="ScrollBar.PageLeftCommand"
-                                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
-                                <ScrollContentPresenter VerticalAlignment="Bottom" Margin="20 0" Grid.Column="1"
-                                        Content="{TemplateBinding Content}" />
-                                <Button Content="4" FontFamily="Webdings" Grid.Column="2"
-                                        Command="ScrollBar.PageRightCommand"
-                                        Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
+                                <Button
+                                    Command="ScrollBar.PageLeftCommand"
+                                    Content="3"
+                                    FontFamily="Webdings"
+                                    Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
+                                <ScrollContentPresenter
+                                    Grid.Column="1"
+                                    Margin="20,0"
+                                    VerticalAlignment="Bottom"
+                                    Content="{TemplateBinding Content}" />
+                                <Button
+                                    Grid.Column="2"
+                                    Command="ScrollBar.PageRightCommand"
+                                    Content="4"
+                                    FontFamily="Webdings"
+                                    Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
                             </Grid>
                         </ControlTemplate>
                     </ScrollViewer.Template>
-                    <Grid Margin="0,0,0,0" VerticalAlignment="Stretch" Height="80">
-                        <StackPanel x:Name="toolbarMainButtonPanel" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                Width="Auto" Margin="0,0,0,0" Orientation="Horizontal">
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ServiceRecordView_View"
-                                    ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_serviceRecord"
-                                    Click="button_serviceRecord_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate ZeiterfassungMenuItem}" Background="{StaticResource ServiceRecordContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    Tag="" Width="90" Height="Auto">
+                    <Grid
+                        Height="80"
+                        Margin="0,0,0,0"
+                        VerticalAlignment="Stretch">
+                        <StackPanel
+                            x:Name="toolbarMainButtonPanel"
+                            Width="Auto"
+                            Margin="0,0,0,0"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            Orientation="Horizontal">
+                            <localView:ImageButton
+                                x:Name="button_serviceRecord"
+                                Width="90"
+                                Height="Auto"
+                                r:DemandUserRight.VisibleDemands="ViewAll, ServiceRecordView_View"
+                                Background="{StaticResource ServiceRecordContentBrush}"
+                                Click="button_serviceRecord_Click"
+                                Content="{t:Translate ZeiterfassungMenuItem}"
+                                ImageSource="Ressources\Icons\HistoryDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}"
+                                Tag="">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -215,12 +325,18 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="AdditionalService_View"
-                                    ImageSource="Ressources\Icons\HistoryDisabled.png" x:Name="button_additionalService"
-                                    Click="button_additionalService_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate Ergänzende DiensteMenuItem}" Background="{StaticResource AdditionalServiceContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    Tag="" Width="120" Height="Auto">
+                            <localView:ImageButton
+                                x:Name="button_additionalService"
+                                Width="120"
+                                Height="Auto"
+                                r:DemandUserRight.VisibleDemands="AdditionalService_View"
+                                Background="{StaticResource AdditionalServiceContentBrush}"
+                                Click="button_additionalService_Click"
+                                Content="{t:Translate Ergänzende DiensteMenuItem}"
+                                ImageSource="Ressources\Icons\HistoryDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}"
+                                Tag="">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -230,28 +346,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                          <localView:ImageButton r:DemandUserRight.VisibleDemands="VertretungenView_View"
-                                    ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_SchulbegleitenderDienst"
-                                    Click="Button_Vertretungen_OnClick" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate VertretungenMenuItem}" Background="{StaticResource SchulbegleitenderDienstContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    Width="90" >
-                            <Button.RenderTransform>
-                              <TransformGroup>
-                                <ScaleTransform ScaleX="1" ScaleY="1" />
-                                <SkewTransform AngleX="0" AngleY="0" />
-                                <RotateTransform Angle="0" />
-                                <TranslateTransform X="0" Y="0" />
-                              </TransformGroup>
-                            </Button.RenderTransform>
-                          </localView:ImageButton>
-
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View, BargeldverwaltungFinanzenAnsehen, DokumenteFinanzen"
-                                    ImageSource="Ressources\Icons\CoinsDisabled.png" x:Name="button_AccountingTransacation"
-                                    Click="button_AccountingTransacation_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate FinanzenMenuItem}" Background="{StaticResource AccountingContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    Width="90">
+                            <localView:ImageButton
+                                x:Name="button_SchulbegleitenderDienst"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="VertretungenView_View"
+                                Background="{StaticResource SchulbegleitenderDienstContentBrush}"
+                                Click="Button_Vertretungen_OnClick"
+                                Content="{t:Translate VertretungenMenuItem}"
+                                ImageSource="Ressources\Icons\CalendarDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -262,50 +366,38 @@
                                 </Button.RenderTransform>
                             </localView:ImageButton>
 
-                            
-	                        <Grid>
-		                        <localView:ImageButton r:DemandUserRight.VisibleDemands="KalenderAnsehen"
-										ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_Scheduler"
-										Click="button_Scheduler_Click" Style="{StaticResource NavBarButton}"
-										Content="{t:Translate KalenderMenuItem}" Background="{StaticResource ResourceContentBrush}"
-										RenderTransformOrigin="0.5,0.5"
-										Width="90">
-			                        <Button.RenderTransform>
-				                        <TransformGroup>
-					                        <ScaleTransform ScaleX="1" ScaleY="1" />
-					                        <SkewTransform AngleX="0" AngleY="0" />
-					                        <RotateTransform Angle="0" />
-					                        <TranslateTransform X="0" Y="0" />
-				                        </TransformGroup>
-			                        </Button.RenderTransform>
-		                        </localView:ImageButton>
-								<BeWo:OutlinedTextBlock Visibility="Collapsed" x:Name="NewAppointmentsOutlinedTextBlock" Margin="25,0,0,0" FontFamily="Verdana" FontSize="25" FontWeight="ExtraBold" TextWrapping="Wrap" StrokeThickness="1" Stroke="White" Fill="OrangeRed" SnapsToDevicePixels="True" Text="!" HorizontalAlignment="Left" VerticalAlignment="Top">
-									<BeWo:OutlinedTextBlock.Triggers>
-										<EventTrigger RoutedEvent="BeWo:OutlinedTextBlock.Loaded">
-											<BeginStoryboard>
-												<Storyboard>
-													<DoubleAnimation Storyboard.TargetName="NewAppointmentsOutlinedTextBlock" 
-																	 Storyboard.TargetProperty="(BeWo:OutlinedTextBlock.FontSize)"
-																	 To="30.0" Duration="0:0:0.3" 
-																	 AutoReverse="True" RepeatBehavior="Forever" />
-												</Storyboard>
-											</BeginStoryboard>
-										</EventTrigger>
-									</BeWo:OutlinedTextBlock.Triggers>
-								</BeWo:OutlinedTextBlock>
-							</Grid>
-                            <!-- ToDo: Neuer Kalender -->
+                            <localView:ImageButton
+                                x:Name="button_AccountingTransacation"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, AccountingTransactionView_View, BargeldverwaltungFinanzenAnsehen, DokumenteFinanzen"
+                                Background="{StaticResource AccountingContentBrush}"
+                                Click="button_AccountingTransacation_Click"
+                                Content="{t:Translate FinanzenMenuItem}"
+                                ImageSource="Ressources\Icons\CoinsDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
+                                <Button.RenderTransform>
+                                    <TransformGroup>
+                                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                                        <SkewTransform AngleX="0" AngleY="0" />
+                                        <RotateTransform Angle="0" />
+                                        <TranslateTransform X="0" Y="0" />
+                                    </TransformGroup>
+                                </Button.RenderTransform>
+                            </localView:ImageButton>
+
+
                             <Grid>
-                                <localView:ImageButton r:DemandUserRight.VisibleDemands="KalenderAnsehen"
-                                                       ImageSource="Ressources\Icons\CalendarDisabledUnderConstruction.png" 
-                                                       x:Name="ButtonScheduling"
-                                                       Click="Button_Scheduling_Click" 
-                                                       Style="{StaticResource NavBarButton}"
-                                                       Content="{t:Translate KalenderMenuItem}" 
-                                                       Background="{StaticResource ResourceContentBrush}"
-                                                       Visibility="Collapsed"
-                                                       RenderTransformOrigin="0.5,0.5"
-                                                       Width="90">
+                                <localView:ImageButton
+                                    x:Name="button_Scheduler"
+                                    Width="90"
+                                    r:DemandUserRight.VisibleDemands="KalenderAnsehen"
+                                    Background="{StaticResource ResourceContentBrush}"
+                                    Click="button_Scheduler_Click"
+                                    Content="{t:Translate KalenderMenuItem}"
+                                    ImageSource="Ressources\Icons\CalendarDisabled.png"
+                                    RenderTransformOrigin="0.5,0.5"
+                                    Style="{StaticResource NavBarButton}">
                                     <Button.RenderTransform>
                                         <TransformGroup>
                                             <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -315,28 +407,103 @@
                                         </TransformGroup>
                                     </Button.RenderTransform>
                                 </localView:ImageButton>
-                                <BeWo:OutlinedTextBlock Visibility="Collapsed" x:Name="NewAppointmentsOutlinedTextBlock2" Margin="25,0,0,0" FontFamily="Verdana" FontSize="25" FontWeight="ExtraBold" TextWrapping="Wrap" StrokeThickness="1" Stroke="White" Fill="OrangeRed" SnapsToDevicePixels="True" Text="!" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                <BeWo:OutlinedTextBlock
+                                    x:Name="NewAppointmentsOutlinedTextBlock"
+                                    Margin="25,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Fill="OrangeRed"
+                                    FontFamily="Verdana"
+                                    FontSize="25"
+                                    FontWeight="ExtraBold"
+                                    SnapsToDevicePixels="True"
+                                    Stroke="White"
+                                    StrokeThickness="1"
+                                    Text="!"
+                                    TextWrapping="Wrap"
+                                    Visibility="Collapsed">
                                     <BeWo:OutlinedTextBlock.Triggers>
                                         <EventTrigger RoutedEvent="BeWo:OutlinedTextBlock.Loaded">
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation Storyboard.TargetName="NewAppointmentsOutlinedTextBlock2" 
-                                                                     Storyboard.TargetProperty="(BeWo:OutlinedTextBlock.FontSize)"
-                                                                     To="30.0" Duration="0:0:0.3" 
-                                                                     AutoReverse="True" RepeatBehavior="Forever" />
+                                                    <DoubleAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetName="NewAppointmentsOutlinedTextBlock"
+                                                        Storyboard.TargetProperty="(BeWo:OutlinedTextBlock.FontSize)"
+                                                        To="30.0"
+                                                        Duration="0:0:0.3" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </EventTrigger>
                                     </BeWo:OutlinedTextBlock.Triggers>
                                 </BeWo:OutlinedTextBlock>
                             </Grid>
-                            <!-- /ToDo: Neuer Kalender -->
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, ResourceBookingView_View"
-                                    ImageSource="Ressources\Icons\CalendarDisabled.png" x:Name="button_ResourceBooking"
-                                    Click="button_ResourceBooking_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate RessourcenMenuItem}" Background="{StaticResource ResourceContentBrush}"
+                            <!--  ToDo: Neuer Kalender  -->
+                            <Grid>
+                                <localView:ImageButton
+                                    x:Name="ButtonScheduling"
+                                    Width="90"
+                                    r:DemandUserRight.VisibleDemands="KalenderAnsehen"
+                                    Background="{StaticResource ResourceContentBrush}"
+                                    Click="Button_Scheduling_Click"
+                                    Content="{t:Translate KalenderMenuItem}"
+                                    ImageSource="Ressources\Icons\CalendarDisabledUnderConstruction.png"
                                     RenderTransformOrigin="0.5,0.5"
-                                    Width="90">
+                                    Style="{StaticResource NavBarButton}"
+                                    Visibility="Collapsed">
+                                    <Button.RenderTransform>
+                                        <TransformGroup>
+                                            <ScaleTransform ScaleX="1" ScaleY="1" />
+                                            <SkewTransform AngleX="0" AngleY="0" />
+                                            <RotateTransform Angle="0" />
+                                            <TranslateTransform X="0" Y="0" />
+                                        </TransformGroup>
+                                    </Button.RenderTransform>
+                                </localView:ImageButton>
+                                <BeWo:OutlinedTextBlock
+                                    x:Name="NewAppointmentsOutlinedTextBlock2"
+                                    Margin="25,0,0,0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Top"
+                                    Fill="OrangeRed"
+                                    FontFamily="Verdana"
+                                    FontSize="25"
+                                    FontWeight="ExtraBold"
+                                    SnapsToDevicePixels="True"
+                                    Stroke="White"
+                                    StrokeThickness="1"
+                                    Text="!"
+                                    TextWrapping="Wrap"
+                                    Visibility="Collapsed">
+                                    <BeWo:OutlinedTextBlock.Triggers>
+                                        <EventTrigger RoutedEvent="BeWo:OutlinedTextBlock.Loaded">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <DoubleAnimation
+                                                        AutoReverse="True"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetName="NewAppointmentsOutlinedTextBlock2"
+                                                        Storyboard.TargetProperty="(BeWo:OutlinedTextBlock.FontSize)"
+                                                        To="30.0"
+                                                        Duration="0:0:0.3" />
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </BeWo:OutlinedTextBlock.Triggers>
+                                </BeWo:OutlinedTextBlock>
+                            </Grid>
+                            <!--  /ToDo: Neuer Kalender  -->
+                            <localView:ImageButton
+                                x:Name="button_ResourceBooking"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, ResourceBookingView_View"
+                                Background="{StaticResource ResourceContentBrush}"
+                                Click="button_ResourceBooking_Click"
+                                Content="{t:Translate RessourcenMenuItem}"
+                                ImageSource="Ressources\Icons\CalendarDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -346,12 +513,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View, Analysis_ServiceOverview_View, Analysis_Auslastung_View, Analysis_AuslastungAllEmployee_View, Analysis_AuslastungTeam_View, Kilometerauswertung_View, KilometerauswertungEigene_View, BewertungAuswertung_View, PivotTabelleAnsehen, DienstplanungAnsehen, AbwesenheitsPlanungAnsehen, Mitarbeiterstundenkonto_ViewAll, Mitarbeiterstundenkonto_ViewSelf, Mitarbeiterstundenkonto_ViewTeams, Jahresbericht, Auswertungen_BerichteAnsehen, Auswertungen_StundenuebersichtAnsehen, Auswertungen_HilfeplanuebersichtAnsehen"
-                                    x:Name="button_Reports" Click="button_Reports_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate AuswertungenMenuItem}"
-                                    Background="{StaticResource ReportContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\ChartBarDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Reports"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, QueryView_View, Analysis_ServiceOverview_View, Analysis_Auslastung_View, Analysis_AuslastungAllEmployee_View, Analysis_AuslastungTeam_View, Kilometerauswertung_View, KilometerauswertungEigene_View, BewertungAuswertung_View, PivotTabelleAnsehen, DienstplanungAnsehen, AbwesenheitsPlanungAnsehen, Mitarbeiterstundenkonto_ViewAll, Mitarbeiterstundenkonto_ViewSelf, Mitarbeiterstundenkonto_ViewTeams, Jahresbericht, Auswertungen_BerichteAnsehen, Auswertungen_StundenuebersichtAnsehen, Auswertungen_HilfeplanuebersichtAnsehen"
+                                Background="{StaticResource ReportContentBrush}"
+                                Click="button_Reports_Click"
+                                Content="{t:Translate AuswertungenMenuItem}"
+                                ImageSource="Ressources\Icons\ChartBarDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -361,12 +532,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, SupportConceptView_View, SupportConcept_ViewAllSupportConcepts, SupportConcept_ViewMyTeams"
-                                    x:Name="button_SupportConcept" Click="button_SupportConcept_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate HilfepläneMenuItem}"
-                                    Background="{StaticResource SupportConceptContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\IDBadgeDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_SupportConcept"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, SupportConceptView_View, SupportConcept_ViewAllSupportConcepts, SupportConcept_ViewMyTeams"
+                                Background="{StaticResource SupportConceptContentBrush}"
+                                Click="button_SupportConcept_Click"
+                                Content="{t:Translate HilfepläneMenuItem}"
+                                ImageSource="Ressources\Icons\IDBadgeDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -376,12 +551,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, CustomerView_View, Customer_ViewMyCustomers, Customer_ViewMyTeams"
-                                    x:Name="button_Customer" Click="button_Customer_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate KlientenMenuItem}"
-                                    Background="{StaticResource CustomerContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\UserHomeMaleDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Customer"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, CustomerView_View, Customer_ViewMyCustomers, Customer_ViewMyTeams"
+                                Background="{StaticResource CustomerContentBrush}"
+                                Click="button_Customer_Click"
+                                Content="{t:Translate KlientenMenuItem}"
+                                ImageSource="Ressources\Icons\UserHomeMaleDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -392,14 +571,17 @@
                                 </Button.RenderTransform>
                             </localView:ImageButton>
 
-							<!-- r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View" -->
-                            <localView:ImageButton Visibility="Collapsed"
-                                                   Click="button_CustomerTeam_Click"
-                                                   x:Name="button_CustomerTeam"
-                                                   Style="{StaticResource NavBarButton}"
-                                                   Content="{t:Translate KliententeamsMenuItem}"
-                                                   Background="{StaticResource CustomerTeamContentBrush}" RenderTransformOrigin="0.5, 0.5"
-                                                   ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png" Width="90">
+                            <!--  r:DemandUserRight.VisibleDemands="ViewAll, CustomerTeam_View"  -->
+                            <localView:ImageButton
+                                x:Name="button_CustomerTeam"
+                                Width="90"
+                                Background="{StaticResource CustomerTeamContentBrush}"
+                                Click="button_CustomerTeam_Click"
+                                Content="{t:Translate KliententeamsMenuItem}"
+                                ImageSource="Ressources/Icons/UserGroupBusinessDisabled.png"
+                                RenderTransformOrigin="0.5, 0.5"
+                                Style="{StaticResource NavBarButton}"
+                                Visibility="Collapsed">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -409,13 +591,17 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="WohnheimView_View"
-                                    x:Name="button_Wohnheim" Click="button_Wohnheim_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate WohnheimeMenuItem}"
-                                    Background="{StaticResource WohnheimContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90">
+
+                            <localView:ImageButton
+                                x:Name="button_Wohnheim"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="WohnheimView_View"
+                                Background="{StaticResource WohnheimContentBrush}"
+                                Click="button_Wohnheim_Click"
+                                Content="{t:Translate WohnheimeMenuItem}"
+                                ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -425,13 +611,17 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                          
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, OrganisationView_View"
-                                    x:Name="button_Organisation" Click="button_Organisation_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate OrganisationenMenuItem}"
-                                    Background="{StaticResource OrganisationContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png" Width="90">
+
+                            <localView:ImageButton
+                                x:Name="button_Organisation"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, OrganisationView_View"
+                                Background="{StaticResource OrganisationContentBrush}"
+                                Click="button_Organisation_Click"
+                                Content="{t:Translate OrganisationenMenuItem}"
+                                ImageSource="Ressources\Icons\OfficeBulidingBlackDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -441,12 +631,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, PersonView_View"
-                                    x:Name="button_Person" Click="button_Person_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate PersonenMenuItem}" Background="{StaticResource PersonContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\AnonymousUserDisabled.png"
-                                    Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Person"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, PersonView_View"
+                                Background="{StaticResource PersonContentBrush}"
+                                Click="button_Person_Click"
+                                Content="{t:Translate PersonenMenuItem}"
+                                ImageSource="Ressources\Icons\AnonymousUserDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -456,12 +650,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, EmployeeView_View, Employee_AllowViewOwnEmployees, Employee_AllowViewOwnTeam"
-                                    x:Name="button_Employee" Click="button_Employee_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate MitarbeiterMenuItem}"
-                                    Background="{StaticResource EmployeeContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Employee"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, EmployeeView_View, Employee_AllowViewOwnEmployees, Employee_AllowViewOwnTeam"
+                                Background="{StaticResource EmployeeContentBrush}"
+                                Click="button_Employee_Click"
+                                Content="{t:Translate MitarbeiterMenuItem}"
+                                ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -471,11 +669,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
-                                    x:Name="button_Team" Click="button_Team_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate TeamsMenuItem}" Background="{StaticResource TeamContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Team"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
+                                Background="{StaticResource TeamContentBrush}"
+                                Click="button_Team_Click"
+                                Content="{t:Translate TeamsMenuItem}"
+                                ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -485,11 +688,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
-                                    x:Name="button_Dokumente" Click="button_Dokumente_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate DokumenteMenuItem}" Background="{StaticResource DokumenteContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\Folder.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Dokumente"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, TeamView_ViewAll, TeamView_ViewMyTeams"
+                                Background="{StaticResource DokumenteContentBrush}"
+                                Click="button_Dokumente_Click"
+                                Content="{t:Translate DokumenteMenuItem}"
+                                ImageSource="Ressources\Icons\Folder.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -499,11 +707,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserView_View"
-                                    x:Name="button_User" Click="button_User_Click" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate BenutzerMenuItem}" Background="{StaticResource UserContentBrush}"
-                                    RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_User"
+                                Width="90"
+                                r:DemandUserRight.VisibleDemands="ViewAll, UserView_View"
+                                Background="{StaticResource UserContentBrush}"
+                                Click="button_User_Click"
+                                Content="{t:Translate BenutzerMenuItem}"
+                                ImageSource="Ressources\Icons\UserBusinessMaleDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -513,12 +726,16 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, UserGroupView_View"
-                                    x:Name="button_UserGroup" Click="button_UserGroup_Click"
-                                    Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate BenutzergruppenMenuItem}"
-                                    Background="{StaticResource UserGroupContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png" Width="Auto">
+                            <localView:ImageButton
+                                x:Name="button_UserGroup"
+                                Width="Auto"
+                                r:DemandUserRight.VisibleDemands="ViewAll, UserGroupView_View"
+                                Background="{StaticResource UserGroupContentBrush}"
+                                Click="button_UserGroup_Click"
+                                Content="{t:Translate BenutzergruppenMenuItem}"
+                                ImageSource="Ressources\Icons\UserGroupBusinessDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -543,13 +760,18 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>-->
-							
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View"
-                                    x:Name="button_Administration" Click="button_Administration_Click"
-                                    HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate VerwaltungMenuItem}"
-                                    Background="{StaticResource AdministrationContentBrush}" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\ConfigurationDisabled.png" Width="90">
+
+                            <localView:ImageButton
+                                x:Name="button_Administration"
+                                Width="90"
+                                HorizontalAlignment="Stretch"
+                                r:DemandUserRight.VisibleDemands="ViewAll, AdministrationView_View"
+                                Background="{StaticResource AdministrationContentBrush}"
+                                Click="button_Administration_Click"
+                                Content="{t:Translate VerwaltungMenuItem}"
+                                ImageSource="Ressources\Icons\ConfigurationDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -559,12 +781,17 @@
                                     </TransformGroup>
                                 </Button.RenderTransform>
                             </localView:ImageButton>
-                            <localView:ImageButton r:DemandUserRight.VisibleDemands="Support_View"
-                                    x:Name="button_Support" Click="button_Support_Click"
-                                    HorizontalAlignment="Stretch" Style="{StaticResource NavBarButton}"
-                                    Content="{t:Translate SupportMenuItem}"
-                                    Background="#FFD4FFCF" RenderTransformOrigin="0.5,0.5"
-                                    ImageSource="Ressources\Icons\TechSupportWhiteDisabled.png" Width="90">
+                            <localView:ImageButton
+                                x:Name="button_Support"
+                                Width="90"
+                                HorizontalAlignment="Stretch"
+                                r:DemandUserRight.VisibleDemands="Support_View"
+                                Background="#FFD4FFCF"
+                                Click="button_Support_Click"
+                                Content="{t:Translate SupportMenuItem}"
+                                ImageSource="Ressources\Icons\TechSupportWhiteDisabled.png"
+                                RenderTransformOrigin="0.5,0.5"
+                                Style="{StaticResource NavBarButton}">
                                 <Button.RenderTransform>
                                     <TransformGroup>
                                         <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -577,12 +804,27 @@
                         </StackPanel>
                     </Grid>
                 </ScrollViewer>
-                <StackPanel x:Name="LogoutButtonPanel" Orientation="Vertical" Grid.Row="1" HorizontalAlignment="Right"
-                        VerticalAlignment="Top" Margin="0,0,0,0">
-                    <Button Margin="0,9,0,0" Click="button_Logout" Width="40" Height="40">
-                        <Image Source="Ressources\Icons\LogoutDisabled.png" Stretch="Fill" StretchDirection="Both"></Image>
+                <StackPanel
+                    x:Name="LogoutButtonPanel"
+                    Grid.Row="1"
+                    Margin="0,0,0,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Orientation="Vertical">
+                    <Button
+                        Width="40"
+                        Height="40"
+                        Margin="0,9,0,0"
+                        Click="button_Logout">
+                        <Image
+                            Source="Ressources\Icons\LogoutDisabled.png"
+                            Stretch="Fill"
+                            StretchDirection="Both" />
                     </Button>
-                    <Label Content="Abmelden" FontSize="12" Foreground="#FFDBDBDB"></Label>
+                    <Label
+                        Content="Abmelden"
+                        FontSize="12"
+                        Foreground="#FFDBDBDB" />
                 </StackPanel>
                 <!--<Rectangle Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="1"  RenderTransformOrigin="0.5,0.5" Height="55" Width="1175" StrokeThickness="0" VerticalAlignment="Top">
                 <Rectangle.OpacityMask>
diff --git a/BeWo/Styles/ControlStyles/DateEditStyles.xaml b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
index 14a231b62..be8854fb6 100644
--- a/BeWo/Styles/ControlStyles/DateEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/DateEditStyles.xaml
@@ -35,9 +35,6 @@
                     <DataTrigger Binding="{Binding Path=IsDefaultButton}" Value="False">
                         <Setter TargetName="PART_Item" Property="HandleToggle" Value="False" />
                     </DataTrigger>
-                    <DataTrigger Binding="{Binding Path=IsReadOnly}" Value="True">
-                        <Setter TargetName="PART_Item" Property="IsHitTestVisible" Value="False" />
-                    </DataTrigger>
                 </DataTemplate.Triggers>
             </DataTemplate>
         </Style.Resources>
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 8f0c77932..3c6d49d77 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -9,7 +9,7 @@
     xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
     xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     x:Name="root"
-    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerGemeinnutzigeArbeitVM}"
+    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVermittlungArbeitVM}"
     d:DesignHeight="1450"
     d:DesignWidth="1800"
     mc:Ignorable="d">
@@ -249,7 +249,7 @@
                     Grid.Column="1"
                     EditValue="{Binding Path=ErsparteHafttage, UpdateSourceTrigger=PropertyChanged}"
                     IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                    Style="{StaticResource TextEditDays}"/>
+                    Style="{StaticResource TextEditDays}" />
 
                 <Label
                     Grid.Row="15"
@@ -260,7 +260,7 @@
                     Grid.Column="1"
                     EditValue="{Binding Path=GeleisteteRatenzahlung, UpdateSourceTrigger=PropertyChanged}"
                     IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                    Style="{StaticResource TextEditCurrency}"/>
+                    Style="{StaticResource TextEditCurrency}" />
 
                 <Label
                     Grid.Row="16"
diff --git a/BeWo/View/Detail/CustomerFalldatenView.xaml b/BeWo/View/Detail/CustomerFalldatenView.xaml
deleted file mode 100644
index b04cf85f7..000000000
--- a/BeWo/View/Detail/CustomerFalldatenView.xaml
+++ /dev/null
@@ -1,523 +0,0 @@
-<UserControl
-    x:Class="BeWo.View.Detail.CustomerFalldatenView"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
-    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-    xmlns:dxmvvm="http://schemas.devexpress.com/winfx/2008/xaml/mvvm"
-    xmlns:localView="clr-namespace:BeWo.View"
-    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-    HorizontalAlignment="Stretch"
-    VerticalAlignment="Stretch"
-    Focusable="True">
-    <UserControl.Resources>
-        <ResourceDictionary>
-            <Style TargetType="{x:Type Label}">
-                <Setter Property="IsEnabled" Value="True" />
-                <Setter Property="Foreground" Value="Black" />
-                <Setter Property="Margin" Value="3" />
-            </Style>
-            <Style TargetType="{x:Type CheckBox}">
-                <Setter Property="HorizontalAlignment" Value="Left" />
-                <Setter Property="VerticalAlignment" Value="Center" />
-                <Setter Property="IsHitTestVisible" Value="{Binding PermissionFalldatenEdit, Mode=OneTime}" />
-                <Setter Property="Focusable" Value="{Binding PermissionFalldatenEdit, Mode=OneTime}" />
-            </Style>
-        </ResourceDictionary>
-    </UserControl.Resources>
-    <Grid HorizontalAlignment="Stretch">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <GroupBox
-            Grid.RowSpan="3"
-            Grid.Column="0"
-            Padding="5"
-            Header="Falldaten"
-            Style="{StaticResource ObjectEditGroupBox}">
-            <Grid>
-                <Grid.Resources>
-                    <ResourceDictionary />
-                </Grid.Resources>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" MinWidth="200" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Label
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Content="Eigenes Aktenzeichen" />
-                <TextBox
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Text="{Binding Path=EigenesAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Content="Auftragseingang"
-                    IsEnabled="True" />
-                <dxe:DateEdit
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    EditValue="{Binding Path=Auftragseingang, UpdateSourceTrigger=PropertyChanged}"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
-                    ShowClearButton="False" />
-                <Label
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Content="Auftragsherkunft" />
-                <uc:NullItemComboBox
-                    x:Name="comboBox_Auftragsherkunft"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Height="23"
-                    MinWidth="30"
-                    Margin="3"
-                    HorizontalAlignment="Stretch"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
-                    ItemsSource="{Binding Path=Auftragsherkunfte}"
-                    SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}" />
-                <Label
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Content="Vermittlungsgrundlage" />
-                <uc:NullItemComboBox
-                    x:Name="comboBox_Vermittlungsgrundlage"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Height="23"
-                    MinWidth="30"
-                    Margin="3"
-                    HorizontalAlignment="Stretch"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
-                    ItemsSource="{Binding Path=Vermittlungsgrundlagen}"
-                    SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
-                <Label
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    Content="Tagessätze" />
-                <dxe:TextEdit
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.##"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    Content="Tagessatzhöhe" />
-                <dxe:TextEdit
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=Tagessatzhohe, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="6"
-                    Grid.Column="0"
-                    Content="Höhe der Geldstrafe" />
-                <dxe:TextEdit
-                    Grid.Row="6"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=HoheDerGeldstrafe, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="True"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="7"
-                    Grid.Column="0"
-                    Content="Zu leistende Arbeitsstunden" />
-                <dxe:TextEdit
-                    Grid.Row="7"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=ZuLeistendeArbeitsstunden, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Std"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="8"
-                    Grid.Column="0"
-                    Content="Hinweis" />
-                <TextBox
-                    Grid.Row="8"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Text="{Binding Path=Hinweis, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="9"
-                    Grid.Column="0"
-                    Content="Termin" />
-                <dxe:DateEdit
-                    Grid.Row="9"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    EditValue="{Binding Path=Termin, UpdateSourceTrigger=PropertyChanged}"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
-                    Mask="G"
-                    MaskUseAsDisplayFormat="True"
-                    ShowClearButton="True">
-                    <dxe:DateEdit.StyleSettings>
-                        <dxe:DateEditNavigatorWithTimePickerStyleSettings />
-                    </dxe:DateEdit.StyleSettings>
-                </dxe:DateEdit>
-                <Label
-                    Grid.Row="10"
-                    Grid.Column="0"
-                    Content="Bearbeitungsstatus" />
-                <uc:NullItemComboBox
-                    x:Name="combobox_bearbeitungsstatus"
-                    Grid.Row="10"
-                    Grid.Column="1"
-                    Height="23"
-                    MinWidth="30"
-                    Margin="3"
-                    HorizontalAlignment="Stretch"
-                    IsEnabled="{Binding Path=PermissionFalldatenEdit, Mode=OneTime}"
-                    SelectedValue="{Binding Path=FalldatenBearbeitungsstatus, Mode=TwoWay}" />
-                <Label
-                    Grid.Row="11"
-                    Grid.Column="0"
-                    Content="Auftragsrückgabe" />
-                <TextBox
-                    Grid.Row="11"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Text="{Binding Path=Auftragsruckgabe, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="12"
-                    Grid.Column="0"
-                    Content="Verlauf" />
-                <TextBox
-                    Grid.Row="12"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Text="{Binding Path=Verlauf, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="13"
-                    Grid.Column="0"
-                    Content="Abgeleistete Stunden" />
-                <dxe:TextEdit
-                    Grid.Row="13"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=AbgeleisteteStunden, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Std"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="14"
-                    Grid.Column="0"
-                    Content="Ersparte Hafttage" />
-                <dxe:TextEdit
-                    Grid.Row="14"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=ErsparteHafttage, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.## Tage"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="15"
-                    Grid.Column="0"
-                    Content="Geleistete Ratenzahlung" />
-                <dxe:TextEdit
-                    Grid.Row="15"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=GeleisteteRatenzahlung, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="16"
-                    Grid.Column="0"
-                    Content="Geleistete Einmalzahlung" />
-                <dxe:TextEdit
-                    Grid.Row="16"
-                    Grid.Column="1"
-                    Height="23"
-                    Margin="3"
-                    dxe:NumericMaskOptions.AlwaysShowDecimalSeparator="False"
-                    EditValue="{Binding Path=GeleisteteEinmalzahlung, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Mask="########0.00 $"
-                    MaskType="Numeric"
-                    MaskUseAsDisplayFormat="True" />
-                <Label
-                    Grid.Row="17"
-                    Grid.Column="0"
-                    Content="Bemerkung" />
-                <TextBox
-                    Grid.Row="17"
-                    Grid.Column="1"
-                    Height="60"
-                    Margin="3"
-                    AcceptsReturn="True"
-                    IsReadOnly="{Binding Path=PermissionFalldatenEdit, Mode=OneTime, Converter={StaticResource BoolReverseConverter}}"
-                    Text="{Binding Path=Bemerkung, UpdateSourceTrigger=PropertyChanged}"
-                    TextWrapping="Wrap"
-                    VerticalScrollBarVisibility="Auto" />
-            </Grid>
-        </GroupBox>
-        <GroupBox
-            Grid.Column="2"
-            Padding="5"
-            VerticalAlignment="Top"
-            Header="Gründe für Abbruch"
-            Style="{StaticResource ObjectEditGroupBox}">
-            <Grid>
-                <Grid.Resources>
-                    <ResourceDictionary />
-                </Grid.Resources>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <CheckBox
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundArbeitsunfahig, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundArbeitsunfahig}" />
-                <CheckBox
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundSuchtproblem, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundSuchtproblem}" />
-                <CheckBox
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundPsychischeProbleme, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundPsychischeProbleme}" />
-                <CheckBox
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundKeineMotivation, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundKeineMotivation}" />
-                <CheckBox
-                    Grid.Row="4"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundInHaft, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="4"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundInHaft}" />
-                <CheckBox
-                    Grid.Row="5"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundUnbekannt, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundUnbekannt}" />
-                <CheckBox
-                    Grid.Row="6"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundKeinKontakt, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="6"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundKeinKontakt}" />
-                <CheckBox
-                    Grid.Row="7"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundNichtAngetreten, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="7"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundNichtAngetreten}" />
-                <CheckBox
-                    Grid.Row="8"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundAbbruchDerTatigkeit, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="8"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundAbbruchDerTatigkeit}" />
-                <CheckBox
-                    Grid.Row="9"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundWiderruf, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="9"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundWiderruf}" />
-                <CheckBox
-                    Grid.Row="10"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=Grund459StPO, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="10"
-                    Grid.Column="1"
-                    Content="{markup:Translate Grund459StPO}" />
-                <CheckBox
-                    Grid.Row="11"
-                    Grid.Column="0"
-                    IsChecked="{Binding Path=GrundAusbleibenDerZahlung, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="11"
-                    Grid.Column="1"
-                    Content="{markup:Translate GrundAusbleibenDerZahlung}" />
-            </Grid>
-        </GroupBox>
-        <GroupBox
-            Grid.Row="1"
-            Grid.RowSpan="2"
-            Grid.Column="2"
-            VerticalAlignment="Top"
-            Header="Besonderheiten"
-            Style="{StaticResource ObjectEditGroupBox}">
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <CheckBox
-                    Grid.Row="0"
-                    Grid.Column="0"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    IsChecked="{Binding Path=BesonderheitMehrfacheBeauftragung, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="0"
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{markup:Translate BesonderheitMehrfacheBeauftragung}" />
-                <CheckBox
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    IsChecked="{Binding Path=BesonderheitMehrfacheVermittlung, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{markup:Translate BesonderheitMehrfacheVermittlung}" />
-                <CheckBox
-                    Grid.Row="2"
-                    Grid.Column="0"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    IsChecked="{Binding Path=BesonderheitVermittlungAusHaft, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{markup:Translate BesonderheitVermittlungAusHaft}" />
-                <CheckBox
-                    Grid.Row="3"
-                    Grid.Column="0"
-                    Margin="0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    IsChecked="{Binding Path=BesonderheitDurchBGBWAufgesucht, UpdateSourceTrigger=PropertyChanged}" />
-                <Label
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    Margin="0"
-                    Content="{markup:Translate BesonderheitDurchBGBWAufgesucht}" />
-            </Grid>
-        </GroupBox>
-    </Grid>
-</UserControl>
diff --git a/BeWo/View/Detail/CustomerFalldatenView.xaml.cs b/BeWo/View/Detail/CustomerFalldatenView.xaml.cs
deleted file mode 100644
index 11c1230c1..000000000
--- a/BeWo/View/Detail/CustomerFalldatenView.xaml.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-using BeWo.ViewModel;
-using BS.Shared;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Wohnhilfe;
-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 BeWo.View.Detail
-{
-    /// <summary>
-    /// Interaktionslogik für CustomerFalldatenView.xaml
-    /// </summary>
-    public partial class CustomerFalldatenView : UserControl
-    {
-        private CustomerFalldatenVM _ViewModel;
-
-        public CustomerFalldatenVM ViewModel
-        {
-            get { return _ViewModel; }
-            set 
-            {
-                _ViewModel = value;
-                DataContext = value;
-            }
-        }
-
-        public CustomerFalldatenView(CustomerFalldatenVM vM)
-        {
-            InitializeComponent();
-
-            ViewModel = vM;
-
-            combobox_bearbeitungsstatus.ItemsSource = Enum.GetValues(typeof(FalldatenBearbeitungsstatus));
-
-            foreach (var label in FindVisualChildren<Label>(this))
-            {
-                label.IsEnabled = true;
-            }
-        }
-
-        public IEnumerable<T> FindVisualChildren<T>(DependencyObject depObj) where T : DependencyObject
-        {
-            if (depObj != null)
-            {
-                int depObjCount = VisualTreeHelper.GetChildrenCount(depObj);
-                for (int i = 0; i < depObjCount; i++)
-                {
-                    DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
-                    if (child != null && child is T)
-                    {
-                        yield return (T)child;
-                    }
-
-                    if (child is GroupBox)
-                    {
-                        GroupBox gb = child as GroupBox;
-                        Object gpchild = gb.Content;
-                        if (gpchild is T)
-                        {
-                            yield return (T)child;
-                            child = gpchild as T;
-                        }
-                    }
-
-                    foreach (T childOfChild in FindVisualChildren<T>(child))
-                    {
-                        yield return childOfChild;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/BeWo/View/Detail/CustomerView.xaml b/BeWo/View/Detail/CustomerView.xaml
index 175eeacf8..3388c399c 100644
--- a/BeWo/View/Detail/CustomerView.xaml
+++ b/BeWo/View/Detail/CustomerView.xaml
@@ -1,28 +1,35 @@
-<localView:BeWoView x:Class="BeWo.View.Detail.CustomerView"
-                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
-                    xmlns:val="clr-namespace:BeWo.Validation"
-                    xmlns:localView="clr-namespace:BeWo.View"
-                    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
-                    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-                    xmlns:localSearchView="clr-namespace:BeWo.View.Search"
-                    xmlns:r="clr-namespace:BeWo.Security"
-                    xmlns:converter="clr-namespace:BeWo.Converter"
-                    xmlns:detail="clr-namespace:BeWo.View.Detail"
-                    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
-                    xmlns:controls="clr-namespace:BeWo.View.Controls"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
-                    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:viewmodel="clr-namespace:BeWo.ViewModel" 
-                    mc:Ignorable="d"
-                    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM, IsDesignTimeCreatable=true}"
-                    d:DesignHeight="800" d:DesignWidth="1366"
-                    Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
-                    x:Name="CustomerBeWoView"
-                    VerticalAlignment="Stretch" Focusable="True" GotFocus="UserControl_GotFocus" >
+<localView:BeWoView
+    x:Class="BeWo.View.Detail.CustomerView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:BeWo.View.Controls"
+    xmlns:converter="clr-namespace:BeWo.Converter"
+    xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:detail="clr-namespace:BeWo.View.Detail"
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+    xmlns:localSearchView="clr-namespace:BeWo.View.Search"
+    xmlns:localView="clr-namespace:BeWo.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:r="clr-namespace:BeWo.Security"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:uc="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+    xmlns:val="clr-namespace:BeWo.Validation"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
+    x:Name="CustomerBeWoView"
+    Width="Auto"
+    Height="Auto"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM,
+                                     IsDesignTimeCreatable=true}"
+    d:DesignHeight="800"
+    d:DesignWidth="1366"
+    Focusable="True"
+    GotFocus="UserControl_GotFocus"
+    mc:Ignorable="d">
     <localView:BeWoView.Resources>
         <converter:BoolNullCheckConverter x:Key="BoolNullCheckConverter" />
         <converter:BoolReverseConverter x:Key="BoolReverseConverter" />
@@ -32,271 +39,702 @@
     </localView:BeWoView.Triggers>
     <Grid x:Name="root">
         <Grid.Resources>
-            <dxg:GridControl VerticalAlignment="Stretch" x:Key="grid_aktuellemvl" HorizontalAlignment="Stretch"
-                  ItemsSource="{Binding Path=AktuelleMedikamentenverordnungsliste.Medikamentenverordnungen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                  CustomColumnSort="Grid_aktuellemedikamentenverordnungsliste_OnCustomColumnSort">
+            <dxg:GridControl
+                x:Key="grid_aktuellemvl"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                CustomColumnSort="Grid_aktuellemedikamentenverordnungsliste_OnCustomColumnSort"
+                ItemsSource="{Binding Path=AktuelleMedikamentenverordnungsliste.Medikamentenverordnungen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Verordnungsdatum" Header="Datum der Verordnung" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="Verordnungsdatum"
+                        Header="Datum der Verordnung"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="MedArt.Bezeichnung" Header="Med_Art" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="MedName" Header="Med_Name" ReadOnly="True"/>
-                    <dxg:GridColumn Binding="{Binding Path=RowData.Row.Darreichungsform}" Header="Darr.form" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Morgens" Header="Morgens" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Mittags" Header="Mittags" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Abends" Header="Abends" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Nachts" Header="Nachts" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="DepotMenge" Header="Depot_Menge" ReadOnly="True"/>
-                    <dxg:GridColumn Binding="{Binding Path=RowData.Row.DepotRhythmus}" Header="Depot_Rhythmus" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="DepotErsterTag" Header="Depot_ErsterTag" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        FieldName="MedArt.Bezeichnung"
+                        Header="Med_Art"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="MedName"
+                        Header="Med_Name"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Binding="{Binding Path=RowData.Row.Darreichungsform}"
+                        Header="Darr.form"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Morgens"
+                        Header="Morgens"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Mittags"
+                        Header="Mittags"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Abends"
+                        Header="Abends"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Nachts"
+                        Header="Nachts"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="DepotMenge"
+                        Header="Depot_Menge"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Binding="{Binding Path=RowData.Row.DepotRhythmus}"
+                        Header="Depot_Rhythmus"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="DepotErsterTag"
+                        Header="Depot_ErsterTag"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="DepotNaechsterTag" Header="Depot_NächsterTag" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="DepotNaechsterTag"
+                        Header="Depot_NächsterTag"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="MedBemerkung" Header="Med_Bemerkung" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="MedVerordnet" Header="Med_Verordnet" ReadOnly="True"/>
+                    <dxg:GridColumn
+                        FieldName="MedBemerkung"
+                        Header="Med_Bemerkung"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="MedVerordnet"
+                        Header="Med_Verordnet"
+                        ReadOnly="True" />
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
-            <dxg:GridControl VerticalAlignment="Stretch" x:Key="grid_bedarfsmvl" HorizontalAlignment="Stretch"
-                  ItemsSource="{Binding Path=Bedarfsmedikamentenverordnungsliste.Medikamentenverordnungen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
+            <dxg:GridControl
+                x:Key="grid_bedarfsmvl"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=Bedarfsmedikamentenverordnungsliste.Medikamentenverordnungen, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Verordnungsdatum" Header="Datum der Verordnung" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="Verordnungsdatum"
+                        Header="Datum der Verordnung"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="MedArt.Bezeichnung" Header="Med_Art" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="MedName" Header="Med_Name" ReadOnly="True"/>
-                    <dxg:GridColumn Binding="{Binding Path=RowData.Row.Darreichungsform}" Header="Darr.form" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Morgens" Header="Morgens" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Mittags" Header="Mittags" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Abends" Header="Abends" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="Nachts" Header="Nachts" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="DepotMenge" Header="Depot_Menge" ReadOnly="True"/>
-                    <dxg:GridColumn Binding="{Binding Path=RowData.Row.DepotRhythmus}" Header="Depot_Rhythmus" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="DepotErsterTag" Header="Depot_ErsterTag" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        FieldName="MedArt.Bezeichnung"
+                        Header="Med_Art"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="MedName"
+                        Header="Med_Name"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Binding="{Binding Path=RowData.Row.Darreichungsform}"
+                        Header="Darr.form"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Morgens"
+                        Header="Morgens"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Mittags"
+                        Header="Mittags"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Abends"
+                        Header="Abends"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="Nachts"
+                        Header="Nachts"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="DepotMenge"
+                        Header="Depot_Menge"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Binding="{Binding Path=RowData.Row.DepotRhythmus}"
+                        Header="Depot_Rhythmus"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="DepotErsterTag"
+                        Header="Depot_ErsterTag"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="DepotNaechsterTag" Header="Depot_NächsterTag" Width="80" ReadOnly="True" IsEnabled="False">
+                    <dxg:GridColumn
+                        Width="80"
+                        FieldName="DepotNaechsterTag"
+                        Header="Depot_NächsterTag"
+                        IsEnabled="False"
+                        ReadOnly="True">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:DateEditSettings DisplayFormat="d"/>
+                            <dxe:DateEditSettings DisplayFormat="d" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="MedBemerkung" Header="Med_Bemerkung" ReadOnly="True"/>
-                    <dxg:GridColumn FieldName="MedVerordnet" Header="Med_Verordnet" ReadOnly="True"/>
+                    <dxg:GridColumn
+                        FieldName="MedBemerkung"
+                        Header="Med_Bemerkung"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="MedVerordnet"
+                        Header="Med_Verordnet"
+                        ReadOnly="True" />
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
 
 
-            <dxg:GridControl VerticalAlignment="Stretch" Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="7" x:Key="grid_medikamentenverordnungshistorie" HorizontalAlignment="Stretch"
-                       ItemsSource="{Binding Path=UngueltigeVerordnungen}" CustomColumnSort="Grid_medikamentenverordnungshistorie_OnCustomColumnSort">
+            <dxg:GridControl
+                x:Key="grid_medikamentenverordnungshistorie"
+                Grid.Row="1"
+                Grid.Column="0"
+                Grid.ColumnSpan="7"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                CustomColumnSort="Grid_medikamentenverordnungshistorie_OnCustomColumnSort"
+                ItemsSource="{Binding Path=UngueltigeVerordnungen}">
                 <dxg:GridControl.DetailDescriptor>
                     <dxg:DataControlDetailDescriptor ItemsSourceBinding="{Binding Medikamentenverordnungen}">
                         <dxg:GridControl>
                             <dxg:GridControl.Columns>
-                                <dxg:GridColumn FieldName="MedArt.Bezeichnung" Header="Med_Art" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="MedName" Header="Med_Name" ReadOnly="True"/>
-                                <dxg:GridColumn Binding="{Binding Path=RowData.Row.Darreichungsform}" Header="Darr.form" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="Morgens" Header="Morgens" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="Mittags" Header="Mittags" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="Abends" Header="Abends" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="Nachts" Header="Nachts" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="DepotMenge" Header="Depot_Menge" ReadOnly="True"/>
-                                <dxg:GridColumn Binding="{Binding Path=RowData.Row.DepotRhythmus}" Header="Depot_Rhythmus" ReadOnly="True"/>
-                                <dxg:GridColumn IsEnabled="False" FieldName="DepotErsterTag" Header="Depot_ErsterTag" Width="80" ReadOnly="True">
+                                <dxg:GridColumn
+                                    FieldName="MedArt.Bezeichnung"
+                                    Header="Med_Art"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="MedName"
+                                    Header="Med_Name"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    Binding="{Binding Path=RowData.Row.Darreichungsform}"
+                                    Header="Darr.form"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="Morgens"
+                                    Header="Morgens"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="Mittags"
+                                    Header="Mittags"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="Abends"
+                                    Header="Abends"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="Nachts"
+                                    Header="Nachts"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="DepotMenge"
+                                    Header="Depot_Menge"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    Binding="{Binding Path=RowData.Row.DepotRhythmus}"
+                                    Header="Depot_Rhythmus"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    Width="80"
+                                    FieldName="DepotErsterTag"
+                                    Header="Depot_ErsterTag"
+                                    IsEnabled="False"
+                                    ReadOnly="True">
                                     <dxg:GridColumn.EditSettings>
-                                        <dxe:DateEditSettings DisplayFormat="d"/>
+                                        <dxe:DateEditSettings DisplayFormat="d" />
                                     </dxg:GridColumn.EditSettings>
                                 </dxg:GridColumn>
-                                <dxg:GridColumn IsEnabled="False" FieldName="DepotNaechsterTag" Header="Depot_NächsterTag" Width="80" ReadOnly="True">
+                                <dxg:GridColumn
+                                    Width="80"
+                                    FieldName="DepotNaechsterTag"
+                                    Header="Depot_NächsterTag"
+                                    IsEnabled="False"
+                                    ReadOnly="True">
                                     <dxg:GridColumn.EditSettings>
-                                        <dxe:DateEditSettings DisplayFormat="d"/>
+                                        <dxe:DateEditSettings DisplayFormat="d" />
                                     </dxg:GridColumn.EditSettings>
                                 </dxg:GridColumn>
-                                <dxg:GridColumn FieldName="MedBemerkung" Header="Med_Bemerkung" ReadOnly="True"/>
-                                <dxg:GridColumn FieldName="MedVerordnet" Header="Med_Verordnet" ReadOnly="True"/>
+                                <dxg:GridColumn
+                                    FieldName="MedBemerkung"
+                                    Header="Med_Bemerkung"
+                                    ReadOnly="True" />
+                                <dxg:GridColumn
+                                    FieldName="MedVerordnet"
+                                    Header="Med_Verordnet"
+                                    ReadOnly="True" />
                             </dxg:GridControl.Columns>
                             <dxg:GridControl.View>
-                                <dxg:TableView x:Name="medHistorienTableView" AutoWidth="True" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell"/>
+                                <dxg:TableView
+                                    x:Name="medHistorienTableView"
+                                    AutoWidth="True"
+                                    NavigationStyle="Cell"
+                                    ShowGroupPanel="False"
+                                    ShowGroupedColumns="false"
+                                    ShowTotalSummary="False" />
                             </dxg:GridControl.View>
                         </dxg:GridControl>
                     </dxg:DataControlDetailDescriptor>
                 </dxg:GridControl.DetailDescriptor>
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="x" Header="" Width="10">
+                    <dxg:GridColumn
+                        Width="10"
+                        FieldName="x"
+                        Header="">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" FontFamily="Webdings" Click="RemoveHistMedVOClick" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="RemoveHistMedVOClick"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="Notice" Header="Liste" ReadOnly="True" AllowEditing="False" />
-                    <dxg:GridColumn FieldName="Ersteller" Header="{markup:Translate Ersteller}" ReadOnly="True" AllowEditing="False" />
-                    <dxg:GridColumn FieldName="X" Header="Drucken" ReadOnly="True">
+                    <dxg:GridColumn
+                        AllowEditing="False"
+                        FieldName="Notice"
+                        Header="Liste"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        AllowEditing="False"
+                        FieldName="Ersteller"
+                        Header="{markup:Translate Ersteller}"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        FieldName="X"
+                        Header="Drucken"
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock x:Name="textblock_link_pdfexport" VerticalAlignment="Center">
-                  <Hyperlink x:Name="LinkListeDrucken" Click="MVHistoryEntryHyperlinkClick" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkListeDrucken_OnRequestNavigate">
-                    <Run Text="Drucken" />
-                  </Hyperlink>
+                                    <Hyperlink
+                                        x:Name="LinkListeDrucken"
+                                        Click="MVHistoryEntryHyperlinkClick"
+                                        Foreground="#FF2B508B"
+                                        RequestNavigate="LinkListeDrucken_OnRequestNavigate"
+                                        TargetName="_NewWindow">
+                                        <Run Text="Drucken" />
+                                    </Hyperlink>
                                 </TextBlock>
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
-            <dxg:GridControl x:Key="grid_costBearer" VerticalAlignment="Stretch" ItemsSource="{Binding Path=CostBearers.VMList}" HorizontalAlignment="Stretch">
+            <dxg:GridControl
+                x:Key="grid_costBearer"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=CostBearers.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" FontFamily="Webdings" Click="Button_deleteCostBearerClick" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="Button_deleteCostBearerClick"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn x:Name="gridcolumn_costbearer" AllowEditing="False" FieldName="CostBearer" Header="{markup:Translate Kostenträger}" Width="150" />
-                    <dxg:GridColumn FieldName="ReferenceNumber" Header="{markup:Translate Aktenzeichen des Klienten}" Width="200" />
-                    <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" />
+                    <dxg:GridColumn
+                        x:Name="gridcolumn_costbearer"
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="CostBearer"
+                        Header="{markup:Translate Kostenträger}" />
+                    <dxg:GridColumn
+                        Width="200"
+                        FieldName="ReferenceNumber"
+                        Header="{markup:Translate Aktenzeichen des Klienten}" />
+                    <dxg:GridColumn
+                        Width="250"
+                        FieldName="Notice"
+                        Header="Notiz" />
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
-            <dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EmployeeRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_EmployeeRelation">
+            <dxg:GridControl
+                x:Key="datagrid_EmployeeRelation"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=EmployeeRelations.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" FontFamily="Webdings" Click="button_removeEmployeeRelation_Click" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_removeEmployeeRelation_Click"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn AllowEditing="False" FieldName="Employee.SimpleDescription" Header="{markup:Translate Betreuer(in)}" Width="150" SortOrder="Ascending"/>
-                    <dxg:GridColumn x:Name="gridcolumn_employeerole" FieldName="Role" Header="Rolle" Width="200" />
-                    <dxg:GridColumn FieldName="StartDate" Header="{markup:Translate Startdatum}" Width="200" />
-                    <dxg:GridColumn FieldName="EndDate" Header="{markup:Translate Enddatum}" Width="200" />
-                    <dxg:GridColumn FieldName="Notice" Header="Erläuterung" Width="250" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="Employee.SimpleDescription"
+                        Header="{markup:Translate Betreuer(in)}"
+                        SortOrder="Ascending" />
+                    <dxg:GridColumn
+                        x:Name="gridcolumn_employeerole"
+                        Width="200"
+                        FieldName="Role"
+                        Header="Rolle" />
+                    <dxg:GridColumn
+                        Width="200"
+                        FieldName="StartDate"
+                        Header="{markup:Translate Startdatum}" />
+                    <dxg:GridColumn
+                        Width="200"
+                        FieldName="EndDate"
+                        Header="{markup:Translate Enddatum}" />
+                    <dxg:GridColumn
+                        Width="250"
+                        FieldName="Notice"
+                        Header="Erläuterung" />
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
-            <dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=TeamRelations.VMList}" HorizontalAlignment="Stretch" x:Key="datagrid_TeamRelation">
+            <dxg:GridControl
+                x:Key="datagrid_TeamRelation"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=TeamRelations.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" FontFamily="Webdings" Click="button_removeTeamRelation_Click" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_removeTeamRelation_Click"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn AllowEditing="False" FieldName="Team" Header="Team" Width="500" />
+                    <dxg:GridColumn
+                        Width="500"
+                        AllowEditing="False"
+                        FieldName="Team"
+                        Header="Team" />
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
-            <dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EnvironmentPersons.VMList}" HorizontalAlignment="Stretch" x:Key="grid_PersonRelations">
+            <dxg:GridControl
+                x:Key="grid_PersonRelations"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=EnvironmentPersons.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" Click="button_environmentPersonDeleteClick" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_environmentPersonDeleteClick"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="PersonString" Header="Person" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn FieldName="OrganisationString" Header="Organisation" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn x:Name="gridcolumn_evironmentroleperson" FieldName="Role" Header="Rolle" Width="150" />
-                    <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" AllowEditing="False"/>
-                    <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" AllowEditing="False"/>
-                    <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" >
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="PersonString"
+                        Header="Person" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="OrganisationString"
+                        Header="Organisation" />
+                    <dxg:GridColumn
+                        x:Name="gridcolumn_evironmentroleperson"
+                        Width="150"
+                        FieldName="Role"
+                        Header="Rolle" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="AddressSummaryInfo"
+                        Header="Adresse" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="ContactSummaryInfo"
+                        Header="Kontaktdaten" />
+                    <dxg:GridColumn
+                        Width="250"
+                        FieldName="Notice"
+                        Header="Notiz">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+                            <dxe:TextEditSettings AcceptsReturn="True" TextWrapping="Wrap" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
 
-            <dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EnvironmentPersonsWithFamily.VMList}" HorizontalAlignment="Stretch" x:Key="grid_FamilyRelations">
+            <dxg:GridControl
+                x:Key="grid_FamilyRelations"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=EnvironmentPersonsWithFamily.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" Click="button_environmentFamilyDeleteClick" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_environmentFamilyDeleteClick"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="PersonString" Header="Person" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn  x:Name="gridcolumn_evironmentFamilyStatus" FieldName="Role" Header="Familienstatus" Width="150" />
-                    <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" AllowEditing="False"/>
-                    <dxg:GridColumn FieldName="FamilyStatus" Header="Familienstand" Width="150" AllowEditing="False"/>
-                    <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250">
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="PersonString"
+                        Header="Person" />
+                    <dxg:GridColumn
+                        x:Name="gridcolumn_evironmentFamilyStatus"
+                        Width="150"
+                        FieldName="Role"
+                        Header="Familienstatus" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="AddressSummaryInfo"
+                        Header="Adresse" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="ContactSummaryInfo"
+                        Header="Kontaktdaten" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="FamilyStatus"
+                        Header="Familienstand" />
+                    <dxg:GridColumn
+                        Width="250"
+                        FieldName="Notice"
+                        Header="Notiz">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+                            <dxe:TextEditSettings AcceptsReturn="True" TextWrapping="Wrap" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
 
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
 
-            <dxg:GridControl VerticalAlignment="Stretch" ItemsSource="{Binding Path=EnvironmentOrganisations.VMList}" HorizontalAlignment="Stretch" x:Key="grid_OrganisationRelations">
+            <dxg:GridControl
+                x:Key="grid_OrganisationRelations"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Stretch"
+                ItemsSource="{Binding Path=EnvironmentOrganisations.VMList}">
                 <dxg:GridControl.Columns>
-                    <dxg:GridColumn FieldName="Notice" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                    <dxg:GridColumn
+                        Width="24"
+                        FieldName="Notice"
+                        FixedWidth="True"
+                        Header=""
+                        ReadOnly="True">
                         <dxg:GridColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="r" Click="button_environmentOrganisationDeleteClick" FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                                <Button
+                                    Width="18"
+                                    Height="18"
+                                    VerticalAlignment="Center"
+                                    Click="button_environmentOrganisationDeleteClick"
+                                    Content="r"
+                                    FontFamily="Webdings" />
                             </DataTemplate>
                         </dxg:GridColumn.CellTemplate>
                     </dxg:GridColumn>
-                    <dxg:GridColumn FieldName="OrganisationString" Header="Organisation" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn FieldName="PersonString" Header="{markup:Translate Ansprechpartner}" Width="150" AllowEditing="False" />
-                    <dxg:GridColumn x:Name="gridcolumn_evironmentroleorganisation" FieldName="Role" Header="Rolle" Width="150" ReadOnly="True" />
-                    <dxg:GridColumn FieldName="AddressSummaryInfo" Header="Adresse" Width="150" />
-                    <dxg:GridColumn FieldName="ContactSummaryInfo" Header="Kontaktdaten" Width="150" />
-                    <dxg:GridColumn FieldName="Info1" Header="Info" Width="200" />
-                    <dxg:GridColumn FieldName="Notice" Header="Notiz" Width="250" >
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="OrganisationString"
+                        Header="Organisation" />
+                    <dxg:GridColumn
+                        Width="150"
+                        AllowEditing="False"
+                        FieldName="PersonString"
+                        Header="{markup:Translate Ansprechpartner}" />
+                    <dxg:GridColumn
+                        x:Name="gridcolumn_evironmentroleorganisation"
+                        Width="150"
+                        FieldName="Role"
+                        Header="Rolle"
+                        ReadOnly="True" />
+                    <dxg:GridColumn
+                        Width="150"
+                        FieldName="AddressSummaryInfo"
+                        Header="Adresse" />
+                    <dxg:GridColumn
+                        Width="150"
+                        FieldName="ContactSummaryInfo"
+                        Header="Kontaktdaten" />
+                    <dxg:GridColumn
+                        Width="200"
+                        FieldName="Info1"
+                        Header="Info" />
+                    <dxg:GridColumn
+                        Width="250"
+                        FieldName="Notice"
+                        Header="Notiz">
                         <dxg:GridColumn.EditSettings>
-                            <dxe:TextEditSettings TextWrapping="Wrap" AcceptsReturn="True"/>
+                            <dxe:TextEditSettings AcceptsReturn="True" TextWrapping="Wrap" />
                         </dxg:GridColumn.EditSettings>
                     </dxg:GridColumn>
                 </dxg:GridControl.Columns>
                 <dxg:GridControl.View>
-                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" NavigationStyle="Cell" RowDoubleClick="TableView_OnRowDoubleClick" />
+                    <dxg:TableView
+                        AutoWidth="true"
+                        NavigationStyle="Cell"
+                        RowDoubleClick="TableView_OnRowDoubleClick"
+                        ShowGroupPanel="False"
+                        ShowGroupedColumns="false"
+                        ShowTotalSummary="False" />
                 </dxg:GridControl.View>
             </dxg:GridControl>
         </Grid.Resources>
         <uc:ShadowChrome>
             <GroupBox Style="{DynamicResource MainContentGroupBoxStyle}">
                 <GroupBox.Header>
-                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom">
-                        <Image Source="..\..\Ressources\Icons\UserHomeMaleDisabled.png" RenderTransformOrigin="0.5,0.5" Stretch="Uniform"
-                      Width="32">
+                    <StackPanel VerticalAlignment="Bottom" Orientation="Horizontal">
+                        <Image
+                            Width="32"
+                            RenderTransformOrigin="0.5,0.5"
+                            Source="..\..\Ressources\Icons\UserHomeMaleDisabled.png"
+                            Stretch="Uniform">
                             <Image.RenderTransform>
                                 <TransformGroup>
                                     <ScaleTransform ScaleX="1" ScaleY="1" />
@@ -306,22 +744,78 @@
                                 </TransformGroup>
                             </Image.RenderTransform>
                         </Image>
-                        <TextBox Text="{Binding FirstName}" Margin="10,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
-                        <TextBox Text="{Binding LastName}" Margin="3,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" />
-                        <TextBox Text="(" IsReadOnly="True" Margin="3,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" Visibility="{Binding Path=CustomerAlias, Converter={StaticResource  ObjectVisibilityConverter}}" />
-                        <TextBox Text="{Binding CustomerAlias}" Margin="0,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" TextDecorations="" />
-                        <TextBox Text=")" IsReadOnly="True" Margin="0,0,0,0" Background="{x:Null}" Foreground="#FFFFFFFF" FontSize="22" BorderBrush="{x:Null}" VerticalAlignment="Bottom" Padding="0,0,0,0" Visibility="{Binding Path=CustomerAlias, Converter={StaticResource  ObjectVisibilityConverter}}" />
+                        <TextBox
+                            Margin="10,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            Text="{Binding FirstName}" />
+                        <TextBox
+                            Margin="3,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            Text="{Binding LastName}" />
+                        <TextBox
+                            Margin="3,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            IsReadOnly="True"
+                            Text="("
+                            Visibility="{Binding Path=CustomerAlias, Converter={StaticResource ObjectVisibilityConverter}}" />
+                        <TextBox
+                            Margin="0,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            Text="{Binding CustomerAlias}"
+                            TextDecorations="" />
+                        <TextBox
+                            Margin="0,0,0,0"
+                            Padding="0,0,0,0"
+                            VerticalAlignment="Bottom"
+                            Background="{x:Null}"
+                            BorderBrush="{x:Null}"
+                            FontSize="22"
+                            Foreground="#FFFFFFFF"
+                            IsReadOnly="True"
+                            Text=")"
+                            Visibility="{Binding Path=CustomerAlias, Converter={StaticResource ObjectVisibilityConverter}}" />
                     </StackPanel>
                 </GroupBox.Header>
-                <Grid Margin="0,3,0,0" Background="{DynamicResource ObjectEditBackgroundBrush}" IsSharedSizeScope="True">
+                <Grid
+                    Margin="0,3,0,0"
+                    Background="{DynamicResource ObjectEditBackgroundBrush}"
+                    IsSharedSizeScope="True">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                         <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
-                    <Rectangle Fill="{StaticResource CustomerContentBrush}" Height="6" />
-                    <TabControl x:Name="tabroot" Grid.Row="1" Style="{StaticResource ObjectEditTabControl}" BorderThickness="0,0,0,0" Padding="4,4,4,4">
-                        <TabItem Header="Details" IsSelected="True" Name="tabitem_details">
+                    <Rectangle Height="6" Fill="{StaticResource CustomerContentBrush}" />
+                    <TabControl
+                        x:Name="tabroot"
+                        Grid.Row="1"
+                        Padding="4,4,4,4"
+                        BorderThickness="0,0,0,0"
+                        Style="{StaticResource ObjectEditTabControl}">
+                        <TabItem
+                            Name="tabitem_details"
+                            Header="Details"
+                            IsSelected="True">
                             <ScrollViewer VerticalScrollBarVisibility="Auto">
                                 <Grid x:Name="grid_details">
                                     <Grid.ColumnDefinitions>
@@ -333,16 +827,35 @@
                                         <RowDefinition Height="Auto" MinHeight="136" />
                                         <RowDefinition Height="*" MinHeight="165" />
                                         <RowDefinition Height="*" />
-                                        <RowDefinition Height="*"  MinHeight="165"  />
+                                        <RowDefinition Height="*" MinHeight="165" />
                                     </Grid.RowDefinitions>
 
-                                    <GroupBox Header="Foto" Margin="8 8 0 0" Style="{StaticResource ObjectEditGroupBox}" Grid.Column="0" >
+                                    <GroupBox
+                                        Grid.Column="0"
+                                        Margin="8,8,0,0"
+                                        Header="Foto"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
-                                            <dxe:ImageEdit Background="Transparent" MinWidth="250" MaxWidth="250" Height="250" x:Name="Img" Stretch="Uniform"  HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" MouseDoubleClick="Img_OnMouseDoubleClick"/>
+                                            <dxe:ImageEdit
+                                                x:Name="Img"
+                                                Height="250"
+                                                MinWidth="250"
+                                                MaxWidth="250"
+                                                HorizontalAlignment="Center"
+                                                Background="Transparent"
+                                                MouseDoubleClick="Img_OnMouseDoubleClick"
+                                                RenderOptions.BitmapScalingMode="HighQuality"
+                                                Stretch="Uniform" />
                                         </Grid>
                                     </GroupBox>
 
-                                    <GroupBox Grid.Row="0" Grid.ColumnSpan="2" Header="Eigenschaften" Style="{StaticResource ObjectEditGroupBox}" Margin="8 8 0 0" Grid.Column="1">
+                                    <GroupBox
+                                        Grid.Row="0"
+                                        Grid.Column="1"
+                                        Grid.ColumnSpan="2"
+                                        Margin="8,8,0,0"
+                                        Header="Eigenschaften"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="Blubb" />
@@ -364,135 +877,339 @@
                                             </Grid.RowDefinitions>
 
 
-                                            <Label Grid.Column="0" Grid.Row="0" Content="{markup:Translate Vorname}" />
-                                            <TextBox x:Name="textbox_first" Grid.Column="1" Grid.Row="0" Margin="3" Height="23"
-                                      Text="{val:ValidationBinding Path=FirstName, UpdateSourceTrigger=PropertyChanged}" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Content="{markup:Translate Vorname}" />
+                                            <TextBox
+                                                x:Name="textbox_first"
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{val:ValidationBinding Path=FirstName,
+                                                                             UpdateSourceTrigger=PropertyChanged}" />
 
-                                            <Label Grid.Column="0" Grid.Row="1" Content="{markup:Translate Nachname}" />
-                                            <TextBox Grid.Column="1" Grid.Row="1"  Margin="3" Height="23" Text="{val:ValidationBinding Path=LastName, UpdateSourceTrigger=PropertyChanged}" />
-                                            <Label Grid.Column="0" Grid.Row="2" Content="{markup:Translate Alias}" />
-                                            <TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{val:ValidationBinding Path=CustomerAlias, UpdateSourceTrigger=PropertyChanged}" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Content="{markup:Translate Nachname}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{val:ValidationBinding Path=LastName,
+                                                                             UpdateSourceTrigger=PropertyChanged}" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Content="{markup:Translate Alias}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{val:ValidationBinding Path=CustomerAlias,
+                                                                             UpdateSourceTrigger=PropertyChanged}" />
 
 
 
-                                            <Label Grid.Column="0" Grid.Row="3" Content="Geburtstag" />
-                                            <dxe:DateEdit AllowNullInput="True" Grid.Column="1" Grid.Row="3" Height="23" Margin="3"
-                                    EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}" MinWidth="90"
-                                    HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Content="Geburtstag" />
+                                            <dxe:DateEdit
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                MinWidth="90"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                AllowNullInput="True"
+                                                EditValue="{Binding Path=DateOfBirth, UpdateSourceTrigger=PropertyChanged}"
+                                                MaskType="DateTimeAdvancingCaret" />
 
-                                            <Label Grid.Column="2" Grid.Row="0" Content="Familienstand" />
-                                            <Label Grid.Column="2" Grid.Row="1" Content="{markup:Translate Beruf}" />
-                                            <Label Grid.Column="2" Grid.Row="2" Content="{markup:Translate Kinder}" />
-                                            <Label Grid.Column="2" Grid.Row="3" Content="{markup:Translate Eigenbeteiligung}" />
-                                            <Label Grid.Column="2" Grid.Row="4" Content="{markup:Translate Krankenkasse}" />
-                                            <Label Grid.Column="2" Grid.Row="5" Content="{markup:Translate Versichertennummer}" />
-                                            <Label Grid.Column="2" Grid.Row="6" Content="{markup:Translate Versichertenstatus}" />
-                                            <Label x:Name="lblArchiviert" Grid.Column="2" Grid.Row="7" Content="Archiviert" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Content="Familienstand" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Beruf}" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Kinder}" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Eigenbeteiligung}" />
+                                            <Label
+                                                Grid.Row="4"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Krankenkasse}" />
+                                            <Label
+                                                Grid.Row="5"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Versichertennummer}" />
+                                            <Label
+                                                Grid.Row="6"
+                                                Grid.Column="2"
+                                                Content="{markup:Translate Versichertenstatus}" />
+                                            <Label
+                                                x:Name="lblArchiviert"
+                                                Grid.Row="7"
+                                                Grid.Column="2"
+                                                Content="Archiviert" />
 
-                                            <Label Grid.Column="0" Grid.Row="4"  Content="Geschlecht"  />
+                                            <Label
+                                                Grid.Row="4"
+                                                Grid.Column="0"
+                                                Content="Geschlecht" />
 
 
-                                            <Grid Grid.Column="1" Grid.Row="4"  Margin="3" Height="23">
+                                            <Grid
+                                                Grid.Row="4"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
-                                                <RadioButton Grid.Column="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                          IsChecked="{Binding Path=IsMale, UpdateSourceTrigger=PropertyChanged}" Content="männlich" />
-                                                <RadioButton Grid.Column="1" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                          IsChecked="{Binding Path=IsFemale, UpdateSourceTrigger=PropertyChanged}" Content="weiblich" />
-                                                <RadioButton Grid.Column="2" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                       IsChecked="{Binding Path=IsDivers, UpdateSourceTrigger=PropertyChanged}" Content="divers" />
+                                                <RadioButton
+                                                    Grid.Column="0"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="männlich"
+                                                    IsChecked="{Binding Path=IsMale, UpdateSourceTrigger=PropertyChanged}" />
+                                                <RadioButton
+                                                    Grid.Column="1"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="weiblich"
+                                                    IsChecked="{Binding Path=IsFemale, UpdateSourceTrigger=PropertyChanged}" />
+                                                <RadioButton
+                                                    Grid.Column="2"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="divers"
+                                                    IsChecked="{Binding Path=IsDivers, UpdateSourceTrigger=PropertyChanged}" />
                                             </Grid>
 
-                                            <Label Grid.Column="0" Grid.Row="5" Content="Staatsangehörigkeit"/>
-                                            <uc:NullItemComboBox x:Name="comboBox_Nationalitaet" Grid.Column="1" Grid.Row="5" Margin="3" Height="23" SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" MinWidth="30" HorizontalAlignment="Stretch"/>
+                                            <Label
+                                                Grid.Row="5"
+                                                Grid.Column="0"
+                                                Content="Staatsangehörigkeit" />
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_Nationalitaet"
+                                                Grid.Row="5"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                MinWidth="30"
+                                                Margin="3"
+                                                HorizontalAlignment="Stretch"
+                                                SelectedValue="{Binding Path=Nationalitaet, Mode=TwoWay}" />
 
 
-                                            <Label Grid.Column="0" Grid.Row="6"  Content="Migrationshintergrund"/>
+                                            <Label
+                                                Grid.Row="6"
+                                                Grid.Column="0"
+                                                Content="Migrationshintergrund" />
 
-                                            <Grid x:Name="panelMigrationshintergrund" Grid.Column="1" Grid.Row="6">
+                                            <Grid
+                                                x:Name="panelMigrationshintergrund"
+                                                Grid.Row="6"
+                                                Grid.Column="1">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
-                                                <CheckBox  Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Margin="3,5,3,1" Height="23" x:Name="chkMigration" HorizontalAlignment="Left"
-                            IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}"  />
-                                                <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{val:ValidationBinding Path=Migrationshintergrund, UpdateSourceTrigger=PropertyChanged}"/>
+                                                <CheckBox
+                                                    x:Name="chkMigration"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Height="23"
+                                                    Margin="3,5,3,1"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    IsChecked="{Binding Path=IsMigrant, UpdateSourceTrigger=PropertyChanged}" />
+                                                <TextBox
+                                                    Grid.Row="0"
+                                                    Grid.Column="1"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    Text="{val:ValidationBinding Path=Migrationshintergrund,
+                                                                                 UpdateSourceTrigger=PropertyChanged}" />
                                             </Grid>
 
 
 
                                             <!--
-            TextBox Grid.Column="2" Grid.Row="6" Margin="3" Height="23"/>
-            Text="{val:ValidationBinding Path=CustomerAlias, UpdateSourceTrigger=PropertyChanged}" />
-            -->
+                                                TextBox Grid.Column="2" Grid.Row="6" Margin="3" Height="23"/>
+                                                Text="{val:ValidationBinding Path=CustomerAlias, UpdateSourceTrigger=PropertyChanged}" />
+                                            -->
 
-                                            <Label Grid.Column="0" Grid.Row="7" HorizontalAlignment="Left"  Content="Aufenthaltsstatus"/>
+                                            <Label
+                                                Grid.Row="7"
+                                                Grid.Column="0"
+                                                HorizontalAlignment="Left"
+                                                Content="Aufenthaltsstatus" />
 
-                                            <Grid Grid.Column="1" Grid.Row="7" >
+                                            <Grid Grid.Row="7" Grid.Column="1">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*"></ColumnDefinition>
-                                                    <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                                    <ColumnDefinition Width="Auto"></ColumnDefinition>
+                                                    <ColumnDefinition Width="*" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                 </Grid.ColumnDefinitions>
-                                                <uc:NullItemComboBox x:Name="comboBox_Aufenthalt" Margin="3" Height="23" SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" MinWidth="30" HorizontalAlignment="Stretch"/>
-                                                <Label Grid.Column="1" HorizontalAlignment="Left"  Content="Gültig bis"/>
-                                                <dxe:DateEdit AllowNullInput="True" Grid.Column="2" Height="23" Margin="3"
-                                    EditValue="{Binding Path=AufenthaltGueltigBis, UpdateSourceTrigger=PropertyChanged}" MinWidth="90"
-                                    HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
+                                                <uc:NullItemComboBox
+                                                    x:Name="comboBox_Aufenthalt"
+                                                    Height="23"
+                                                    MinWidth="30"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Stretch"
+                                                    SelectedValue="{Binding Path=AufenthaltsStatus, Mode=TwoWay}" />
+                                                <Label
+                                                    Grid.Column="1"
+                                                    HorizontalAlignment="Left"
+                                                    Content="Gültig bis" />
+                                                <dxe:DateEdit
+                                                    Grid.Column="2"
+                                                    Height="23"
+                                                    MinWidth="90"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    AllowNullInput="True"
+                                                    EditValue="{Binding Path=AufenthaltGueltigBis, UpdateSourceTrigger=PropertyChanged}"
+                                                    MaskType="DateTimeAdvancingCaret" />
                                             </Grid>
 
 
 
-                                            <Grid x:Name="panelDebitor" Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="2">
+                                            <Grid
+                                                x:Name="panelDebitor"
+                                                Grid.Row="8"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="2">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto" SharedSizeGroup="Blubb"/>
+                                                    <ColumnDefinition Width="Auto" SharedSizeGroup="Blubb" />
                                                     <ColumnDefinition Width="*" />
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
                                                 <Label x:Name="lblDebitorNumber" Content="{markup:Translate Debitor Nr.}" />
-                                                <TextBox x:Name="txtDebitorNumber" Grid.Column="1" Margin="3" Height="23"
-                                          Text="{val:ValidationBinding Path=DebitorNumber, UpdateSourceTrigger=PropertyChanged}" />
-                                                <Label x:Name="lblCostCenter" Grid.Column="2" Content="{markup:Translate Kostenstelle}" />
-                                                <TextBox x:Name="txtCostCenter" Grid.Column="3" Margin="3" Height="23"
-                                          Text="{val:ValidationBinding Path=CostCenter, UpdateSourceTrigger=PropertyChanged}" />
+                                                <TextBox
+                                                    x:Name="txtDebitorNumber"
+                                                    Grid.Column="1"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    Text="{val:ValidationBinding Path=DebitorNumber,
+                                                                                 UpdateSourceTrigger=PropertyChanged}" />
+                                                <Label
+                                                    x:Name="lblCostCenter"
+                                                    Grid.Column="2"
+                                                    Content="{markup:Translate Kostenstelle}" />
+                                                <TextBox
+                                                    x:Name="txtCostCenter"
+                                                    Grid.Column="3"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    Text="{val:ValidationBinding Path=CostCenter,
+                                                                                 UpdateSourceTrigger=PropertyChanged}" />
                                             </Grid>
 
-                                            <Label Grid.Column="0" Grid.Row="9" Content="Kommentar" />
-                                            <uc:NullItemComboBox Grid.Column="3" Grid.Row="0" Margin="3" Height="23"
-                                            ItemsSource="{x:Static core:EnumTranslations.FamilyStatusTranslations}"
-                                            SelectedValue="{Binding Path=FamilyStatus}" DisplayMemberPath="Value"
-                                            SelectedValuePath="Key" />
+                                            <Label
+                                                Grid.Row="9"
+                                                Grid.Column="0"
+                                                Content="Kommentar" />
+                                            <uc:NullItemComboBox
+                                                Grid.Row="0"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                DisplayMemberPath="Value"
+                                                ItemsSource="{x:Static core:EnumTranslations.FamilyStatusTranslations}"
+                                                SelectedValue="{Binding Path=FamilyStatus}"
+                                                SelectedValuePath="Key" />
 
-                                            <TextBox Grid.Column="3" Grid.Row="1" Margin="3" Height="23"
-                                      Text="{Binding Path=Profession, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="3" Grid.Row="2" Margin="3" Height="23"
-                                      Text="{Binding Path=Childs, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="3" Grid.Row="3" Margin="3" Height="23"
-                                      Text="{Binding Path=EquityContribution, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="3" Grid.Row="4" Margin="3" Height="23"
-                                      Text="{Binding Path=HealthInsurance, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="3" Grid.Row="5" Margin="3" Height="23"
-                                      Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="3" Grid.Row="6" Margin="3" Height="23"
-                                      Text="{Binding Path=VersichertenStatus, UpdateSourceTrigger=PropertyChanged}" />
-                                            <CheckBox x:Name="chkArchiviert" Grid.Column="3" Grid.Row="7" Margin="3,5,3,1" Height="23"
-                                      IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Margin="3" Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="9"
-                                      Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" Height="100"
-                                      VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Left"
-                                      ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto"
-                                      HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True"
-                                      AutoWordSelection="True" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Profession, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Childs, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="3"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=EquityContribution, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="4"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=HealthInsurance, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="5"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InsuranceNumber, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="6"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=VersichertenStatus, UpdateSourceTrigger=PropertyChanged}" />
+                                            <CheckBox
+                                                x:Name="chkArchiviert"
+                                                Grid.Row="7"
+                                                Grid.Column="3"
+                                                Height="23"
+                                                Margin="3,5,3,1"
+                                                IsChecked="{Binding Path=IsArchived, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="9"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="3"
+                                                Height="100"
+                                                Margin="3"
+                                                VerticalAlignment="Stretch"
+                                                HorizontalContentAlignment="Left"
+                                                VerticalContentAlignment="Stretch"
+                                                AcceptsReturn="True"
+                                                AutoWordSelection="True"
+                                                HorizontalScrollBarVisibility="Hidden"
+                                                Language="de-DE"
+                                                ScrollViewer.CanContentScroll="False"
+                                                SpellCheck.IsEnabled="True"
+                                                Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
+                                                TextWrapping="Wrap"
+                                                VerticalScrollBarVisibility="Auto" />
                                         </Grid>
                                     </GroupBox>
 
 
-                                    <GroupBox Grid.Column="0" Grid.Row="1" Margin="0 8 0 0" Header="Adresse" Style="{StaticResource ObjectEditGroupBox}">
+                                    <GroupBox
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        Margin="0,8,0,0"
+                                        Header="Adresse"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
@@ -507,36 +1224,100 @@
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
 
-                                            <Label Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Content="Adresszusatz" />
-                                            <Label Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Content="Strasse" />
-                                            <Label Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Postleitzahl" />
-                                            <Label Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Ort" />
-                                            <Label x:Name="lblDistance" Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" Content="Entfernung in km" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Adresszusatz" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Strasse" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Postleitzahl" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Ort" />
+                                            <Label
+                                                x:Name="lblDistance"
+                                                Grid.Row="4"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Entfernung in km" />
 
 
-                                            <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23" Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23" Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23" Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
-                                            <dxe:SpinEdit MinValue="0" Increment="1" IsFloatValue="False" AllowNullInput="True" x:Name="txtDistance"
-                                              EditValue="{Binding Path=DistanceInMeter, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
-                                              Grid.Column="1" Grid.Row="4"
-                                              Height="23" Margin="3"/>
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=AddressLine1, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Street, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=PostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Town, UpdateSourceTrigger=PropertyChanged}" />
+                                            <dxe:SpinEdit
+                                                x:Name="txtDistance"
+                                                Grid.Row="4"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                AllowNullInput="True"
+                                                EditValue="{Binding Path=DistanceInMeter, Mode=TwoWay, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
+                                                Increment="1"
+                                                IsFloatValue="False"
+                                                MinValue="0" />
 
-                                            <TextBlock x:Name="ButtonOpenAiChat" HorizontalAlignment="Left" Width="Auto" Margin="5,2,0,0" Grid.Column="0" Grid.Row="5" PreviewMouseLeftButtonDown="OpenAiChat">
-                                            <Hyperlink NavigateUri="https://www.bewoplaner.de" TargetName="newWindow" Foreground="Transparent" >
-                                                
-                                                    <Image HorizontalAlignment="Left" Source="..\..\Ressources\Icons\chatbot.png" Width="48" Height="48"
-                                                            Style="{StaticResource toolbarImageStyle}" >
-                                                        
-                                                    </Image>
-                                                
-                                            </Hyperlink>
+                                            <TextBlock
+                                                x:Name="ButtonOpenAiChat"
+                                                Grid.Row="5"
+                                                Grid.Column="0"
+                                                Width="Auto"
+                                                Margin="5,2,0,0"
+                                                HorizontalAlignment="Left"
+                                                PreviewMouseLeftButtonDown="OpenAiChat">
+                                                <Hyperlink
+                                                    Foreground="Transparent"
+                                                    NavigateUri="https://www.bewoplaner.de"
+                                                    TargetName="newWindow">
+
+                                                    <Image
+                                                        Width="48"
+                                                        Height="48"
+                                                        HorizontalAlignment="Left"
+                                                        Source="..\..\Ressources\Icons\chatbot.png"
+                                                        Style="{StaticResource toolbarImageStyle}" />
+
+                                                </Hyperlink>
                                             </TextBlock>
                                         </Grid>
                                     </GroupBox>
-                                    <GroupBox Grid.Column="1" Grid.Row="1" Margin="8 8 0 0" Header="Rechnungsadresse"
-                                Style="{StaticResource ObjectEditGroupBox}">
+                                    <GroupBox
+                                        Grid.Row="1"
+                                        Grid.Column="1"
+                                        Margin="8,8,0,0"
+                                        Header="Rechnungsadresse"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
@@ -549,25 +1330,62 @@
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
 
-                                            <Label Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Content="Name" />
-                                            <Label Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Content="Strasse" />
-                                            <Label Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Postleitzahl" />
-                                            <Label Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Ort" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Name" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Strasse" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Postleitzahl" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Ort" />
 
-                                            <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23"
-                                      Text="{Binding Path=InvoiceAddressLine1, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="23"
-                                      Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
-                                      Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="23"
-                                      Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressLine1, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressStreet, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressPostalCode, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=InvoiceAddressTown, UpdateSourceTrigger=PropertyChanged}" />
 
 
                                         </Grid>
                                     </GroupBox>
-                                    <GroupBox Grid.Column="2" Grid.Row="1" Header="Kontakt" Grid.ColumnSpan="2"
-                                Style="{StaticResource ObjectEditGroupBox}" Margin="8,8,0,0">
+                                    <GroupBox
+                                        Grid.Row="1"
+                                        Grid.Column="2"
+                                        Grid.ColumnSpan="2"
+                                        Margin="8,8,0,0"
+                                        Header="Kontakt"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
@@ -581,21 +1399,66 @@
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
 
-                                            <Label Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Content="Handy" />
-                                            <Label Grid.Column="0" Grid.Row="1" VerticalAlignment="Center" Content="Telefon" />
-                                            <Label Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Fax" />
-                                            <Label Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Mail" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Handy" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Telefon" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Fax" />
+                                            <Label
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                VerticalAlignment="Center"
+                                                Content="Mail" />
 
-                                            <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="0" Margin="3" Height="23"
-                                      Text="{Binding Path=MobilePhone, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="1" Margin="3" Height="23"
-                                      Text="{Binding Path=Phone, UpdateSourceTrigger=PropertyChanged}" />
-                                            <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="2" Margin="3" Height="23"
-                                      Text="{Binding Path=Fax, UpdateSourceTrigger=PropertyChanged}" />
-                                            <Button Grid.Column="1" Grid.Row="3" Content="*" FontFamily="Wingdings" Click="EmailBtnClick" Margin="3"
-                                    Height="21" IsEnabled="{Binding Path=EMail, Converter={StaticResource ObjectBoolConverter}}" />
-                                            <TextBox x:Name="EMailTextBox" Grid.RowSpan="1" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="3" Margin="3"
-                                      Height="23" Text="{Binding Path=EMail, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=MobilePhone, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Phone, UpdateSourceTrigger=PropertyChanged}" />
+                                            <TextBox
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=Fax, UpdateSourceTrigger=PropertyChanged}" />
+                                            <Button
+                                                Grid.Row="3"
+                                                Grid.Column="1"
+                                                Height="21"
+                                                Margin="3"
+                                                Click="EmailBtnClick"
+                                                Content="*"
+                                                FontFamily="Wingdings"
+                                                IsEnabled="{Binding Path=EMail, Converter={StaticResource ObjectBoolConverter}}" />
+                                            <TextBox
+                                                x:Name="EMailTextBox"
+                                                Grid.Row="3"
+                                                Grid.RowSpan="1"
+                                                Grid.Column="2"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Margin="3"
+                                                Text="{Binding Path=EMail, UpdateSourceTrigger=PropertyChanged}" />
 
                                         </Grid>
                                     </GroupBox>
@@ -605,31 +1468,54 @@
                                 </Grid>
                             </ScrollViewer>
                         </TabItem>
-                        <TabItem Header="{markup:Translate CustomerVarFieldsTitle}" Name="tabitem_varFields">
+                        <TabItem Name="tabitem_varFields" Header="{markup:Translate CustomerVarFieldsTitle}">
                             <ScrollViewer VerticalScrollBarVisibility="Auto">
                                 <localView:VarFieldView VarFieldList="{Binding VarFields}" />
                             </ScrollViewer>
                         </TabItem>
-                        <TabItem Header="{markup:Translate CustomerNotizen}" Name="tabitem_notizen" Selector.Selected="tabitem_notizen_Selected" />
-                        <TabItem Header="Schulbegleitender Dienst" Name="tabitem_schuldienst" Selector.Selected="tabitem_SchulDienst_Selected" />
-                        <TabItem Header="Falldaten" Name="tabitem_falldaten" Selector.Selected="tabitem_falldaten_Selected" Visibility="{Binding Path=PermissionFalldatenView, Converter={StaticResource BoolVisibilityConverter}}"/>
-                        <TabItem Header="Vermittlung Arbeit" Name="tabitem_gemeinnutzigearbeit" Visibility="{Binding Path=PermissionGemeinnutzigeArbeitView, Converter={StaticResource BoolVisibilityConverter}}">
-                            <detail:CustomerVermittlungArbeitView/>
+                        <TabItem
+                            Name="tabitem_notizen"
+                            Header="{markup:Translate CustomerNotizen}"
+                            Selector.Selected="tabitem_notizen_Selected" />
+                        <TabItem
+                            Name="tabitem_schuldienst"
+                            Header="Schulbegleitender Dienst"
+                            Selector.Selected="tabitem_SchulDienst_Selected" />
+                        <TabItem
+                            Name="tabitem_gemeinnutzigearbeit"
+                            Header="Vermittlung Arbeit"
+                            Visibility="{Binding Path=PermissionGemeinnutzigeArbeitView, Converter={StaticResource BoolVisibilityConverter}}">
+                            <detail:CustomerVermittlungArbeitView />
                         </TabItem>
-                        <TabItem Header="Wohnhilfe" Name="tabitem_wohnhilfe" Visibility="{Binding Path=PermissionWohnhilfeView, Converter={StaticResource BoolVisibilityConverter}}">
-                            <detail:CustomerWohnhilfeView/>
+                        <TabItem
+                            Name="tabitem_wohnhilfe"
+                            Header="Wohnhilfe"
+                            Visibility="{Binding Path=PermissionWohnhilfeView, Converter={StaticResource BoolVisibilityConverter}}">
+                            <detail:CustomerWohnhilfeView />
                         </TabItem>
-                        <TabItem Header="{markup:Translate CustomerStundenplan}" Name="tabitem_stundenplan" Selector.Selected="tabitem_stundenplan_Selected" />
-                        <TabItem Header="Dokumentation" Name="tabitem_notice">
+                        <TabItem
+                            Name="tabitem_stundenplan"
+                            Header="{markup:Translate CustomerStundenplan}"
+                            Selector.Selected="tabitem_stundenplan_Selected" />
+                        <TabItem Name="tabitem_notice" Header="Dokumentation">
                             <GroupBox Header="Dokumentation" Style="{StaticResource ObjectEditGroupBox}">
-                                <TextBox Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
-                              VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Left"
-                              ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto"
-                              HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True"
-                              AutoWordSelection="True" Language="de-DE" SpellCheck.IsEnabled="True"/>
+                                <TextBox
+                                    Margin="3"
+                                    VerticalAlignment="Stretch"
+                                    HorizontalContentAlignment="Left"
+                                    VerticalContentAlignment="Stretch"
+                                    AcceptsReturn="True"
+                                    AutoWordSelection="True"
+                                    HorizontalScrollBarVisibility="Hidden"
+                                    Language="de-DE"
+                                    ScrollViewer.CanContentScroll="False"
+                                    SpellCheck.IsEnabled="True"
+                                    Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}"
+                                    TextWrapping="Wrap"
+                                    VerticalScrollBarVisibility="Auto" />
                             </GroupBox>
                         </TabItem>
-                        <!-- Region tabitem_notice -->
+                        <!--  Region tabitem_notice  -->
                         <!--<TabItem Name="tabitem_notice">
 							<GroupBox Style="{StaticResource ObjectEditGroupBox}">
 							<GroupBox.Header>
@@ -650,7 +1536,7 @@
 							<TextBox Margin="3" Text="{Binding Path=Notice, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Left" ScrollViewer.CanContentScroll="False" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden" TextWrapping="Wrap" AcceptsReturn="True" AutoWordSelection="True" />
 							</GroupBox>
 						</TabItem>-->
-                        <!-- EndRegion -->
+                        <!--  EndRegion  -->
 
                         <TabItem Header="Aktenzeichen" Selector.Selected="TabItemCostBearer_Selected">
                             <Grid x:Name="grid_costBearerRel">
@@ -658,8 +1544,10 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
-                                <GroupBox Style="{StaticResource ObjectEditGroupBox}" x:Name="groupBox_newCostBearer"
-                              Header="{markup:Translate Neues Aktenzeichen für Kostenträger vergeben}">
+                                <GroupBox
+                                    x:Name="groupBox_newCostBearer"
+                                    Header="{markup:Translate Neues Aktenzeichen für Kostenträger vergeben}"
+                                    Style="{StaticResource ObjectEditGroupBox}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
@@ -674,61 +1562,119 @@
                                             <RowDefinition Height="0" />
                                         </Grid.RowDefinitions>
                                         <Label Content="{markup:Translate Kostenträger}" />
-                                        <uc:PopUpEdit Margin="3" Height="23"
-                                      IsReadOnly="True"
-                                      DeleteButtonVisibility="Collapsed"
-                                      Name="popupedit_costBearer"
-                                      PopUpClick="popupedit_costBearer_PopUpClick"
-                                      Text="{val:ValidationBinding Path=CostBearers.NewVM.CostBearerString}"
-                                      Grid.Row="0" Grid.Column="1"
-                                      PreviewMouseDoubleClick="Popupedit_costBearer_OnPreviewMouseDoubleClick"
-                                      Cursor="Arrow" />
-                                        <Label Content="{markup:Translate Aktenzeichen des Klienten}" Grid.Row="0" Grid.Column="2" />
-                                        <TextBox Grid.Row="0" Grid.Column="3" Margin="3" Height="23" Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" />
-                                        <Label Content="Notiz" Grid.Row="1" Grid.Column="0" />
-                                        <TextBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="3" Margin="3" Height="23"
-                                    Text="{Binding Path=CostBearers.NewVM.Notice}" />
-                                        <Button Margin="3" Grid.Row="2" Height="25" Content="Hinzufügen" Grid.ColumnSpan="4" Grid.Column="0"
-                                  HorizontalAlignment="Right" x:Name="button_addCostBearer" Click="button_addCostBearer_Click" />
+                                        <uc:PopUpEdit
+                                            Name="popupedit_costBearer"
+                                            Grid.Row="0"
+                                            Grid.Column="1"
+                                            Height="23"
+                                            Margin="3"
+                                            Cursor="Arrow"
+                                            DeleteButtonVisibility="Collapsed"
+                                            IsReadOnly="True"
+                                            PopUpClick="popupedit_costBearer_PopUpClick"
+                                            PreviewMouseDoubleClick="Popupedit_costBearer_OnPreviewMouseDoubleClick"
+                                            Text="{val:ValidationBinding Path=CostBearers.NewVM.CostBearerString}" />
+                                        <Label
+                                            Grid.Row="0"
+                                            Grid.Column="2"
+                                            Content="{markup:Translate Aktenzeichen des Klienten}" />
+                                        <TextBox
+                                            Grid.Row="0"
+                                            Grid.Column="3"
+                                            Height="23"
+                                            Margin="3"
+                                            Text="{Binding Path=CostBearers.NewVM.ReferenceNumber}" />
+                                        <Label
+                                            Grid.Row="1"
+                                            Grid.Column="0"
+                                            Content="Notiz" />
+                                        <TextBox
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            Grid.ColumnSpan="3"
+                                            Height="23"
+                                            Margin="3"
+                                            Text="{Binding Path=CostBearers.NewVM.Notice}" />
+                                        <Button
+                                            x:Name="button_addCostBearer"
+                                            Grid.Row="2"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="4"
+                                            Height="25"
+                                            Margin="3"
+                                            HorizontalAlignment="Right"
+                                            Click="button_addCostBearer_Click"
+                                            Content="Hinzufügen" />
                                     </Grid>
                                 </GroupBox>
-                                <GroupBox x:Name="GroupBoxCostBearerGrid" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1"
-                              Margin=" 0 20 0 0" Header="{markup:Translate Zugeordnete Aktenzeichen pro Kostenträger}" />
+                                <GroupBox
+                                    x:Name="GroupBoxCostBearerGrid"
+                                    Grid.Row="1"
+                                    Margin="0,20,0,0"
+                                    Header="{markup:Translate Zugeordnete Aktenzeichen pro Kostenträger}"
+                                    Style="{StaticResource ObjectEditGroupBox}" />
                             </Grid>
                         </TabItem>
-                        <TabItem Header="Diagnosen" x:Name="tabitem_diagnosis">
+                        <TabItem x:Name="tabitem_diagnosis" Header="Diagnosen">
                             <TabItem.Resources>
-                                <GroupBox x:Key="gb_possible" Margin="0 20 0 20" Style="{StaticResource PopUpWindowStyle}">
+                                <GroupBox
+                                    x:Key="gb_possible"
+                                    Margin="0,20,0,20"
+                                    Style="{StaticResource PopUpWindowStyle}">
                                     <GroupBox.Header>
-                                        <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,0,0">
+                                        <StackPanel
+                                            Margin="0,0,0,0"
+                                            VerticalAlignment="Center"
+                                            Orientation="Horizontal">
                                             <!--<Image Source="..\..\Ressources\Icons\CoinsDisabled.png" Height="28" />-->
-                                            <TextBox Text="Mögliche Diagnosen" Margin="10,4,0,0" Background="{x:Null}"
-                                      Foreground="{DynamicResource MainGroupBoxForegroundBrush}" FontSize="20" BorderBrush="{x:Null}"
-                                      VerticalAlignment="Stretch" BorderThickness="0,0,0,0" Padding="0,0,0,0" />
+                                            <TextBox
+                                                Margin="10,4,0,0"
+                                                Padding="0,0,0,0"
+                                                VerticalAlignment="Stretch"
+                                                Background="{x:Null}"
+                                                BorderBrush="{x:Null}"
+                                                BorderThickness="0,0,0,0"
+                                                FontSize="20"
+                                                Foreground="{DynamicResource MainGroupBoxForegroundBrush}"
+                                                Text="Mögliche Diagnosen" />
                                         </StackPanel>
                                     </GroupBox.Header>
                                     <Grid>
-                                        <dxg:GridControl MouseDoubleClick="grid_possibleDiagnosis_MouseDoubleClick" Name="grid_possibleDiagnosis">
+                                        <dxg:GridControl Name="grid_possibleDiagnosis" MouseDoubleClick="grid_possibleDiagnosis_MouseDoubleClick">
                                             <dxg:GridControl.Columns>
-                                                <dxg:GridColumn FieldName="Key" FixedWidth="True" Width="70" AllowResizing="True"
-                           AutoFilterCondition="Contains" Header="ICD 10" />
-                                                <dxg:GridColumn FieldName="Value" AutoFilterCondition="Contains" Header="Beschreibung">
+                                                <dxg:GridColumn
+                                                    Width="70"
+                                                    AllowResizing="True"
+                                                    AutoFilterCondition="Contains"
+                                                    FieldName="Key"
+                                                    FixedWidth="True"
+                                                    Header="ICD 10" />
+                                                <dxg:GridColumn
+                                                    AutoFilterCondition="Contains"
+                                                    FieldName="Value"
+                                                    Header="Beschreibung">
                                                     <dxg:GridColumn.EditSettings>
                                                         <dxe:TextEditSettings TextWrapping="Wrap" />
                                                     </dxg:GridColumn.EditSettings>
                                                 </dxg:GridColumn>
                                             </dxg:GridControl.Columns>
                                             <dxg:GridControl.View>
-                                                <dxg:TableView x:Name="gridView_possible" NavigationStyle="Row" Margin="2 2 2 2" AutoWidth="True"
-                                            ShowAutoFilterRow="True" ShowGroupPanel="False" ShowGroupedColumns="false"
-                                            ShowTotalSummary="False" />
+                                                <dxg:TableView
+                                                    x:Name="gridView_possible"
+                                                    Margin="2,2,2,2"
+                                                    AutoWidth="True"
+                                                    NavigationStyle="Row"
+                                                    ShowAutoFilterRow="True"
+                                                    ShowGroupPanel="False"
+                                                    ShowGroupedColumns="false"
+                                                    ShowTotalSummary="False" />
                                             </dxg:GridControl.View>
                                         </dxg:GridControl>
                                     </Grid>
                                 </GroupBox>
                             </TabItem.Resources>
-                            <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Diagnosen">
-                                <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                            <GroupBox Header="Diagnosen" Style="{StaticResource ObjectEditGroupBox}">
+                                <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
                                     <Grid x:Name="grid_misc">
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="*" />
@@ -742,52 +1688,125 @@
                                             <ColumnDefinition Width="Auto" />
                                             <ColumnDefinition Width="*" />
                                         </Grid.ColumnDefinitions>
-                                        <Label x:Name="lbl_medication" Margin="3" Grid.Row="1" VerticalAlignment="Top" Content="Medikation" />
-                                        <TextBox x:Name="tb_medication" Margin="3" MinHeight="40" MaxHeight="200" Grid.Column="1" Grid.Row="1"
-													VerticalScrollBarVisibility="Auto" AcceptsReturn="True"
-													Text="{Binding Path=Medication, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
-                                        <Label x:Name="lbl_diag" Grid.Column="0" Grid.Row="2" Margin="3" VerticalAlignment="Top"
-                                  Content="Bemerkungen" />
-                                        <Label x:Name="lbl_diag10" Grid.Column="0" Grid.Row="3" Margin="3" VerticalAlignment="Top"
-                                  Content="ICD10 Diagnosen" />
-                                        <TextBox x:Name="tb_diag" Margin="3" Height="40" Grid.Column="1" Grid.Row="2"
-                                    VerticalScrollBarVisibility="Auto" AcceptsReturn="True"
-                                    Text="{Binding Path=Diagnosis, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
-                                        <TextBox x:Name="tb_diag10" Margin="3" Height="40" Grid.Column="1" Grid.Row="3"
-                                    VerticalScrollBarVisibility="Auto" AcceptsReturn="True"
-                                    Text="{Binding Path=ICD10Diagnosis, UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
-                                        <Grid Grid.Row="0" Grid.ColumnSpan="2" Grid.Column="0">
+                                        <Label
+                                            x:Name="lbl_medication"
+                                            Grid.Row="1"
+                                            Margin="3"
+                                            VerticalAlignment="Top"
+                                            Content="Medikation" />
+                                        <TextBox
+                                            x:Name="tb_medication"
+                                            Grid.Row="1"
+                                            Grid.Column="1"
+                                            MinHeight="40"
+                                            MaxHeight="200"
+                                            Margin="3"
+                                            AcceptsReturn="True"
+                                            Text="{Binding Path=Medication, UpdateSourceTrigger=PropertyChanged}"
+                                            TextWrapping="Wrap"
+                                            VerticalScrollBarVisibility="Auto" />
+                                        <Label
+                                            x:Name="lbl_diag"
+                                            Grid.Row="2"
+                                            Grid.Column="0"
+                                            Margin="3"
+                                            VerticalAlignment="Top"
+                                            Content="Bemerkungen" />
+                                        <Label
+                                            x:Name="lbl_diag10"
+                                            Grid.Row="3"
+                                            Grid.Column="0"
+                                            Margin="3"
+                                            VerticalAlignment="Top"
+                                            Content="ICD10 Diagnosen" />
+                                        <TextBox
+                                            x:Name="tb_diag"
+                                            Grid.Row="2"
+                                            Grid.Column="1"
+                                            Height="40"
+                                            Margin="3"
+                                            AcceptsReturn="True"
+                                            Text="{Binding Path=Diagnosis, UpdateSourceTrigger=PropertyChanged}"
+                                            TextWrapping="Wrap"
+                                            VerticalScrollBarVisibility="Auto" />
+                                        <TextBox
+                                            x:Name="tb_diag10"
+                                            Grid.Row="3"
+                                            Grid.Column="1"
+                                            Height="40"
+                                            Margin="3"
+                                            AcceptsReturn="True"
+                                            Text="{Binding Path=ICD10Diagnosis, UpdateSourceTrigger=PropertyChanged}"
+                                            TextWrapping="Wrap"
+                                            VerticalScrollBarVisibility="Auto" />
+                                        <Grid
+                                            Grid.Row="0"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
-                                            <dxg:GridControl Margin="3" Name="grid_choosenDiagnosis">
+                                            <dxg:GridControl Name="grid_choosenDiagnosis" Margin="3">
                                                 <dxg:GridControl.Columns>
-                                                    <dxg:GridColumn FieldName="Key" AllowResizing="True" AutoFilterCondition="Contains" FixedWidth="True"
-                                              Width="70" Header="ICD 10" />
-                                                    <dxg:GridColumn FieldName="Value" AutoFilterCondition="Contains" Header="Beschreibung" Width="400">
+                                                    <dxg:GridColumn
+                                                        Width="70"
+                                                        AllowResizing="True"
+                                                        AutoFilterCondition="Contains"
+                                                        FieldName="Key"
+                                                        FixedWidth="True"
+                                                        Header="ICD 10" />
+                                                    <dxg:GridColumn
+                                                        Width="400"
+                                                        AutoFilterCondition="Contains"
+                                                        FieldName="Value"
+                                                        Header="Beschreibung">
                                                         <dxg:GridColumn.EditSettings>
                                                             <dxe:TextEditSettings TextWrapping="Wrap" />
                                                         </dxg:GridColumn.EditSettings>
                                                     </dxg:GridColumn>
-                                                    <dxg:GridColumn AllowColumnFiltering="False" AllowAutoFilter="False" FixedWidth="True" Width="26"
-                                              AllowResizing="False" FieldName="Key" Header=" ">
+                                                    <dxg:GridColumn
+                                                        Width="26"
+                                                        AllowAutoFilter="False"
+                                                        AllowColumnFiltering="False"
+                                                        AllowResizing="False"
+                                                        FieldName="Key"
+                                                        FixedWidth="True"
+                                                        Header=" ">
                                                         <dxg:GridColumn.CellTemplate>
                                                             <DataTemplate>
-                                                                <Button x:Name="button_removeDiagnosis" Width="20" Height="20"
-                                                    ToolTip="Diagnose aus der Liste entfernen" Tag="{Binding Value}"
-                                                    Style="{DynamicResource CloseButtonStyle}" Click="button_removeDiagnosis_Click" Margin="2" />
+                                                                <Button
+                                                                    x:Name="button_removeDiagnosis"
+                                                                    Width="20"
+                                                                    Height="20"
+                                                                    Margin="2"
+                                                                    Click="button_removeDiagnosis_Click"
+                                                                    Style="{DynamicResource CloseButtonStyle}"
+                                                                    Tag="{Binding Value}"
+                                                                    ToolTip="Diagnose aus der Liste entfernen" />
                                                             </DataTemplate>
                                                         </dxg:GridColumn.CellTemplate>
                                                     </dxg:GridColumn>
                                                 </dxg:GridControl.Columns>
                                                 <dxg:GridControl.View>
-                                                    <dxg:TableView x:Name="gridView_choosen" NavigationStyle="None" Margin="2 30 2 2" AutoWidth="True"
-                                              ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False" />
+                                                    <dxg:TableView
+                                                        x:Name="gridView_choosen"
+                                                        Margin="2,30,2,2"
+                                                        AutoWidth="True"
+                                                        NavigationStyle="None"
+                                                        ShowGroupPanel="False"
+                                                        ShowGroupedColumns="false"
+                                                        ShowTotalSummary="False" />
                                                 </dxg:GridControl.View>
                                             </dxg:GridControl>
                                             <!--<Label FontSize="14" Foreground="{StaticResource GridPrintMenuLightBrush}" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="10 3 0 0" Content="Zugeordnete Diagnosen:" />-->
-                                            <Button x:Name="button_addDiagnosos" HorizontalAlignment="Left" VerticalAlignment="Top"
-                                    Click="button_addDiagnosos_Click" Height="25" Margin="6 6 10 0" ToolTip="Diagnose hinzufügen">
+                                            <Button
+                                                x:Name="button_addDiagnosos"
+                                                Height="25"
+                                                Margin="6,6,10,0"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top"
+                                                Click="button_addDiagnosos_Click"
+                                                ToolTip="Diagnose hinzufügen">
                                                 <Grid>
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="Auto" />
@@ -796,19 +1815,49 @@
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition Height="Auto" />
                                                     </Grid.RowDefinitions>
-                                                    <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                        <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round"
-                                              StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" Width="16" Height="16" />
-                                                        <Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round"
-                                              StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" Width="16" Height="16" />
+                                                    <Grid
+                                                        Width="18"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center">
+                                                        <Line
+                                                            Width="16"
+                                                            Height="16"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            Fill="{x:Null}"
+                                                            Stroke="#FFFFFFFF"
+                                                            StrokeEndLineCap="Round"
+                                                            StrokeStartLineCap="Round"
+                                                            StrokeThickness="2"
+                                                            X1="4"
+                                                            X2="12"
+                                                            Y1="8"
+                                                            Y2="8" />
+                                                        <Line
+                                                            Width="16"
+                                                            Height="16"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            Fill="{x:Null}"
+                                                            Stroke="#FFFFFFFF"
+                                                            StrokeEndLineCap="Round"
+                                                            StrokeStartLineCap="Round"
+                                                            StrokeThickness="2"
+                                                            X1="8"
+                                                            X2="8"
+                                                            Y1="4"
+                                                            Y2="12" />
                                                     </Grid>
-                                                    <Label Foreground="#FFFFFFFF" Grid.Column="1">Diagnose hinzufügen</Label>
+                                                    <Label Grid.Column="1" Foreground="#FFFFFFFF">Diagnose hinzufügen</Label>
                                                 </Grid>
                                             </Button>
                                         </Grid>
-                                        <GroupBox Grid.Row="4" Grid.ColumnSpan="2" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Header="Behinderungen">
+                                        <GroupBox
+                                            Grid.Row="4"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="2"
+                                            Header="Behinderungen"
+                                            Style="{StaticResource ObjectEditGroupBox}">
                                             <Grid x:Name="grid_disabilities">
                                                 <Grid MinHeight="100">
                                                     <Grid.ColumnDefinitions>
@@ -821,36 +1870,74 @@
                                                         <RowDefinition Height="*" />
                                                         <RowDefinition Height="*" />
                                                     </Grid.RowDefinitions>
-                                                    <Label Grid.Column="2" Grid.Row="0" Content="Nicht zugeordnete Behinderungen" HorizontalAlignment="Left" />
-                                                    <ListBox Grid.Column="2" Grid.Row="1" Grid.RowSpan="2" x:Name="listbox_possibleDisabilities"
-                                            DisplayMemberPath="TypeDescription" ItemsSource="{Binding Path=PossibleDisabilities}"
-                                            IsSynchronizedWithCurrentItem="True" />
-                                                    <Button x:Name="button_addDisability" Click="button_addDisability_Click" Grid.Column="1" Margin="3"
-                                          Grid.Row="1" VerticalAlignment="Bottom" Content="&lt;" FontWeight="Bold" Width="25"
-                                          IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_possibleDisabilities}"
-                                          Height="25" />
-                                                    <Button x:Name="button_removeDisability" Click="button_removeDisability_Click" Grid.Column="1" Margin="3"
-                                          Grid.Row="2" VerticalAlignment="Top" Content="&gt;" FontWeight="Bold" Width="25"
-                                          IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_disabilities}"
-                                          Height="25" />
-                                                    <Label Grid.Column="0" Grid.Row="0" Content="{markup:Translate Diesem Klienten zugeordnete Behinderungen}"
-                                          HorizontalAlignment="Left" />
-                                                    <ListBox Grid.Column="0" Grid.Row="1" Grid.RowSpan="2" x:Name="listbox_disabilities"
-                                            DisplayMemberPath="TypeDescription" ItemsSource="{Binding Path=Disabilities}"
-                                            IsSynchronizedWithCurrentItem="True" />
+                                                    <Label
+                                                        Grid.Row="0"
+                                                        Grid.Column="2"
+                                                        HorizontalAlignment="Left"
+                                                        Content="Nicht zugeordnete Behinderungen" />
+                                                    <ListBox
+                                                        x:Name="listbox_possibleDisabilities"
+                                                        Grid.Row="1"
+                                                        Grid.RowSpan="2"
+                                                        Grid.Column="2"
+                                                        DisplayMemberPath="TypeDescription"
+                                                        IsSynchronizedWithCurrentItem="True"
+                                                        ItemsSource="{Binding Path=PossibleDisabilities}" />
+                                                    <Button
+                                                        x:Name="button_addDisability"
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        Width="25"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="button_addDisability_Click"
+                                                        Content="&lt;"
+                                                        FontWeight="Bold"
+                                                        IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_possibleDisabilities}" />
+                                                    <Button
+                                                        x:Name="button_removeDisability"
+                                                        Grid.Row="2"
+                                                        Grid.Column="1"
+                                                        Width="25"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        VerticalAlignment="Top"
+                                                        Click="button_removeDisability_Click"
+                                                        Content="&gt;"
+                                                        FontWeight="Bold"
+                                                        IsEnabled="{Binding Path=SelectedIndex, Converter={StaticResource IndexBoolConverter}, ElementName=listbox_disabilities}" />
+                                                    <Label
+                                                        Grid.Row="0"
+                                                        Grid.Column="0"
+                                                        HorizontalAlignment="Left"
+                                                        Content="{markup:Translate Diesem Klienten zugeordnete Behinderungen}" />
+                                                    <ListBox
+                                                        x:Name="listbox_disabilities"
+                                                        Grid.Row="1"
+                                                        Grid.RowSpan="2"
+                                                        Grid.Column="0"
+                                                        DisplayMemberPath="TypeDescription"
+                                                        IsSynchronizedWithCurrentItem="True"
+                                                        ItemsSource="{Binding Path=Disabilities}" />
                                                 </Grid>
                                             </Grid>
                                         </GroupBox>
-                                        <GroupBox Grid.Row="5" Grid.ColumnSpan="6" Grid.Column="0" Style="{StaticResource ObjectEditGroupBox}" Header="Schwerbehindertenausweis">
+                                        <GroupBox
+                                            Grid.Row="5"
+                                            Grid.Column="0"
+                                            Grid.ColumnSpan="6"
+                                            Header="Schwerbehindertenausweis"
+                                            Style="{StaticResource ObjectEditGroupBox}">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
+                                                    <ColumnDefinition Width="Auto" />
                                                 </Grid.ColumnDefinitions>
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
@@ -860,68 +1947,176 @@
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
 
-                                                <Label Grid.Column="0" Grid.Row="0" Content="Aust. Vers. -amt" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                                <TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="23" Width="150" Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
+                                                <Label
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="Aust. Vers. -amt" />
+                                                <TextBox
+                                                    Grid.Row="0"
+                                                    Grid.Column="1"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    Text="{Binding Path=AusstVersAmt, UpdateSourceTrigger=PropertyChanged}" />
 
-                                                <Label Grid.Column="0" Grid.Row="1" Content="Ausweis unbefristet gültig" VerticalAlignment="Center" />
-                                                <CheckBox Grid.Column="1" Grid.Row="1" Margin="3,5,3,1" Height="23" x:Name="AusweisUnbefristetCheckBox"
-                                          VerticalAlignment="Center" VerticalContentAlignment="Center"
-                                          IsChecked="{Binding Path=AusweisUnbefristetGueltig, UpdateSourceTrigger=PropertyChanged}"/>
+                                                <Label
+                                                    Grid.Row="1"
+                                                    Grid.Column="0"
+                                                    VerticalAlignment="Center"
+                                                    Content="Ausweis unbefristet gültig" />
+                                                <CheckBox
+                                                    x:Name="AusweisUnbefristetCheckBox"
+                                                    Grid.Row="1"
+                                                    Grid.Column="1"
+                                                    Height="23"
+                                                    Margin="3,5,3,1"
+                                                    VerticalAlignment="Center"
+                                                    VerticalContentAlignment="Center"
+                                                    IsChecked="{Binding Path=AusweisUnbefristetGueltig, UpdateSourceTrigger=PropertyChanged}" />
 
-                                                <Label Grid.Column="0" Grid.Row="2" Content="Ausweis gültig von" VerticalAlignment="Center" />
-                                                <dxe:DateEdit Grid.Column="1" Grid.Row="2" AllowNullInput="True" Height="23" Margin="3"
-                                            Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
-                                            EditValue="{Binding Path=AusweisGueltigVon, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
+                                                <Label
+                                                    Grid.Row="2"
+                                                    Grid.Column="0"
+                                                    VerticalAlignment="Center"
+                                                    Content="Ausweis gültig von" />
+                                                <dxe:DateEdit
+                                                    Grid.Row="2"
+                                                    Grid.Column="1"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    AllowNullInput="True"
+                                                    EditValue="{Binding Path=AusweisGueltigVon, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                                    MaskType="DateTimeAdvancingCaret" />
 
-                                                <Label Grid.Column="0" Grid.Row="3" Content="Ausweis gültig bis" VerticalAlignment="Center" />
-                                                <dxe:DateEdit Grid.Column="1" Grid.Row="3" AllowNullInput="True" Height="23" Margin="3"
-                                            Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret"
-                                            EditValue="{Binding Path=AusweisGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                                            IsEnabled="{Binding ElementName=AusweisUnbefristetCheckBox, Path=IsChecked, Converter={StaticResource BoolReverseConverter}}" />
+                                                <Label
+                                                    Grid.Row="3"
+                                                    Grid.Column="0"
+                                                    VerticalAlignment="Center"
+                                                    Content="Ausweis gültig bis" />
+                                                <dxe:DateEdit
+                                                    Grid.Row="3"
+                                                    Grid.Column="1"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    AllowNullInput="True"
+                                                    EditValue="{Binding Path=AusweisGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                                    IsEnabled="{Binding ElementName=AusweisUnbefristetCheckBox, Path=IsChecked, Converter={StaticResource BoolReverseConverter}}"
+                                                    MaskType="DateTimeAdvancingCaret" />
 
-                                                <Label Grid.Column="2" Grid.Row="0" Content="Beiblatt gültig bis" VerticalAlignment="Center" />
-                                                <dxe:DateEdit Grid.Column="3" Grid.Row="0" AllowNullInput="True" Height="23" Margin="3"
-                                            EditValue="{Binding Path=BeiblattGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                                            Width="150" HorizontalAlignment="Left" MaskType="DateTimeAdvancingCaret" />
+                                                <Label
+                                                    Grid.Row="0"
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Content="Beiblatt gültig bis" />
+                                                <dxe:DateEdit
+                                                    Grid.Row="0"
+                                                    Grid.Column="3"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    AllowNullInput="True"
+                                                    EditValue="{Binding Path=BeiblattGueltigBis, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
+                                                    MaskType="DateTimeAdvancingCaret" />
 
-                                                <Label Grid.Column="2" Grid.Row="1" Content="Grad der Behinderung" VerticalAlignment="Center" />
-                                                <ComboBox Grid.Column="3" Grid.Row="1" Height="23" Margin="3" x:Name="GdBComboBox" Width="150" SelectionChanged="GdBComboBox_OnSelectionChanged"/>
+                                                <Label
+                                                    Grid.Row="1"
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Content="Grad der Behinderung" />
+                                                <ComboBox
+                                                    x:Name="GdBComboBox"
+                                                    Grid.Row="1"
+                                                    Grid.Column="3"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    SelectionChanged="GdBComboBox_OnSelectionChanged" />
 
-                                                <Label Grid.Column="2" Grid.Row="2" Content="Merkzeichen" VerticalAlignment="Center" />
-                                                <uc:PopUpEdit IsReadOnly="True"
-                                            DeleteButtonVisibility="Collapsed"
-                                            PopUpClick="popupedit_merkzeichen_PopUpClick"
-                                            HorizontalAlignment="Stretch"
-                                            HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="2" Margin="3"
-                                            Text="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
-                                            ToolTip="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
-                                            Cursor="Arrow" />
+                                                <Label
+                                                    Grid.Row="2"
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Content="Merkzeichen" />
+                                                <uc:PopUpEdit
+                                                    Grid.Row="2"
+                                                    Grid.Column="3"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Cursor="Arrow"
+                                                    DeleteButtonVisibility="Collapsed"
+                                                    IsReadOnly="True"
+                                                    PopUpClick="popupedit_merkzeichen_PopUpClick"
+                                                    Text="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}"
+                                                    ToolTip="{Binding ElementName=MerkzeichenSelection, Path=AusgewaehlteMerkzeichenString}" />
 
-                                                <Label Grid.Column="2" Grid.Row="3" Content="Behinderungsart" VerticalAlignment="Center" />
-                                                <uc:PopUpEdit IsReadOnly="True"
-                                DeleteButtonVisibility="Collapsed"
-                                PopUpClick="popupedit_behinderungsarten_PopUpClick"
-                                HorizontalAlignment="Stretch"
-                                HorizontalContentAlignment="Stretch" Height="23" Width="150" Grid.Column="3" Grid.Row="3" Margin="3"
-                Text="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
-                ToolTip="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
-                                Cursor="Arrow" />
+                                                <Label
+                                                    Grid.Row="3"
+                                                    Grid.Column="2"
+                                                    VerticalAlignment="Center"
+                                                    Content="Behinderungsart" />
+                                                <uc:PopUpEdit
+                                                    Grid.Row="3"
+                                                    Grid.Column="3"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Stretch"
+                                                    HorizontalContentAlignment="Stretch"
+                                                    Cursor="Arrow"
+                                                    DeleteButtonVisibility="Collapsed"
+                                                    IsReadOnly="True"
+                                                    PopUpClick="popupedit_behinderungsarten_PopUpClick"
+                                                    Text="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}"
+                                                    ToolTip="{Binding ElementName=BehinderungsartenSelection, Path=AusgewaehlteBehinderungsartenString}" />
 
-                                                <Label Grid.Column="4" Grid.Row="0" Content="Pflegegrad" VerticalAlignment="Center" />
-                                                <uc:NullItemComboBox Grid.Column="5" Grid.Row="0" Margin="3" Height="23" Width="150"
-										ItemsSource="{x:Static core:EnumTranslations.PflegegradTranslations}"
-										SelectedValue="{Binding Path=Pflegegrad}" DisplayMemberPath="Value"
-										SelectedValuePath="Key" />
-                                                <Label Grid.Column="4" Grid.Row="1" Content="Aktenzeichen" VerticalAlignment="Center" />
-                                                <TextBox Grid.Column="5" Grid.Row="1" Margin="3" Height="23" Width="150" Text="{Binding Path=AusweisAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
+                                                <Label
+                                                    Grid.Row="0"
+                                                    Grid.Column="4"
+                                                    VerticalAlignment="Center"
+                                                    Content="Pflegegrad" />
+                                                <uc:NullItemComboBox
+                                                    Grid.Row="0"
+                                                    Grid.Column="5"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    DisplayMemberPath="Value"
+                                                    ItemsSource="{x:Static core:EnumTranslations.PflegegradTranslations}"
+                                                    SelectedValue="{Binding Path=Pflegegrad}"
+                                                    SelectedValuePath="Key" />
+                                                <Label
+                                                    Grid.Row="1"
+                                                    Grid.Column="4"
+                                                    VerticalAlignment="Center"
+                                                    Content="Aktenzeichen" />
+                                                <TextBox
+                                                    Grid.Row="1"
+                                                    Grid.Column="5"
+                                                    Width="150"
+                                                    Height="23"
+                                                    Margin="3"
+                                                    Text="{Binding Path=AusweisAktenzeichen, UpdateSourceTrigger=PropertyChanged}" />
                                             </Grid>
                                         </GroupBox>
                                     </Grid>
                                 </ScrollViewer>
                             </GroupBox>
                         </TabItem>
-                        <TabItem r:DemandUserRight.VisibleDemands="Customer_ViewBetreuung" Header="Betreuung" Selector.Selected="TabItemEmployees_Selected">
-                            <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                        <TabItem
+                            r:DemandUserRight.VisibleDemands="Customer_ViewBetreuung"
+                            Header="Betreuung"
+                            Selector.Selected="TabItemEmployees_Selected">
+                            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
                                 <Grid x:Name="grid_emplyeeRel">
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
@@ -930,7 +2125,10 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
-                                    <GroupBox x:Name="groupbox_customerCareType" Header="Betreuung" Style="{StaticResource ObjectEditGroupBox}">
+                                    <GroupBox
+                                        x:Name="groupbox_customerCareType"
+                                        Header="Betreuung"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid IsSharedSizeScope="True">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto" />
@@ -947,63 +2145,169 @@
                                             </Grid.RowDefinitions>
 
 
-                                            <Label Content="Betreuung begonnen am" Grid.Column="0" Grid.Row="0" />
-                                            <dxe:DateEdit Grid.Column="1" Grid.Row="0" Height="23" Margin="3" Width="100" HorizontalAlignment="Left"
-                                        AllowNullInput="True"
-                                        EditValue="{val:ValidationBinding Path=AssistanceBegin, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                                        MaskType="DateTimeAdvancingCaret" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Content="Betreuung begonnen am" />
+                                            <dxe:DateEdit
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Width="100"
+                                                Height="23"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                AllowNullInput="True"
+                                                EditValue="{val:ValidationBinding Path=AssistanceBegin,
+                                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                                  Mode=TwoWay}"
+                                                MaskType="DateTimeAdvancingCaret" />
 
-                                            <Label Content="Betreuung beendet am" Grid.Column="0" Grid.Row="1" />
-                                            <dxe:DateEdit Grid.Column="1" Grid.Row="1" Height="23" Margin="3" Width="100" HorizontalAlignment="Left"
-                                        AllowNullInput="True"
-                                        EditValue="{val:ValidationBinding Path=TerminationDate, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
-                                        MaskType="DateTimeAdvancingCaret" />
+                                            <Label
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Content="Betreuung beendet am" />
+                                            <dxe:DateEdit
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Width="100"
+                                                Height="23"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                AllowNullInput="True"
+                                                EditValue="{val:ValidationBinding Path=TerminationDate,
+                                                                                  UpdateSourceTrigger=PropertyChanged,
+                                                                                  Mode=TwoWay}"
+                                                MaskType="DateTimeAdvancingCaret" />
 
-                                            <Label Content="Grund für Beendigung" Grid.Row="2" Grid.Column="0" />
-                                            <uc:NullItemComboBox x:Name="comboBox_TerminationReason" ItemsSource="{Binding Path=TerminationReasons, Mode=OneWay}"
-                                      HorizontalAlignment="Left" Width="200" Grid.Column="1" Grid.Row="2" Margin="3" Height="23"
-                                      SelectedValue="{Binding Path=TerminationReason, Mode=TwoWay}" />
+                                            <Label
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Content="Grund für Beendigung" />
+                                            <uc:NullItemComboBox
+                                                x:Name="comboBox_TerminationReason"
+                                                Grid.Row="2"
+                                                Grid.Column="1"
+                                                Width="200"
+                                                Height="23"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                ItemsSource="{Binding Path=TerminationReasons, Mode=OneWay}"
+                                                SelectedValue="{Binding Path=TerminationReason, Mode=TwoWay}" />
 
-                                            <Grid x:Name="ctrlAdvisedAttended" Grid.ColumnSpan="2" Grid.Column="0" Grid.Row="3" Height="23"
-                                    Visibility="Collapsed">
+                                            <Grid
+                                                x:Name="ctrlAdvisedAttended"
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="2"
+                                                Height="23"
+                                                Visibility="Collapsed">
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="Auto" />
                                                     <ColumnDefinition Width="*" />
                                                 </Grid.ColumnDefinitions>
-                                                <RadioButton Grid.Column="0" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                            IsChecked="{Binding Path=IsAdvised, UpdateSourceTrigger=PropertyChanged}"
-                                            Content="wird beraten" />
-                                                <RadioButton Grid.Column="1" Margin="3" VerticalAlignment="Center" HorizontalAlignment="Left"
-                                            IsChecked="{Binding Path=IsAttended, UpdateSourceTrigger=PropertyChanged}"
-                                            Content="wird begleitet" />
+                                                <RadioButton
+                                                    Grid.Column="0"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="wird beraten"
+                                                    IsChecked="{Binding Path=IsAdvised, UpdateSourceTrigger=PropertyChanged}" />
+                                                <RadioButton
+                                                    Grid.Column="1"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Center"
+                                                    Content="wird begleitet"
+                                                    IsChecked="{Binding Path=IsAttended, UpdateSourceTrigger=PropertyChanged}" />
                                             </Grid>
 
 
-                                            <Label Content="Betreuungsart" Grid.Row="0" Grid.Column="2"/>
-                                            <ListBox Grid.Row="1" Grid.RowSpan="4" Grid.Column="2" IsSynchronizedWithCurrentItem="True" x:Name="customerCareTypeList"
-                                      Margin="3" Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200" VerticalAlignment="Top"
-                                      MinHeight="52" MaxHeight="65" />
+                                            <Label
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Content="Betreuungsart" />
+                                            <ListBox
+                                                x:Name="customerCareTypeList"
+                                                Grid.Row="1"
+                                                Grid.RowSpan="4"
+                                                Grid.Column="2"
+                                                Width="Auto"
+                                                Height="Auto"
+                                                MinWidth="200"
+                                                MinHeight="52"
+                                                MaxHeight="65"
+                                                Margin="3"
+                                                Padding="3,3,3,3"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Top"
+                                                IsSynchronizedWithCurrentItem="True" />
 
-                                            <StackPanel Orientation="Horizontal" Grid.Row="0" Grid.Column="3">
+                                            <StackPanel
+                                                Grid.Row="0"
+                                                Grid.Column="3"
+                                                Orientation="Horizontal">
                                                 <Label Content="Vermittlung" />
-                                                <Button x:Name="button_addPlacement" HorizontalAlignment="Center" Grid.Column="2" Width="20" Height="20"
-                                        Margin="5,0,0,0" VerticalAlignment="Center" Click="button_addPlacement_Click">
-                                                    <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                        <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round"
-                                              StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" Width="16" Height="16" />
-                                                        <Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round"
-                                              StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center"
-                                              VerticalAlignment="Center" Width="16" Height="16" />
+                                                <Button
+                                                    x:Name="button_addPlacement"
+                                                    Grid.Column="2"
+                                                    Width="20"
+                                                    Height="20"
+                                                    Margin="5,0,0,0"
+                                                    HorizontalAlignment="Center"
+                                                    VerticalAlignment="Center"
+                                                    Click="button_addPlacement_Click">
+                                                    <Grid
+                                                        Width="18"
+                                                        HorizontalAlignment="Center"
+                                                        VerticalAlignment="Center">
+                                                        <Line
+                                                            Width="16"
+                                                            Height="16"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            Fill="{x:Null}"
+                                                            Stroke="#FFFFFFFF"
+                                                            StrokeEndLineCap="Round"
+                                                            StrokeStartLineCap="Round"
+                                                            StrokeThickness="2"
+                                                            X1="4"
+                                                            X2="12"
+                                                            Y1="8"
+                                                            Y2="8" />
+                                                        <Line
+                                                            Width="16"
+                                                            Height="16"
+                                                            HorizontalAlignment="Center"
+                                                            VerticalAlignment="Center"
+                                                            Fill="{x:Null}"
+                                                            Stroke="#FFFFFFFF"
+                                                            StrokeEndLineCap="Round"
+                                                            StrokeStartLineCap="Round"
+                                                            StrokeThickness="2"
+                                                            X1="8"
+                                                            X2="8"
+                                                            Y1="4"
+                                                            Y2="12" />
                                                     </Grid>
 
                                                 </Button>
                                             </StackPanel>
 
-                                            <ListBox Grid.Column="3" Grid.Row="1" Grid.RowSpan="4" IsSynchronizedWithCurrentItem="True"
-                                      x:Name="placementListBox" ItemsSource="{Binding Path=PlacementList.VMList, Mode=OneWay}" Margin="3"
-                                      Height="Auto" Padding="3,3,3,3" Width="Auto" HorizontalAlignment="Left" MinWidth="200"
-                                      MinHeight="20" MaxHeight="200">
+                                            <ListBox
+                                                x:Name="placementListBox"
+                                                Grid.Row="1"
+                                                Grid.RowSpan="4"
+                                                Grid.Column="3"
+                                                Width="Auto"
+                                                Height="Auto"
+                                                MinWidth="200"
+                                                MinHeight="20"
+                                                MaxHeight="200"
+                                                Margin="3"
+                                                Padding="3,3,3,3"
+                                                HorizontalAlignment="Left"
+                                                IsSynchronizedWithCurrentItem="True"
+                                                ItemsSource="{Binding Path=PlacementList.VMList, Mode=OneWay}">
                                                 <ListBox.ItemContainerStyle>
                                                     <Style TargetType="{x:Type ListBoxItem}">
                                                         <Setter Property="Margin" Value="2" />
@@ -1013,21 +2317,48 @@
 
                                                 <ListBox.ItemTemplate>
                                                     <DataTemplate>
-                                                        <Grid x:Name="ItemGrid" Grid.Row="2" Grid.ColumnSpan="2" >
+                                                        <Grid
+                                                            x:Name="ItemGrid"
+                                                            Grid.Row="2"
+                                                            Grid.ColumnSpan="2">
                                                             <Grid.ColumnDefinitions>
                                                                 <ColumnDefinition Width="Auto" />
                                                                 <ColumnDefinition Width="Auto" />
-                                                                <ColumnDefinition Width="*" SharedSizeGroup="VermittlungComboBox"/>
+                                                                <ColumnDefinition Width="*" SharedSizeGroup="VermittlungComboBox" />
                                                                 <ColumnDefinition Width="Auto" />
                                                             </Grid.ColumnDefinitions>
-                                                            <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" x:Name="datepicker_validUntil" EditValue="{Binding Path=PlacementDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="23" Grid.Row="0" Width="100" />
-                                                            <ComboBox x:Name="comboBox_PlacementObjectives" Loaded="comboBox_PlacementObjectives_Loaded" Margin="2,0,0,0" Grid.Column="2" MinWidth="100" Height="23" SelectedValue="{Binding Path=Objective, Mode=TwoWay}" />
-                                                            <Button x:Name="button_deletePlacement" Grid.Column="3" Grid.Row="1" Width="20" Height="20" VerticalAlignment="Center" HorizontalAlignment="Right" Style="{DynamicResource CloseButtonStyle}" Click="button_deletePlacement_Click" Margin="3,0,0,0" />
+                                                            <dxe:DateEdit
+                                                                x:Name="datepicker_validUntil"
+                                                                Grid.Row="0"
+                                                                Grid.Column="1"
+                                                                Width="100"
+                                                                Height="23"
+                                                                EditValue="{Binding Path=PlacementDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                                MaskType="DateTimeAdvancingCaret" />
+                                                            <ComboBox
+                                                                x:Name="comboBox_PlacementObjectives"
+                                                                Grid.Column="2"
+                                                                Height="23"
+                                                                MinWidth="100"
+                                                                Margin="2,0,0,0"
+                                                                Loaded="comboBox_PlacementObjectives_Loaded"
+                                                                SelectedValue="{Binding Path=Objective, Mode=TwoWay}" />
+                                                            <Button
+                                                                x:Name="button_deletePlacement"
+                                                                Grid.Row="1"
+                                                                Grid.Column="3"
+                                                                Width="20"
+                                                                Height="20"
+                                                                Margin="3,0,0,0"
+                                                                HorizontalAlignment="Right"
+                                                                VerticalAlignment="Center"
+                                                                Click="button_deletePlacement_Click"
+                                                                Style="{DynamicResource CloseButtonStyle}" />
                                                         </Grid>
                                                         <DataTemplate.Triggers>
                                                             <DataTrigger Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource AncestorType={x:Type ListBoxItem}, Mode=FindAncestor}}" Value="True">
-                                                                <Setter Property="Background" TargetName="ItemGrid" Value="White" />
-                                                                <Setter Property="TextBlock.Foreground" TargetName="ItemGrid" Value="#FF000000" />
+                                                                <Setter TargetName="ItemGrid" Property="Background" Value="White" />
+                                                                <Setter TargetName="ItemGrid" Property="TextBlock.Foreground" Value="#FF000000" />
                                                             </DataTrigger>
                                                         </DataTemplate.Triggers>
                                                     </DataTemplate>
@@ -1035,9 +2366,22 @@
                                             </ListBox>
                                         </Grid>
                                     </GroupBox>
-                                    <controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_newEmployeeRel" Width="350" StaysOpen="True" Placement="MousePoint">
-                                        <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                            <GroupBox x:Name="groupbox_newEmployeeRel" Header="{markup:Translate Betreuer zuordnen}" Style="{StaticResource ObjectEditGroupBox}">
+                                    <controls:PopupNonTopmost
+                                        x:Name="popup_newEmployeeRel"
+                                        Grid.Row="0"
+                                        Width="350"
+                                        Placement="MousePoint"
+                                        StaysOpen="True"
+                                        Topmost="False">
+                                        <Border
+                                            Padding="3"
+                                            Background="White"
+                                            BorderBrush="Gray"
+                                            BorderThickness="1">
+                                            <GroupBox
+                                                x:Name="groupbox_newEmployeeRel"
+                                                Header="{markup:Translate Betreuer zuordnen}"
+                                                Style="{StaticResource ObjectEditGroupBox}">
                                                 <Grid>
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition Height="Auto" />
@@ -1054,53 +2398,141 @@
 
                                                     </Grid.ColumnDefinitions>
                                                     <Label VerticalAlignment="Center" Content="{t:Translate MitarbeiterSingular}" />
-                                                    <uc:PopUpEdit IsReadOnly="True"
-                                DeleteButtonVisibility="Collapsed"
-                                Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="3" Height="23" x:Name="popupedit_employeeRelations"
-                                Text="{val:ValidationBinding Path=EmployeeRelations.NewVM.EmployeeString}"
-                                PopUpClick="popupedit_employeeRelations_PopUpClick"
-                                PreviewMouseDoubleClick="Popupedit_employeeRelations_OnPreviewMouseDoubleClick"
-                                Cursor="Arrow" />
-                                                    <Label Content="Rolle" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
-                                                    <uc:NullItemComboBox Grid.Column="1" Grid.Row="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                            ItemsSource="{Binding Path=EmployeeRelations.PossibleRoles}"
-                                            SelectedItem="{val:ValidationBinding Path=EmployeeRelations.NewVM.Role}" />
-                                                    <Label Content="Startdatum" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center" />
-                                                    <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" EditValue="{Binding Path=EmployeeRelations.NewVM.StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="23" Grid.Row="2" Margin="3" Width="100" HorizontalAlignment="Left"/>
+                                                    <uc:PopUpEdit
+                                                        x:Name="popupedit_employeeRelations"
+                                                        Grid.Row="0"
+                                                        Grid.Column="1"
+                                                        Grid.ColumnSpan="2"
+                                                        Height="23"
+                                                        Margin="3"
+                                                        Cursor="Arrow"
+                                                        DeleteButtonVisibility="Collapsed"
+                                                        IsReadOnly="True"
+                                                        PopUpClick="popupedit_employeeRelations_PopUpClick"
+                                                        PreviewMouseDoubleClick="Popupedit_employeeRelations_OnPreviewMouseDoubleClick"
+                                                        Text="{val:ValidationBinding Path=EmployeeRelations.NewVM.EmployeeString}" />
+                                                    <Label
+                                                        Grid.Row="1"
+                                                        Grid.Column="0"
+                                                        VerticalAlignment="Center"
+                                                        Content="Rolle" />
+                                                    <uc:NullItemComboBox
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        Grid.ColumnSpan="2"
+                                                        Height="23"
+                                                        Margin="3"
+                                                        ItemsSource="{Binding Path=EmployeeRelations.PossibleRoles}"
+                                                        SelectedItem="{val:ValidationBinding Path=EmployeeRelations.NewVM.Role}" />
+                                                    <Label
+                                                        Grid.Row="2"
+                                                        Grid.Column="0"
+                                                        VerticalAlignment="Center"
+                                                        Content="Startdatum" />
+                                                    <dxe:DateEdit
+                                                        Grid.Row="2"
+                                                        Grid.Column="1"
+                                                        Width="100"
+                                                        Height="23"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        EditValue="{Binding Path=EmployeeRelations.NewVM.StartDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                        MaskType="DateTimeAdvancingCaret" />
 
-                                                    <Label Content="Enddatum" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center" />
-                                                    <dxe:DateEdit MaskType="DateTimeAdvancingCaret" Grid.Column="1" EditValue="{Binding Path=EmployeeRelations.NewVM.EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Height="23" Grid.Row="3" Margin="3" Width="100" HorizontalAlignment="Left"/>
+                                                    <Label
+                                                        Grid.Row="3"
+                                                        Grid.Column="0"
+                                                        VerticalAlignment="Center"
+                                                        Content="Enddatum" />
+                                                    <dxe:DateEdit
+                                                        Grid.Row="3"
+                                                        Grid.Column="1"
+                                                        Width="100"
+                                                        Height="23"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        EditValue="{Binding Path=EmployeeRelations.NewVM.EndDate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                        MaskType="DateTimeAdvancingCaret" />
 
-                                                    <Label Content="Notiz" Grid.Row="4" Grid.Column="0" VerticalAlignment="Top" />
-                                                    <TextBox Grid.Row="4" Grid.Column="1" Height="50" Margin="3" Grid.ColumnSpan="2"
-                                            Text="{Binding Path=EmployeeRelations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
+                                                    <Label
+                                                        Grid.Row="4"
+                                                        Grid.Column="0"
+                                                        VerticalAlignment="Top"
+                                                        Content="Notiz" />
+                                                    <TextBox
+                                                        Grid.Row="4"
+                                                        Grid.Column="1"
+                                                        Grid.ColumnSpan="2"
+                                                        Height="50"
+                                                        Margin="3"
+                                                        Text="{Binding Path=EmployeeRelations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
                                                     <!--<Label Content="Chatpartner" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"/>-->
                                                     <!--<CheckBox  Grid.Row="3" Grid.Column="2" IsChecked="{Binding Path=EmployeeRelations.NewVM.Chatpartner, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Right" Margin="3"/>-->
-                                                    <Button Grid.Row="5" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
-                                          Margin="3" Content="Hinzufügen" x:Name="button_addEmployeeRelation"
-                                          Click="button_addEmployeeRelation_Click" />
-                                                    <Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                          Margin="3" Content="Abbrechen" x:Name="button_cancelEmployeeRelation"
-                                          Click="button_cancelEmployeeRelation_Click" />
+                                                    <Button
+                                                        x:Name="button_addEmployeeRelation"
+                                                        Grid.Row="5"
+                                                        Grid.Column="1"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="button_addEmployeeRelation_Click"
+                                                        Content="Hinzufügen" />
+                                                    <Button
+                                                        x:Name="button_cancelEmployeeRelation"
+                                                        Grid.Row="5"
+                                                        Grid.Column="2"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Stretch"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="button_cancelEmployeeRelation_Click"
+                                                        Content="Abbrechen" />
                                                 </Grid>
                                             </GroupBox>
                                         </Border>
                                     </controls:PopupNonTopmost>
-                                    <GroupBox x:Name="GroupBoxEmployeeGrid" Header="{markup:Translate Diesem Klienten zugeordnete Betreuer}" Grid.Row="2"
-                                Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0" MinHeight="120">
+                                    <GroupBox
+                                        x:Name="GroupBoxEmployeeGrid"
+                                        Grid.Row="2"
+                                        MinHeight="120"
+                                        Margin="0,20,0,0"
+                                        Header="{markup:Translate Diesem Klienten zugeordnete Betreuer}"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid x:Name="employeeGrid">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="*" />
                                             </Grid.RowDefinitions>
-                                            <Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                                    Margin="3" Content="{markup:Translate Neuen Betreuer hinzufügen}" x:Name="button_openAddEmployeeRelation"
-                                    Click="button_openAddEmployeeRelationn_Click" />
+                                            <Button
+                                                x:Name="button_openAddEmployeeRelation"
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Height="25"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Bottom"
+                                                Click="button_openAddEmployeeRelationn_Click"
+                                                Content="{markup:Translate Neuen Betreuer hinzufügen}" />
                                         </Grid>
                                     </GroupBox>
-                                    <controls:PopupNonTopmost Grid.Row="0" Topmost="False" x:Name="popup_newTeamRel" Width="350" StaysOpen="True" Placement="MousePoint">
-                                        <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                            <GroupBox x:Name="groupbox_newTeamRel" Header="Team zuordnen" Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0">
+                                    <controls:PopupNonTopmost
+                                        x:Name="popup_newTeamRel"
+                                        Grid.Row="0"
+                                        Width="350"
+                                        Placement="MousePoint"
+                                        StaysOpen="True"
+                                        Topmost="False">
+                                        <Border
+                                            Padding="3"
+                                            Background="White"
+                                            BorderBrush="Gray"
+                                            BorderThickness="1">
+                                            <GroupBox
+                                                x:Name="groupbox_newTeamRel"
+                                                Margin="0,20,0,0"
+                                                Header="Team zuordnen"
+                                                Style="{StaticResource ObjectEditGroupBox}">
                                                 <Grid>
                                                     <Grid.RowDefinitions>
                                                         <RowDefinition Height="Auto" />
@@ -1113,35 +2545,70 @@
 
                                                     </Grid.ColumnDefinitions>
                                                     <Label VerticalAlignment="Center" Content="Team" />
-                                                    <uc:PopUpEdit IsReadOnly="True" DeleteButtonVisibility="Collapsed" Grid.Row="0" Grid.ColumnSpan="2"
-                                              Grid.Column="1" Margin="3" Height="23" x:Name="popupedit_teamRelations"
-                                              Text="{val:ValidationBinding Path=TeamRelations.NewVM.TeamString}"
-                                              PopUpClick="popupedit_teamRelations_PopUpClick"
-                                              Cursor="Arrow" PreviewMouseDoubleClick="Popupedit_teamRelations_OnPreviewMouseDoubleClick" />
-                                                    <Button Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" Height="25"
-                                          Margin="3" Content="Hinzufügen" x:Name="button_addTeamRelation" Click="button_addTeamRelation_Click" />
-                                                    <Button Grid.Row="1" Grid.Column="2" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                                          Margin="3" Content="Abbrechen" x:Name="button_cancelTeamRelation" Click="button_cancelTeamRelation_Click" />
+                                                    <uc:PopUpEdit
+                                                        x:Name="popupedit_teamRelations"
+                                                        Grid.Row="0"
+                                                        Grid.Column="1"
+                                                        Grid.ColumnSpan="2"
+                                                        Height="23"
+                                                        Margin="3"
+                                                        Cursor="Arrow"
+                                                        DeleteButtonVisibility="Collapsed"
+                                                        IsReadOnly="True"
+                                                        PopUpClick="popupedit_teamRelations_PopUpClick"
+                                                        PreviewMouseDoubleClick="Popupedit_teamRelations_OnPreviewMouseDoubleClick"
+                                                        Text="{val:ValidationBinding Path=TeamRelations.NewVM.TeamString}" />
+                                                    <Button
+                                                        x:Name="button_addTeamRelation"
+                                                        Grid.Row="1"
+                                                        Grid.Column="1"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Right"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="button_addTeamRelation_Click"
+                                                        Content="Hinzufügen" />
+                                                    <Button
+                                                        x:Name="button_cancelTeamRelation"
+                                                        Grid.Row="1"
+                                                        Grid.Column="2"
+                                                        Height="25"
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Bottom"
+                                                        Click="button_cancelTeamRelation_Click"
+                                                        Content="Abbrechen" />
                                                 </Grid>
                                             </GroupBox>
                                         </Border>
                                     </controls:PopupNonTopmost>
-                                    <GroupBox x:Name="GroupBoxTeamGrid" Header="{markup:Translate Diesem Klienten zugeordnete Teams}" Grid.Row="4"
-                                Style="{StaticResource ObjectEditGroupBox}" Margin="0 20 0 0">
+                                    <GroupBox
+                                        x:Name="GroupBoxTeamGrid"
+                                        Grid.Row="4"
+                                        Margin="0,20,0,0"
+                                        Header="{markup:Translate Diesem Klienten zugeordnete Teams}"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid x:Name="teamGrid">
                                             <Grid.RowDefinitions>
                                                 <RowDefinition Height="Auto" />
                                                 <RowDefinition Height="*" />
                                             </Grid.RowDefinitions>
-                                            <Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                                    Margin="3" Content="Neues Team hinzufügen" x:Name="button_openAddTeamRelation"
-                                    Click="button_openAddTeamRelationn_Click" />
+                                            <Button
+                                                x:Name="button_openAddTeamRelation"
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Height="25"
+                                                Margin="3"
+                                                HorizontalAlignment="Left"
+                                                VerticalAlignment="Bottom"
+                                                Click="button_openAddTeamRelationn_Click"
+                                                Content="Neues Team hinzufügen" />
                                         </Grid>
                                     </GroupBox>
                                 </Grid>
                             </ScrollViewer>
                         </TabItem>
-                        <TabItem  r:DemandUserRight.VisibleDemands="Customer_ViewAbsenceTimes" Header="Abwesenheiten">
+                        <TabItem r:DemandUserRight.VisibleDemands="Customer_ViewAbsenceTimes" Header="Abwesenheiten">
                             <Grid>
                                 <detail:AbsenceTimesView x:Name="AbsenceTimesView" AbsenceTimes="{Binding ViewModel.AbsenceTimes, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, ElementName=CustomerBeWoView}" />
                             </Grid>
@@ -1156,7 +2623,11 @@
                                             <RowDefinition Height="Auto" />
                                             <RowDefinition Height="*" />
                                         </Grid.RowDefinitions>
-                                        <GroupBox x:Name="groupbox_Environment" Grid.Row="0" Header="Umfeld" Style="{DynamicResource ObjectEditGroupBox}">
+                                        <GroupBox
+                                            x:Name="groupbox_Environment"
+                                            Grid.Row="0"
+                                            Header="Umfeld"
+                                            Style="{DynamicResource ObjectEditGroupBox}">
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition Width="*" />
@@ -1164,21 +2635,54 @@
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
                                                 </Grid.RowDefinitions>
-                                                <TextBox Margin="3" Height="50" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" Text="{Binding Path=Environment, UpdateSourceTrigger=PropertyChanged}" />
+                                                <TextBox
+                                                    Height="50"
+                                                    Margin="3"
+                                                    AcceptsReturn="True"
+                                                    Text="{Binding Path=Environment, UpdateSourceTrigger=PropertyChanged}"
+                                                    VerticalScrollBarVisibility="Auto" />
                                             </Grid>
                                         </GroupBox>
-                                        <GroupBox x:Name="GroupBoxPersons" Grid.Row="2" Margin="0,20,0,0" Header="{markup:Translate Diesem Klienten zugeordnete Personen}" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
+                                        <GroupBox
+                                            x:Name="GroupBoxPersons"
+                                            Grid.Row="2"
+                                            MinHeight="150"
+                                            MaxHeight="350"
+                                            Margin="0,20,0,0"
+                                            Header="{markup:Translate Diesem Klienten zugeordnete Personen}"
+                                            Style="{DynamicResource ObjectEditGroupBox}">
                                             <Grid x:Name="environmentPersonGrid">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
                                                     <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
-                                                <Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                            Margin="3" Content="Neue Person hinzufügen" x:Name="button_openAddEnvironmentPerson"
-                            Click="button_openAddEnvironmentPerson_Click" />
-                                                <controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentPerson" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=button_openAddEnvironmentPerson}">
-                                                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                                        <GroupBox x:Name="groupbox_newEnvironmentPerson" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                                                <Button
+                                                    x:Name="button_openAddEnvironmentPerson"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Height="25"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Bottom"
+                                                    Click="button_openAddEnvironmentPerson_Click"
+                                                    Content="Neue Person hinzufügen" />
+                                                <controls:PopupNonTopmost
+                                                    x:Name="popup_newEnvironmentPerson"
+                                                    Grid.Row="1"
+                                                    Width="350"
+                                                    Placement="Relative"
+                                                    PlacementTarget="{Binding ElementName=button_openAddEnvironmentPerson}"
+                                                    StaysOpen="True"
+                                                    Topmost="False">
+                                                    <Border
+                                                        Padding="3"
+                                                        Background="White"
+                                                        BorderBrush="Gray"
+                                                        BorderThickness="1">
+                                                        <GroupBox
+                                                            x:Name="groupbox_newEnvironmentPerson"
+                                                            Header="Neue Person hinzufügen"
+                                                            Style="{DynamicResource ObjectEditGroupBox}">
                                                             <Grid>
                                                                 <Grid.ColumnDefinitions>
                                                                     <ColumnDefinition Width="Auto" />
@@ -1193,64 +2697,144 @@
                                                                     <RowDefinition Height="Auto" />
                                                                 </Grid.RowDefinitions>
 
-                                                                <Label Grid.Row="0" Grid.Column="0" Content="Person" />
-                                                                <Label Grid.Row="1" Grid.Column="0" Content="Organisation" />
-                                                                <Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
-                                                                <Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
+                                                                <Label
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="0"
+                                                                    Content="Person" />
+                                                                <Label
+                                                                    Grid.Row="1"
+                                                                    Grid.Column="0"
+                                                                    Content="Organisation" />
+                                                                <Label
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="0"
+                                                                    Content="Rolle" />
+                                                                <Label
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="0"
+                                                                    Content="Notiz" />
 
-                                                                <uc:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
-                                              PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick"
-                                              NewClick="popupedit_environmentPersonSearch_NewClick" IsReadOnly="True"
-                                              x:Name="popupedit_environmentPersonSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                              Grid.Row="0" DeleteButtonVisibility="Collapsed"
-                                              PopUpClick="popupedit_environmentPersonSearch_PopUpClick"
-                                              Text="{val:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_environmentPersonSearch"
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    NewButtonVisibility="Visible"
+                                                                    NewClick="popupedit_environmentPersonSearch_NewClick"
+                                                                    PopUpClick="popupedit_environmentPersonSearch_PopUpClick"
+                                                                    PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick"
+                                                                    Text="{val:ValidationBinding Path=EnvironmentPersons.NewVM.PersonString,
+                                                                                                 UpdateSourceTrigger=PropertyChanged}" />
 
-                                                                <uc:PopUpEdit NewButtonVisibility="Collapsed"
-                                    Cursor="Arrow"
-                                    IsReadOnly="True"
-                                    x:Name="popupedit_environmentPersonOrganisationSearch"
-                                    Grid.Column="1" Margin="3" Height="23" Grid.Row="1" Grid.ColumnSpan="2"
-                                    DeleteButtonVisibility="Collapsed"
-                                    PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
-                                    PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick"
-                                    Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
-                                                                <uc:NullItemComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                              ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
-                                              SelectedItem="{val:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_environmentPersonOrganisationSearch"
+                                                                    Grid.Row="1"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    NewButtonVisibility="Collapsed"
+                                                                    PopUpClick="popupedit_environmentPersonOrganisationSearch_PopUpClick"
+                                                                    PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick"
+                                                                    Text="{Binding Path=EnvironmentPersons.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <uc:NullItemComboBox
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    ItemsSource="{Binding Path=EnvironmentPersons.PossibleRoles}"
+                                                                    SelectedItem="{val:ValidationBinding Path=EnvironmentPersons.NewVM.Role}" />
 
-                                                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True"
-                                            VerticalScrollBarVisibility="Auto"
-                                            Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <TextBox
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3"
+                                                                    AcceptsReturn="True"
+                                                                    Text="{Binding Path=EnvironmentPersons.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}"
+                                                                    VerticalScrollBarVisibility="Auto" />
 
-                                                                <Button Grid.Column="1" Grid.Row="4" x:Name="button_addEnvironmentPerson"
-                                            Click="button_addEnvironmentPerson_Click" Content="Hinzufügen" Height="25"
-                                            FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+                                                                <Button
+                                                                    x:Name="button_addEnvironmentPerson"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="1"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_addEnvironmentPerson_Click"
+                                                                    Content="Hinzufügen"
+                                                                    FontWeight="Normal" />
 
-                                                                <Button Grid.Row="4" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                            Margin="3" Content="Abbrechen" x:Name="button_cancelAddEnvironmentPerson" Click="button_cancelAddEnvironmentPerson_Click" />
+                                                                <Button
+                                                                    x:Name="button_cancelAddEnvironmentPerson"
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="2"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_cancelAddEnvironmentPerson_Click"
+                                                                    Content="Abbrechen" />
                                                             </Grid>
                                                         </GroupBox>
                                                     </Border>
                                                 </controls:PopupNonTopmost>
                                             </Grid>
                                         </GroupBox>
-                                        <GroupBox x:Name="GroupBoxOrganisations" Grid.Row="3" Margin="0,20,0,0"
-                                    Header="{markup:Translate Diesem Klienten zugeordnete Organisationen}" Style="{DynamicResource ObjectEditGroupBox}" VerticalAlignment="Top"
-                                    MinHeight="150" MaxHeight="400">
+                                        <GroupBox
+                                            x:Name="GroupBoxOrganisations"
+                                            Grid.Row="3"
+                                            MinHeight="150"
+                                            MaxHeight="400"
+                                            Margin="0,20,0,0"
+                                            VerticalAlignment="Top"
+                                            Header="{markup:Translate Diesem Klienten zugeordnete Organisationen}"
+                                            Style="{DynamicResource ObjectEditGroupBox}">
                                             <Grid x:Name="environmentOrganisationGrid">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
                                                     <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
-                                                <Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                                        Margin="3" Content="Neue Organisation hinzufügen" x:Name="button_openAddEnvironmentOrganisation"
-                                        Click="button_openAddEnvironmentOrganisation_Click" />
+                                                <Button
+                                                    x:Name="button_openAddEnvironmentOrganisation"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Height="25"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Bottom"
+                                                    Click="button_openAddEnvironmentOrganisation_Click"
+                                                    Content="Neue Organisation hinzufügen" />
 
-                                                <controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentOrganisation" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=button_openAddEnvironmentOrganisation}">
-                                                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                                        <GroupBox x:Name="groupbox_newEnvironmentOrganisation" Header="Neue Organisation hinzufügen"
-                                Style="{DynamicResource ObjectEditGroupBox}" Margin="0,10,0,0">
+                                                <controls:PopupNonTopmost
+                                                    x:Name="popup_newEnvironmentOrganisation"
+                                                    Grid.Row="1"
+                                                    Width="350"
+                                                    Placement="Relative"
+                                                    PlacementTarget="{Binding ElementName=button_openAddEnvironmentOrganisation}"
+                                                    StaysOpen="True"
+                                                    Topmost="False">
+                                                    <Border
+                                                        Padding="3"
+                                                        Background="White"
+                                                        BorderBrush="Gray"
+                                                        BorderThickness="1">
+                                                        <GroupBox
+                                                            x:Name="groupbox_newEnvironmentOrganisation"
+                                                            Margin="0,10,0,0"
+                                                            Header="Neue Organisation hinzufügen"
+                                                            Style="{DynamicResource ObjectEditGroupBox}">
                                                             <Grid>
                                                                 <Grid.ColumnDefinitions>
                                                                     <ColumnDefinition Width="Auto" />
@@ -1266,52 +2850,113 @@
                                                                     <RowDefinition Height="Auto" />
                                                                 </Grid.RowDefinitions>
 
-                                                                <Label Grid.Row="0" Grid.Column="0" Content="Organisation" />
-                                                                <Label Grid.Row="1" Grid.Column="0" Content="{markup:Translate Ansprechpartner}" />
-                                                                <Label Grid.Row="2" Grid.Column="0" Content="Rolle" />
-                                                                <Label Grid.Row="3" Grid.Column="0" Content="Notiz" />
-                                                                <Label Grid.Row="4" Grid.Column="0" Content="Zusätzliche Info" />
+                                                                <Label
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="0"
+                                                                    Content="Organisation" />
+                                                                <Label
+                                                                    Grid.Row="1"
+                                                                    Grid.Column="0"
+                                                                    Content="{markup:Translate Ansprechpartner}" />
+                                                                <Label
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="0"
+                                                                    Content="Rolle" />
+                                                                <Label
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="0"
+                                                                    Content="Notiz" />
+                                                                <Label
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="0"
+                                                                    Content="Zusätzliche Info" />
 
-                                                                <uc:PopUpEdit NewButtonVisibility="Visible"
-                                    Cursor="Arrow"
-                                    NewClick="popupedit_environmentOrganisationSearch_NewClick"
-                                    IsReadOnly="True"
-                                    x:Name="popupedit_environmentOrganisationSearch"
-                                    Grid.Column="1" Margin="3" Height="23" Grid.Row="0" Grid.ColumnSpan="2"
-                                    DeleteButtonVisibility="Collapsed"
-                                    PopUpClick="popupedit_environmentOrganisationSearch_PopUpClick"
-                                    PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick"
-                                    Text="{val:ValidationBinding Path=EnvironmentOrganisations.NewVM.OrganisationString, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_environmentOrganisationSearch"
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    NewButtonVisibility="Visible"
+                                                                    NewClick="popupedit_environmentOrganisationSearch_NewClick"
+                                                                    PopUpClick="popupedit_environmentOrganisationSearch_PopUpClick"
+                                                                    PreviewMouseDoubleClick="Popupedit_environmentOrganisationSearch_OnPreviewMouseDoubleClick"
+                                                                    Text="{val:ValidationBinding Path=EnvironmentOrganisations.NewVM.OrganisationString,
+                                                                                                 UpdateSourceTrigger=PropertyChanged}" />
 
-                                                                <uc:PopUpEdit Cursor="Arrow" NewButtonVisibility="Collapsed"
-                                    PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick"
-                                    IsReadOnly="True"
-                                    x:Name="popupedit_environmentAnsprechpartnerSearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                    Grid.Row="1" DeleteButtonVisibility="Collapsed"
-                                    PopUpClick="popupedit_environmentansprechpartnersearchviewSearch_PopUpClick"
-                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_environmentAnsprechpartnerSearch"
+                                                                    Grid.Row="1"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    NewButtonVisibility="Collapsed"
+                                                                    PopUpClick="popupedit_environmentansprechpartnersearchviewSearch_PopUpClick"
+                                                                    PreviewMouseDoubleClick="Popupedit_environmentPersonSearch_OnPreviewMouseDoubleClick"
+                                                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
 
-                                                                <uc:NullItemComboBox Grid.Column="1" Margin="3" Height="23" Grid.Row="2" Grid.ColumnSpan="2"
-                                    ItemsSource="{Binding Path=EnvironmentOrganisations.PossibleRoles}"
-                                    SelectedItem="{val:ValidationBinding Path=EnvironmentOrganisations.NewVM.Role}" />
+                                                                <uc:NullItemComboBox
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    ItemsSource="{Binding Path=EnvironmentOrganisations.PossibleRoles}"
+                                                                    SelectedItem="{val:ValidationBinding Path=EnvironmentOrganisations.NewVM.Role}" />
 
 
-                                                                <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True" Grid.ColumnSpan="2"
-                                    VerticalScrollBarVisibility="Auto"
-                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <TextBox
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3"
+                                                                    AcceptsReturn="True"
+                                                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}"
+                                                                    VerticalScrollBarVisibility="Auto" />
 
 
-                                                                <TextBox Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" Margin="3" Height="50" AcceptsReturn="True"
-                                    VerticalScrollBarVisibility="Auto"
-                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.Info1, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <TextBox
+                                                                    Grid.Row="4"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3"
+                                                                    AcceptsReturn="True"
+                                                                    Text="{Binding Path=EnvironmentOrganisations.NewVM.Info1, UpdateSourceTrigger=PropertyChanged}"
+                                                                    VerticalScrollBarVisibility="Auto" />
 
 
-                                                                <Button Grid.Column="1" Grid.Row="5" x:Name="button_addEnvironmentOrganisation"
-                                    Click="button_addEnvironmentOrganisation_Click" Content="Hinzufügen" Height="25"
-                                    FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+                                                                <Button
+                                                                    x:Name="button_addEnvironmentOrganisation"
+                                                                    Grid.Row="5"
+                                                                    Grid.Column="1"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_addEnvironmentOrganisation_Click"
+                                                                    Content="Hinzufügen"
+                                                                    FontWeight="Normal" />
 
-                                                                <Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                    Margin="3" Content="Abbrechen" x:Name="button_cancelAddEnvironmentOrganisation" Click="button_cancelAddEnvironmentOrganisation_Click" />
+                                                                <Button
+                                                                    x:Name="button_cancelAddEnvironmentOrganisation"
+                                                                    Grid.Row="5"
+                                                                    Grid.Column="2"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_cancelAddEnvironmentOrganisation_Click"
+                                                                    Content="Abbrechen" />
 
                                                             </Grid>
                                                         </GroupBox>
@@ -1320,18 +2965,46 @@
                                             </Grid>
 
                                         </GroupBox>
-                                        <GroupBox x:Name="GroupBoxFamily" Grid.Row="1" Margin="0,20,0,0" Header="{markup:Translate Diesem Klienten zugeordnete Angehörige}" Style="{DynamicResource ObjectEditGroupBox}" MinHeight="150" MaxHeight="350">
+                                        <GroupBox
+                                            x:Name="GroupBoxFamily"
+                                            Grid.Row="1"
+                                            MinHeight="150"
+                                            MaxHeight="350"
+                                            Margin="0,20,0,0"
+                                            Header="{markup:Translate Diesem Klienten zugeordnete Angehörige}"
+                                            Style="{DynamicResource ObjectEditGroupBox}">
                                             <Grid x:Name="environmentFamilyGrid">
                                                 <Grid.RowDefinitions>
                                                     <RowDefinition Height="Auto" />
                                                     <RowDefinition Height="*" />
                                                 </Grid.RowDefinitions>
-                                                <Button Grid.Row="0" Grid.Column="0" HorizontalAlignment="Left" VerticalAlignment="Bottom" Height="25"
-                            Margin="3" Content="Neue Person hinzufügen" x:Name="button_openAddEnvironmentFamily"
-                            Click="button_openAddEnvironmentFamily_Click" />
-                                                <controls:PopupNonTopmost Topmost="False" x:Name="popup_newEnvironmentFamily" Width="350" StaysOpen="True" Placement="Relative" Grid.Row="1" PlacementTarget="{Binding ElementName=button_openAddEnvironmentFamily}">
-                                                    <Border Background="White" Padding="3" BorderThickness="1" BorderBrush="Gray">
-                                                        <GroupBox x:Name="groupbox_newEnvironmentFamily" Header="Neue Person hinzufügen" Style="{DynamicResource ObjectEditGroupBox}">
+                                                <Button
+                                                    x:Name="button_openAddEnvironmentFamily"
+                                                    Grid.Row="0"
+                                                    Grid.Column="0"
+                                                    Height="25"
+                                                    Margin="3"
+                                                    HorizontalAlignment="Left"
+                                                    VerticalAlignment="Bottom"
+                                                    Click="button_openAddEnvironmentFamily_Click"
+                                                    Content="Neue Person hinzufügen" />
+                                                <controls:PopupNonTopmost
+                                                    x:Name="popup_newEnvironmentFamily"
+                                                    Grid.Row="1"
+                                                    Width="350"
+                                                    Placement="Relative"
+                                                    PlacementTarget="{Binding ElementName=button_openAddEnvironmentFamily}"
+                                                    StaysOpen="True"
+                                                    Topmost="False">
+                                                    <Border
+                                                        Padding="3"
+                                                        Background="White"
+                                                        BorderBrush="Gray"
+                                                        BorderThickness="1">
+                                                        <GroupBox
+                                                            x:Name="groupbox_newEnvironmentFamily"
+                                                            Header="Neue Person hinzufügen"
+                                                            Style="{DynamicResource ObjectEditGroupBox}">
                                                             <Grid>
                                                                 <Grid.ColumnDefinitions>
                                                                     <ColumnDefinition Width="Auto" />
@@ -1347,34 +3020,79 @@
                                                                     <RowDefinition Height="Auto" />
                                                                 </Grid.RowDefinitions>
 
-                                                                <Label Grid.Row="0" Grid.Column="0" Content="Person" />
-                                                                <Label Grid.Row="2" Grid.Column="0" Content="Familienstatus" />
-                                                                <Label Grid.Row="3" Grid.Column="0" Content="Notiz"  />
+                                                                <Label
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="0"
+                                                                    Content="Person" />
+                                                                <Label
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="0"
+                                                                    Content="Familienstatus" />
+                                                                <Label
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="0"
+                                                                    Content="Notiz" />
 
-                                                                <uc:PopUpEdit Cursor="Arrow" NewButtonVisibility="Visible"
-                                              PreviewMouseDoubleClick="Popupedit_familyPersonSearch_OnPreviewMouseDoubleClick"
-                                              NewClick="popupedit_familyPersonSearch_NewClick" IsReadOnly="True"
-                                              x:Name="popupedit_environmentFamilySearch" Grid.Column="1" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                              Grid.Row="0" DeleteButtonVisibility="Collapsed"
-                                              PopUpClick="popupedit_environmentPersonFamilySearch_PopUpClick"
-                                              Text="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.PersonString, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <uc:PopUpEdit
+                                                                    x:Name="popupedit_environmentFamilySearch"
+                                                                    Grid.Row="0"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    Cursor="Arrow"
+                                                                    DeleteButtonVisibility="Collapsed"
+                                                                    IsReadOnly="True"
+                                                                    NewButtonVisibility="Visible"
+                                                                    NewClick="popupedit_familyPersonSearch_NewClick"
+                                                                    PopUpClick="popupedit_environmentPersonFamilySearch_PopUpClick"
+                                                                    PreviewMouseDoubleClick="Popupedit_familyPersonSearch_OnPreviewMouseDoubleClick"
+                                                                    Text="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.PersonString,
+                                                                                                 UpdateSourceTrigger=PropertyChanged}" />
 
-                                                                <uc:NullItemComboBox Grid.Column="1" Grid.Row="2" Grid.ColumnSpan="2" Margin="3" Height="23"
-                                              ItemsSource="{Binding Path=RoleInFamilys}"
-                                              SelectedItem="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.Role}" />
+                                                                <uc:NullItemComboBox
+                                                                    Grid.Row="2"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="23"
+                                                                    Margin="3"
+                                                                    ItemsSource="{Binding Path=RoleInFamilys}"
+                                                                    SelectedItem="{val:ValidationBinding Path=EnvironmentPersonsWithFamily.NewVM.Role}" />
 
 
-                                                                <TextBox Grid.Column="1" Grid.Row="3" Margin="3" Height="50" AcceptsReturn="True" Grid.ColumnSpan="2"
-                                    VerticalScrollBarVisibility="Auto"
-                                    Text="{Binding Path=EnvironmentPersonsWithFamily.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}" />
+                                                                <TextBox
+                                                                    Grid.Row="3"
+                                                                    Grid.Column="1"
+                                                                    Grid.ColumnSpan="2"
+                                                                    Height="50"
+                                                                    Margin="3"
+                                                                    AcceptsReturn="True"
+                                                                    Text="{Binding Path=EnvironmentPersonsWithFamily.NewVM.Notice, UpdateSourceTrigger=PropertyChanged}"
+                                                                    VerticalScrollBarVisibility="Auto" />
 
 
-                                                                <Button Grid.Column="1" Grid.Row="5" x:Name="button_addEnvironmentFamily"
-                                            Click="button_addEnvironmentFamily_Click" Content="Hinzufügen" Height="25"
-                                            FontWeight="Normal" Margin="3" VerticalAlignment="Bottom" HorizontalAlignment="Right" />
+                                                                <Button
+                                                                    x:Name="button_addEnvironmentFamily"
+                                                                    Grid.Row="5"
+                                                                    Grid.Column="1"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_addEnvironmentFamily_Click"
+                                                                    Content="Hinzufügen"
+                                                                    FontWeight="Normal" />
 
-                                                                <Button Grid.Row="5" Grid.Column="2" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Height="25"
-                                            Margin="3" Content="Abbrechen" x:Name="button_cancelAddEnvironmentFamily" Click="button_cancelAddEnvironmentFamily_Click" />
+                                                                <Button
+                                                                    x:Name="button_cancelAddEnvironmentFamily"
+                                                                    Grid.Row="5"
+                                                                    Grid.Column="2"
+                                                                    Height="25"
+                                                                    Margin="3"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Click="button_cancelAddEnvironmentFamily_Click"
+                                                                    Content="Abbrechen" />
 
                                                             </Grid>
                                                         </GroupBox>
@@ -1406,12 +3124,19 @@
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
-                                    <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Punktebogen Kategorien">
+                                    <GroupBox Header="Punktebogen Kategorien" Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
-                                            <ListView x:Name="AssessmentSheetCategoryListView" Grid.Column="1" Grid.ColumnSpan="3" Grid.Row="1"
-                                      Margin="3" Background="Transparent" BorderBrush="Transparent" HorizontalAlignment="Stretch"
-                                      ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                      ItemsSource="{Binding AssessmentSheetCategories, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                            <ListView
+                                                x:Name="AssessmentSheetCategoryListView"
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="3"
+                                                Margin="3"
+                                                HorizontalAlignment="Stretch"
+                                                Background="Transparent"
+                                                BorderBrush="Transparent"
+                                                ItemsSource="{Binding AssessmentSheetCategories, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                                 <ListView.ItemsPanel>
                                                     <ItemsPanelTemplate>
                                                         <WrapPanel />
@@ -1420,13 +3145,16 @@
                                                 <ListView.ItemTemplate>
                                                     <DataTemplate>
                                                         <Grid>
-                                                            <!--Visibility="{Binding Converter={StaticResource AssessmentSheetCategory2VisibilityConverter}}">-->
+                                                            <!--  Visibility="{Binding Converter={StaticResource AssessmentSheetCategory2VisibilityConverter}}">  -->
                                                             <Grid.ColumnDefinitions>
                                                                 <ColumnDefinition Width="Auto" />
                                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="a" />
                                                             </Grid.ColumnDefinitions>
                                                             <CheckBox Margin="3" IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" />
-                                                            <TextBlock Margin="3" Grid.Column="1" Text="{Binding Description, Mode=OneWay}" />
+                                                            <TextBlock
+                                                                Grid.Column="1"
+                                                                Margin="3"
+                                                                Text="{Binding Description, Mode=OneWay}" />
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ListView.ItemTemplate>
@@ -1442,8 +3170,11 @@
                                             </ListView>
                                         </Grid>
                                     </GroupBox>
-                                    <GroupBox Header="Individuelle Kategorien" Style="{StaticResource ObjectEditGroupBox}" Grid.Row="1"
-                                Margin="0,10,0,0">
+                                    <GroupBox
+                                        Grid.Row="1"
+                                        Margin="0,10,0,0"
+                                        Header="Individuelle Kategorien"
+                                        Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 
                                             <Grid.ColumnDefinitions>
@@ -1460,24 +3191,44 @@
                                                 <RowDefinition Height="*" />
                                             </Grid.RowDefinitions>
 
-                                            <Label Grid.Column="0" Grid.Row="0">Bezeichnung</Label>
-                                            <TextBox Grid.Column="1" Grid.Row="0" Margin="3" HorizontalAlignment="Stretch" VerticalAlignment="Top"
-                                      Height="23"
-                                      Text="{val:ValidationBinding Path=IndividualAssessmentSheetCategories.NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
+                                            <Label Grid.Row="0" Grid.Column="0">Bezeichnung</Label>
+                                            <TextBox
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Height="23"
+                                                Margin="3"
+                                                HorizontalAlignment="Stretch"
+                                                VerticalAlignment="Top"
+                                                Text="{val:ValidationBinding Path=IndividualAssessmentSheetCategories.NewVM.Description,
+                                                                             UpdateSourceTrigger=PropertyChanged}" />
 
-                                            <Label Grid.Column="2" Grid.Row="0">Position</Label>
+                                            <Label Grid.Row="0" Grid.Column="2">Position</Label>
                                             <dxe:SpinEdit
-                                  EditValue="{Binding Path=IndividualAssessmentSheetCategories.NewVM.Position, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
-                                  x:Name="tb_pos" IsFloatValue="False" Increment="1" MinValue="0" Height="23" Margin="3" Grid.Row="0"
-                                  Grid.Column="3" AllowNullInput="True" Width="100" />
+                                                x:Name="tb_pos"
+                                                Grid.Row="0"
+                                                Grid.Column="3"
+                                                Width="100"
+                                                Height="23"
+                                                Margin="3"
+                                                AllowNullInput="True"
+                                                EditValue="{Binding Path=IndividualAssessmentSheetCategories.NewVM.Position, Converter={StaticResource Int2DecimalConverter}, UpdateSourceTrigger=PropertyChanged}"
+                                                Increment="1"
+                                                IsFloatValue="False"
+                                                MinValue="0" />
 
 
-                                            <Label Grid.Column="0" Grid.Row="1">Mögliche Werte</Label>
+                                            <Label Grid.Row="1" Grid.Column="0">Mögliche Werte</Label>
 
-                                            <ListView Grid.Column="1" Grid.ColumnSpan="5" Grid.Row="1" Margin="3" Background="Transparent"
-                                      BorderBrush="Transparent" HorizontalAlignment="Stretch"
-                                      ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                      ItemsSource="{Binding IndividualAssessmentSheetCategories.PossibleValues}">
+                                            <ListView
+                                                Grid.Row="1"
+                                                Grid.Column="1"
+                                                Grid.ColumnSpan="5"
+                                                Margin="3"
+                                                HorizontalAlignment="Stretch"
+                                                Background="Transparent"
+                                                BorderBrush="Transparent"
+                                                ItemsSource="{Binding IndividualAssessmentSheetCategories.PossibleValues}"
+                                                ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                                 <ListView.ItemTemplate>
                                                     <DataTemplate>
                                                         <Grid>
@@ -1486,7 +3237,10 @@
                                                                 <ColumnDefinition Width="Auto" SharedSizeGroup="a" />
                                                             </Grid.ColumnDefinitions>
                                                             <dxe:CheckEdit Margin="3" IsChecked="{Binding IsNewSelected}" />
-                                                            <TextBlock Margin="3" Grid.Column="1" Text="{Binding Description}" />
+                                                            <TextBlock
+                                                                Grid.Column="1"
+                                                                Margin="3"
+                                                                Text="{Binding Description}" />
                                                         </Grid>
                                                     </DataTemplate>
                                                 </ListView.ItemTemplate>
@@ -1502,27 +3256,57 @@
                                             </ListView>
 
 
-                                            <Button FontWeight="Normal" HorizontalAlignment="Left" Grid.Column="0" Grid.Row="2" Grid.ColumnSpan="4"
-                                    Height="25" Margin="3 3 3 3" Padding="5 0" Click="button_addIndAsc_Click" IsDefault="True">
+                                            <Button
+                                                Grid.Row="2"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="4"
+                                                Height="25"
+                                                Margin="3,3,3,3"
+                                                Padding="5,0"
+                                                HorizontalAlignment="Left"
+                                                Click="button_addIndAsc_Click"
+                                                FontWeight="Normal"
+                                                IsDefault="True">
                                                 Hinzufügen
                                             </Button>
 
 
-                                            <dxg:GridControl x:Name="datagrid_asc" Margin="0,10,0,0" Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="5"
-                                          DataSource="{Binding IndividualAssessmentSheetCategories.VMList}">
+                                            <dxg:GridControl
+                                                x:Name="datagrid_asc"
+                                                Grid.Row="3"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="5"
+                                                Margin="0,10,0,0"
+                                                DataSource="{Binding IndividualAssessmentSheetCategories.VMList}">
                                                 <dxg:GridControl.Columns>
 
-                                                    <dxg:GridColumn FieldName="IsDeleteable" Header="" FixedWidth="True" Width="24" ReadOnly="True">
+                                                    <dxg:GridColumn
+                                                        Width="24"
+                                                        FieldName="IsDeleteable"
+                                                        FixedWidth="True"
+                                                        Header=""
+                                                        ReadOnly="True">
                                                         <dxg:GridColumn.CellTemplate>
                                                             <DataTemplate>
-                                                                <Button Content="r" Click="DeleteIndAscButton_Click"
-                                                    Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}"
-                                                    FontFamily="Webdings" Width="18" Height="18" VerticalAlignment="Center" />
+                                                                <Button
+                                                                    Width="18"
+                                                                    Height="18"
+                                                                    VerticalAlignment="Center"
+                                                                    Click="DeleteIndAscButton_Click"
+                                                                    Content="r"
+                                                                    FontFamily="Webdings"
+                                                                    Visibility="{Binding Path=EditValue, Converter={StaticResource BoolVisibilityConverter}}" />
                                                             </DataTemplate>
                                                         </dxg:GridColumn.CellTemplate>
                                                     </dxg:GridColumn>
-                                                    <dxg:GridColumn FieldName="Position" Header="Position" Width="80" />
-                                                    <dxg:GridColumn FieldName="Description" Header="Bezeichnung" Width="180" />
+                                                    <dxg:GridColumn
+                                                        Width="80"
+                                                        FieldName="Position"
+                                                        Header="Position" />
+                                                    <dxg:GridColumn
+                                                        Width="180"
+                                                        FieldName="Description"
+                                                        Header="Bezeichnung" />
                                                     <dxg:GridColumn FieldName="ValuesString" Header="Mögliche Werte">
                                                         <dxg:GridColumn.DisplayTemplate>
                                                             <ControlTemplate>
@@ -1531,8 +3315,13 @@
                                                         </dxg:GridColumn.DisplayTemplate>
                                                         <dxg:GridColumn.EditTemplate>
                                                             <ControlTemplate>
-                                                                <Button x:Name="PART_Editor" BorderThickness="0" Style="{x:Null}" Height="21"
-                                                    HorizontalAlignment="Stretch" Click="PART_Editor_Click">
+                                                                <Button
+                                                                    x:Name="PART_Editor"
+                                                                    Height="21"
+                                                                    HorizontalAlignment="Stretch"
+                                                                    BorderThickness="0"
+                                                                    Click="PART_Editor_Click"
+                                                                    Style="{x:Null}">
 
                                                                     <TextBlock Text="{Binding Value}" TextWrapping="Wrap" />
                                                                 </Button>
@@ -1541,21 +3330,33 @@
                                                     </dxg:GridColumn>
                                                 </dxg:GridControl.Columns>
                                                 <dxg:GridControl.View>
-                                                    <dxg:TableView AutoWidth="true" ShowGroupPanel="False" ShowGroupedColumns="false" ShowTotalSummary="False"
-                                              NavigationStyle="Cell" />
+                                                    <dxg:TableView
+                                                        AutoWidth="true"
+                                                        NavigationStyle="Cell"
+                                                        ShowGroupPanel="False"
+                                                        ShowGroupedColumns="false"
+                                                        ShowTotalSummary="False" />
                                                 </dxg:GridControl.View>
                                             </dxg:GridControl>
 
-                                            <Popup x:Name="popup_values" Width="400" StaysOpen="false" Placement="MousePoint">
+                                            <Popup
+                                                x:Name="popup_values"
+                                                Width="400"
+                                                Placement="MousePoint"
+                                                StaysOpen="false">
                                                 <Border>
                                                     <Grid Background="White">
                                                         <Grid.RowDefinitions>
                                                             <RowDefinition Height="*" />
                                                             <RowDefinition Height="Auto" />
                                                         </Grid.RowDefinitions>
-                                                        <ListView Margin="3" Background="White" BorderBrush="White" HorizontalAlignment="Stretch"
-                                                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                                                ItemsSource="{Binding IndividualAssessmentSheetCategories.PossibleValues}">
+                                                        <ListView
+                                                            Margin="3"
+                                                            HorizontalAlignment="Stretch"
+                                                            Background="White"
+                                                            BorderBrush="White"
+                                                            ItemsSource="{Binding IndividualAssessmentSheetCategories.PossibleValues}"
+                                                            ScrollViewer.HorizontalScrollBarVisibility="Disabled">
                                                             <ListView.ItemTemplate>
                                                                 <DataTemplate>
                                                                     <Grid>
@@ -1564,7 +3365,10 @@
                                                                             <ColumnDefinition Width="Auto" SharedSizeGroup="a" />
                                                                         </Grid.ColumnDefinitions>
                                                                         <dxe:CheckEdit Margin="3" IsChecked="{Binding IsEditSelected}" />
-                                                                        <TextBlock Margin="3" Grid.Column="1" Text="{Binding Description}" />
+                                                                        <TextBlock
+                                                                            Grid.Column="1"
+                                                                            Margin="3"
+                                                                            Text="{Binding Description}" />
                                                                     </Grid>
                                                                 </DataTemplate>
                                                             </ListView.ItemTemplate>
@@ -1578,8 +3382,15 @@
                                                                 </ItemsPanelTemplate>
                                                             </ListView.ItemsPanel>
                                                         </ListView>
-                                                        <Button FontWeight="Normal" HorizontalAlignment="Right" Grid.Row="1" Height="25" Margin="3 3 3 3"
-                                              Padding="5 0" Click="button_editIndAsc_Click" IsDefault="True">
+                                                        <Button
+                                                            Grid.Row="1"
+                                                            Height="25"
+                                                            Margin="3,3,3,3"
+                                                            Padding="5,0"
+                                                            HorizontalAlignment="Right"
+                                                            Click="button_editIndAsc_Click"
+                                                            FontWeight="Normal"
+                                                            IsDefault="True">
                                                             Ãœbernehmen
                                                         </Button>
                                                     </Grid>
@@ -1593,13 +3404,20 @@
 
                             </ScrollViewer>
                         </TabItem>
-                        <TabItem Header="Medikamentenverordnungen" Name="tabitem_Medikamentenverordnungen" Selector.Selected="tabitem_medver_Selected">
+                        <TabItem
+                            Name="tabitem_Medikamentenverordnungen"
+                            Header="Medikamentenverordnungen"
+                            Selector.Selected="tabitem_medver_Selected">
                             <Grid>
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="*" />
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
-                                <UniformGrid Grid.Row="0" Grid.Column="0" Rows="3" Columns="1">
+                                <UniformGrid
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Columns="1"
+                                    Rows="3">
                                     <GroupBox Header="Aktuelle Medikamentenverordnung" Style="{StaticResource ObjectEditGroupBox}">
                                         <Grid>
                                             <Grid.RowDefinitions>
@@ -1611,35 +3429,81 @@
                                                 <ColumnDefinition Width="Auto" />
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Margin="0,3,0,3" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Foreground="Black">
+                                            <TextBlock
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Margin="0,3,0,3"
+                                                VerticalAlignment="Center"
+                                                Foreground="Black">
                                                 <TextBlock.Inlines>
                                                     <Run Text="Erstellt von: " />
                                                     <Run FontWeight="Bold" Text="{Binding Path=AktuelleMedikamentenverordnungsliste.Ersteller, Mode=OneWay}" />
                                                 </TextBlock.Inlines>
                                             </TextBlock>
-                                            <TextBlock Margin="15,3,0,3" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Foreground="Black">
+                                            <TextBlock
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Margin="15,3,0,3"
+                                                VerticalAlignment="Center"
+                                                Foreground="Black">
                                                 <TextBlock.Inlines>
                                                     <Run Text="Datum: " />
                                                     <Run FontWeight="Bold" Text="{Binding Path=AktuelleMedikamentenverordnungsliste.ErstellDatum, Mode=OneWay}" />
                                                 </TextBlock.Inlines>
                                             </TextBlock>
-                                            <StackPanel Grid.Column="2" Grid.Row="0" Margin="0,3,0,3" HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <StackPanel
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Margin="0,3,0,3"
+                                                HorizontalAlignment="Right"
+                                                Orientation="Horizontal">
                                                 <StackPanel Orientation="Horizontal">
-                                                    <TextBlock Margin="3" FontSize="14"  HorizontalAlignment="Left" VerticalAlignment="Center">
-                            <Hyperlink x:Name="LinkAktuelleListeDrucken" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkAktuelleListeDrucken_OnRequestNavigate">
-                              <Run Text="Drucken" />
-                            </Hyperlink>
+                                                    <TextBlock
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14">
+                                                        <Hyperlink
+                                                            x:Name="LinkAktuelleListeDrucken"
+                                                            Foreground="#FF2B508B"
+                                                            RequestNavigate="LinkAktuelleListeDrucken_OnRequestNavigate"
+                                                            TargetName="_NewWindow">
+                                                            <Run Text="Drucken" />
+                                                        </Hyperlink>
                                                     </TextBlock>
-                                                    <TextBlock Margin="3" FontSize="14"  HorizontalAlignment="Left" VerticalAlignment="Center">
-                            <Hyperlink x:Name="LinkListeMitZusatzFeldern" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkListeMitZusatzeldernDrucken_OnRequestNavigate">
-                              <Run Text="Drucken mit Zusatzfeldern" />
-                            </Hyperlink>
+                                                    <TextBlock
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14">
+                                                        <Hyperlink
+                                                            x:Name="LinkListeMitZusatzFeldern"
+                                                            Foreground="#FF2B508B"
+                                                            RequestNavigate="LinkListeMitZusatzeldernDrucken_OnRequestNavigate"
+                                                            TargetName="_NewWindow">
+                                                            <Run Text="Drucken mit Zusatzfeldern" />
+                                                        </Hyperlink>
                                                     </TextBlock>
                                                 </StackPanel>
-                                                <Button Content="Bearbeiten" x:Name="ButtonAktuelleMedBearbeiten" IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Click="EditMedVerordnungClick" VerticalAlignment="Center" />
-                                                <Button Content="Löschen" x:Name="ButtonAktuelleMedLoeschen" IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Margin="3,0,0,0" Click="RemoveMedVerordnungClick" VerticalAlignment="Center" />
+                                                <Button
+                                                    x:Name="ButtonAktuelleMedBearbeiten"
+                                                    VerticalAlignment="Center"
+                                                    Click="EditMedVerordnungClick"
+                                                    Content="Bearbeiten"
+                                                    IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
+                                                <Button
+                                                    x:Name="ButtonAktuelleMedLoeschen"
+                                                    Margin="3,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Click="RemoveMedVerordnungClick"
+                                                    Content="Löschen"
+                                                    IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
                                             </StackPanel>
-                                            <Grid x:Name="AktuelleMVRGrid" Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" />
+                                            <Grid
+                                                x:Name="AktuelleMVRGrid"
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="3" />
                                         </Grid>
                                     </GroupBox>
                                     <GroupBox Header="Bedarfsmedikation" Style="{StaticResource ObjectEditGroupBox}">
@@ -1653,47 +3517,116 @@
                                                 <ColumnDefinition Width="Auto" />
                                                 <ColumnDefinition Width="*" />
                                             </Grid.ColumnDefinitions>
-                                            <TextBlock Margin="0,3,0,3" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Foreground="Black">
+                                            <TextBlock
+                                                Grid.Row="0"
+                                                Grid.Column="0"
+                                                Margin="0,3,0,3"
+                                                VerticalAlignment="Center"
+                                                Foreground="Black">
                                                 <TextBlock.Inlines>
                                                     <Run Text="Erstellt von: " />
                                                     <Run FontWeight="Bold" Text="{Binding Path=Bedarfsmedikamentenverordnungsliste.Ersteller, Mode=OneWay}" />
                                                 </TextBlock.Inlines>
                                             </TextBlock>
-                                            <TextBlock Margin="15,3,0,3" Grid.Column="1" Grid.Row="0" VerticalAlignment="Center" Foreground="Black">
+                                            <TextBlock
+                                                Grid.Row="0"
+                                                Grid.Column="1"
+                                                Margin="15,3,0,3"
+                                                VerticalAlignment="Center"
+                                                Foreground="Black">
                                                 <TextBlock.Inlines>
                                                     <Run Text="Datum: " />
                                                     <Run FontWeight="Bold" Text="{Binding Path=Bedarfsmedikamentenverordnungsliste.ErstellDatum, Mode=OneWay}" />
                                                 </TextBlock.Inlines>
                                             </TextBlock>
-                                            <StackPanel Grid.Column="2" Grid.Row="0" Margin="0,3,0,3" HorizontalAlignment="Right" Orientation="Horizontal">
+                                            <StackPanel
+                                                Grid.Row="0"
+                                                Grid.Column="2"
+                                                Margin="0,3,0,3"
+                                                HorizontalAlignment="Right"
+                                                Orientation="Horizontal">
                                                 <StackPanel Orientation="Horizontal">
-                                                    <TextBlock Margin="3" FontSize="14"  HorizontalAlignment="Left" VerticalAlignment="Center">
-                            <Hyperlink x:Name="LinkBedarfsListeDrucken" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkBedarfsListeDrucken_OnRequestNavigate">
-                              <Run Text="Drucken" />
-                            </Hyperlink>
+                                                    <TextBlock
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14">
+                                                        <Hyperlink
+                                                            x:Name="LinkBedarfsListeDrucken"
+                                                            Foreground="#FF2B508B"
+                                                            RequestNavigate="LinkBedarfsListeDrucken_OnRequestNavigate"
+                                                            TargetName="_NewWindow">
+                                                            <Run Text="Drucken" />
+                                                        </Hyperlink>
                                                     </TextBlock>
-                                                    <TextBlock Margin="3" FontSize="14"  HorizontalAlignment="Left" VerticalAlignment="Center">
-                            <Hyperlink x:Name="LinkBedarfsListeMitZusatzFeldern" TargetName="_NewWindow" Foreground="#FF2B508B" RequestNavigate="LinkBedarfsListeMitZusatzeldernDrucken_OnRequestNavigate">
-                              <Run Text="Drucken mit Zusatzfeldern" />
-                            </Hyperlink>
+                                                    <TextBlock
+                                                        Margin="3"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        FontSize="14">
+                                                        <Hyperlink
+                                                            x:Name="LinkBedarfsListeMitZusatzFeldern"
+                                                            Foreground="#FF2B508B"
+                                                            RequestNavigate="LinkBedarfsListeMitZusatzeldernDrucken_OnRequestNavigate"
+                                                            TargetName="_NewWindow">
+                                                            <Run Text="Drucken mit Zusatzfeldern" />
+                                                        </Hyperlink>
                                                     </TextBlock>
                                                 </StackPanel>
-                                                <Button Content="Bearbeiten" x:Name="ButtonBedarfMedBearbeiten" IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Click="EditBedarfMedVerordnungClick" VerticalAlignment="Center" />
-                                                <Button Content="Löschen" x:Name="ButtonBedarfMedLoeschen" IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Margin="3,0,0,0" Click="RemoveBedarfsMedVerordnungClick" VerticalAlignment="Center" />
+                                                <Button
+                                                    x:Name="ButtonBedarfMedBearbeiten"
+                                                    VerticalAlignment="Center"
+                                                    Click="EditBedarfMedVerordnungClick"
+                                                    Content="Bearbeiten"
+                                                    IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
+                                                <Button
+                                                    x:Name="ButtonBedarfMedLoeschen"
+                                                    Margin="3,0,0,0"
+                                                    VerticalAlignment="Center"
+                                                    Click="RemoveBedarfsMedVerordnungClick"
+                                                    Content="Löschen"
+                                                    IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
                                             </StackPanel>
-                                            <Grid x:Name="BedarfsMVRGrid" Grid.Row="1" Grid.ColumnSpan="3" Grid.Column="0" />
+                                            <Grid
+                                                x:Name="BedarfsMVRGrid"
+                                                Grid.Row="1"
+                                                Grid.Column="0"
+                                                Grid.ColumnSpan="3" />
                                         </Grid>
                                     </GroupBox>
-                                    <GroupBox x:Name="GroupBoxMedikamentenverordnungen" Header="Historie" Style="{StaticResource ObjectEditGroupBox}" />
+                                    <GroupBox
+                                        x:Name="GroupBoxMedikamentenverordnungen"
+                                        Header="Historie"
+                                        Style="{StaticResource ObjectEditGroupBox}" />
                                 </UniformGrid>
-                                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="1">
-                                    <Button Content="Neu aus Bedarfsverordnung" x:Name="ButtonNeuAusBedarfsverordnung" IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Click="MedVerAusBedarfsListeClick" Margin="3" />
-                                    <Button Content="Neu aus aktueller Verordnung" x:Name="ButtonNeuAusAktuellerVerordnung" IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" Click="MedVerAusListeClick" Margin="3" />
-                                    <Button Content="Neue Medikamentenverordnung" x:Name="ButtonNeueMedikamentenverordnung" Click="NeueMVLHinzufuegenClick" Margin="3" />
+                                <StackPanel
+                                    Grid.Row="1"
+                                    HorizontalAlignment="Right"
+                                    Orientation="Horizontal">
+                                    <Button
+                                        x:Name="ButtonNeuAusBedarfsverordnung"
+                                        Margin="3"
+                                        Click="MedVerAusBedarfsListeClick"
+                                        Content="Neu aus Bedarfsverordnung"
+                                        IsEnabled="{Binding Path=Bedarfsmedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
+                                    <Button
+                                        x:Name="ButtonNeuAusAktuellerVerordnung"
+                                        Margin="3"
+                                        Click="MedVerAusListeClick"
+                                        Content="Neu aus aktueller Verordnung"
+                                        IsEnabled="{Binding Path=AktuelleMedikamentenverordnungsliste, Converter={StaticResource BoolNullCheckConverter}}" />
+                                    <Button
+                                        x:Name="ButtonNeueMedikamentenverordnung"
+                                        Margin="3"
+                                        Click="NeueMVLHinzufuegenClick"
+                                        Content="Neue Medikamentenverordnung" />
                                 </StackPanel>
                             </Grid>
                         </TabItem>
-                        <TabItem Header="Bargeldverwaltung" Name="tabitem_Bargeldverwaltung" Selector.Selected="Tabitem_Bargeldverwaltung_OnSelected">
+                        <TabItem
+                            Name="tabitem_Bargeldverwaltung"
+                            Header="Bargeldverwaltung"
+                            Selector.Selected="Tabitem_Bargeldverwaltung_OnSelected">
 
                             <!--<Grid x:Name="BargeldverwaltungsGrid">
 				<Grid.RowDefinitions>
@@ -1831,57 +3764,153 @@
                         </TabItem>
 
 
-                        <TabItem Header="ownChat" Name="tabitem_chatservice" Selector.Selected="tabitem_chatservice_Selected" />
-                        <TabItem Header="Dokumente" Name="tabitem_documents" Selector.Selected="tabitem_documents_Selected" />
+                        <TabItem
+                            Name="tabitem_chatservice"
+                            Header="ownChat"
+                            Selector.Selected="tabitem_chatservice_Selected" />
+                        <TabItem
+                            Name="tabitem_documents"
+                            Header="Dokumente"
+                            Selector.Selected="tabitem_documents_Selected" />
 
-                        <TabItem Header="Log" Name="tabitem_log" Selector.Selected="tabitem_log_Selected" />
+                        <TabItem
+                            Name="tabitem_log"
+                            Header="Log"
+                            Selector.Selected="tabitem_log_Selected" />
                     </TabControl>
-                    <Border Grid.Row="2" Grid.ColumnSpan="3" Height="40" Margin="0,10,0,0" VerticalAlignment="Stretch" Background="#FF000000">
+                    <Border
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="40"
+                        Margin="0,10,0,0"
+                        VerticalAlignment="Stretch"
+                        Background="#FF000000">
                         <Border.OpacityMask>
-                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                <GradientStop Color="#19000000" Offset="0" />
-                                <GradientStop Color="#33FFFFFF" Offset="1" />
+                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="#19000000" />
+                                <GradientStop Offset="1" Color="#33FFFFFF" />
                             </LinearGradientBrush>
                         </Border.OpacityMask>
                     </Border>
-                    <StackPanel Grid.ColumnSpan="3" Grid.Row="2" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,0,0" HorizontalAlignment="Right">
-                        <Button r:DemandUserRight.VisibleDemands="EditAll, CustomerView_Edit" x:Name="btnSave" Content="Speichern" Margin="0,0,2,0" Command="ApplicationCommands.Save" Height="25" />
-                        <Button x:Name="btnClose" Content="Schließen" Margin="0,0,3,0" Command="ApplicationCommands.Close" Height="25" />
+                    <StackPanel
+                        Grid.Row="2"
+                        Grid.ColumnSpan="3"
+                        Height="Auto"
+                        Margin="5,10,0,0"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Button
+                            x:Name="btnSave"
+                            Height="25"
+                            Margin="0,0,2,0"
+                            r:DemandUserRight.VisibleDemands="EditAll, CustomerView_Edit"
+                            Command="ApplicationCommands.Save"
+                            Content="Speichern" />
+                        <Button
+                            x:Name="btnClose"
+                            Height="25"
+                            Margin="0,0,3,0"
+                            Command="ApplicationCommands.Close"
+                            Content="Schließen" />
                     </StackPanel>
                 </Grid>
             </GroupBox>
         </uc:ShadowChrome>
-        <Popup Margin="10" Name="popup_employee" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
-          Closed="popup_Closed" Opened="popup_Opened">
-            <localSearchView:EmployeeSearchView ItemSelected="EmployeeSearchView_ItemSelected_1" x:Name="employeesearchview" />
+        <Popup
+            Name="popup_employee"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
+            <localSearchView:EmployeeSearchView x:Name="employeesearchview" ItemSelected="EmployeeSearchView_ItemSelected_1" />
         </Popup>
-        <Popup Margin="10" Name="popup_team" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
-          Closed="popup_Closed" Opened="popup_Opened">
-            <localSearchView:TeamSearchView ItemSelected="TeamSearchView_ItemSelected_1" x:Name="teamsearchview" />
+        <Popup
+            Name="popup_team"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
+            <localSearchView:TeamSearchView x:Name="teamsearchview" ItemSelected="TeamSearchView_ItemSelected_1" />
         </Popup>
-        <Popup Margin="10" x:Name="popup_person" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
-          Closed="popup_Closed" Opened="popup_Opened">
+        <Popup
+            x:Name="popup_person"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
             <localSearchView:PersonSearchView x:Name="personsearchview" />
         </Popup>
-        <Popup Margin="10" x:Name="popup_organisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
-          Closed="popup_Closed" Opened="popup_Opened">
-            <localSearchView:OrganisationSearchView SearchMode="All" x:Name="organisationsearchview" />
+        <Popup
+            x:Name="popup_organisation"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
+            <localSearchView:OrganisationSearchView x:Name="organisationsearchview" SearchMode="All" />
         </Popup>
-        <Popup Margin="10" x:Name="popup_costBearer" StaysOpen="False" Placement="MousePoint" Width="370" Height="250"
-          Closed="popup_Closed" Opened="popup_Opened">
-            <localSearchView:OrganisationSearchView SearchMode="CostBearer" x:Name="costbearersearchview"
-                            ItemSelected="costbearersearchview_ItemSelected" />
+        <Popup
+            x:Name="popup_costBearer"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
+            <localSearchView:OrganisationSearchView
+                x:Name="costbearersearchview"
+                ItemSelected="costbearersearchview_ItemSelected"
+                SearchMode="CostBearer" />
         </Popup>
-        <Popup Name="PopupBehinderungsarten" StaysOpen="False" Placement="MousePoint" Width="270" Height="300" >
+        <Popup
+            Name="PopupBehinderungsarten"
+            Width="270"
+            Height="300"
+            Placement="MousePoint"
+            StaysOpen="False">
             <controls:BehinderungsartenSelectionControl x:Name="BehinderungsartenSelection" AusgewaehlteBehinderungsarten="{Binding Path=PublicViewModel.BehinderungsartenListe, RelativeSource={RelativeSource AncestorType={x:Type detail:CustomerView}}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
         </Popup>
-        <Popup Name="PopupMerkzeichen" StaysOpen="False" Placement="MousePoint" Width="270" Height="240" >
+        <Popup
+            Name="PopupMerkzeichen"
+            Width="270"
+            Height="240"
+            Placement="MousePoint"
+            StaysOpen="False">
             <controls:MerkzeichenSelectionControl x:Name="MerkzeichenSelection" AusgewaehlteMerkzeichen="{Binding Path=PublicViewModel.MerkzeichenListe, RelativeSource={RelativeSource AncestorType={x:Type detail:CustomerView}}, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
         </Popup>
-        <Popup Margin="10" x:Name="popup_ansprechpartner" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
+        <Popup
+            x:Name="popup_ansprechpartner"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
             <localSearchView:PersonSearchView x:Name="ansprechpartnersearchview" />
         </Popup>
-        <Popup Margin="10" x:Name="popup_personOrganisation" StaysOpen="False" Placement="MousePoint" Width="370" Height="250" Closed="popup_Closed" Opened="popup_Opened">
+        <Popup
+            x:Name="popup_personOrganisation"
+            Width="370"
+            Height="250"
+            Margin="10"
+            Closed="popup_Closed"
+            Opened="popup_Opened"
+            Placement="MousePoint"
+            StaysOpen="False">
             <localSearchView:OrganisationSearchView x:Name="personOrganisationsearchview" />
         </Popup>
         <Border x:Name="popup_content" Margin="0,10,0,-10" />
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index faf3b7284..c16a0a3f2 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -342,11 +342,6 @@ namespace BeWo.View.Detail
                     stundenplanView.ViewModel = value.Arbeitszeiten;
                     stundenplanView.RefreshView();
                 }
-                
-                if (tabitem_falldaten.Content != null && tabitem_falldaten.Content is CustomerFalldatenView falldatenView)
-                {
-                    falldatenView.ViewModel = value.CustomerFalldatenVM;
-                }
 
                 _saveInProgress = false;
 
@@ -1095,14 +1090,6 @@ namespace BeWo.View.Detail
             }
         }
 
-        private void tabitem_falldaten_Selected(object sender, RoutedEventArgs e)
-        {
-            if (tabitem_falldaten.Content == null)
-            {
-                tabitem_falldaten.Content = new CustomerFalldatenView(ViewModel.CustomerFalldatenVM);
-            }
-        }
-
         private void tabitem_notizen_Selected(object sender, RoutedEventArgs e)
         {
             if (ViewModel.IsNew)
diff --git a/BeWo/ViewModel/CustomerFalldatenVM.cs b/BeWo/ViewModel/CustomerFalldatenVM.cs
deleted file mode 100644
index a9cba3e7a..000000000
--- a/BeWo/ViewModel/CustomerFalldatenVM.cs
+++ /dev/null
@@ -1,606 +0,0 @@
-using System;
-
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Wohnhilfe;
-
-namespace BeWo.ViewModel
-{
-    public class CustomerFalldatenVM : AbstractDCMapperVM<FalldatenDC>
-    {
-        private string _EigenesAktenzeichen;
-        private DateTime? _Auftragseingang;
-        private ValueListEntryDC _Auftragsherkunft;
-        private ObservableSortCollection<ValueListEntryDC> _Auftragsherkunfte;
-        private ValueListEntryDC _Vermittlungsgrundlage;
-        private ObservableSortCollection<ValueListEntryDC> _Vermittlungsgrundlagen;
-        private decimal? _Tagessatze;
-        private decimal? _Tagessatzhohe;
-        private decimal? _HoheDerGeldstrafe;
-        private decimal? _ZuLeistendeArbeitsstunden;
-        private string _Hinweis;
-        private DateTime? _Termin;
-        private FalldatenBearbeitungsstatus? _FalldatenBearbeitungsstatus;
-        private string _Auftragsruckgabe;
-        private string _Verlauf;
-        private decimal? _AbgeleisteteStunden;
-        private decimal? _ErsparteHafttage;
-        private decimal? _GeleisteteRatenzahlung;
-        private string _Bemerkung;
-        private decimal? _GeleisteteEinmalzahlung;
-        private bool _GrundArbeitsunfahig;
-        private bool _GrundSuchtproblem;
-        private bool _GrundPsychischeProbleme;
-        private bool _GrundKeineMotivation;
-        private bool _GrundInHaft;
-        private bool _GrundUnbekannt;
-        private bool _GrundKeinKontakt;
-        private bool _GrundNichtAngetreten;
-        private bool _GrundAbbruchDerTatigkeit;
-        private bool _GrundWiderruf;
-        private bool _Grund459StPO;
-        private bool _GrundAusbleibenDerZahlung;
-        private bool _BesonderheitMehrfacheBeauftragung;
-        private bool _BesonderheitMehrfacheVermittlung;
-        private bool _BesonderheitVermittlungAusHaft;
-        private bool _BesonderheitDurchBGBWAufgesucht;
-
-        public CustomerFalldatenVM(CustomerVM cust, FalldatenDC dc) : base(dc, dc.IsNew)
-        {
-            Customer = cust;
-        }
-
-        public CustomerVM Customer { get; set; }
-
-        public bool PermissionFalldatenEdit { get; } = BeWoApp.HasLoggedOnUserRight(UserRightType.Customer_GemeinnutzigeArbeit_Manage);
-        public bool NoPermissionFalldatenEdit => !PermissionFalldatenEdit;
-
-        public string EigenesAktenzeichen
-        {
-            get { return _EigenesAktenzeichen; }
-            set
-            {
-                if (!AreDifferent(_EigenesAktenzeichen, value))
-                    return;
-
-                _EigenesAktenzeichen = value;
-                StoreDirtyInformation(AreDifferent(DataContract.EigenesAktenzeichen, value), nameof(EigenesAktenzeichen));
-                FirePropertyChanged(nameof(EigenesAktenzeichen));
-            }
-        }
-        public DateTime? Auftragseingang
-        {
-            get { return _Auftragseingang; }
-            set
-            {
-                if (!AreDifferent(_Auftragseingang, value))
-                    return;
-
-                _Auftragseingang = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Auftragseingang, value), nameof(Auftragseingang));
-                FirePropertyChanged(nameof(Auftragseingang));
-            }
-        }
-        public ValueListEntryDC Auftragsherkunft
-        {
-            get { return _Auftragsherkunft; }
-            set
-            {
-                if (!AreDifferent(_Auftragsherkunft, value))
-                    return;
-
-                _Auftragsherkunft = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Auftragsherkunft, value), nameof(Auftragsherkunft));
-                FirePropertyChanged(nameof(Auftragsherkunft));
-            }
-        }
-        public ObservableSortCollection<ValueListEntryDC> Auftragsherkunfte
-        {
-            get { return _Auftragsherkunfte ?? (_Auftragsherkunfte = new ObservableSortCollection<ValueListEntryDC>()); }
-            set { _Auftragsherkunfte = value; }
-        }
-        public ValueListEntryDC Vermittlungsgrundlage
-        {
-            get { return _Vermittlungsgrundlage; }
-            set
-            {
-                if (!AreDifferent(_Vermittlungsgrundlage, value))
-                    return;
-
-                _Vermittlungsgrundlage = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Vermittlungsgrundlage, value), nameof(Vermittlungsgrundlage));
-                FirePropertyChanged(nameof(Vermittlungsgrundlage));
-            }
-        }
-        public ObservableSortCollection<ValueListEntryDC> Vermittlungsgrundlagen
-        {
-            get { return _Vermittlungsgrundlagen ?? (_Vermittlungsgrundlagen = new ObservableSortCollection<ValueListEntryDC>()); }
-            set { _Vermittlungsgrundlagen = value; }
-        }
-        public decimal? Tagessatze
-        {
-            get { return _Tagessatze; }
-            set
-            {
-                if (!AreDifferent(_Tagessatze, value))
-                    return;
-
-                _Tagessatze = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Tagessatze, value), nameof(Tagessatze));
-                FirePropertyChanged(nameof(Tagessatze));
-                UpdateHoheDerGeldstrafe();
-            }
-        }
-        public decimal? Tagessatzhohe
-        {
-            get { return _Tagessatzhohe; }
-            set
-            {
-                if (!AreDifferent(_Tagessatzhohe, value))
-                    return;
-
-                _Tagessatzhohe = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Tagessatzhohe, value), nameof(Tagessatzhohe));
-                FirePropertyChanged(nameof(Tagessatzhohe));
-                UpdateHoheDerGeldstrafe();
-            }
-        }
-        public decimal? HoheDerGeldstrafe
-        {
-            get { return _HoheDerGeldstrafe; }
-            set
-            {
-                if (!AreDifferent(_HoheDerGeldstrafe, value))
-                    return;
-
-                _HoheDerGeldstrafe = value;
-                StoreDirtyInformation(AreDifferent(DataContract.HoheDerGeldstrafe, value), nameof(HoheDerGeldstrafe));
-                FirePropertyChanged(nameof(HoheDerGeldstrafe));
-            }
-        }
-        public decimal? ZuLeistendeArbeitsstunden
-        {
-            get { return _ZuLeistendeArbeitsstunden; }
-            set
-            {
-                if (!AreDifferent(_ZuLeistendeArbeitsstunden, value))
-                    return;
-
-                _ZuLeistendeArbeitsstunden = value;
-                StoreDirtyInformation(AreDifferent(DataContract.ZuLeistendeArbeitsstunden, value), nameof(ZuLeistendeArbeitsstunden));
-                FirePropertyChanged(nameof(ZuLeistendeArbeitsstunden));
-            }
-        }
-        public string Hinweis
-        {
-            get { return _Hinweis; }
-            set
-            {
-                if (!AreDifferent(_Hinweis, value))
-                    return;
-
-                _Hinweis = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Hinweis, value), nameof(Hinweis));
-                FirePropertyChanged(nameof(Hinweis));
-            }
-        }
-        public DateTime? Termin
-        {
-            get { return _Termin; }
-            set
-            {
-                if (!AreDifferent(_Termin, value))
-                    return;
-
-                _Termin = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Termin, value), nameof(Termin));
-                FirePropertyChanged(nameof(Termin));
-            }
-        }
-        public FalldatenBearbeitungsstatus? FalldatenBearbeitungsstatus
-        {
-            get { return _FalldatenBearbeitungsstatus; }
-            set
-            {
-                if (!AreDifferent(_FalldatenBearbeitungsstatus, value))
-                    return;
-
-                _FalldatenBearbeitungsstatus = value;
-                StoreDirtyInformation(AreDifferent(DataContract.FalldatenBearbeitungsstatus, value), nameof(FalldatenBearbeitungsstatus));
-                FirePropertyChanged(nameof(FalldatenBearbeitungsstatus));
-            }
-        }
-        public string Auftragsruckgabe
-        {
-            get { return _Auftragsruckgabe; }
-            set
-            {
-                if (!AreDifferent(_Auftragsruckgabe, value))
-                    return;
-
-                _Auftragsruckgabe = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Auftragsruckgabe, value), nameof(Auftragsruckgabe));
-                FirePropertyChanged(nameof(Auftragsruckgabe));
-            }
-        }
-        public string Verlauf
-        {
-            get { return _Verlauf; }
-            set
-            {
-                if (!AreDifferent(_Verlauf, value))
-                    return;
-
-                _Verlauf = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Verlauf, value), nameof(Verlauf));
-                FirePropertyChanged(nameof(Verlauf));
-            }
-        }
-        public decimal? AbgeleisteteStunden
-        {
-            get { return _AbgeleisteteStunden; }
-            set
-            {
-                if (!AreDifferent(_AbgeleisteteStunden, value))
-                    return;
-
-                _AbgeleisteteStunden = value;
-                StoreDirtyInformation(AreDifferent(DataContract.AbgeleisteteStunden, value), nameof(AbgeleisteteStunden));
-                FirePropertyChanged(nameof(AbgeleisteteStunden));
-            }
-        }
-        public decimal? ErsparteHafttage
-        {
-            get { return _ErsparteHafttage; }
-            set
-            {
-                if (!AreDifferent(_ErsparteHafttage, value))
-                    return;
-
-                _ErsparteHafttage = value;
-                StoreDirtyInformation(AreDifferent(DataContract.ErsparteHafttage, value), nameof(ErsparteHafttage));
-                FirePropertyChanged(nameof(ErsparteHafttage));
-            }
-        }
-        public decimal? GeleisteteRatenzahlung
-        {
-            get { return _GeleisteteRatenzahlung; }
-            set
-            {
-                if (!AreDifferent(_GeleisteteRatenzahlung, value))
-                    return;
-
-                _GeleisteteRatenzahlung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GeleisteteRatenzahlung, value), nameof(GeleisteteRatenzahlung));
-                FirePropertyChanged(nameof(GeleisteteRatenzahlung));
-            }
-        }
-        public string Bemerkung
-        {
-            get { return _Bemerkung; }
-            set
-            {
-                if (!AreDifferent(_Bemerkung, value))
-                    return;
-
-                _Bemerkung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Bemerkung, value), nameof(Bemerkung));
-                FirePropertyChanged(nameof(Bemerkung));
-            }
-        }
-        public decimal? GeleisteteEinmalzahlung
-        {
-            get { return _GeleisteteEinmalzahlung; }
-            set
-            {
-                if (!AreDifferent(_GeleisteteEinmalzahlung, value))
-                    return;
-
-                _GeleisteteEinmalzahlung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GeleisteteEinmalzahlung, value), nameof(GeleisteteEinmalzahlung));
-                FirePropertyChanged(nameof(GeleisteteEinmalzahlung));
-            }
-        }
-        public bool GrundArbeitsunfahig
-        {
-            get { return _GrundArbeitsunfahig; }
-            set
-            {
-                if (!AreDifferent(_GrundArbeitsunfahig, value))
-                    return;
-
-                _GrundArbeitsunfahig = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundArbeitsunfahig, value), nameof(GrundArbeitsunfahig));
-                FirePropertyChanged(nameof(GrundArbeitsunfahig));
-            }
-        }
-        public bool GrundSuchtproblem
-        {
-            get { return _GrundSuchtproblem; }
-            set
-            {
-                if (!AreDifferent(_GrundSuchtproblem, value))
-                    return;
-
-                _GrundSuchtproblem = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundSuchtproblem, value), nameof(GrundSuchtproblem));
-                FirePropertyChanged(nameof(GrundSuchtproblem));
-            }
-        }
-        public bool GrundPsychischeProbleme
-        {
-            get { return _GrundPsychischeProbleme; }
-            set
-            {
-                if (!AreDifferent(_GrundPsychischeProbleme, value))
-                    return;
-
-                _GrundPsychischeProbleme = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundPsychischeProbleme, value), nameof(GrundPsychischeProbleme));
-                FirePropertyChanged(nameof(GrundPsychischeProbleme));
-            }
-        }
-        public bool GrundKeineMotivation
-        {
-            get { return _GrundKeineMotivation; }
-            set
-            {
-                if (!AreDifferent(_GrundKeineMotivation, value))
-                    return;
-
-                _GrundKeineMotivation = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundKeineMotivation, value), nameof(GrundKeineMotivation));
-                FirePropertyChanged(nameof(GrundKeineMotivation));
-            }
-        }
-        public bool GrundInHaft
-        {
-            get { return _GrundInHaft; }
-            set
-            {
-                if (!AreDifferent(_GrundInHaft, value))
-                    return;
-
-                _GrundInHaft = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundInHaft, value), nameof(GrundInHaft));
-                FirePropertyChanged(nameof(GrundInHaft));
-            }
-        }
-        public bool GrundUnbekannt
-        {
-            get { return _GrundUnbekannt; }
-            set
-            {
-                if (!AreDifferent(_GrundUnbekannt, value))
-                    return;
-
-                _GrundUnbekannt = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundUnbekannt, value), nameof(GrundUnbekannt));
-                FirePropertyChanged(nameof(GrundUnbekannt));
-            }
-        }
-        public bool GrundKeinKontakt
-        {
-            get { return _GrundKeinKontakt; }
-            set
-            {
-                if (!AreDifferent(_GrundKeinKontakt, value))
-                    return;
-
-                _GrundKeinKontakt = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundKeinKontakt, value), nameof(GrundKeinKontakt));
-                FirePropertyChanged(nameof(GrundKeinKontakt));
-            }
-        }
-        public bool GrundNichtAngetreten
-        {
-            get { return _GrundNichtAngetreten; }
-            set
-            {
-                if (!AreDifferent(_GrundNichtAngetreten, value))
-                    return;
-
-                _GrundNichtAngetreten = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundNichtAngetreten, value), nameof(GrundNichtAngetreten));
-                FirePropertyChanged(nameof(GrundNichtAngetreten));
-            }
-        }
-        public bool GrundAbbruchDerTatigkeit
-        {
-            get { return _GrundAbbruchDerTatigkeit; }
-            set
-            {
-                if (!AreDifferent(_GrundAbbruchDerTatigkeit, value))
-                    return;
-
-                _GrundAbbruchDerTatigkeit = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundAbbruchDerTatigkeit, value), nameof(GrundAbbruchDerTatigkeit));
-                FirePropertyChanged(nameof(GrundAbbruchDerTatigkeit));
-            }
-        }
-        public bool GrundWiderruf
-        {
-            get { return _GrundWiderruf; }
-            set
-            {
-                if (!AreDifferent(_GrundWiderruf, value))
-                    return;
-
-                _GrundWiderruf = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundWiderruf, value), nameof(GrundWiderruf));
-                FirePropertyChanged(nameof(GrundWiderruf));
-            }
-        }
-        public bool Grund459StPO
-        {
-            get { return _Grund459StPO; }
-            set
-            {
-                if (!AreDifferent(_Grund459StPO, value))
-                    return;
-
-                _Grund459StPO = value;
-                StoreDirtyInformation(AreDifferent(DataContract.Grund459StPO, value), nameof(Grund459StPO));
-                FirePropertyChanged(nameof(Grund459StPO));
-            }
-        }
-        public bool GrundAusbleibenDerZahlung
-        {
-            get { return _GrundAusbleibenDerZahlung; }
-            set
-            {
-                if (!AreDifferent(_GrundAusbleibenDerZahlung, value))
-                    return;
-
-                _GrundAusbleibenDerZahlung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.GrundAusbleibenDerZahlung, value), nameof(GrundAusbleibenDerZahlung));
-                FirePropertyChanged(nameof(GrundAusbleibenDerZahlung));
-            }
-        }
-        public bool BesonderheitMehrfacheBeauftragung
-        {
-            get { return _BesonderheitMehrfacheBeauftragung; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitMehrfacheBeauftragung, value))
-                    return;
-
-                _BesonderheitMehrfacheBeauftragung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.BesonderheitMehrfacheBeauftragung, value), nameof(BesonderheitMehrfacheBeauftragung));
-                FirePropertyChanged(nameof(BesonderheitMehrfacheBeauftragung));
-            }
-        }
-        public bool BesonderheitMehrfacheVermittlung
-        {
-            get { return _BesonderheitMehrfacheVermittlung; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitMehrfacheVermittlung, value))
-                    return;
-
-                _BesonderheitMehrfacheVermittlung = value;
-                StoreDirtyInformation(AreDifferent(DataContract.BesonderheitMehrfacheVermittlung, value), nameof(BesonderheitMehrfacheVermittlung));
-                FirePropertyChanged(nameof(BesonderheitMehrfacheVermittlung));
-            }
-        }
-        public bool BesonderheitVermittlungAusHaft
-        {
-            get { return _BesonderheitVermittlungAusHaft; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitVermittlungAusHaft, value))
-                    return;
-
-                _BesonderheitVermittlungAusHaft = value;
-                StoreDirtyInformation(AreDifferent(DataContract.BesonderheitVermittlungAusHaft, value), nameof(BesonderheitVermittlungAusHaft));
-                FirePropertyChanged(nameof(BesonderheitVermittlungAusHaft));
-            }
-        }
-        public bool BesonderheitDurchBGBWAufgesucht
-        {
-            get { return _BesonderheitDurchBGBWAufgesucht; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitDurchBGBWAufgesucht, value))
-                    return;
-
-                _BesonderheitDurchBGBWAufgesucht = value;
-                StoreDirtyInformation(AreDifferent(DataContract.BesonderheitDurchBGBWAufgesucht, value), nameof(BesonderheitDurchBGBWAufgesucht));
-                FirePropertyChanged(nameof(BesonderheitDurchBGBWAufgesucht));
-            }
-        }
-
-        public void UpdateHoheDerGeldstrafe()
-        {
-            if (!Tagessatze.HasValue || !Tagessatzhohe.HasValue)
-                return;
-
-            HoheDerGeldstrafe = Tagessatze * Tagessatzhohe;
-        }
-
-        protected override void InitByDataContract(FalldatenDC pDataContract)
-        {
-            _EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
-            _Auftragseingang = pDataContract.Auftragseingang;
-            _Auftragsherkunft = pDataContract.Auftragsherkunft;
-            _Vermittlungsgrundlage = pDataContract.Vermittlungsgrundlage;
-            _Tagessatze = pDataContract.Tagessatze;
-            _Tagessatzhohe = pDataContract.Tagessatzhohe;
-            _HoheDerGeldstrafe = pDataContract.HoheDerGeldstrafe;
-            _ZuLeistendeArbeitsstunden = pDataContract.ZuLeistendeArbeitsstunden;
-            _Hinweis = pDataContract.Hinweis;
-            _Termin = pDataContract.Termin;
-            _FalldatenBearbeitungsstatus = pDataContract.FalldatenBearbeitungsstatus;
-            _Auftragsruckgabe = pDataContract.Auftragsruckgabe;
-            _Verlauf = pDataContract.Verlauf;
-            _AbgeleisteteStunden = pDataContract.AbgeleisteteStunden;
-            _ErsparteHafttage = pDataContract.ErsparteHafttage;
-            _GeleisteteRatenzahlung = pDataContract.GeleisteteRatenzahlung;
-            _Bemerkung = pDataContract.Bemerkung;
-            _GeleisteteEinmalzahlung = pDataContract.GeleisteteEinmalzahlung;
-            _GrundArbeitsunfahig = pDataContract.GrundArbeitsunfahig;
-            _GrundSuchtproblem = pDataContract.GrundSuchtproblem;
-            _GrundPsychischeProbleme = pDataContract.GrundPsychischeProbleme;
-            _GrundKeineMotivation = pDataContract.GrundKeineMotivation;
-            _GrundInHaft = pDataContract.GrundInHaft;
-            _GrundUnbekannt = pDataContract.GrundUnbekannt;
-            _GrundKeinKontakt = pDataContract.GrundKeinKontakt;
-            _GrundNichtAngetreten = pDataContract.GrundNichtAngetreten;
-            _GrundAbbruchDerTatigkeit = pDataContract.GrundAbbruchDerTatigkeit;
-            _GrundWiderruf = pDataContract.GrundWiderruf;
-            _Grund459StPO = pDataContract.Grund459StPO;
-            _GrundAusbleibenDerZahlung = pDataContract.GrundAusbleibenDerZahlung;
-            _BesonderheitMehrfacheBeauftragung = pDataContract.BesonderheitMehrfacheBeauftragung;
-            _BesonderheitMehrfacheVermittlung = pDataContract.BesonderheitMehrfacheVermittlung;
-            _BesonderheitVermittlungAusHaft = pDataContract.BesonderheitVermittlungAusHaft;
-            _BesonderheitDurchBGBWAufgesucht = pDataContract.BesonderheitDurchBGBWAufgesucht;
-        }
-
-        internal void InitValueListEntrys(ObservableSortCollection<ValueListEntryDC> auftragsherkunfte, ObservableSortCollection<ValueListEntryDC> vermittlungsgrundlage)
-        {
-            _Auftragsherkunfte = auftragsherkunfte;
-            _Vermittlungsgrundlagen = vermittlungsgrundlage;
-        }
-
-        protected override FalldatenDC MapToDataContract(FalldatenDC pDataContract, bool doCommit)
-        {
-            pDataContract.EigenesAktenzeichen = _EigenesAktenzeichen;
-            pDataContract.Auftragseingang = _Auftragseingang;
-            pDataContract.Auftragsherkunft = _Auftragsherkunft;
-            pDataContract.Vermittlungsgrundlage = _Vermittlungsgrundlage;
-            pDataContract.Tagessatze = _Tagessatze;
-            pDataContract.Tagessatzhohe = _Tagessatzhohe;
-            pDataContract.HoheDerGeldstrafe = _HoheDerGeldstrafe;
-            pDataContract.ZuLeistendeArbeitsstunden = _ZuLeistendeArbeitsstunden;
-            pDataContract.Hinweis = _Hinweis;
-            pDataContract.Termin = _Termin;
-            pDataContract.FalldatenBearbeitungsstatus = _FalldatenBearbeitungsstatus;
-            pDataContract.Auftragsruckgabe = _Auftragsruckgabe;
-            pDataContract.Verlauf = _Verlauf;
-            pDataContract.AbgeleisteteStunden = _AbgeleisteteStunden;
-            pDataContract.ErsparteHafttage = _ErsparteHafttage;
-            pDataContract.GeleisteteRatenzahlung = _GeleisteteRatenzahlung;
-            pDataContract.Bemerkung = _Bemerkung;
-            pDataContract.GeleisteteEinmalzahlung = _GeleisteteEinmalzahlung;
-            pDataContract.GrundArbeitsunfahig = _GrundArbeitsunfahig;
-            pDataContract.GrundSuchtproblem = _GrundSuchtproblem;
-            pDataContract.GrundPsychischeProbleme = _GrundPsychischeProbleme;
-            pDataContract.GrundKeineMotivation = _GrundKeineMotivation;
-            pDataContract.GrundInHaft = _GrundInHaft;
-            pDataContract.GrundUnbekannt = _GrundUnbekannt;
-            pDataContract.GrundKeinKontakt = _GrundKeinKontakt;
-            pDataContract.GrundNichtAngetreten = _GrundNichtAngetreten;
-            pDataContract.GrundAbbruchDerTatigkeit = _GrundAbbruchDerTatigkeit;
-            pDataContract.GrundWiderruf = _GrundWiderruf;
-            pDataContract.Grund459StPO = _Grund459StPO;
-            pDataContract.GrundAusbleibenDerZahlung = _GrundAusbleibenDerZahlung;
-            pDataContract.BesonderheitMehrfacheBeauftragung = _BesonderheitMehrfacheBeauftragung;
-            pDataContract.BesonderheitMehrfacheVermittlung = _BesonderheitMehrfacheVermittlung;
-            pDataContract.BesonderheitVermittlungAusHaft = _BesonderheitVermittlungAusHaft;
-            pDataContract.BesonderheitDurchBGBWAufgesucht = _BesonderheitDurchBGBWAufgesucht;
-
-            return pDataContract;
-        }
-    }
-}
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index 0c3aac7d7..3265b8c01 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -236,9 +236,8 @@ namespace BeWo.ViewModel
         private ObservableSortCollection<ValueListEntryDC> _EintragKategorien;
 
         private SubstitutionNeed _SubstitutionNeed;
-		private CustomerFalldatenVM _CustomerFalldatenVM;
 		private CustomerWohnhilfeListVM _CustomerWohnhilfeListVM;
-		private CustomerGemeinnutzigeArbeitListVM _CustomerGemeinnutzigeArbeitListVM;
+		private CustomerVermittlungArbeitListVM _CustomerGemeinnutzigeArbeitListVM;
 
 		public CustomerVM()
         {
@@ -271,7 +270,6 @@ namespace BeWo.ViewModel
             var auftragsherkunfte      = new ObservableSortCollection<ValueListEntryDC>(possibleauftragsherkunfte, Comparer.ValueListEntryDCComparer);
             var vermittlungsgrundlage  = new ObservableSortCollection<ValueListEntryDC>(possiblevermittlungsgrundlage, Comparer.ValueListEntryDCComparer);
 
-			_CustomerFalldatenVM.InitValueListEntrys(auftragsherkunfte, vermittlungsgrundlage);
 			_CustomerGemeinnutzigeArbeitListVM.InitValueListEntrys(auftragsherkunfte, vermittlungsgrundlage);
 
 			_MedArten = new BindingList<MedArtDC>(pPossibleMedArten);
@@ -838,8 +836,7 @@ namespace BeWo.ViewModel
 				return base.IsDirty || TeamRelations.IsDirty || EmployeeRelations.IsDirty || _EnvironmentPersons.IsDirty ||
 				       _EnvironmentOrganisations.IsDirty || _AbsenceTimes.IsDirty || _VarFields.IsDirty ||
 				       CostBearers.IsDirty || _IndividualAssessmentSheetCategories.IsDirty ||
-					   _PlacementList.IsDirty || _MedVerordnungslisten.IsDirty || _EnvironmentPersonsWithFamily.IsDirty || _Arbeitszeiten.IsDirty || 
-					   _CustomerFalldatenVM.IsDirty 
+					   _PlacementList.IsDirty || _MedVerordnungslisten.IsDirty || _EnvironmentPersonsWithFamily.IsDirty || _Arbeitszeiten.IsDirty
 					   //|| _CustomerWohnhilfeListVM.IsDirty
 					   ;
 			}
@@ -1745,18 +1742,6 @@ namespace BeWo.ViewModel
                 }
             }
         }
-		public CustomerFalldatenVM CustomerFalldatenVM
-		{
-			get { return _CustomerFalldatenVM; }
-
-			set
-			{
-				if (!AreDifferent(_CustomerFalldatenVM, value))
-					return;
-				_CustomerFalldatenVM = value;
-                FirePropertyChanged(nameof(CustomerFalldatenVM));
-            }
-		}
 		public CustomerWohnhilfeListVM CustomerWohnhilfeListVM
 		{
 			get { return _CustomerWohnhilfeListVM; }
@@ -1770,7 +1755,7 @@ namespace BeWo.ViewModel
 			}
 		}
 
-		public CustomerGemeinnutzigeArbeitListVM CustomerGemeinnutzigeArbeitListVM
+		public CustomerVermittlungArbeitListVM CustomerGemeinnutzigeArbeitListVM
 		{
 			get { return _CustomerGemeinnutzigeArbeitListVM; }
 
@@ -2015,8 +2000,6 @@ namespace BeWo.ViewModel
 		        }
 		    }
 
-			CustomerFalldatenVM = new CustomerFalldatenVM(this, pDataContract.FalldatenDC ?? (pDataContract.FalldatenDC = new FalldatenDC(true)));
-
 			EnvironmentPersons = VMFactory.CreateCustomerEnvironmentPersonRelListVM(dcListUmfeld, ValueListEntryType.EnvironmentPersonType);
             EnvironmentPersonsWithFamily = VMFactory.CreateCustomerEnvironmentPersonRelListVM(dcListFamily, ValueListEntryType.RoleInFamily);
 
@@ -2039,7 +2022,7 @@ namespace BeWo.ViewModel
 
 			CustomerWohnhilfeListVM.AddNewVMToListAndSelect(false);
 
-			CustomerGemeinnutzigeArbeitListVM = new CustomerGemeinnutzigeArbeitListVM(pDataContract.CustomerGemeinnutzigeArbeitDC ?? (pDataContract.CustomerGemeinnutzigeArbeitDC = new List<FalldatenDC>()));
+			CustomerGemeinnutzigeArbeitListVM = new CustomerVermittlungArbeitListVM(pDataContract.CustomerGemeinnutzigeArbeitDC ?? (pDataContract.CustomerGemeinnutzigeArbeitDC = new List<CustomerVermittlungArbeitDC>()));
 
 			CustomerGemeinnutzigeArbeitListVM.AddNewVMToListAndSelect(false);
 		}
@@ -2104,15 +2087,6 @@ namespace BeWo.ViewModel
             pDataContract.SubstitutionNeed                  = _SubstitutionNeed;
 			pDataContract.AufenthaltGueltigBis = _AufenthaltGueltigBis;
 
-			var falldaten_new_and_no_changed = _CustomerFalldatenVM.IsNew && !_CustomerFalldatenVM.IsDirty;
-
-            if (!falldaten_new_and_no_changed)
-            {
-				pDataContract.FalldatenDC = _CustomerFalldatenVM.CommitToDataContract();
-			}
-
-			if(_CustomerFalldatenVM.IsNew && !_CustomerFalldatenVM.IsDirty)
-
 			if (_MerkzeichenListe != null)
 		    {
 			    pDataContract.MerkzeichenListe = _MerkzeichenListe.ToList();
diff --git a/BeWo/ViewModel/CustomerGemeinnutzigeArbeitVM.cs b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
similarity index 94%
rename from BeWo/ViewModel/CustomerGemeinnutzigeArbeitVM.cs
rename to BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
index 18a0d280f..f1c420ace 100644
--- a/BeWo/ViewModel/CustomerGemeinnutzigeArbeitVM.cs
+++ b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace BeWo.ViewModel
 {
-    public class CustomerGemeinnutzigeArbeitVM : AbstractDCMapperVM<FalldatenDC>
+    public class CustomerVermittlungArbeitVM : AbstractDCMapperVM<CustomerVermittlungArbeitDC>
     {
         private string _EigenesAktenzeichen;
         private DateTime? _Auftragseingang;
@@ -22,7 +22,7 @@ namespace BeWo.ViewModel
         private decimal? _ZuLeistendeArbeitsstunden;
         private string _Hinweis;
         private DateTime? _Termin;
-        private FalldatenBearbeitungsstatus? _FalldatenBearbeitungsstatus;
+        private CustomerVermittlungBearbeitungsstatus? _CustomerVermittlungBearbeitungsstatus;
         private string _Auftragsruckgabe;
         private string _Verlauf;
         private decimal? _AbgeleisteteStunden;
@@ -47,12 +47,12 @@ namespace BeWo.ViewModel
         private bool _BesonderheitVermittlungAusHaft;
         private bool _BesonderheitDurchBGBWAufgesucht;
 
-        public CustomerGemeinnutzigeArbeitVM()
+        public CustomerVermittlungArbeitVM()
         {
 
         }
 
-        public CustomerGemeinnutzigeArbeitVM(FalldatenDC falldatenDC) : base(falldatenDC, falldatenDC.IsNew)
+        public CustomerVermittlungArbeitVM(CustomerVermittlungArbeitDC vermittlung) : base(vermittlung, vermittlung.Oid == null)
         {
 
         }
@@ -201,18 +201,18 @@ namespace BeWo.ViewModel
                 FirePropertyChanged(nameof(Termin));
             }
         }
-        public IEnumerable<FalldatenBearbeitungsstatus> FalldatenBearbeitungsstatusTypes => Utils.GetAllEnumValues<FalldatenBearbeitungsstatus>();
-        public FalldatenBearbeitungsstatus? FalldatenBearbeitungsstatus
+        public IEnumerable<CustomerVermittlungBearbeitungsstatus> FalldatenBearbeitungsstatusTypes => Utils.GetAllEnumValues<CustomerVermittlungBearbeitungsstatus>();
+        public CustomerVermittlungBearbeitungsstatus? CustomerVermittlungBearbeitungsstatus
         {
-            get { return _FalldatenBearbeitungsstatus; }
+            get { return _CustomerVermittlungBearbeitungsstatus; }
             set
             {
-                if (!AreDifferent(_FalldatenBearbeitungsstatus, value))
+                if (!AreDifferent(_CustomerVermittlungBearbeitungsstatus, value))
                     return;
 
-                _FalldatenBearbeitungsstatus = value;
-                StoreDirtyInformation(AreDifferent(DataContract.FalldatenBearbeitungsstatus, value), nameof(FalldatenBearbeitungsstatus));
-                FirePropertyChanged(nameof(FalldatenBearbeitungsstatus));
+                _CustomerVermittlungBearbeitungsstatus = value;
+                StoreDirtyInformation(AreDifferent(DataContract.CustomerVermittlungBearbeitungsstatus, value), nameof(CustomerVermittlungBearbeitungsstatus));
+                FirePropertyChanged(nameof(CustomerVermittlungBearbeitungsstatus));
             }
         }
         public string Auftragsruckgabe
@@ -523,7 +523,7 @@ namespace BeWo.ViewModel
             HoheDerGeldstrafe = Tagessatze * Tagessatzhohe;
         }
 
-        protected override void InitByDataContract(FalldatenDC pDataContract)
+        protected override void InitByDataContract(CustomerVermittlungArbeitDC pDataContract)
         {
             _EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
             _Auftragseingang = pDataContract.Auftragseingang;
@@ -535,7 +535,7 @@ namespace BeWo.ViewModel
             _ZuLeistendeArbeitsstunden = pDataContract.ZuLeistendeArbeitsstunden;
             _Hinweis = pDataContract.Hinweis;
             _Termin = pDataContract.Termin;
-            _FalldatenBearbeitungsstatus = pDataContract.FalldatenBearbeitungsstatus;
+            _CustomerVermittlungBearbeitungsstatus = pDataContract.CustomerVermittlungBearbeitungsstatus;
             _Auftragsruckgabe = pDataContract.Auftragsruckgabe;
             _Verlauf = pDataContract.Verlauf;
             _AbgeleisteteStunden = pDataContract.AbgeleisteteStunden;
@@ -567,7 +567,7 @@ namespace BeWo.ViewModel
             _Vermittlungsgrundlagen = vermittlungsgrundlage;
         }
 
-        protected override FalldatenDC MapToDataContract(FalldatenDC pDataContract, bool doCommit)
+        protected override CustomerVermittlungArbeitDC MapToDataContract(CustomerVermittlungArbeitDC pDataContract, bool doCommit)
         {
             pDataContract.EigenesAktenzeichen = _EigenesAktenzeichen;
             pDataContract.Auftragseingang = _Auftragseingang;
@@ -579,7 +579,7 @@ namespace BeWo.ViewModel
             pDataContract.ZuLeistendeArbeitsstunden = _ZuLeistendeArbeitsstunden;
             pDataContract.Hinweis = _Hinweis;
             pDataContract.Termin = _Termin;
-            pDataContract.FalldatenBearbeitungsstatus = _FalldatenBearbeitungsstatus;
+            pDataContract.CustomerVermittlungBearbeitungsstatus = _CustomerVermittlungBearbeitungsstatus;
             pDataContract.Auftragsruckgabe = _Auftragsruckgabe;
             pDataContract.Verlauf = _Verlauf;
             pDataContract.AbgeleisteteStunden = _AbgeleisteteStunden;
diff --git a/BeWo/ViewModel/ListViewModel/CustomerGemeinnutzigeArbeitListVM.cs b/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
similarity index 89%
rename from BeWo/ViewModel/ListViewModel/CustomerGemeinnutzigeArbeitListVM.cs
rename to BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
index abe416c51..3ed149a38 100644
--- a/BeWo/ViewModel/ListViewModel/CustomerGemeinnutzigeArbeitListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/CustomerVermittlungArbeitListVM.cs
@@ -9,12 +9,12 @@ using System.Threading.Tasks;
 
 namespace BeWo.ViewModel.ListViewModel
 {
-    public class CustomerGemeinnutzigeArbeitListVM : AbstractListVM<FalldatenDC, CustomerGemeinnutzigeArbeitVM>
+    public class CustomerVermittlungArbeitListVM : AbstractListVM<CustomerVermittlungArbeitDC, CustomerVermittlungArbeitVM>
     {
         private ObservableSortCollection<ValueListEntryDC> _Auftragsherkunfte;
         private ObservableSortCollection<ValueListEntryDC> _Vermittlungsgrundlagen;
 
-        public CustomerGemeinnutzigeArbeitListVM(IEnumerable<FalldatenDC> arbeiten) : base(arbeiten)
+        public CustomerVermittlungArbeitListVM(IEnumerable<CustomerVermittlungArbeitDC> arbeiten) : base(arbeiten)
         {
             AddVMCommand = new DelegateCommand(() => AddNewVMToListAndSelect(true), CanAddVM);
 
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 9525a2fbc..818bc8987 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -210,7 +210,6 @@
     <Compile Include="Entities\AbwesenheitsInformationPrint.cs" />
     <Compile Include="Entities\AddressHistory.cs" />
     <Compile Include="Entities\Bargeldtransaktionshistory.cs" />
-    <Compile Include="Entities\CustomerFalldaten.cs" />
     <Compile Include="Entities\ErrorMessage.cs" />
     <Compile Include="Entities\AddressRoute.cs" />
     <Compile Include="Entities\ConfirmationReceiptSignature.cs" />
@@ -769,9 +768,6 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Mappings\GkvTransferProtokoll.hbm.xml" />
-    <EmbeddedResource Include="Mappings\CustomerFalldaten.hbm.xml">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
     <EmbeddedResource Include="Mappings\TwoFactorCode.hbm.xml" />
     <Content Include="Mappings\Timesheet2Mail.hbm.xml" />
     <EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index e18e6b280..9d04f2610 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -805,7 +805,5 @@ namespace BeWo.Data.Entities
                 return name;
             }
         }
-
-		public virtual CustomerFalldaten CustomerFalldaten { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/Data/Entities/CustomerFalldaten.cs b/Data/Entities/CustomerFalldaten.cs
deleted file mode 100644
index 15231f2c1..000000000
--- a/Data/Entities/CustomerFalldaten.cs
+++ /dev/null
@@ -1,460 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-using BS.Shared;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Wohnhilfe;
-
-namespace BeWo.Data.Entities
-{
-    public class CustomerFalldaten : BeWoEntityBase
-    {
-        private string _EigenesAktenzeichen;
-        private DateTime? _Auftragseingang;
-        private ValueListEntry _Auftragsherkunft;
-        private ValueListEntry _Vermittlungsgrundlage;
-        private decimal? _Tagessatze;
-        private decimal? _Tagessatzhohe;
-        private decimal? _HoheDerGeldstrafe;
-        private decimal? _ZuLeistendeArbeitsstunden;
-        private string _Hinweis;
-        private DateTime? _Termin;
-        private FalldatenBearbeitungsstatus? _FalldatenBearbeitungsstatus;
-        private string _Auftragsruckgabe;
-        private string _Verlauf;
-        private decimal? _AbgeleisteteStunden;
-        private decimal? _ErsparteHafttage;
-        private decimal? _GeleisteteRatenzahlung;
-        private string _Bemerkung;
-        private decimal? _GeleisteteEinmalzahlung;
-        private bool _GrundArbeitsunfahig;
-        private bool _GrundSuchtproblem;
-        private bool _GrundPsychischeProbleme;
-        private bool _GrundKeineMotivation;
-        private bool _GrundInHaft;
-        private bool _GrundUnbekannt;
-        private bool _GrundKeinKontakt;
-        private bool _GrundNichtAngetreten;
-        private bool _GrundAbbruchDerTatigkeit;
-        private bool _GrundWiderruf;
-        private bool _Grund459StPO;
-        private bool _GrundAusbleibenDerZahlung;
-        private bool _BesonderheitMehrfacheBeauftragung;
-        private bool _BesonderheitMehrfacheVermittlung;
-        private bool _BesonderheitVermittlungAusHaft;
-        private bool _BesonderheitDurchBGBWAufgesucht;
-
-        public CustomerFalldaten()
-        {
-            _Tid = TableID.CustomerFalldaten;
-        }
-
-        public virtual string EigenesAktenzeichen
-        {
-            get { return _EigenesAktenzeichen; }
-            set
-            {
-                if (!AreDifferent(_EigenesAktenzeichen, value))
-                    return;
-
-                _EigenesAktenzeichen = value;
-            }
-        }
-
-        public virtual DateTime? Auftragseingang
-        {
-            get { return _Auftragseingang; }
-            set
-            {
-                if (!AreDifferent(_Auftragseingang, value))
-                    return;
-
-                _Auftragseingang = value;
-            }
-        }
-
-        public virtual ValueListEntry Auftragsherkunft
-        {
-            get { return _Auftragsherkunft; }
-            set
-            {
-                if (!AreDifferent(_Auftragsherkunft, value))
-                    return;
-
-                _Auftragsherkunft = value;
-            }
-        }
-
-        public virtual ValueListEntry Vermittlungsgrundlage
-        {
-            get { return _Vermittlungsgrundlage; }
-            set
-            {
-                if (!AreDifferent(_Vermittlungsgrundlage, value))
-                    return;
-
-                _Vermittlungsgrundlage = value;
-            }
-        }
-
-        public virtual decimal? Tagessatze
-        {
-            get { return _Tagessatze; }
-            set
-            {
-                if (!AreDifferent(_Tagessatze, value))
-                    return;
-
-                _Tagessatze = value;
-            }
-        }
-
-        public virtual decimal? Tagessatzhohe
-        {
-            get { return _Tagessatzhohe; }
-            set
-            {
-                if (!AreDifferent(_Tagessatzhohe, value))
-                    return;
-
-                _Tagessatzhohe = value;
-            }
-        }
-
-        public virtual decimal? HoheDerGeldstrafe
-        {
-            get { return _HoheDerGeldstrafe; }
-            set
-            {
-                if (!AreDifferent(_HoheDerGeldstrafe, value))
-                    return;
-
-                _HoheDerGeldstrafe = value;
-            }
-        }
-
-        public virtual decimal? ZuLeistendeArbeitsstunden
-        {
-            get { return _ZuLeistendeArbeitsstunden; }
-            set
-            {
-                if (!AreDifferent(_ZuLeistendeArbeitsstunden, value))
-                    return;
-
-                _ZuLeistendeArbeitsstunden = value;
-            }
-        }
-
-        public virtual string Hinweis
-        {
-            get { return _Hinweis; }
-            set
-            {
-                if (!AreDifferent(_Hinweis, value))
-                    return;
-
-                _Hinweis = value;
-            }
-        }
-
-        public virtual DateTime? Termin
-        {
-            get { return _Termin; }
-            set
-            {
-                if (!AreDifferent(_Termin, value))
-                    return;
-
-                _Termin = value;
-            }
-        }
-
-        public virtual FalldatenBearbeitungsstatus? FalldatenBearbeitungsstatus
-        {
-            get { return _FalldatenBearbeitungsstatus; }
-            set
-            {
-                if (!AreDifferent(_FalldatenBearbeitungsstatus, value))
-                    return;
-
-                _FalldatenBearbeitungsstatus = value;
-            }
-        }
-
-        public virtual string Auftragsruckgabe
-        {
-            get { return _Auftragsruckgabe; }
-            set
-            {
-                if (!AreDifferent(_Auftragsruckgabe, value))
-                    return;
-
-                _Auftragsruckgabe = value;
-            }
-        }
-
-        public virtual string Verlauf
-        {
-            get { return _Verlauf; }
-            set
-            {
-                if (!AreDifferent(_Verlauf, value))
-                    return;
-
-                _Verlauf = value;
-            }
-        }
-
-        public virtual decimal? AbgeleisteteStunden
-        {
-            get { return _AbgeleisteteStunden; }
-            set
-            {
-                if (!AreDifferent(_AbgeleisteteStunden, value))
-                    return;
-
-                _AbgeleisteteStunden = value;
-            }
-        }
-
-        public virtual decimal? ErsparteHafttage
-        {
-            get { return _ErsparteHafttage; }
-            set
-            {
-                if (!AreDifferent(_ErsparteHafttage, value))
-                    return;
-
-                _ErsparteHafttage = value;
-            }
-        }
-
-        public virtual decimal? GeleisteteRatenzahlung
-        {
-            get { return _GeleisteteRatenzahlung; }
-            set
-            {
-                if (!AreDifferent(_GeleisteteRatenzahlung, value))
-                    return;
-
-                _GeleisteteRatenzahlung = value;
-            }
-        }
-
-        public virtual string Bemerkung
-        {
-            get { return _Bemerkung; }
-            set
-            {
-                if (!AreDifferent(_Bemerkung, value))
-                    return;
-
-                _Bemerkung = value;
-            }
-        }
-
-        public virtual decimal? GeleisteteEinmalzahlung
-        {
-            get { return _GeleisteteEinmalzahlung; }
-            set
-            {
-                if (!AreDifferent(_GeleisteteEinmalzahlung, value))
-                    return;
-
-                _GeleisteteEinmalzahlung = value;
-            }
-        }
-
-        public virtual bool GrundArbeitsunfahig
-        {
-            get { return _GrundArbeitsunfahig; }
-            set
-            {
-                if (!AreDifferent(_GrundArbeitsunfahig, value))
-                    return;
-
-                _GrundArbeitsunfahig = value;
-            }
-        }
-
-        public virtual bool GrundSuchtproblem
-        {
-            get { return _GrundSuchtproblem; }
-            set
-            {
-                if (!AreDifferent(_GrundSuchtproblem, value))
-                    return;
-
-                _GrundSuchtproblem = value;
-            }
-        }
-
-        public virtual bool GrundPsychischeProbleme
-        {
-            get { return _GrundPsychischeProbleme; }
-            set
-            {
-                if (!AreDifferent(_GrundPsychischeProbleme, value))
-                    return;
-
-                _GrundPsychischeProbleme = value;
-            }
-        }
-
-        public virtual bool GrundKeineMotivation
-        {
-            get { return _GrundKeineMotivation; }
-            set
-            {
-                if (!AreDifferent(_GrundKeineMotivation, value))
-                    return;
-
-                _GrundKeineMotivation = value;
-            }
-        }
-
-        public virtual bool GrundInHaft
-        {
-            get { return _GrundInHaft; }
-            set
-            {
-                if (!AreDifferent(_GrundInHaft, value))
-                    return;
-
-                _GrundInHaft = value;
-            }
-        }
-
-        public virtual bool GrundUnbekannt
-        {
-            get { return _GrundUnbekannt; }
-            set
-            {
-                if (!AreDifferent(_GrundUnbekannt, value))
-                    return;
-
-                _GrundUnbekannt = value;
-            }
-        }
-
-        public virtual bool GrundKeinKontakt
-        {
-            get { return _GrundKeinKontakt; }
-            set
-            {
-                if (!AreDifferent(_GrundKeinKontakt, value))
-                    return;
-
-                _GrundKeinKontakt = value;
-            }
-        }
-
-        public virtual bool GrundNichtAngetreten
-        {
-            get { return _GrundNichtAngetreten; }
-            set
-            {
-                if (!AreDifferent(_GrundNichtAngetreten, value))
-                    return;
-
-                _GrundNichtAngetreten = value;
-            }
-        }
-
-        public virtual bool GrundAbbruchDerTatigkeit
-        {
-            get { return _GrundAbbruchDerTatigkeit; }
-            set
-            {
-                if (!AreDifferent(_GrundAbbruchDerTatigkeit, value))
-                    return;
-
-                _GrundAbbruchDerTatigkeit = value;
-            }
-        }
-
-        public virtual bool GrundWiderruf
-        {
-            get { return _GrundWiderruf; }
-            set
-            {
-                if (!AreDifferent(_GrundWiderruf, value))
-                    return;
-
-                _GrundWiderruf = value;
-            }
-        }
-
-        public virtual bool Grund459StPO
-        {
-            get { return _Grund459StPO; }
-            set
-            {
-                if (!AreDifferent(_Grund459StPO, value))
-                    return;
-
-                _Grund459StPO = value;
-            }
-        }
-
-        public virtual bool GrundAusbleibenDerZahlung
-        {
-            get { return _GrundAusbleibenDerZahlung; }
-            set
-            {
-                if (!AreDifferent(_GrundAusbleibenDerZahlung, value))
-                    return;
-
-                _GrundAusbleibenDerZahlung = value;
-            }
-        }
-
-        public virtual bool BesonderheitMehrfacheBeauftragung
-        {
-            get { return _BesonderheitMehrfacheBeauftragung; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitMehrfacheBeauftragung, value))
-                    return;
-
-                _BesonderheitMehrfacheBeauftragung = value;
-            }
-        }
-
-        public virtual bool BesonderheitMehrfacheVermittlung
-        {
-            get { return _BesonderheitMehrfacheVermittlung; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitMehrfacheVermittlung, value))
-                    return;
-
-                _BesonderheitMehrfacheVermittlung = value;
-            }
-        }
-
-        public virtual bool BesonderheitVermittlungAusHaft
-        {
-            get { return _BesonderheitVermittlungAusHaft; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitVermittlungAusHaft, value))
-                    return;
-
-                _BesonderheitVermittlungAusHaft = value;
-            }
-        }
-
-        public virtual bool BesonderheitDurchBGBWAufgesucht
-        {
-            get { return _BesonderheitDurchBGBWAufgesucht; }
-            set
-            {
-                if (!AreDifferent(_BesonderheitDurchBGBWAufgesucht, value))
-                    return;
-
-                _BesonderheitDurchBGBWAufgesucht = value;
-            }
-        }
-    }
-}
diff --git a/Data/Mappings/Customer.hbm.xml b/Data/Mappings/Customer.hbm.xml
index c391e80ce..b947ce0ed 100644
--- a/Data/Mappings/Customer.hbm.xml
+++ b/Data/Mappings/Customer.hbm.xml
@@ -136,6 +136,5 @@
       <key column="CustomerOid" />
       <one-to-many class="BeWo.Data.Entities.Arbeitszeit, BeWo.Data" />
     </bag>
-	  <many-to-one name="CustomerFalldaten" column="CustomerFalldatenOid" class="BeWo.Data.Entities.CustomerFalldaten,BeWo.Data" cascade="all-delete-orphan"/>
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/Data/Mappings/CustomerFalldaten.hbm.xml b/Data/Mappings/CustomerFalldaten.hbm.xml
deleted file mode 100644
index 1e6eafdb3..000000000
--- a/Data/Mappings/CustomerFalldaten.hbm.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-
-<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-	<class name="BeWo.Data.Entities.CustomerFalldaten,BeWo.Data" table="CustomerFalldaten">
-		<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
-			<generator class="identity" />
-		</id>
-		<version type="Int64" column="Version" name="Version" />
-		<property name="InsTs"/>
-		<property name="InsUser"/>
-		<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
-		<property name="UdpUser"/>
-		<property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
-		<property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared"  />
-		<property name="Notice"/>
-		<property name="EigenesAktenzeichen"/>
-		<property name="Auftragseingang"/>
-		<many-to-one name="Auftragsherkunft" column="AuftragsherkunftValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry, BeWo.Data" cascade="none" />
-		<many-to-one name="Vermittlungsgrundlage" column="VermittlungsgrundlageValueListEntryOid" class="BeWo.Data.Entities.ValueListEntry, BeWo.Data" cascade="none" />
-		<property name="Tagessatze"/>
-		<property name="Tagessatzhohe"/>
-		<property name="HoheDerGeldstrafe"/>
-		<property name="ZuLeistendeArbeitsstunden"/>
-		<property name="Hinweis"/>
-		<property name="Termin"/>
-		<property column="FalldatenBearbeitungsstatus" type="BS.Shared.DataContracts.FalldatenBearbeitungsstatus, BS.Shared" name="FalldatenBearbeitungsstatus" />
-		<property name="Auftragsruckgabe"/>
-		<property name="Verlauf"/>
-		<property name="AbgeleisteteStunden"/>
-		<property name="ErsparteHafttage"/>
-		<property name="GeleisteteRatenzahlung"/>
-		<property name="Bemerkung"/>
-		<property name="GeleisteteEinmalzahlung"/>
-		<property name="GrundArbeitsunfahig"/>
-		<property name="GrundSuchtproblem"/>
-		<property name="GrundPsychischeProbleme"/>
-		<property name="GrundKeineMotivation"/>
-		<property name="GrundInHaft"/>
-		<property name="GrundUnbekannt"/>
-		<property name="GrundKeinKontakt"/>
-		<property name="GrundNichtAngetreten"/>
-		<property name="GrundAbbruchDerTatigkeit"/>
-		<property name="GrundWiderruf"/>
-		<property name="Grund459StPO"/>
-		<property name="GrundAusbleibenDerZahlung"/>
-		<property name="BesonderheitMehrfacheBeauftragung"/>
-		<property name="BesonderheitMehrfacheVermittlung"/>
-		<property name="BesonderheitVermittlungAusHaft"/>
-		<property name="BesonderheitDurchBGBWAufgesucht"/>
-	</class>
-</hibernate-mapping>
diff --git a/Model/Changes_2024_09_23 CustomerFalldatenDrop.txt b/Model/Changes_2024_09_23 CustomerFalldatenDrop.txt
new file mode 100644
index 000000000..be4e6cc78
--- /dev/null
+++ b/Model/Changes_2024_09_23 CustomerFalldatenDrop.txt	
@@ -0,0 +1,6 @@
+ALTER TABLE `customer` 
+DROP FOREIGN KEY `FK_CUSTOMERFALLDATEN`;
+ALTER TABLE `customer` 
+DROP COLUMN `CustomerFalldatenOid`,
+DROP INDEX `FK_CUSTOMERFALLDATEN_idx` ;
+;
\ No newline at end of file
diff --git a/Service/DCEntityMapper/CustomerDC_Customer.cs b/Service/DCEntityMapper/CustomerDC_Customer.cs
index 39f6e44c8..7e9dd528c 100644
--- a/Service/DCEntityMapper/CustomerDC_Customer.cs
+++ b/Service/DCEntityMapper/CustomerDC_Customer.cs
@@ -123,11 +123,6 @@ namespace BeWo.Service.DCEntityMapper
 				pDataContract.ICD10DiagnosisCodes = pEntity.Diagnosis2CustomerList.Select(e => e.ICD10DiagnosisCode).ToList();
 			}
             
-			if(pEntity.CustomerFalldaten != null)
-            {
-				pDataContract.FalldatenDC = MapperFactory.FalldatenDC_CustomerFalldaten.MapToNewDC(pEntity.CustomerFalldaten);
-            }
-            
             IList<VarFieldDef> defs = DAOFactory.SearchDAO.GetVarFieldDefs(TableID.Customer);
 			pDataContract.CustomerVarFields = MapperFactory.VarFieldDC_VarField.VarFieldMapToDCs(defs, pEntity.VarFieldValueList);
 
@@ -169,23 +164,6 @@ namespace BeWo.Service.DCEntityMapper
 
 			MapperFactory.MedikamentenverordnungslisteDC_Medikamentenverordnungsliste.MergeWithEntitys(pDataContract.Medikamentenverordnungslisten, pEntity.Medikamentenverordnungslisten);
 
-			if(pDataContract.FalldatenDC is object)
-            {
-				if(pEntity.CustomerFalldaten is null)
-                {
-					pEntity.CustomerFalldaten = MapperFactory.FalldatenDC_CustomerFalldaten.MapToNewEntity(pDataContract.FalldatenDC);
-                }
-                else
-                {
-					MapperFactory.FalldatenDC_CustomerFalldaten.MergeWithEntity(pDataContract.FalldatenDC, pEntity.CustomerFalldaten);
-				}
-			}
-            else
-            {
-				pEntity.CustomerFalldaten = null;
-            }
-			
-
 			//pEntity.Jugendamt = pDataContract.Jugendamt != null ? DAOFactory.GenericDAO.LoadByID<Organisation>(pDataContract.Jugendamt.OrganisationOid) : null;
 
 			//pEntity.Ansprechpartner = pDataContract.Ansprechpartner != null ? DAOFactory.GenericDAO.LoadByID<Person>(pDataContract.Ansprechpartner.PersonOid) : null;
diff --git a/Service/DCEntityMapper/FalldatenDC_CustomerFalldaten.cs b/Service/DCEntityMapper/FalldatenDC_CustomerFalldaten.cs
deleted file mode 100644
index 84430c92b..000000000
--- a/Service/DCEntityMapper/FalldatenDC_CustomerFalldaten.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-using BeWo.Data.Access;
-using BeWo.Data.Entities;
-
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Wohnhilfe;
-
-namespace BeWo.Service.DCEntityMapper
-{
-    public class FalldatenDC_CustomerFalldaten : AbstractIDCEntityMapper<CustomerFalldaten, FalldatenDC>
-    {
-        public override FalldatenDC MergeWithDC(CustomerFalldaten pEntity, FalldatenDC pDataContract)
-        {
-            pDataContract.EigenesAktenzeichen = pEntity.EigenesAktenzeichen;
-            pDataContract.Auftragseingang = pEntity.Auftragseingang;
-            pDataContract.Tagessatze = pEntity.Tagessatze;
-            pDataContract.Tagessatzhohe = pEntity.Tagessatzhohe;
-            pDataContract.HoheDerGeldstrafe = pEntity.HoheDerGeldstrafe;
-            pDataContract.ZuLeistendeArbeitsstunden = pEntity.ZuLeistendeArbeitsstunden;
-            pDataContract.Hinweis = pEntity.Hinweis;
-            pDataContract.Termin = pEntity.Termin;
-            pDataContract.FalldatenBearbeitungsstatus = pEntity.FalldatenBearbeitungsstatus;
-            pDataContract.Auftragsruckgabe = pEntity.Auftragsruckgabe;
-            pDataContract.Verlauf = pEntity.Verlauf;
-            pDataContract.AbgeleisteteStunden = pEntity.AbgeleisteteStunden;
-            pDataContract.ErsparteHafttage = pEntity.ErsparteHafttage;
-            pDataContract.GeleisteteRatenzahlung = pEntity.GeleisteteRatenzahlung;
-            pDataContract.Bemerkung = pEntity.Bemerkung;
-            pDataContract.GeleisteteEinmalzahlung = pEntity.GeleisteteEinmalzahlung;
-            pDataContract.GrundArbeitsunfahig = pEntity.GrundArbeitsunfahig;
-            pDataContract.GrundSuchtproblem = pEntity.GrundSuchtproblem;
-            pDataContract.GrundPsychischeProbleme = pEntity.GrundPsychischeProbleme;
-            pDataContract.GrundKeineMotivation = pEntity.GrundKeineMotivation;
-            pDataContract.GrundInHaft = pEntity.GrundInHaft;
-            pDataContract.GrundUnbekannt = pEntity.GrundUnbekannt;
-            pDataContract.GrundKeinKontakt = pEntity.GrundKeinKontakt;
-            pDataContract.GrundNichtAngetreten = pEntity.GrundNichtAngetreten;
-            pDataContract.GrundAbbruchDerTatigkeit = pEntity.GrundAbbruchDerTatigkeit;
-            pDataContract.GrundWiderruf = pEntity.GrundWiderruf;
-            pDataContract.Grund459StPO = pEntity.Grund459StPO;
-            pDataContract.GrundAusbleibenDerZahlung = pEntity.GrundAusbleibenDerZahlung;
-            pDataContract.BesonderheitMehrfacheBeauftragung = pEntity.BesonderheitMehrfacheBeauftragung;
-            pDataContract.BesonderheitMehrfacheVermittlung = pEntity.BesonderheitMehrfacheVermittlung;
-            pDataContract.BesonderheitVermittlungAusHaft = pEntity.BesonderheitVermittlungAusHaft;
-            pDataContract.BesonderheitDurchBGBWAufgesucht = pEntity.BesonderheitDurchBGBWAufgesucht;
-
-            if (pEntity.Auftragsherkunft != null)
-            {
-                pDataContract.Auftragsherkunft = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Auftragsherkunft);
-            }
-            if (pEntity.Vermittlungsgrundlage != null)
-            {
-                pDataContract.Vermittlungsgrundlage = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Vermittlungsgrundlage);
-            }
-
-
-            return pDataContract;
-        }
-
-        public override CustomerFalldaten MergeWithEntity(FalldatenDC pDataContract, CustomerFalldaten pEntity)
-        {
-            pEntity.EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
-            pEntity.Auftragseingang = pDataContract.Auftragseingang;
-            pEntity.Tagessatze = pDataContract.Tagessatze;
-            pEntity.Tagessatzhohe = pDataContract.Tagessatzhohe;
-            pEntity.HoheDerGeldstrafe = pDataContract.HoheDerGeldstrafe;
-            pEntity.ZuLeistendeArbeitsstunden = pDataContract.ZuLeistendeArbeitsstunden;
-            pEntity.Hinweis = pDataContract.Hinweis;
-            pEntity.Termin = pDataContract.Termin;
-            pEntity.FalldatenBearbeitungsstatus = pDataContract.FalldatenBearbeitungsstatus;
-            pEntity.Auftragsruckgabe = pDataContract.Auftragsruckgabe;
-            pEntity.Verlauf = pDataContract.Verlauf;
-            pEntity.AbgeleisteteStunden = pDataContract.AbgeleisteteStunden;
-            pEntity.ErsparteHafttage = pDataContract.ErsparteHafttage;
-            pEntity.GeleisteteRatenzahlung = pDataContract.GeleisteteRatenzahlung;
-            pEntity.Bemerkung = pDataContract.Bemerkung;
-            pEntity.GeleisteteEinmalzahlung = pDataContract.GeleisteteEinmalzahlung;
-            pEntity.GrundArbeitsunfahig = pDataContract.GrundArbeitsunfahig;
-            pEntity.GrundSuchtproblem = pDataContract.GrundSuchtproblem;
-            pEntity.GrundPsychischeProbleme = pDataContract.GrundPsychischeProbleme;
-            pEntity.GrundKeineMotivation = pDataContract.GrundKeineMotivation;
-            pEntity.GrundInHaft = pDataContract.GrundInHaft;
-            pEntity.GrundUnbekannt = pDataContract.GrundUnbekannt;
-            pEntity.GrundKeinKontakt = pDataContract.GrundKeinKontakt;
-            pEntity.GrundNichtAngetreten = pDataContract.GrundNichtAngetreten;
-            pEntity.GrundAbbruchDerTatigkeit = pDataContract.GrundAbbruchDerTatigkeit;
-            pEntity.GrundWiderruf = pDataContract.GrundWiderruf;
-            pEntity.Grund459StPO = pDataContract.Grund459StPO;
-            pEntity.GrundAusbleibenDerZahlung = pDataContract.GrundAusbleibenDerZahlung;
-            pEntity.BesonderheitMehrfacheBeauftragung = pDataContract.BesonderheitMehrfacheBeauftragung;
-            pEntity.BesonderheitMehrfacheVermittlung = pDataContract.BesonderheitMehrfacheVermittlung;
-            pEntity.BesonderheitVermittlungAusHaft = pDataContract.BesonderheitVermittlungAusHaft;
-            pEntity.BesonderheitDurchBGBWAufgesucht = pDataContract.BesonderheitDurchBGBWAufgesucht;
-
-            if (pDataContract.Auftragsherkunft == null)
-            {
-                pEntity.Auftragsherkunft = null;
-            }
-            else if (pEntity.Auftragsherkunft == null || pEntity.Auftragsherkunft.Oid != pDataContract.Auftragsherkunft.ValueListEntryOid)
-            {
-                pEntity.Auftragsherkunft = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Auftragsherkunft.ValueListEntryOid.Value);
-            }
-
-            if (pDataContract.Vermittlungsgrundlage == null)
-            {
-                pEntity.Vermittlungsgrundlage = null;
-            }
-            else if (pEntity.Vermittlungsgrundlage == null || pEntity.Vermittlungsgrundlage.Oid != pDataContract.Vermittlungsgrundlage.ValueListEntryOid)
-            {
-                pEntity.Vermittlungsgrundlage = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Vermittlungsgrundlage.ValueListEntryOid.Value);
-            }
-
-            return pEntity;
-        }
-
-        protected override bool AreDCAndEntityEqual(FalldatenDC pDC, CustomerFalldaten pEntity)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}
diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs
index c8855638e..2e3dcb1a6 100644
--- a/Service/DCEntityMapper/MapperFactory.cs
+++ b/Service/DCEntityMapper/MapperFactory.cs
@@ -302,8 +302,6 @@ namespace BeWo.Service.DCEntityMapper
 
         private static WohneinheitBelegungDC_WohneinheitBelegung _WohneinheitBelegungDC_WohneinheitBelegung;
 
-        private static FalldatenDC_CustomerFalldaten _FalldatenDC_CustomerFalldaten;
-
         private static ImageDC_Image _ImageDC_Image;
 
         public static MedRecordDC_MedRecord MedRecordDC_MedRecord =>
@@ -763,9 +761,6 @@ namespace BeWo.Service.DCEntityMapper
         public static WohneinheitBelegungDC_WohneinheitBelegung WohneinheitBelegungDC_WohneinheitBelegung =>
             _WohneinheitBelegungDC_WohneinheitBelegung ?? (_WohneinheitBelegungDC_WohneinheitBelegung = new WohneinheitBelegungDC_WohneinheitBelegung());
 
-        public static FalldatenDC_CustomerFalldaten FalldatenDC_CustomerFalldaten =>
-            _FalldatenDC_CustomerFalldaten ?? (_FalldatenDC_CustomerFalldaten = new FalldatenDC_CustomerFalldaten());
-
         public static ImageDC_Image ImageDC_Image =>
             _ImageDC_Image ?? (_ImageDC_Image = new ImageDC_Image());
     }
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 5d82f25a8..d77c5ef1c 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -228,7 +228,6 @@
     <Compile Include="DCEntityMapper\BargeldtransaktionshistoryDC_Bargeldtransaktionshistory.cs" />
     <Compile Include="DCEntityMapper\ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs" />
     <Compile Include="DCEntityMapper\ImageDC_Image.cs" />
-    <Compile Include="DCEntityMapper\FalldatenDC_CustomerFalldaten.cs" />
     <Compile Include="DCEntityMapper\DienstvertretungDC_Dienstvertretung.cs" />
     <Compile Include="DCEntityMapper\DokumentvorlageDC_Dokumentvorlage.cs" />
     <Compile Include="DCEntityMapper\AdditionalServiceNoticeDC_AdditionalServiceNotice.cs" />
diff --git a/Shared/Core/EnumTranslations.cs b/Shared/Core/EnumTranslations.cs
index 23633bc47..1a033df48 100644
--- a/Shared/Core/EnumTranslations.cs
+++ b/Shared/Core/EnumTranslations.cs
@@ -890,9 +890,9 @@ namespace BS.Shared.Core
 
             var nicht_abgefragt = "";// "nicht abgefragt";
 
-            dict.Add(FalldatenBearbeitungsstatus.NoProgress, "Keine Bearbeitung");
-            dict.Add(FalldatenBearbeitungsstatus.InProgress, "In Bearbeitung");
-            dict.Add(FalldatenBearbeitungsstatus.Finished, "Fertig");
+            dict.Add(CustomerVermittlungBearbeitungsstatus.NoProgress, "Keine Bearbeitung");
+            dict.Add(CustomerVermittlungBearbeitungsstatus.InProgress, "In Bearbeitung");
+            dict.Add(CustomerVermittlungBearbeitungsstatus.Finished, "Fertig");
 
             dict.Add(Verbandszugehorigkeit.Arbeiterwohlfahrt, "Arbeiterwohlfahrt");
             dict.Add(Verbandszugehorigkeit.DeutscherCaritasverband, "Deutscher Caritasverband");
diff --git a/Shared/DataContracts/CustomerDC.cs b/Shared/DataContracts/CustomerDC.cs
index 196a5e0ca..148a2329b 100644
--- a/Shared/DataContracts/CustomerDC.cs
+++ b/Shared/DataContracts/CustomerDC.cs
@@ -82,8 +82,7 @@ namespace BS.Shared.DataContracts
         [DataMember] public string HealthInsurance { get; set; }
         [DataMember] public string InsuranceNumber { get; set; }
         [DataMember] public string VersichertenStatus { get; set; }
-        [DataMember] public FalldatenDC FalldatenDC { get; set; }
         [DataMember] public List<CustomerWohnhilfeDC> CustomerWohnhilfeDC { get; set; }       
-        [DataMember] public List<FalldatenDC> CustomerGemeinnutzigeArbeitDC { get; set; }       
+        [DataMember] public List<CustomerVermittlungArbeitDC> CustomerGemeinnutzigeArbeitDC { get; set; }       
     }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/CustomerGemeinnutzigeArbeitDC.cs b/Shared/DataContracts/CustomerGemeinnutzigeArbeitDC.cs
deleted file mode 100644
index 3df18154b..000000000
--- a/Shared/DataContracts/CustomerGemeinnutzigeArbeitDC.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BS.Shared.DataContracts
-{
-    public class CustomerGemeinnutzigeArbeitDC : BeWoDataContract
-    {
-    }
-}
diff --git a/Shared/DataContracts/CustomerVermittlungArbeitDC.cs b/Shared/DataContracts/CustomerVermittlungArbeitDC.cs
new file mode 100644
index 000000000..1674830bd
--- /dev/null
+++ b/Shared/DataContracts/CustomerVermittlungArbeitDC.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Runtime.Serialization;
+
+namespace BS.Shared.DataContracts
+{
+	[DataContract]
+	public class CustomerVermittlungArbeitDC : BeWoDataContract
+	{
+		[DataMember] public string EigenesAktenzeichen { get; set; }
+		[DataMember] public DateTime? Auftragseingang { get; set; }
+		[DataMember] public ValueListEntryDC Auftragsherkunft { get; set; }
+		[DataMember] public ValueListEntryDC Vermittlungsgrundlage { get; set; }
+		[DataMember] public decimal? Tagessatze { get; set; }
+		[DataMember] public decimal? Tagessatzhohe { get; set; }
+		[DataMember] public decimal? HoheDerGeldstrafe { get; set; }
+		[DataMember] public decimal? ZuLeistendeArbeitsstunden { get; set; }
+		[DataMember] public string Hinweis { get; set; }
+		[DataMember] public DateTime? Termin { get; set; }
+		[DataMember] public CustomerVermittlungBearbeitungsstatus? CustomerVermittlungBearbeitungsstatus { get; set; }
+		[DataMember] public string Auftragsruckgabe { get; set; }
+		[DataMember] public string Verlauf { get; set; }
+		[DataMember] public decimal? AbgeleisteteStunden { get; set; }
+		[DataMember] public decimal? ErsparteHafttage { get; set; }
+		[DataMember] public decimal? GeleisteteRatenzahlung { get; set; }
+		[DataMember] public string Bemerkung { get; set; }
+		[DataMember] public decimal? GeleisteteEinmalzahlung { get; set; }
+		[DataMember] public bool GrundArbeitsunfahig { get; set; }
+		[DataMember] public bool GrundSuchtproblem { get; set; }
+		[DataMember] public bool GrundPsychischeProbleme { get; set; }
+		[DataMember] public bool GrundKeineMotivation { get; set; }
+		[DataMember] public bool GrundInHaft { get; set; }
+		[DataMember] public bool GrundUnbekannt { get; set; }
+		[DataMember] public bool GrundKeinKontakt { get; set; }
+		[DataMember] public bool GrundNichtAngetreten { get; set; }
+		[DataMember] public bool GrundAbbruchDerTatigkeit { get; set; }
+		[DataMember] public bool GrundWiderruf { get; set; }
+		[DataMember] public bool Grund459StPO { get; set; }
+		[DataMember] public bool GrundAusbleibenDerZahlung { get; set; }
+		[DataMember] public bool BesonderheitMehrfacheBeauftragung { get; set; }
+		[DataMember] public bool BesonderheitMehrfacheVermittlung { get; set; }
+		[DataMember] public bool BesonderheitVermittlungAusHaft { get; set; }
+		[DataMember] public bool BesonderheitDurchBGBWAufgesucht { get; set; }
+	}
+
+	public enum CustomerVermittlungBearbeitungsstatus
+	{
+		NoProgress,
+		InProgress,
+		Finished
+	}
+}
diff --git a/Shared/FalldatenDC.cs b/Shared/FalldatenDC.cs
deleted file mode 100644
index 7f6ed89cb..000000000
--- a/Shared/FalldatenDC.cs
+++ /dev/null
@@ -1,69 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.Serialization;
-
-using BS.Shared.Core;
-using BS.Shared.DataContracts.Compact;
-
-namespace BS.Shared.DataContracts
-{
-    public enum FalldatenBearbeitungsstatus
-    {
-        NoProgress,
-        InProgress,
-        Finished
-    }
-
-    [DataContract]
-    public class FalldatenDC : IDataContract
-    {
-        public bool IsNew { get; set; }
-
-        public FalldatenDC()
-        {
-
-        }
-
-        public FalldatenDC(bool isNew)
-        {
-            IsNew = isNew;
-        }
-
-        [DataMember] public string EigenesAktenzeichen { get; set; }
-        [DataMember] public DateTime? Auftragseingang { get; set; }
-        [DataMember] public ValueListEntryDC Auftragsherkunft { get; set; }
-        [DataMember] public ValueListEntryDC Vermittlungsgrundlage { get; set; }
-        [DataMember] public decimal? Tagessatze { get; set; }
-        [DataMember] public decimal? Tagessatzhohe { get; set; }
-        [DataMember] public decimal? HoheDerGeldstrafe { get; set; }
-        [DataMember] public decimal? ZuLeistendeArbeitsstunden { get; set; }
-        [DataMember] public string Hinweis { get; set; }
-        [DataMember] public DateTime? Termin { get; set; }
-        [DataMember] public FalldatenBearbeitungsstatus? FalldatenBearbeitungsstatus { get; set; }
-        [DataMember] public string Auftragsruckgabe { get; set; }
-        [DataMember] public string Verlauf { get; set; }
-        [DataMember] public decimal? AbgeleisteteStunden { get; set; }
-        [DataMember] public decimal? ErsparteHafttage { get; set; }
-        [DataMember] public decimal? GeleisteteRatenzahlung { get; set; }
-        [DataMember] public string Bemerkung { get; set; }
-        [DataMember] public decimal? GeleisteteEinmalzahlung { get; set; }
-
-        [DataMember] public bool GrundArbeitsunfahig { get; set; }
-        [DataMember] public bool GrundSuchtproblem { get; set; }
-        [DataMember] public bool GrundPsychischeProbleme { get; set; }
-        [DataMember] public bool GrundKeineMotivation { get; set; }
-        [DataMember] public bool GrundInHaft { get; set; }
-        [DataMember] public bool GrundUnbekannt { get; set; }
-        [DataMember] public bool GrundKeinKontakt { get; set; }
-        [DataMember] public bool GrundNichtAngetreten { get; set; }
-        [DataMember] public bool GrundAbbruchDerTatigkeit { get; set; }
-        [DataMember] public bool GrundWiderruf { get; set; }
-        [DataMember] public bool Grund459StPO { get; set; }
-        [DataMember] public bool GrundAusbleibenDerZahlung { get; set; }
-
-        [DataMember] public bool BesonderheitMehrfacheBeauftragung { get; set; }
-        [DataMember] public bool BesonderheitMehrfacheVermittlung { get; set; }
-        [DataMember] public bool BesonderheitVermittlungAusHaft { get; set; }
-        [DataMember] public bool BesonderheitDurchBGBWAufgesucht { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 7c000e8cd..05419ff42 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -170,14 +170,13 @@
     <Compile Include="DataContracts\AdditionalServiceGroupOfPeopleRelationDC.cs" />
     <Compile Include="DataContracts\AdditionalServiceRegionDC.cs" />
     <Compile Include="DataContracts\AddressRouteDC.cs" />
-    <Compile Include="DataContracts\CustomerGemeinnutzigeArbeitDC.cs" />
+    <Compile Include="DataContracts\CustomerVermittlungArbeitDC.cs" />
     <Compile Include="DataContracts\Wohnhilfe\CustomerWohnhilfeDC.cs" />
     <Compile Include="DataContracts\ImageDC.cs" />
     <Compile Include="DataContracts\Wohnhilfe\CustomerWohnhilfeBereichBundDC.cs" />
     <Compile Include="DataContracts\Wohnhilfe\CustomerWohnhilfeBereichEinkommenUndArbeitDC.cs" />
     <Compile Include="DataContracts\Wohnhilfe\CustomerWohnhilfeBereichSozialeKontakteDC.cs" />
     <Compile Include="DataContracts\Wohnhilfe\CustomerWohnhilfeBereichSozialstrukturDC.cs" />
-    <Compile Include="FalldatenDC.cs" />
     <Compile Include="DataContracts\BeWoDataContract.cs" />
     <Compile Include="DataContracts\HilfeplanImportDC.cs" />
     <Compile Include="DataContracts\HilfeplanImportZielDC.cs" />

From a3bd73b8d39ede759b180c1ddbdd62793f0b77d9 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 12:39:49 +0200
Subject: [PATCH 11/22] Added GroupBox to Customer Sub Views

---
 BeWo/BeWo.csproj                              |  4 ++
 BeWo/Styles/Colors/Colors.xaml                |  2 +
 BeWo/Styles/ControlStyles/GroupBoxStyles.xaml | 52 +++++++++++++++++++
 BeWo/Styles/ControlStyles/TextEditStyles.xaml |  6 +++
 BeWo/Styles/ModernOrangeBlack.xaml            |  1 +
 .../Wohnhilfe/CustomerWohnhilfeControl.xaml   |  9 ++--
 .../Detail/CustomerVermittlungArbeitView.xaml |  6 +--
 BeWo/View/Detail/CustomerWohnhilfeView.xaml   |  4 +-
 8 files changed, 76 insertions(+), 8 deletions(-)
 create mode 100644 BeWo/Styles/ControlStyles/GroupBoxStyles.xaml

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 257f736b7..2be9f4505 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -293,6 +293,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\ControlStyles\GroupBoxStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\ControlStyles\LabelStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/BeWo/Styles/Colors/Colors.xaml b/BeWo/Styles/Colors/Colors.xaml
index 6d82f9f5d..af79deddd 100644
--- a/BeWo/Styles/Colors/Colors.xaml
+++ b/BeWo/Styles/Colors/Colors.xaml
@@ -5,4 +5,6 @@
     <SolidColorBrush x:Key="ControlBackgroundBrush" Color="#FFFDC784" />
     <SolidColorBrush x:Key="ControlSelectedBackgroundBrush" Color="#FFFFD86C" />
     <SolidColorBrush x:Key="ControlMouseOverBackgroundBrush" Color="#FFDCA158" />
+
+    <SolidColorBrush x:Key="TabItemHotTextBrush" Color="#FFAB4A07" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml
new file mode 100644
index 000000000..fa4852bd1
--- /dev/null
+++ b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml
@@ -0,0 +1,52 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="BaseGroupBox" TargetType="{x:Type GroupBox}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="3" />
+    </Style>
+    <Style
+        x:Key="ObjectEditGroupBox"
+        BasedOn="{StaticResource BaseGroupBox}"
+        TargetType="{x:Type GroupBox}">
+        <!-- <Setter Property="BorderBrush" Value="#D5DFE5" />-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GroupBox}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+
+                        <Border
+                            x:Name="Header"
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            MinHeight="20"
+                            Padding="3,0,3,0"
+                            TextElement.FontFamily="Microsoft Sans Serif"
+                            TextElement.FontSize="16"
+                            TextElement.Foreground="{StaticResource TabItemHotTextBrush}">
+                            <ContentPresenter
+                                ContentSource="Header"
+                                RecognizesAccessKey="True"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </Border>
+                        <Border
+                            Grid.Row="1"
+                            BorderBrush="#FF86878F"
+                            BorderThickness="0,0,0,1" />
+                        <ContentPresenter
+                            Grid.Row="2"
+                            Grid.Column="0"
+                            Margin="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index 98a1c219f..0795c898d 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -9,6 +9,12 @@
         <Setter Property="Margin" Value="3" />
         <Setter Property="Height" Value="23" />
     </Style>
+    <Style
+        x:Key="BaseNumberTextEdit"
+        BasedOn="{StaticResource BaseTextEdit}"
+        TargetType="{x:Type dxe:TextEdit}">
+        <Setter Property="MaskType" Value="Numeric" />
+    </Style>
     <Style
         x:Key="BaseNumberMaskTextEdit"
         BasedOn="{StaticResource BaseTextEdit}"
diff --git a/BeWo/Styles/ModernOrangeBlack.xaml b/BeWo/Styles/ModernOrangeBlack.xaml
index 945963d94..357934f1f 100644
--- a/BeWo/Styles/ModernOrangeBlack.xaml
+++ b/BeWo/Styles/ModernOrangeBlack.xaml
@@ -16,6 +16,7 @@
         <ResourceDictionary Source="ControlStyles\ComboBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\CustomControlsStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\DateEditStyles.xaml" />
+        <ResourceDictionary Source="ControlStyles\GroupBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\LabelStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\ListBoxStyles.xaml" />
         <ResourceDictionary Source="ControlStyles\RadioButtonStyles.xaml" />
diff --git a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
index 78172cc68..5dd9f39df 100644
--- a/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
+++ b/BeWo/View/Controls/Wohnhilfe/CustomerWohnhilfeControl.xaml
@@ -112,14 +112,16 @@
                         Grid.Row="2"
                         Grid.Column="2"
                         EditValue="{Binding Path=AlterAmStichtag, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}"/>
 
                     <Label Grid.Row="3" Grid.Column="0">B1040 Haushaltsgröße</Label>
                     <dxe:TextEdit
                         Grid.Row="3"
                         Grid.Column="2"
                         EditValue="{Binding Path=Haushaltsgrosse, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}" />
 
                     <Label Grid.Row="4" Grid.Column="0">B1050 BerichtseinheitID</Label>
                     <dxe:TextEdit
@@ -388,7 +390,8 @@
                         Grid.Row="5"
                         Grid.Column="1"
                         EditValue="{Binding Path=BetreuungsdauerInTagen, UpdateSourceTrigger=PropertyChanged}"
-                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"/>
+                        IsReadOnly="{Binding PermissionCustomerWohnhilfeManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                        Style="{StaticResource BaseNumberTextEdit}" />
 
                     <Label Grid.Row="6" Grid.Column="0">G7010 Art der Beendigung</Label>
                     <ComboBox
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index cfdc9f390..c8d8557b2 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -1,5 +1,4 @@
 <UserControl
-    x:Name="root"
     x:Class="BeWo.View.Detail.CustomerVermittlungArbeitView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -7,6 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BeWo.View.Detail"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="root"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -17,7 +17,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <GroupBox Header="Vermittlung Gemeinnützige Arbeit" Style="{StaticResource ObjectEditGroupBox}">
         <Grid DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
@@ -66,5 +66,5 @@
                 </TabControl.ContentTemplate>
             </TabControl>
         </Grid>
-    </Grid>
+    </GroupBox>
 </UserControl>
diff --git a/BeWo/View/Detail/CustomerWohnhilfeView.xaml b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
index 73ef891eb..b518e5001 100644
--- a/BeWo/View/Detail/CustomerWohnhilfeView.xaml
+++ b/BeWo/View/Detail/CustomerWohnhilfeView.xaml
@@ -24,7 +24,7 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <Grid>
+    <GroupBox Header="Wohnungslosenhilfe" Style="{StaticResource ObjectEditGroupBox}">
         <Grid DataContext="{Binding CustomerWohnhilfeListVM}">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
@@ -129,5 +129,5 @@
                 </Border>
             </Popup>
         </Grid>
-    </Grid>
+    </GroupBox>
 </UserControl>

From 28933ad5ce805a016af6e9a9c6350f912b744c04 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 14:34:56 +0200
Subject: [PATCH 12/22] Customer Vermittlung Arbeit

---
 BeWo/Styles/ControlStyles/ComboBoxStyles.xaml |   2 +-
 .../ControlStyles/NullItemComboBoxStyles.xaml |   2 +-
 BeWo/Styles/ControlStyles/TextEditStyles.xaml |   2 +
 .../CustomerVermittlungArbeitControl.xaml     |  12 +-
 .../Detail/CustomerVermittlungArbeitView.xaml |   7 +-
 BeWo/View/Detail/CustomerView.xaml.cs         |   9 +-
 BeWo/ViewModel/CustomerVM.cs                  |  15 +-
 BeWo/ViewModel/CustomerVermittlungArbeitVM.cs |  10 --
 .../ListViewModel/AbstractDCListMapperVM.cs   |  13 ++
 Data/Data.csproj                              |   4 +
 Data/Entities/Customer.cs                     |   2 +
 Data/Entities/CustomerVermittlungArbeit.cs    |  56 ++++++++
 Data/Mappings/Customer.hbm.xml                |   4 +
 .../CustomerVermittlungArbeit.hbm.xml         |  51 +++++++
 ...2024_09_23 Customer Vermittlung Arbeit.txt |  60 ++++++++
 Service/DCEntityMapper/CustomerDC_Customer.cs |  12 +-
 ...tlungArbeitDC_CustomerVermittlungArbeit.cs | 136 ++++++++++++++++++
 Service/DCEntityMapper/MapperFactory.cs       |   5 +
 Service/Service.csproj                        |   1 +
 Shared/BeWoEntityEnums.cs                     |   5 +-
 Shared/DataContracts/CustomerDC.cs            |   2 +-
 21 files changed, 380 insertions(+), 30 deletions(-)
 create mode 100644 Data/Entities/CustomerVermittlungArbeit.cs
 create mode 100644 Data/Mappings/CustomerVermittlungArbeit.hbm.xml
 create mode 100644 Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt
 create mode 100644 Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs

diff --git a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
index e325b91fa..feca10e40 100644
--- a/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/ComboBoxStyles.xaml
@@ -133,7 +133,7 @@
         <Setter Property="ItemTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                    <TextBlock Text="{Binding Path=.}" TextWrapping="NoWrap" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
diff --git a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
index 49dc57942..603a56e11 100644
--- a/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
+++ b/BeWo/Styles/ControlStyles/NullItemComboBoxStyles.xaml
@@ -21,7 +21,7 @@
         <Setter Property="ItemTemplate">
             <Setter.Value>
                 <DataTemplate>
-                    <TextBlock Text="{Binding _name}" TextWrapping="NoWrap" />
+                    <TextBlock Text="{Binding Path=.}" TextWrapping="NoWrap" />
                 </DataTemplate>
             </Setter.Value>
         </Setter>
diff --git a/BeWo/Styles/ControlStyles/TextEditStyles.xaml b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
index 0795c898d..46f4b48fd 100644
--- a/BeWo/Styles/ControlStyles/TextEditStyles.xaml
+++ b/BeWo/Styles/ControlStyles/TextEditStyles.xaml
@@ -14,6 +14,8 @@
         BasedOn="{StaticResource BaseTextEdit}"
         TargetType="{x:Type dxe:TextEdit}">
         <Setter Property="MaskType" Value="Numeric" />
+        <Setter Property="MaskUseAsDisplayFormat" Value="True" />
+        <Setter Property="Mask" Value="N0" />
     </Style>
     <Style
         x:Key="BaseNumberMaskTextEdit"
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 3c6d49d77..bf7756b77 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -109,9 +109,11 @@
                     x:Name="comboBox_Auftragsherkunft"
                     Grid.Row="2"
                     Grid.Column="1"
+                    DisplayMemberPath="TypeDescription"
                     IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
-                    ItemsSource="{Binding Path=Auftragsherkunfte}"
-                    SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}" />
+                    ItemsSource="{Binding Path=DataContext.Auftragsherkunfte, RelativeSource={RelativeSource AncestorType={x:Type GroupBox}, AncestorLevel=2, Mode=FindAncestor}}"
+                    SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}"
+                    Style="{StaticResource PrimaryNullItemComboBox}"/>
 
                 <Label
                     Grid.Row="3"
@@ -121,8 +123,9 @@
                     x:Name="comboBox_Vermittlungsgrundlage"
                     Grid.Row="3"
                     Grid.Column="1"
+                    DisplayMemberPath="TypeDescription"
                     IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
-                    ItemsSource="{Binding Path=Vermittlungsgrundlagen}"
+                    ItemsSource="{Binding Path=DataContext.Vermittlungsgrundlagen, RelativeSource={RelativeSource AncestorType={x:Type GroupBox}, AncestorLevel=2, Mode=FindAncestor}}"
                     SelectedValue="{Binding Path=Vermittlungsgrundlage, Mode=TwoWay}" />
 
                 <Label
@@ -133,7 +136,8 @@
                     Grid.Row="4"
                     Grid.Column="1"
                     EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
-                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}" />
+                    IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
+                    Style="{StaticResource TextEditNumberDecimalNullable}"/>
 
                 <Label
                     Grid.Row="5"
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index c8d8557b2..3e47362af 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -17,8 +17,11 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <GroupBox Header="Vermittlung Gemeinnützige Arbeit" Style="{StaticResource ObjectEditGroupBox}">
-        <Grid DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}">
+    <GroupBox
+        DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}"
+        Header="Vermittlung Gemeinnützige Arbeit"
+        Style="{StaticResource ObjectEditGroupBox}">
+        <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index c16a0a3f2..9915682f7 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -280,7 +280,7 @@ namespace BeWo.View.Detail
             if(DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureCustomerWohnhilfe)
             {
                 tabroot.SelectedItem = tabitem_gemeinnutzigearbeit;
-                tabroot.SelectedItem = tabitem_wohnhilfe;
+                // tabroot.SelectedItem = tabitem_wohnhilfe;
             }
 #endif
         }
@@ -554,7 +554,14 @@ namespace BeWo.View.Detail
         
         private void ReloadViewModel(long pCustomerOID)
         {
+            var selected_oid = ViewModel.CustomerGemeinnutzigeArbeitListVM?.SelectedVM?.DataContract?.Oid;
+
             VMFactory.CreateCustomerVMAsync(pCustomerOID, cb => this.Dispatch(delegate { 
+                if(cb?.CustomerGemeinnutzigeArbeitListVM is object && selected_oid is long oid)
+				{
+                    cb.CustomerGemeinnutzigeArbeitListVM.SetSelectByDCOid(oid);
+				}
+
                 ViewModel = cb;
 
                 UpdateUris();
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index 3265b8c01..015b25911 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -837,7 +837,7 @@ namespace BeWo.ViewModel
 				       _EnvironmentOrganisations.IsDirty || _AbsenceTimes.IsDirty || _VarFields.IsDirty ||
 				       CostBearers.IsDirty || _IndividualAssessmentSheetCategories.IsDirty ||
 					   _PlacementList.IsDirty || _MedVerordnungslisten.IsDirty || _EnvironmentPersonsWithFamily.IsDirty || _Arbeitszeiten.IsDirty
-					   //|| _CustomerWohnhilfeListVM.IsDirty
+					   || _CustomerGemeinnutzigeArbeitListVM.IsDirty
 					   ;
 			}
 		}
@@ -2020,11 +2020,7 @@ namespace BeWo.ViewModel
 
 			CustomerWohnhilfeListVM = new CustomerWohnhilfeListVM(this, pDataContract.CustomerWohnhilfeDC ?? (pDataContract.CustomerWohnhilfeDC = new List<CustomerWohnhilfeDC>()));
 
-			CustomerWohnhilfeListVM.AddNewVMToListAndSelect(false);
-
-			CustomerGemeinnutzigeArbeitListVM = new CustomerVermittlungArbeitListVM(pDataContract.CustomerGemeinnutzigeArbeitDC ?? (pDataContract.CustomerGemeinnutzigeArbeitDC = new List<CustomerVermittlungArbeitDC>()));
-
-			CustomerGemeinnutzigeArbeitListVM.AddNewVMToListAndSelect(false);
+			CustomerGemeinnutzigeArbeitListVM = new CustomerVermittlungArbeitListVM(pDataContract.CustomerVermittlungArbeitDC ?? (pDataContract.CustomerVermittlungArbeitDC = new List<CustomerVermittlungArbeitDC>()));
 		}
 	    protected override CustomerDC MapToDataContract(CustomerDC pDataContract, bool doCommit)
 		{
@@ -2188,7 +2184,12 @@ namespace BeWo.ViewModel
                 pDataContract.Arbeitszeiten = _Arbeitszeiten.CopyToDCList(doCommit);
             }
 
-			if(_CustomerWohnhilfeListVM != null)
+			if (_CustomerGemeinnutzigeArbeitListVM != null)
+			{
+				pDataContract.CustomerVermittlungArbeitDC = _CustomerGemeinnutzigeArbeitListVM.CopyToDCList(doCommit);
+			}
+
+			if (_CustomerWohnhilfeListVM != null)
             {
 				pDataContract.CustomerWohnhilfeDC = _CustomerWohnhilfeListVM.CopyToDCList(doCommit);
             }
diff --git a/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
index f1c420ace..93036c03e 100644
--- a/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
+++ b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
@@ -98,11 +98,6 @@ namespace BeWo.ViewModel
                 FirePropertyChanged(nameof(Auftragsherkunft));
             }
         }
-        public ObservableSortCollection<ValueListEntryDC> Auftragsherkunfte
-        {
-            get { return _Auftragsherkunfte ?? (_Auftragsherkunfte = new ObservableSortCollection<ValueListEntryDC>()); }
-            set { _Auftragsherkunfte = value; }
-        }
         public ValueListEntryDC Vermittlungsgrundlage
         {
             get { return _Vermittlungsgrundlage; }
@@ -116,11 +111,6 @@ namespace BeWo.ViewModel
                 FirePropertyChanged(nameof(Vermittlungsgrundlage));
             }
         }
-        public ObservableSortCollection<ValueListEntryDC> Vermittlungsgrundlagen
-        {
-            get { return _Vermittlungsgrundlagen ?? (_Vermittlungsgrundlagen = new ObservableSortCollection<ValueListEntryDC>()); }
-            set { _Vermittlungsgrundlagen = value; }
-        }
         public decimal? Tagessatze
         {
             get { return _Tagessatze; }
diff --git a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
index 18e55cc55..a4c97cf94 100644
--- a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
+using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
 
 namespace BeWo.ViewModel.ListViewModel
@@ -258,5 +259,17 @@ namespace BeWo.ViewModel.ListViewModel
 
             return lConstr.Invoke(new object[] { pDC }) as VMType;
         }
+
+        public void SetSelectByDCOid(long dc_oid)
+		{
+			foreach (var vm in VMList)
+			{
+                if (vm.DataContract is BeWoDataContract dc && dc.Oid == dc_oid)
+				{
+                    SelectedVM = vm;
+                    return;
+				}
+			}
+		}
     }
 }
\ No newline at end of file
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 818bc8987..d3aee6d9a 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -206,6 +206,7 @@
     <Compile Include="Access\UserDAO.cs" />
     <Compile Include="ASPHibernateSessionManager.cs" />
     <Compile Include="DefaultHibernateSessionManager.cs" />
+    <Compile Include="Entities\CustomerVermittlungArbeit.cs" />
     <Compile Include="Entities\TwoFactorCode.cs" />
     <Compile Include="Entities\AbwesenheitsInformationPrint.cs" />
     <Compile Include="Entities\AddressHistory.cs" />
@@ -769,6 +770,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Mappings\GkvTransferProtokoll.hbm.xml" />
     <EmbeddedResource Include="Mappings\TwoFactorCode.hbm.xml" />
+    <EmbeddedResource Include="Mappings\CustomerVermittlungArbeit.hbm.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Content Include="Mappings\Timesheet2Mail.hbm.xml" />
     <EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
       <SubType>Designer</SubType>
diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index 9d04f2610..4f7a087b1 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -805,5 +805,7 @@ namespace BeWo.Data.Entities
                 return name;
             }
         }
+
+		public virtual IList<CustomerVermittlungArbeit> CustomerVermittlungArbeiten { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/Data/Entities/CustomerVermittlungArbeit.cs b/Data/Entities/CustomerVermittlungArbeit.cs
new file mode 100644
index 000000000..32afe9ab7
--- /dev/null
+++ b/Data/Entities/CustomerVermittlungArbeit.cs
@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Data.Entities
+{
+	public class CustomerVermittlungArbeit : BeWoEntityBase
+	{
+		public CustomerVermittlungArbeit()
+		{
+			_Tid = TableID.CustomerGemeinnutzigeArbeit;
+		}
+
+		public virtual Customer Customer { get; set; }
+
+		public virtual string EigenesAktenzeichen { get; set; }
+		public virtual DateTime? Auftragseingang { get; set; }
+		public virtual ValueListEntry Auftragsherkunft { get; set; }
+		public virtual ValueListEntry Vermittlungsgrundlage { get; set; }
+		public virtual decimal? Tagessatze { get; set; }
+		public virtual decimal? Tagessatzhohe { get; set; }
+		public virtual decimal? HoheDerGeldstrafe { get; set; }
+		public virtual decimal? ZuLeistendeArbeitsstunden { get; set; }
+		public virtual string Hinweis { get; set; }
+		public virtual DateTime? Termin { get; set; }
+		public virtual CustomerVermittlungBearbeitungsstatus? CustomerVermittlungBearbeitungsstatus { get; set; }
+		public virtual string Auftragsruckgabe { get; set; }
+		public virtual string Verlauf { get; set; }
+		public virtual decimal? AbgeleisteteStunden { get; set; }
+		public virtual decimal? ErsparteHafttage { get; set; }
+		public virtual decimal? GeleisteteRatenzahlung { get; set; }
+		public virtual string Bemerkung { get; set; }
+		public virtual decimal? GeleisteteEinmalzahlung { get; set; }
+
+		public virtual bool GrundArbeitsunfahig { get; set; }
+		public virtual bool GrundSuchtproblem { get; set; }
+		public virtual bool GrundPsychischeProbleme { get; set; }
+		public virtual bool GrundKeineMotivation { get; set; }
+		public virtual bool GrundInHaft { get; set; }
+		public virtual bool GrundUnbekannt { get; set; }
+		public virtual bool GrundKeinKontakt { get; set; }
+		public virtual bool GrundNichtAngetreten { get; set; }
+		public virtual bool GrundAbbruchDerTatigkeit { get; set; }
+		public virtual bool GrundWiderruf { get; set; }
+		public virtual bool Grund459StPO { get; set; }
+		public virtual bool GrundAusbleibenDerZahlung { get; set; }
+
+		public virtual bool BesonderheitMehrfacheBeauftragung { get; set; }
+		public virtual bool BesonderheitMehrfacheVermittlung { get; set; }
+		public virtual bool BesonderheitVermittlungAusHaft { get; set; }
+		public virtual bool BesonderheitDurchBGBWAufgesucht { get; set; }
+	}
+}
diff --git a/Data/Mappings/Customer.hbm.xml b/Data/Mappings/Customer.hbm.xml
index b947ce0ed..9cc011b0c 100644
--- a/Data/Mappings/Customer.hbm.xml
+++ b/Data/Mappings/Customer.hbm.xml
@@ -136,5 +136,9 @@
       <key column="CustomerOid" />
       <one-to-many class="BeWo.Data.Entities.Arbeitszeit, BeWo.Data" />
     </bag>
+    <bag name="CustomerVermittlungArbeiten" table="customervermittlungarbeit" generic="true" cascade="all-delete-orphan" batch-size="250">
+      <key column="CustomerOid" />
+      <one-to-many class="BeWo.Data.Entities.CustomerVermittlungArbeit, BeWo.Data" />
+    </bag>
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/Data/Mappings/CustomerVermittlungArbeit.hbm.xml b/Data/Mappings/CustomerVermittlungArbeit.hbm.xml
new file mode 100644
index 000000000..5137de973
--- /dev/null
+++ b/Data/Mappings/CustomerVermittlungArbeit.hbm.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="BeWo.Data.Entities.CustomerVermittlungArbeit,BeWo.Data" table="CustomerVermittlungArbeit">
+    <id name="Oid" column ="Oid" unsaved-value="null">
+      <generator class="identity" />
+    </id>
+    <version type="Int64" column="Version" name="Version" />
+    <property name="InsTs"/>
+    <property name="InsUser"/>
+    <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
+    <property name="UdpUser"/>
+    <property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
+    <property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared"  />
+    <property name="Notice"/>
+    <many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
+    <property name="EigenesAktenzeichen"/>
+    <property name="Auftragseingang"/>
+    <many-to-one name="Auftragsherkunft" column="Auftragsherkunft" class="BeWo.Data.Entities.ValueListEntry, BeWo.Data" cascade="none" />
+    <many-to-one name="Vermittlungsgrundlage" column="Vermittlungsgrundlage" class="BeWo.Data.Entities.ValueListEntry, BeWo.Data" cascade="none" />
+    <property name="Tagessatze"/>
+    <property name="Tagessatzhohe"/>
+    <property name="HoheDerGeldstrafe"/>
+    <property name="ZuLeistendeArbeitsstunden"/>
+    <property name="Hinweis"/>
+    <property name="Termin"/>
+    <property name="Auftragsruckgabe"/>
+    <property name="Verlauf"/>
+    <property name="AbgeleisteteStunden"/>
+    <property name="ErsparteHafttage"/>
+    <property name="GeleisteteRatenzahlung"/>
+    <property name="Bemerkung"/>
+    <property name="GeleisteteEinmalzahlung"/>
+    <property name="GrundArbeitsunfahig"/>
+    <property name="GrundSuchtproblem"/>
+    <property name="GrundPsychischeProbleme"/>
+    <property name="GrundKeineMotivation"/>
+    <property name="GrundInHaft"/>
+    <property name="GrundUnbekannt"/>
+    <property name="GrundKeinKontakt"/>
+    <property name="GrundNichtAngetreten"/>
+    <property name="GrundAbbruchDerTatigkeit"/>
+    <property name="GrundWiderruf"/>
+    <property name="Grund459StPO"/>
+    <property name="GrundAusbleibenDerZahlung"/>
+    <property name="BesonderheitMehrfacheBeauftragung"/>
+    <property name="BesonderheitMehrfacheVermittlung"/>
+    <property name="BesonderheitVermittlungAusHaft"/>
+    <property name="BesonderheitDurchBGBWAufgesucht"/>
+  </class>
+</hibernate-mapping>
diff --git a/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt b/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt
new file mode 100644
index 000000000..f78e3af67
--- /dev/null
+++ b/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt	
@@ -0,0 +1,60 @@
+CREATE TABLE `CustomerVermittlungArbeit` (
+`Oid` bigint NOT NULL AUTO_INCREMENT,
+`InsTs` datetime DEFAULT NULL,
+`InsUser` varchar(256) DEFAULT NULL,
+`Notice` varchar(1024) DEFAULT NULL,
+`Tid` int DEFAULT NULL,
+`UdpUser` varchar(256) DEFAULT NULL,
+`Version` bigint DEFAULT NULL,
+`IsActive` tinyint DEFAULT NULL,
+`SystemEntryID` int DEFAULT NULL,
+`CustomerOid` bigint NOT NULL,
+`EigenesAktenzeichen` varchar(256),
+`Auftragseingang` datetime DEFAULT NULL,
+`Auftragsherkunft` bigint DEFAULT NULL,
+`Vermittlungsgrundlage` bigint DEFAULT NULL,
+`Tagessatze` decimal(18,10) DEFAULT NULL,
+`Tagessatzhohe` decimal(18,10) DEFAULT NULL,
+`HoheDerGeldstrafe` decimal(18,10) DEFAULT NULL,
+`ZuLeistendeArbeitsstunden` decimal(18,10) DEFAULT NULL,
+`Hinweis` varchar(256),
+`Termin` datetime DEFAULT NULL,
+`CustomerVermittlungBearbeitungsstatus` tinyint DEFAULT NULL,
+`Auftragsruckgabe` varchar(256),
+`Verlauf` varchar(256),
+`AbgeleisteteStunden` decimal(18,10) DEFAULT NULL,
+`ErsparteHafttage` decimal(18,10) DEFAULT NULL,
+`GeleisteteRatenzahlung` decimal(18,10) DEFAULT NULL,
+`Bemerkung` varchar(256),
+`GeleisteteEinmalzahlung` decimal(18,10) DEFAULT NULL,
+`GrundArbeitsunfahig` tinyint,
+`GrundSuchtproblem` tinyint,
+`GrundPsychischeProbleme` tinyint,
+`GrundKeineMotivation` tinyint,
+`GrundInHaft` tinyint,
+`GrundUnbekannt` tinyint,
+`GrundKeinKontakt` tinyint,
+`GrundNichtAngetreten` tinyint,
+`GrundAbbruchDerTatigkeit` tinyint,
+`GrundWiderruf` tinyint,
+`Grund459StPO` tinyint,
+`GrundAusbleibenDerZahlung` tinyint,
+`BesonderheitMehrfacheBeauftragung` tinyint,
+`BesonderheitMehrfacheVermittlung` tinyint,
+`BesonderheitVermittlungAusHaft` tinyint,
+`BesonderheitDurchBGBWAufgesucht` tinyint,
+PRIMARY KEY (`Oid`),
+CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_CUSTOMER` FOREIGN KEY (`CustomerOid`) REFERENCES `customer` (`Oid`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1;
+
+ALTER TABLE `customervermittlungarbeit` 
+ADD CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_AUFTRAGSHERKUNFT`
+  FOREIGN KEY (`Auftragsherkunft`)
+  REFERENCES `7375324044`.`valuelistentry` (`Oid`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION,
+ADD CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_VERMITTLUNGSGRUNDLAGE`
+  FOREIGN KEY (`Vermittlungsgrundlage`)
+  REFERENCES `valuelistentry` (`Oid`)
+  ON DELETE NO ACTION
+  ON UPDATE NO ACTION;
diff --git a/Service/DCEntityMapper/CustomerDC_Customer.cs b/Service/DCEntityMapper/CustomerDC_Customer.cs
index 7e9dd528c..65e1f8f5c 100644
--- a/Service/DCEntityMapper/CustomerDC_Customer.cs
+++ b/Service/DCEntityMapper/CustomerDC_Customer.cs
@@ -7,6 +7,7 @@ using BeWo.Data.Entities;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
 
 namespace BeWo.Service.DCEntityMapper
 {
@@ -128,6 +129,8 @@ namespace BeWo.Service.DCEntityMapper
 
 			pDataContract.AssessmentSheetCategoryDCs = MapperFactory.AssessmentSheetCategoryDC_AssessmentSheetCategory.MapToNewDCs(pEntity.AssessmentSheetCategoryList);
 
+			pDataContract.CustomerVermittlungArbeitDC = MapperFactory.CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.MapToNewDCs(pEntity.CustomerVermittlungArbeiten);
+
 			return pDataContract;
 		}
 
@@ -286,7 +289,14 @@ namespace BeWo.Service.DCEntityMapper
 
 		    MapperFactory.ArbeitszeitDC_Arbeitszeit.MergeWithEntitys(pDataContract.Arbeitszeiten, pEntity.Arbeitszeiten);
 
-            return pEntity;
+			MapperFactory.CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.MergeWithEntitys(pDataContract.CustomerVermittlungArbeitDC, pEntity.CustomerVermittlungArbeiten);
+
+			var v = pEntity.CustomerVermittlungArbeiten;
+
+			if (v is object && v.Any())
+				v.DoForEach(x => x.Customer = pEntity);
+
+			return pEntity;
 		}
 
 		public bool ContainsFamilyDataData(CustomerDC dc)
diff --git a/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs b/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
new file mode 100644
index 000000000..b579b1286
--- /dev/null
+++ b/Service/DCEntityMapper/CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs
@@ -0,0 +1,136 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+
+namespace BeWo.Service.DCEntityMapper
+{
+	public class CustomerVermittlungArbeitDC_CustomerVermittlungArbeit : AbstractIDCEntityMapper<CustomerVermittlungArbeit, CustomerVermittlungArbeitDC>
+	{
+		public override CustomerVermittlungArbeitDC MergeWithDC(CustomerVermittlungArbeit pEntity, CustomerVermittlungArbeitDC pDataContract)
+		{
+			pDataContract.Oid = pEntity.Oid;
+			pDataContract.Version = pEntity.Version;
+			pDataContract.Notice = pEntity.Notice;
+			pDataContract.EigenesAktenzeichen = pEntity.EigenesAktenzeichen;
+			pDataContract.Auftragseingang = pEntity.Auftragseingang;
+			pDataContract.Tagessatze = pEntity.Tagessatze;
+			pDataContract.Tagessatzhohe = pEntity.Tagessatzhohe;
+			pDataContract.HoheDerGeldstrafe = pEntity.HoheDerGeldstrafe;
+			pDataContract.ZuLeistendeArbeitsstunden = pEntity.ZuLeistendeArbeitsstunden;
+			pDataContract.Hinweis = pEntity.Hinweis;
+			pDataContract.Termin = pEntity.Termin;
+			pDataContract.CustomerVermittlungBearbeitungsstatus = pEntity.CustomerVermittlungBearbeitungsstatus;
+			pDataContract.Auftragsruckgabe = pEntity.Auftragsruckgabe;
+			pDataContract.Verlauf = pEntity.Verlauf;
+			pDataContract.AbgeleisteteStunden = pEntity.AbgeleisteteStunden;
+			pDataContract.ErsparteHafttage = pEntity.ErsparteHafttage;
+			pDataContract.GeleisteteRatenzahlung = pEntity.GeleisteteRatenzahlung;
+			pDataContract.Bemerkung = pEntity.Bemerkung;
+			pDataContract.GeleisteteEinmalzahlung = pEntity.GeleisteteEinmalzahlung;
+			pDataContract.GrundArbeitsunfahig = pEntity.GrundArbeitsunfahig;
+			pDataContract.GrundSuchtproblem = pEntity.GrundSuchtproblem;
+			pDataContract.GrundPsychischeProbleme = pEntity.GrundPsychischeProbleme;
+			pDataContract.GrundKeineMotivation = pEntity.GrundKeineMotivation;
+			pDataContract.GrundInHaft = pEntity.GrundInHaft;
+			pDataContract.GrundUnbekannt = pEntity.GrundUnbekannt;
+			pDataContract.GrundKeinKontakt = pEntity.GrundKeinKontakt;
+			pDataContract.GrundNichtAngetreten = pEntity.GrundNichtAngetreten;
+			pDataContract.GrundAbbruchDerTatigkeit = pEntity.GrundAbbruchDerTatigkeit;
+			pDataContract.GrundWiderruf = pEntity.GrundWiderruf;
+			pDataContract.Grund459StPO = pEntity.Grund459StPO;
+			pDataContract.GrundAusbleibenDerZahlung = pEntity.GrundAusbleibenDerZahlung;
+			pDataContract.BesonderheitMehrfacheBeauftragung = pEntity.BesonderheitMehrfacheBeauftragung;
+			pDataContract.BesonderheitMehrfacheVermittlung = pEntity.BesonderheitMehrfacheVermittlung;
+			pDataContract.BesonderheitVermittlungAusHaft = pEntity.BesonderheitVermittlungAusHaft;
+			pDataContract.BesonderheitDurchBGBWAufgesucht = pEntity.BesonderheitDurchBGBWAufgesucht;
+
+			if (pEntity.Auftragsherkunft != null)
+			{
+				pDataContract.Auftragsherkunft = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Auftragsherkunft);
+			}
+
+			if (pEntity.Vermittlungsgrundlage != null)
+			{
+				pDataContract.Vermittlungsgrundlage = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDC(pEntity.Vermittlungsgrundlage);
+			}
+
+			return pDataContract;
+		}
+
+		public override CustomerVermittlungArbeit MergeWithEntity(CustomerVermittlungArbeitDC pDataContract, CustomerVermittlungArbeit pEntity)
+		{
+			pEntity.Oid = pDataContract.Oid;
+			pEntity.Version = pDataContract.Version;
+			pEntity.Notice = pDataContract.Notice;
+			pEntity.EigenesAktenzeichen = pDataContract.EigenesAktenzeichen;
+			pEntity.Auftragseingang = pDataContract.Auftragseingang;
+			pEntity.Tagessatze = pDataContract.Tagessatze;
+			pEntity.Tagessatzhohe = pDataContract.Tagessatzhohe;
+			pEntity.HoheDerGeldstrafe = pDataContract.HoheDerGeldstrafe;
+			pEntity.ZuLeistendeArbeitsstunden = pDataContract.ZuLeistendeArbeitsstunden;
+			pEntity.Hinweis = pDataContract.Hinweis;
+			pEntity.Termin = pDataContract.Termin;
+			pEntity.CustomerVermittlungBearbeitungsstatus = pDataContract.CustomerVermittlungBearbeitungsstatus;
+			pEntity.Auftragsruckgabe = pDataContract.Auftragsruckgabe;
+			pEntity.Verlauf = pDataContract.Verlauf;
+			pEntity.AbgeleisteteStunden = pDataContract.AbgeleisteteStunden;
+			pEntity.ErsparteHafttage = pDataContract.ErsparteHafttage;
+			pEntity.GeleisteteRatenzahlung = pDataContract.GeleisteteRatenzahlung;
+			pEntity.Bemerkung = pDataContract.Bemerkung;
+			pEntity.GeleisteteEinmalzahlung = pDataContract.GeleisteteEinmalzahlung;
+			pEntity.GrundArbeitsunfahig = pDataContract.GrundArbeitsunfahig;
+			pEntity.GrundSuchtproblem = pDataContract.GrundSuchtproblem;
+			pEntity.GrundPsychischeProbleme = pDataContract.GrundPsychischeProbleme;
+			pEntity.GrundKeineMotivation = pDataContract.GrundKeineMotivation;
+			pEntity.GrundInHaft = pDataContract.GrundInHaft;
+			pEntity.GrundUnbekannt = pDataContract.GrundUnbekannt;
+			pEntity.GrundKeinKontakt = pDataContract.GrundKeinKontakt;
+			pEntity.GrundNichtAngetreten = pDataContract.GrundNichtAngetreten;
+			pEntity.GrundAbbruchDerTatigkeit = pDataContract.GrundAbbruchDerTatigkeit;
+			pEntity.GrundWiderruf = pDataContract.GrundWiderruf;
+			pEntity.Grund459StPO = pDataContract.Grund459StPO;
+			pEntity.GrundAusbleibenDerZahlung = pDataContract.GrundAusbleibenDerZahlung;
+			pEntity.BesonderheitMehrfacheBeauftragung = pDataContract.BesonderheitMehrfacheBeauftragung;
+			pEntity.BesonderheitMehrfacheVermittlung = pDataContract.BesonderheitMehrfacheVermittlung;
+			pEntity.BesonderheitVermittlungAusHaft = pDataContract.BesonderheitVermittlungAusHaft;
+			pEntity.BesonderheitDurchBGBWAufgesucht = pDataContract.BesonderheitDurchBGBWAufgesucht;
+
+			if (pDataContract.Auftragsherkunft == null)
+			{
+				pEntity.Auftragsherkunft = null;
+			}
+			else if (pEntity.Auftragsherkunft == null || pEntity.Auftragsherkunft.Oid != pDataContract.Auftragsherkunft.ValueListEntryOid)
+			{
+				pEntity.Auftragsherkunft = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Auftragsherkunft.ValueListEntryOid.Value);
+			}
+
+			if (pDataContract.Vermittlungsgrundlage == null)
+			{
+				pEntity.Vermittlungsgrundlage = null;
+			}
+			else if (pEntity.Vermittlungsgrundlage == null || pEntity.Vermittlungsgrundlage.Oid != pDataContract.Vermittlungsgrundlage.ValueListEntryOid)
+			{
+				pEntity.Vermittlungsgrundlage = DAOFactory.GenericDAO.LoadByID<ValueListEntry>(pDataContract.Vermittlungsgrundlage.ValueListEntryOid.Value);
+			}
+
+			return pEntity;
+		}
+
+		protected override bool AreDCAndEntityEqual(CustomerVermittlungArbeitDC pDC, CustomerVermittlungArbeit pEntity)
+		{
+			if (pDC.Oid == null)
+			{
+				return false;
+			}
+
+			return pDC.Oid == pEntity.Oid;
+		}
+	}
+}
diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs
index 2e3dcb1a6..0905bafdd 100644
--- a/Service/DCEntityMapper/MapperFactory.cs
+++ b/Service/DCEntityMapper/MapperFactory.cs
@@ -304,6 +304,8 @@ namespace BeWo.Service.DCEntityMapper
 
         private static ImageDC_Image _ImageDC_Image;
 
+        private static CustomerVermittlungArbeitDC_CustomerVermittlungArbeit _CustomerVermittlungArbeitDC_CustomerVermittlungArbeit;
+
         public static MedRecordDC_MedRecord MedRecordDC_MedRecord =>
              _MedRecordDC_MedRecord ?? (_MedRecordDC_MedRecord = new MedRecordDC_MedRecord());
 
@@ -763,5 +765,8 @@ namespace BeWo.Service.DCEntityMapper
 
         public static ImageDC_Image ImageDC_Image =>
             _ImageDC_Image ?? (_ImageDC_Image = new ImageDC_Image());
+        
+        public static CustomerVermittlungArbeitDC_CustomerVermittlungArbeit CustomerVermittlungArbeitDC_CustomerVermittlungArbeit =>
+            _CustomerVermittlungArbeitDC_CustomerVermittlungArbeit ?? (_CustomerVermittlungArbeitDC_CustomerVermittlungArbeit = new CustomerVermittlungArbeitDC_CustomerVermittlungArbeit());
     }
 }
\ No newline at end of file
diff --git a/Service/Service.csproj b/Service/Service.csproj
index d77c5ef1c..c486f25f5 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -227,6 +227,7 @@
     <Compile Include="DCEntityMapper\AddressRouteDC_AddressRoute.cs" />
     <Compile Include="DCEntityMapper\BargeldtransaktionshistoryDC_Bargeldtransaktionshistory.cs" />
     <Compile Include="DCEntityMapper\ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs" />
+    <Compile Include="DCEntityMapper\CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs" />
     <Compile Include="DCEntityMapper\ImageDC_Image.cs" />
     <Compile Include="DCEntityMapper\DienstvertretungDC_Dienstvertretung.cs" />
     <Compile Include="DCEntityMapper\DokumentvorlageDC_Dokumentvorlage.cs" />
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index c24829b2b..6e0c7628b 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -174,9 +174,10 @@ namespace BS.Shared
         GkvTransferprotokoll = 167,
         Wohneinheit = 168,
         WohneinheitBelegung = 169,
-        CustomerFalldaten = 170,
+        CustomerGemeinnutzigeArbeit = 170,
         Image = 171,
-        TwoFactorCode = 172
+        TwoFactorCode = 172,
+        CustomerWohnhilfe = 173,
     }
 
     public enum SystemEntryID
diff --git a/Shared/DataContracts/CustomerDC.cs b/Shared/DataContracts/CustomerDC.cs
index 148a2329b..899672416 100644
--- a/Shared/DataContracts/CustomerDC.cs
+++ b/Shared/DataContracts/CustomerDC.cs
@@ -83,6 +83,6 @@ namespace BS.Shared.DataContracts
         [DataMember] public string InsuranceNumber { get; set; }
         [DataMember] public string VersichertenStatus { get; set; }
         [DataMember] public List<CustomerWohnhilfeDC> CustomerWohnhilfeDC { get; set; }       
-        [DataMember] public List<CustomerVermittlungArbeitDC> CustomerGemeinnutzigeArbeitDC { get; set; }       
+        [DataMember] public List<CustomerVermittlungArbeitDC> CustomerVermittlungArbeitDC { get; set; }       
     }
 }
\ No newline at end of file

From 4a038c8fcc774ff57d63397f804f186da878474c Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 15:02:08 +0200
Subject: [PATCH 13/22] Bearbeitungsstatus + Delete + Select by Index > Select
 by Oid

---
 .../Controls/CustomerVermittlungArbeitControl.xaml  |  4 ++--
 BeWo/View/Detail/CustomerVermittlungArbeitView.xaml |  4 ++--
 BeWo/View/Detail/CustomerView.xaml.cs               |  7 ++++---
 BeWo/ViewModel/CustomerVM.cs                        |  8 ++++----
 BeWo/ViewModel/CustomerVermittlungArbeitVM.cs       |  2 +-
 .../ListViewModel/AbstractDCListMapperVM.cs         | 13 +++++--------
 Data/Mappings/Customer.hbm.xml                      |  2 +-
 Data/Mappings/CustomerVermittlungArbeit.hbm.xml     |  1 +
 8 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index bf7756b77..24697f5da 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -209,8 +209,8 @@
                     Grid.Column="1"
                     HorizontalAlignment="Stretch"
                     IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
-                    ItemsSource="{Binding Path=FalldatenBearbeitungsstatusTypes}"
-                    SelectedValue="{Binding Path=FalldatenBearbeitungsstatus}"
+                    ItemsSource="{Binding Path=CustomerVermittlungBearbeitungsstatusTypes}"
+                    SelectedValue="{Binding Path=CustomerVermittlungBearbeitungsstatus}"
                     Style="{StaticResource EnumTranslationNullItemComboBox}" />
 
                 <Label
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index 3e47362af..8657353fd 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -5,7 +5,7 @@
     xmlns:controls="clr-namespace:BeWo.View.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BeWo.View.Detail"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="clr-namespace:BeWo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM}"
     x:Name="root"
     d:DesignHeight="450"
     d:DesignWidth="800"
@@ -18,7 +18,7 @@
         </ResourceDictionary>
     </UserControl.Resources>
     <GroupBox
-        DataContext="{Binding CustomerGemeinnutzigeArbeitListVM}"
+        DataContext="{Binding CustomerVermittlungArbeitListVM}"
         Header="Vermittlung Gemeinnützige Arbeit"
         Style="{StaticResource ObjectEditGroupBox}">
         <Grid>
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 9915682f7..09030678f 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -554,12 +554,13 @@ namespace BeWo.View.Detail
         
         private void ReloadViewModel(long pCustomerOID)
         {
-            var selected_oid = ViewModel.CustomerGemeinnutzigeArbeitListVM?.SelectedVM?.DataContract?.Oid;
+            var list = ViewModel.CustomerVermittlungArbeitListVM;
+            var sel_index = list?.VMList.IndexOf(list.SelectedVM) ?? -1;
 
             VMFactory.CreateCustomerVMAsync(pCustomerOID, cb => this.Dispatch(delegate { 
-                if(cb?.CustomerGemeinnutzigeArbeitListVM is object && selected_oid is long oid)
+                if(cb?.CustomerVermittlungArbeitListVM is object && -1 < sel_index)
 				{
-                    cb.CustomerGemeinnutzigeArbeitListVM.SetSelectByDCOid(oid);
+                    cb.CustomerVermittlungArbeitListVM.SetSelectByIndex(sel_index);
 				}
 
                 ViewModel = cb;
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index 015b25911..4c3fd0471 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -1755,16 +1755,16 @@ namespace BeWo.ViewModel
 			}
 		}
 
-		public CustomerVermittlungArbeitListVM CustomerGemeinnutzigeArbeitListVM
+		public CustomerVermittlungArbeitListVM CustomerVermittlungArbeitListVM
 		{
 			get { return _CustomerGemeinnutzigeArbeitListVM; }
 
 			set
 			{
-				if (!AreDifferent(CustomerGemeinnutzigeArbeitListVM, value))
+				if (!AreDifferent(CustomerVermittlungArbeitListVM, value))
 					return;
 				_CustomerGemeinnutzigeArbeitListVM = value;
-				FirePropertyChanged(nameof(CustomerGemeinnutzigeArbeitListVM));
+				FirePropertyChanged(nameof(CustomerVermittlungArbeitListVM));
 			}
 		}
 
@@ -2020,7 +2020,7 @@ namespace BeWo.ViewModel
 
 			CustomerWohnhilfeListVM = new CustomerWohnhilfeListVM(this, pDataContract.CustomerWohnhilfeDC ?? (pDataContract.CustomerWohnhilfeDC = new List<CustomerWohnhilfeDC>()));
 
-			CustomerGemeinnutzigeArbeitListVM = new CustomerVermittlungArbeitListVM(pDataContract.CustomerVermittlungArbeitDC ?? (pDataContract.CustomerVermittlungArbeitDC = new List<CustomerVermittlungArbeitDC>()));
+			CustomerVermittlungArbeitListVM = new CustomerVermittlungArbeitListVM(pDataContract.CustomerVermittlungArbeitDC ?? (pDataContract.CustomerVermittlungArbeitDC = new List<CustomerVermittlungArbeitDC>()));
 		}
 	    protected override CustomerDC MapToDataContract(CustomerDC pDataContract, bool doCommit)
 		{
diff --git a/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
index 93036c03e..5117aced1 100644
--- a/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
+++ b/BeWo/ViewModel/CustomerVermittlungArbeitVM.cs
@@ -191,7 +191,7 @@ namespace BeWo.ViewModel
                 FirePropertyChanged(nameof(Termin));
             }
         }
-        public IEnumerable<CustomerVermittlungBearbeitungsstatus> FalldatenBearbeitungsstatusTypes => Utils.GetAllEnumValues<CustomerVermittlungBearbeitungsstatus>();
+        public IEnumerable<CustomerVermittlungBearbeitungsstatus> CustomerVermittlungBearbeitungsstatusTypes => Utils.GetAllEnumValues<CustomerVermittlungBearbeitungsstatus>();
         public CustomerVermittlungBearbeitungsstatus? CustomerVermittlungBearbeitungsstatus
         {
             get { return _CustomerVermittlungBearbeitungsstatus; }
diff --git a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
index a4c97cf94..4d30b99ba 100644
--- a/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
+++ b/BeWo/ViewModel/ListViewModel/AbstractDCListMapperVM.cs
@@ -260,15 +260,12 @@ namespace BeWo.ViewModel.ListViewModel
             return lConstr.Invoke(new object[] { pDC }) as VMType;
         }
 
-        public void SetSelectByDCOid(long dc_oid)
+        public void SetSelectByIndex(int index)
 		{
-			foreach (var vm in VMList)
-			{
-                if (vm.DataContract is BeWoDataContract dc && dc.Oid == dc_oid)
-				{
-                    SelectedVM = vm;
-                    return;
-				}
+            if(-1 < index  && index < VMList.Count){
+                var x = VMList[index];
+
+                SelectedVM = x;
 			}
 		}
     }
diff --git a/Data/Mappings/Customer.hbm.xml b/Data/Mappings/Customer.hbm.xml
index 9cc011b0c..025292612 100644
--- a/Data/Mappings/Customer.hbm.xml
+++ b/Data/Mappings/Customer.hbm.xml
@@ -136,7 +136,7 @@
       <key column="CustomerOid" />
       <one-to-many class="BeWo.Data.Entities.Arbeitszeit, BeWo.Data" />
     </bag>
-    <bag name="CustomerVermittlungArbeiten" table="customervermittlungarbeit" generic="true" cascade="all-delete-orphan" batch-size="250">
+    <bag name="CustomerVermittlungArbeiten" table="customervermittlungarbeit" generic="true" cascade="all-delete-orphan" batch-size="250" inverse="true">
       <key column="CustomerOid" />
       <one-to-many class="BeWo.Data.Entities.CustomerVermittlungArbeit, BeWo.Data" />
     </bag>
diff --git a/Data/Mappings/CustomerVermittlungArbeit.hbm.xml b/Data/Mappings/CustomerVermittlungArbeit.hbm.xml
index 5137de973..c506ae037 100644
--- a/Data/Mappings/CustomerVermittlungArbeit.hbm.xml
+++ b/Data/Mappings/CustomerVermittlungArbeit.hbm.xml
@@ -24,6 +24,7 @@
     <property name="ZuLeistendeArbeitsstunden"/>
     <property name="Hinweis"/>
     <property name="Termin"/>
+    <property name="CustomerVermittlungBearbeitungsstatus" type="BS.Shared.DataContracts.CustomerVermittlungBearbeitungsstatus, BS.Shared" />
     <property name="Auftragsruckgabe"/>
     <property name="Verlauf"/>
     <property name="AbgeleisteteStunden"/>

From 5ce2cf425c23ef2600060bd0b3d9c5e075a20bf4 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Mon, 23 Sep 2024 18:14:35 +0200
Subject: [PATCH 14/22] Customer Wohnhilfe

---
 BeWo/DebugConfig.cs                           |  13 +-
 .../CustomerVermittlungArbeitControl.xaml     |   4 +-
 .../Detail/CustomerVermittlungArbeitView.xaml |   4 +-
 BeWo/View/Detail/CustomerView.xaml.cs         |  15 +-
 BeWo/ViewModel/CustomerVM.cs                  |   2 +-
 BeWo/ViewModel/CustomerWohnhilfeVM.cs         |  14 +-
 .../ListViewModel/CustomerWohnhilfeListVM.cs  |  18 +-
 .../CustomerWohnhilfeBereichBundVM.cs         |   2 +-
 ...merWohnhilfeBereichEinkommenUndArbeitVM.cs |   2 +-
 ...stomerWohnhilfeBereichSozialeKontakteVM.cs |   5 +-
 ...ustomerWohnhilfeBereichSozialstrukturVM.cs |   4 +-
 Data/Data.csproj                              |   4 +
 Data/Entities/Customer.cs                     |   1 +
 Data/Entities/CustomerWohnhilfe.cs            | 131 +++++++++++++
 Data/Mappings/Customer.hbm.xml                |   4 +
 Data/Mappings/CustomerWohnhilfe.hbm.xml       |  74 ++++++++
 ...nges_2024_09_22 CustomerFalldatenDrop.txt} |   4 +-
 ...2024_09_23 Customer Vermittlung Arbeit.txt |   8 +-
 .../Changes_2024_09_23 Customer Wohnhilfe.txt |  70 +++++++
 Service/DCEntityMapper/CustomerDC_Customer.cs |  10 +-
 .../CustomerWohnhilfeDC_CustomerWohnhilfe.cs  | 174 ++++++++++++++++++
 Service/DCEntityMapper/MapperFactory.cs       |   5 +
 Service/Service.csproj                        |   1 +
 Shared/Core/Utils.cs                          |  21 +++
 .../CustomerWohnhilfeBereichBundDC.cs         |   2 +-
 ...merWohnhilfeBereichEinkommenUndArbeitDC.cs |   2 +-
 ...stomerWohnhilfeBereichSozialeKontakteDC.cs |   2 +-
 ...ustomerWohnhilfeBereichSozialstrukturDC.cs |   2 +-
 .../Wohnhilfe/CustomerWohnhilfeDC.cs          |   2 +-
 29 files changed, 565 insertions(+), 35 deletions(-)
 create mode 100644 Data/Entities/CustomerWohnhilfe.cs
 create mode 100644 Data/Mappings/CustomerWohnhilfe.hbm.xml
 rename Model/{Changes_2024_09_23 CustomerFalldatenDrop.txt => Changes_2024_09_22 CustomerFalldatenDrop.txt} (97%)
 create mode 100644 Model/Changes_2024_09_23 Customer Wohnhilfe.txt
 create mode 100644 Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs

diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index fcf3a8142..0ab92130f 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -35,6 +35,16 @@ namespace BeWo
 
         public bool AutoLogin { get; set; }
         public UIContext? SelectView { get; set; }
+        /// <summary>
+        /// Customer:
+        /// - Details: 0
+        /// - ...: 1
+        /// - ...: 2
+        /// - ...: 3
+        /// - VermittlungArbeit: 4
+        /// - Wohnhilfe: 5
+        /// </summary>
+        public int? SelectIndex { get; set; }
 
         public static DebugConfig SimpleAutoLogin => new DebugConfig()
         {
@@ -46,7 +56,8 @@ namespace BeWo
         {
             DebugConfigMode = DebugConfigMode.FeatureCustomerWohnhilfe,
             AutoLogin = true,
-            SelectView = UIContext.Customer
+            SelectView = UIContext.Customer,
+            SelectIndex = 5
         };
 
         public static DebugConfig Feature_Wohnheim_Wohneinheit => new DebugConfig()
diff --git a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
index 24697f5da..9388b5fe9 100644
--- a/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
+++ b/BeWo/View/Controls/CustomerVermittlungArbeitControl.xaml
@@ -113,7 +113,7 @@
                     IsEnabled="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, ElementName=root}"
                     ItemsSource="{Binding Path=DataContext.Auftragsherkunfte, RelativeSource={RelativeSource AncestorType={x:Type GroupBox}, AncestorLevel=2, Mode=FindAncestor}}"
                     SelectedValue="{Binding Path=Auftragsherkunft, Mode=TwoWay}"
-                    Style="{StaticResource PrimaryNullItemComboBox}"/>
+                    Style="{StaticResource PrimaryNullItemComboBox}" />
 
                 <Label
                     Grid.Row="3"
@@ -137,7 +137,7 @@
                     Grid.Column="1"
                     EditValue="{Binding Path=Tagessatze, UpdateSourceTrigger=PropertyChanged}"
                     IsReadOnly="{Binding PermissionCustomerGemeinnutzigeArbeitManage, Mode=OneTime, Converter={StaticResource BoolReverseConverter}, ElementName=root}"
-                    Style="{StaticResource TextEditNumberDecimalNullable}"/>
+                    Style="{StaticResource TextEditNumberDecimalNullable}" />
 
                 <Label
                     Grid.Row="5"
diff --git a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
index 8657353fd..9c69dc9c8 100644
--- a/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
+++ b/BeWo/View/Detail/CustomerVermittlungArbeitView.xaml
@@ -5,8 +5,10 @@
     xmlns:controls="clr-namespace:BeWo.View.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:BeWo.View.Detail"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:viewmodel="clr-namespace:BeWo.ViewModel" d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM}"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:viewmodel="clr-namespace:BeWo.ViewModel"
     x:Name="root"
+    d:DataContext="{d:DesignInstance Type=viewmodel:CustomerVM}"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
diff --git a/BeWo/View/Detail/CustomerView.xaml.cs b/BeWo/View/Detail/CustomerView.xaml.cs
index 09030678f..1d99afec2 100644
--- a/BeWo/View/Detail/CustomerView.xaml.cs
+++ b/BeWo/View/Detail/CustomerView.xaml.cs
@@ -279,8 +279,12 @@ namespace BeWo.View.Detail
 #if DEBUG
             if(DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.DebugConfigMode == DebugConfigMode.FeatureCustomerWohnhilfe)
             {
-                tabroot.SelectedItem = tabitem_gemeinnutzigearbeit;
-                // tabroot.SelectedItem = tabitem_wohnhilfe;
+                var index = DebugConfig.CurrentConfig.SelectIndex;
+
+                if (index.HasValue && tabroot.Items.Count > index.Value)
+				{
+                    tabroot.SelectedIndex = index.Value;
+				}
             }
 #endif
         }
@@ -557,11 +561,18 @@ namespace BeWo.View.Detail
             var list = ViewModel.CustomerVermittlungArbeitListVM;
             var sel_index = list?.VMList.IndexOf(list.SelectedVM) ?? -1;
 
+            var list2 = ViewModel.CustomerWohnhilfeListVM;
+            var sel_index2 = list2?.VMList.IndexOf(list2.SelectedVM) ?? -1;
+
             VMFactory.CreateCustomerVMAsync(pCustomerOID, cb => this.Dispatch(delegate { 
                 if(cb?.CustomerVermittlungArbeitListVM is object && -1 < sel_index)
 				{
                     cb.CustomerVermittlungArbeitListVM.SetSelectByIndex(sel_index);
 				}
+                if (cb?.CustomerWohnhilfeListVM is object && -1 < sel_index2)
+                {
+                    cb.CustomerWohnhilfeListVM.SetSelectByIndex(sel_index2);
+                }
 
                 ViewModel = cb;
 
diff --git a/BeWo/ViewModel/CustomerVM.cs b/BeWo/ViewModel/CustomerVM.cs
index 4c3fd0471..f8c809d43 100644
--- a/BeWo/ViewModel/CustomerVM.cs
+++ b/BeWo/ViewModel/CustomerVM.cs
@@ -837,7 +837,7 @@ namespace BeWo.ViewModel
 				       _EnvironmentOrganisations.IsDirty || _AbsenceTimes.IsDirty || _VarFields.IsDirty ||
 				       CostBearers.IsDirty || _IndividualAssessmentSheetCategories.IsDirty ||
 					   _PlacementList.IsDirty || _MedVerordnungslisten.IsDirty || _EnvironmentPersonsWithFamily.IsDirty || _Arbeitszeiten.IsDirty
-					   || _CustomerGemeinnutzigeArbeitListVM.IsDirty
+					   || _CustomerGemeinnutzigeArbeitListVM.IsDirty || _CustomerWohnhilfeListVM.IsDirty
 					   ;
 			}
 		}
diff --git a/BeWo/ViewModel/CustomerWohnhilfeVM.cs b/BeWo/ViewModel/CustomerWohnhilfeVM.cs
index 87a357c65..e8dd345a2 100644
--- a/BeWo/ViewModel/CustomerWohnhilfeVM.cs
+++ b/BeWo/ViewModel/CustomerWohnhilfeVM.cs
@@ -114,17 +114,19 @@ namespace BeWo.ViewModel
 
         protected override void InitByDataContract(CustomerWohnhilfeDC dc)
         {
-            Displayname = "Test " + counter++;
+            Displayname = dc.Displayname;
 
-            _BereichBundVM = new CustomerWohnhilfeBereichBundVM(dc.BereichBundDC ?? (dc.BereichBundDC = new CustomerWohnhilfeBereichBundDC()));
-            _BereichEinkommenUndArbeitVM = new CustomerWohnhilfeBereichEinkommenUndArbeitVM(dc.BereichEinkommenUndArbeitDC ?? (dc.BereichEinkommenUndArbeitDC = new CustomerWohnhilfeBereichEinkommenUndArbeitDC())); ;
-            _BereichSozialeKontakteVM = new CustomerWohnhilfeBereichSozialeKontakteVM(dc.BereichSozialeKontakteDC ?? (dc.BereichSozialeKontakteDC = new CustomerWohnhilfeBereichSozialeKontakteDC()));
-            _BereichSozialstrukturVM = new CustomerWohnhilfeBereichSozialstrukturVM(dc.BereichSozialstrukturDC ?? (dc.BereichSozialstrukturDC = new CustomerWohnhilfeBereichSozialstrukturDC()));
+            var isNew = dc.Oid == null;
+
+            _BereichBundVM = new CustomerWohnhilfeBereichBundVM(dc.BereichBundDC ?? (dc.BereichBundDC = new CustomerWohnhilfeBereichBundDC()), isNew);
+            _BereichEinkommenUndArbeitVM = new CustomerWohnhilfeBereichEinkommenUndArbeitVM(dc.BereichEinkommenUndArbeitDC ?? (dc.BereichEinkommenUndArbeitDC = new CustomerWohnhilfeBereichEinkommenUndArbeitDC()), isNew); ;
+            _BereichSozialeKontakteVM = new CustomerWohnhilfeBereichSozialeKontakteVM(dc.BereichSozialeKontakteDC ?? (dc.BereichSozialeKontakteDC = new CustomerWohnhilfeBereichSozialeKontakteDC()), isNew);
+            _BereichSozialstrukturVM = new CustomerWohnhilfeBereichSozialstrukturVM(dc.BereichSozialstrukturDC ?? (dc.BereichSozialstrukturDC = new CustomerWohnhilfeBereichSozialstrukturDC()), isNew);
         }
 
         protected override CustomerWohnhilfeDC MapToDataContract(CustomerWohnhilfeDC pDataContract, bool doCommit)
         {
-            pDataContract.Dispalyname = _Displayname;
+            pDataContract.Displayname = _Displayname;
 
             pDataContract.BereichBundDC = _BereichBundVM.CommitToDataContract();
             pDataContract.BereichEinkommenUndArbeitDC = _BereichEinkommenUndArbeitVM.CommitToDataContract();
diff --git a/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs b/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs
index e349e5e88..1cfa4e929 100644
--- a/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs
+++ b/BeWo/ViewModel/ListViewModel/CustomerWohnhilfeListVM.cs
@@ -1,4 +1,5 @@
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Wohnhilfe;
 using DevExpress.Mvvm;
@@ -24,7 +25,7 @@ namespace BeWo.ViewModel.ListViewModel
         {
             Customer = vm;
 
-            AddVMCommand = new DelegateCommand(() => AddNewVMToListAndSelect(true), CanAddWohnhilfe);
+            AddVMCommand = new DelegateCommand(AddVM, CanAddWohnhilfe);
 
             DeleteSelectedVMCommand = new DelegateCommand(() => DeleteSelectedVM($"Wohnhilfe '{SelectedVM.Displayname}'"));
 
@@ -50,6 +51,13 @@ namespace BeWo.ViewModel.ListViewModel
             }
         }
 
+        public void AddVM()
+		{
+            var new_vm = AddNewVMToListAndSelect(true);
+
+            new_vm.Displayname = "Wohnhilfe";
+        }
+
         public void CopySelectedWohnhilfe()
         {
             var old_vm = SelectedVM;
@@ -63,8 +71,12 @@ namespace BeWo.ViewModel.ListViewModel
         {
             var selected_vm = SelectedVM;
 
-            selected_vm.BereichSozialstrukturVM.Geburtsdatum = Customer.DateOfBirth;
-
+			if (selected_vm.BereichSozialstrukturVM.Geburtsdatum.HasValue)
+			{
+                selected_vm.BereichSozialstrukturVM.Geburtsdatum = Customer.DateOfBirth;
+                selected_vm.BereichBundVM.AlterAmStichtag = Utils.GetAge(Customer.DateOfBirth.Value);
+            }
+                
             if (Customer.IsMale)
                 selected_vm.BereichBundVM.Geschlecht = Geschlecht.Mannlich;
             else if (Customer.IsFemale)
diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs
index 6771d3435..9651dd54a 100644
--- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs
+++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichBundVM.cs
@@ -27,7 +27,7 @@ namespace BeWo.ViewModel.Wohnhilfe
             _AlterAmStichtag = 1000;
         }
 
-        public CustomerWohnhilfeBereichBundVM(CustomerWohnhilfeBereichBundDC dc) : base(dc, dc.Oid == null)
+        public CustomerWohnhilfeBereichBundVM(CustomerWohnhilfeBereichBundDC dc, bool isNew) : base(dc, isNew)
         {
 
         }
diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs
index 50e99d2ff..c08633c60 100644
--- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs
+++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitVM.cs
@@ -28,7 +28,7 @@ namespace BeWo.ViewModel.Wohnhilfe
             _Uberschuldung = WohnhilfeBoolData.Ja;
         }
 
-        public CustomerWohnhilfeBereichEinkommenUndArbeitVM(CustomerWohnhilfeBereichEinkommenUndArbeitDC dc) : base(dc, dc.Oid == null)
+        public CustomerWohnhilfeBereichEinkommenUndArbeitVM(CustomerWohnhilfeBereichEinkommenUndArbeitDC dc, bool isNew) : base(dc, isNew)
         {
 
         }
diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
index 07a301565..d0aa630b5 100644
--- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
+++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteVM.cs
@@ -41,7 +41,7 @@ namespace BeWo.ViewModel.Wohnhilfe
             _EndeKrankenversicherung = Krankenversicherung.Nein;
         }
 
-        public CustomerWohnhilfeBereichSozialeKontakteVM(CustomerWohnhilfeBereichSozialeKontakteDC dc) : base(dc, dc.Oid == null)
+        public CustomerWohnhilfeBereichSozialeKontakteVM(CustomerWohnhilfeBereichSozialeKontakteDC dc, bool isNew) : base(dc, isNew)
         {
             _CanEditBeginnKontakt &= PermissionCustomerWohnhilfeManage;
             _CanEditEndeKontakt &= PermissionCustomerWohnhilfeManage;
@@ -397,6 +397,9 @@ namespace BeWo.ViewModel.Wohnhilfe
             _BeginnKontaktArzt = pDataContract.BeginnKontaktArzt;
             _EndeKontaktArzt = pDataContract.EndeKontaktArzt;
             _VorlageSchwerbehindertenausweises = pDataContract.VorlageSchwerbehindertenausweises;
+
+            _CanEditBeginnKontakt = pDataContract.BeginnSozialeKontakte == WohnhilfeBoolData.Ja;
+            _CanEditEndeKontakt = pDataContract.EndeSozialeKontakte == WohnhilfeBoolData.Ja;
         }
 
         protected override CustomerWohnhilfeBereichSozialeKontakteDC MapToDataContract(CustomerWohnhilfeBereichSozialeKontakteDC pDataContract, bool doCommit)
diff --git a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs
index b8c216196..925d3af50 100644
--- a/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs
+++ b/BeWo/ViewModel/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturVM.cs
@@ -30,10 +30,10 @@ namespace BeWo.ViewModel.Wohnhilfe
         {
             _Bundesland = BS.Shared.DataContracts.Wohnhilfe.Bundesland.Bayern;
             _IsWohnungslosenhilfe = true;
-            _ArtDesHilfeangebots = BS.Shared.DataContracts.Wohnhilfe.ArtDesHilfeangebots.vollstationär;
+            _ArtDesHilfeangebots = ArtDesHilfeangebots.vollstationär;
         }
 
-        public CustomerWohnhilfeBereichSozialstrukturVM(CustomerWohnhilfeBereichSozialstrukturDC dc) : base(dc, dc.Oid == null)
+        public CustomerWohnhilfeBereichSozialstrukturVM(CustomerWohnhilfeBereichSozialstrukturDC dc, bool isNew) : base(dc, isNew)
         {
 
         }
diff --git a/Data/Data.csproj b/Data/Data.csproj
index d3aee6d9a..cbe538377 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -207,6 +207,7 @@
     <Compile Include="ASPHibernateSessionManager.cs" />
     <Compile Include="DefaultHibernateSessionManager.cs" />
     <Compile Include="Entities\CustomerVermittlungArbeit.cs" />
+    <Compile Include="Entities\CustomerWohnhilfe.cs" />
     <Compile Include="Entities\TwoFactorCode.cs" />
     <Compile Include="Entities\AbwesenheitsInformationPrint.cs" />
     <Compile Include="Entities\AddressHistory.cs" />
@@ -773,6 +774,9 @@
     <EmbeddedResource Include="Mappings\CustomerVermittlungArbeit.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Mappings\CustomerWohnhilfe.hbm.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <Content Include="Mappings\Timesheet2Mail.hbm.xml" />
     <EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
       <SubType>Designer</SubType>
diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index 4f7a087b1..4fbfc0d91 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -807,5 +807,6 @@ namespace BeWo.Data.Entities
         }
 
 		public virtual IList<CustomerVermittlungArbeit> CustomerVermittlungArbeiten { get; set; }
+		public virtual IList<CustomerWohnhilfe> CustomerWohnhilfen { get; set; }
 	}
 }
\ No newline at end of file
diff --git a/Data/Entities/CustomerWohnhilfe.cs b/Data/Entities/CustomerWohnhilfe.cs
new file mode 100644
index 000000000..787792013
--- /dev/null
+++ b/Data/Entities/CustomerWohnhilfe.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Collections.Generic;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts.Wohnhilfe;
+
+namespace BeWo.Data.Entities
+{
+	public class CustomerWohnhilfe : BeWoEntityBase
+	{
+		public CustomerWohnhilfe()
+		{
+			_Tid = TableID.CustomerWohnhilfe;
+		}
+
+		public virtual Customer Customer { get; set; }
+
+		public virtual string Displayname { get; set; }
+
+		public virtual Verbandszugehorigkeit? Verbandszugehorigkeit { get; set; }
+
+		public virtual Geschlecht? Geschlecht { get; set; }
+
+		public virtual int? AlterAmStichtag { get; set; }
+
+		public virtual int? Haushaltsgrosse { get; set; }
+
+		public virtual string BerichtseinheitID { get; set; }
+
+		public virtual Unterbringungsart? Unterbringungsart { get; set; }
+
+		public virtual int? OrtDerEinrichtung { get; set; }
+
+		public virtual Angebot? Angebot { get; set; }
+
+		public virtual Einkommenssituation BeginnEinkommenssituation { get; set; }
+
+		public virtual Einkommenssituation EndeEinkommenssituation { get; set; }
+
+		public virtual AufstockungEinkommen BeginnAufstockungEinkommen { get; set; }
+
+		public virtual AufstockungEinkommen EndeAufstockungEinkommen { get; set; }
+
+		public virtual WohnhilfeBoolData BeginnEigenesBankkonto { get; set; }
+
+		public virtual WohnhilfeBoolData EndeEigenesBankkonto { get; set; }
+
+		public virtual WohnhilfeBoolData Uberschuldung { get; set; }
+
+		public virtual Berufsabschluss Berufsabschluss { get; set; }
+
+		public virtual WohnhilfeBoolData ErwerbsfahigkeitSinnSGB { get; set; }
+
+		public virtual Beschaftigungsstatus BeginnBeschaftigungsstatus { get; set; }
+
+		public virtual Beschaftigungsstatus EndeBeschaftigungsstatus { get; set; }
+
+		public virtual DauerArbeitslosigkeit DauerArbeitslosigkeit { get; set; }
+
+		public virtual WohnhilfeBoolData BeginnSozialeKontakte { get; set; }
+
+		public virtual bool BeginnKontaktPartner { get; set; }
+
+		public virtual bool BeginnKontaktMindKinder { get; set; }
+
+		public virtual bool BeginnKontaktVolljahrKinderElternVerwandten { get; set; }
+
+		public virtual bool BeginnKontaktFreundenBekannten { get; set; }
+
+		public virtual bool BeginnKontaktSelbsthilfe { get; set; }
+
+		public virtual bool BeginnKontaktSonstige { get; set; }
+
+		public virtual WohnhilfeBoolData EndeSozialeKontakte { get; set; }
+
+		public virtual bool EndeKontaktPartner { get; set; }
+
+		public virtual bool EndeKontaktMindKinder { get; set; }
+
+		public virtual bool EndeKontaktVolljahrKinderElternVerwandten { get; set; }
+
+		public virtual bool EndeKontaktFreundenBekannten { get; set; }
+
+		public virtual bool EndeKontaktSelbsthilfe { get; set; }
+
+		public virtual bool EndeKontaktSonstige { get; set; }
+
+		public virtual Krankenversicherung BeginnKrankenversicherung { get; set; }
+
+		public virtual Krankenversicherung EndeKrankenversicherung { get; set; }
+
+		public virtual KontaktArzt BeginnKontaktArzt { get; set; }
+
+		public virtual KontaktArzt EndeKontaktArzt { get; set; }
+
+		public virtual WohnhilfeBoolData VorlageSchwerbehindertenausweises { get; set; }
+
+		public virtual Bundesland? Bundesland { get; set; }
+
+		public virtual bool IsWohnungslosenhilfe { get; set; }
+
+		public virtual ArtDesHilfeangebots ArtDesHilfeangebots { get; set; }
+
+		public virtual DateTime? Betreuungsbeginn { get; set; }
+
+		public virtual DateTime? Betreuungsende { get; set; }
+
+		public virtual int? BetreuungsdauerInTagen { get; set; }
+
+		public virtual ArtDerBeendigung ArtDerBeendigung { get; set; }
+
+		public virtual DateTime? Geburtsdatum { get; set; }
+
+		public virtual Geschlechtidentitat Geschlechtidentitat { get; set; }
+
+		public virtual Staatsangehorigkeit? Staatsangehorigkeit { get; set; }
+
+		public virtual Aufenthaltsstatus Aufenthaltsstatus { get; set; }
+
+		public virtual WohnhilfeBoolData Migrationshintergrund { get; set; }
+
+		public virtual HochsterSchulabschluss HochsterSchulabschluss { get; set; }
+
+		public virtual Familienstand Familienstand { get; set; }
+
+		public virtual Haushaltsstruktur Haushaltsstruktur { get; set; }
+
+		public virtual WohnhilfeBoolData EigeneMindKinderAuserhalbHaushaltsstruktur { get; set; }
+	}
+}
diff --git a/Data/Mappings/Customer.hbm.xml b/Data/Mappings/Customer.hbm.xml
index 025292612..c9a5fc87e 100644
--- a/Data/Mappings/Customer.hbm.xml
+++ b/Data/Mappings/Customer.hbm.xml
@@ -140,5 +140,9 @@
       <key column="CustomerOid" />
       <one-to-many class="BeWo.Data.Entities.CustomerVermittlungArbeit, BeWo.Data" />
     </bag>
+    <bag name="CustomerWohnhilfen" table="customerwohnhilfe" generic="true" cascade="all-delete-orphan" batch-size="250" inverse="true">
+      <key column="CustomerOid" />
+      <one-to-many class="BeWo.Data.Entities.CustomerWohnhilfe, BeWo.Data" />
+    </bag>
   </class>
 </hibernate-mapping>
\ No newline at end of file
diff --git a/Data/Mappings/CustomerWohnhilfe.hbm.xml b/Data/Mappings/CustomerWohnhilfe.hbm.xml
new file mode 100644
index 000000000..f23bac0ec
--- /dev/null
+++ b/Data/Mappings/CustomerWohnhilfe.hbm.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="BeWo.Data.Entities.CustomerWohnhilfe,BeWo.Data" table="CustomerWohnhilfe">
+    <id name="Oid" column ="Oid" unsaved-value="null">
+      <generator class="identity" />
+    </id>
+    <version type="Int64" column="Version" name="Version" />
+    <property name="InsTs"/>
+    <property name="InsUser"/>
+    <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
+    <property name="UdpUser"/>
+    <property name="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" />
+    <property name="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared"  />
+    <property name="Notice"/>
+    <many-to-one name="Customer" column="CustomerOid" class="BeWo.Data.Entities.Customer, BeWo.Data" cascade="none"/>
+    <property name="Displayname"/>
+    <property name="Verbandszugehorigkeit"/>
+    <property name="Geschlecht"/>
+    <property name="AlterAmStichtag"/>
+    <property name="Haushaltsgrosse"/>
+    <property name="BerichtseinheitID"/>
+    <property name="Unterbringungsart"/>
+    <property name="OrtDerEinrichtung"/>
+    <property name="Angebot"/>
+    <property name="BeginnEinkommenssituation"/>
+    <property name="EndeEinkommenssituation"/>
+    <property name="BeginnAufstockungEinkommen"/>
+    <property name="EndeAufstockungEinkommen"/>
+    <property name="BeginnEigenesBankkonto"/>
+    <property name="EndeEigenesBankkonto"/>
+    <property name="Uberschuldung"/>
+    <property name="Berufsabschluss"/>
+    <property name="ErwerbsfahigkeitSinnSGB"/>
+    <property name="BeginnBeschaftigungsstatus"/>
+    <property name="EndeBeschaftigungsstatus"/>
+    <property name="DauerArbeitslosigkeit"/>
+    <property name="BeginnSozialeKontakte"/>
+    <property name="BeginnKontaktPartner"/>
+    <property name="BeginnKontaktMindKinder"/>
+    <property name="BeginnKontaktVolljahrKinderElternVerwandten"/>
+    <property name="BeginnKontaktFreundenBekannten"/>
+    <property name="BeginnKontaktSelbsthilfe"/>
+    <property name="BeginnKontaktSonstige"/>
+    <property name="EndeSozialeKontakte"/>
+    <property name="EndeKontaktPartner"/>
+    <property name="EndeKontaktMindKinder"/>
+    <property name="EndeKontaktVolljahrKinderElternVerwandten"/>
+    <property name="EndeKontaktFreundenBekannten"/>
+    <property name="EndeKontaktSelbsthilfe"/>
+    <property name="EndeKontaktSonstige"/>
+    <property name="BeginnKrankenversicherung"/>
+    <property name="EndeKrankenversicherung"/>
+    <property name="BeginnKontaktArzt"/>
+    <property name="EndeKontaktArzt"/>
+    <property name="VorlageSchwerbehindertenausweises"/>
+    <property name="Bundesland"/>
+    <property name="IsWohnungslosenhilfe"/>
+    <property name="ArtDesHilfeangebots"/>
+    <property name="Betreuungsbeginn"/>
+    <property name="Betreuungsende"/>
+    <property name="BetreuungsdauerInTagen"/>
+    <property name="ArtDerBeendigung"/>
+    <property name="Geburtsdatum"/>
+    <property name="Geschlechtidentitat"/>
+    <property name="Staatsangehorigkeit"/>
+    <property name="Aufenthaltsstatus"/>
+    <property name="Migrationshintergrund"/>
+    <property name="HochsterSchulabschluss"/>
+    <property name="Familienstand"/>
+    <property name="Haushaltsstruktur"/>
+    <property name="EigeneMindKinderAuserhalbHaushaltsstruktur"/>
+  </class>
+</hibernate-mapping>
diff --git a/Model/Changes_2024_09_23 CustomerFalldatenDrop.txt b/Model/Changes_2024_09_22 CustomerFalldatenDrop.txt
similarity index 97%
rename from Model/Changes_2024_09_23 CustomerFalldatenDrop.txt
rename to Model/Changes_2024_09_22 CustomerFalldatenDrop.txt
index be4e6cc78..c76b27084 100644
--- a/Model/Changes_2024_09_23 CustomerFalldatenDrop.txt	
+++ b/Model/Changes_2024_09_22 CustomerFalldatenDrop.txt	
@@ -3,4 +3,6 @@ DROP FOREIGN KEY `FK_CUSTOMERFALLDATEN`;
 ALTER TABLE `customer` 
 DROP COLUMN `CustomerFalldatenOid`,
 DROP INDEX `FK_CUSTOMERFALLDATEN_idx` ;
-;
\ No newline at end of file
+;
+
+
diff --git a/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt b/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt
index f78e3af67..8780fcf3c 100644
--- a/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt	
+++ b/Model/Changes_2024_09_23 Customer Vermittlung Arbeit.txt	
@@ -51,10 +51,10 @@ ALTER TABLE `customervermittlungarbeit`
 ADD CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_AUFTRAGSHERKUNFT`
   FOREIGN KEY (`Auftragsherkunft`)
   REFERENCES `7375324044`.`valuelistentry` (`Oid`)
-  ON DELETE NO ACTION
-  ON UPDATE NO ACTION,
+  ON DELETE SET NULL
+  ON UPDATE CASCADE,
 ADD CONSTRAINT `FK_CUSTOMERVERMITTLUNGARBEIT_VERMITTLUNGSGRUNDLAGE`
   FOREIGN KEY (`Vermittlungsgrundlage`)
   REFERENCES `valuelistentry` (`Oid`)
-  ON DELETE NO ACTION
-  ON UPDATE NO ACTION;
+  ON DELETE SET NULL
+  ON UPDATE CASCADE;
diff --git a/Model/Changes_2024_09_23 Customer Wohnhilfe.txt b/Model/Changes_2024_09_23 Customer Wohnhilfe.txt
new file mode 100644
index 000000000..26d83ff4e
--- /dev/null
+++ b/Model/Changes_2024_09_23 Customer Wohnhilfe.txt	
@@ -0,0 +1,70 @@
+CREATE TABLE `CustomerWohnhilfe` (
+`Oid` bigint NOT NULL AUTO_INCREMENT,
+`InsTs` datetime DEFAULT NULL,
+`InsUser` varchar(256) DEFAULT NULL,
+`Notice` varchar(1024) DEFAULT NULL,
+`Tid` int DEFAULT NULL,
+`UdpUser` varchar(256) DEFAULT NULL,
+`Version` bigint DEFAULT NULL,
+`IsActive` tinyint DEFAULT NULL,
+`SystemEntryID` int DEFAULT NULL,
+`CustomerOid` bigint NOT NULL,
+`Displayname` varchar(256) DEFAULT NULL,
+`Verbandszugehorigkeit` tinyint DEFAULT NULL,
+`Geschlecht` tinyint DEFAULT NULL,
+`AlterAmStichtag` int DEFAULT NULL,
+`Haushaltsgrosse` int DEFAULT NULL,
+`BerichtseinheitID` varchar(256),
+`Unterbringungsart` tinyint DEFAULT NULL,
+`OrtDerEinrichtung` int DEFAULT NULL,
+`Angebot` tinyint DEFAULT NULL,
+`BeginnEinkommenssituation` tinyint,
+`EndeEinkommenssituation` tinyint,
+`BeginnAufstockungEinkommen` tinyint,
+`EndeAufstockungEinkommen` tinyint,
+`BeginnEigenesBankkonto` tinyint,
+`EndeEigenesBankkonto` tinyint,
+`Uberschuldung` tinyint,
+`Berufsabschluss` tinyint,
+`ErwerbsfahigkeitSinnSGB` tinyint,
+`BeginnBeschaftigungsstatus` tinyint,
+`EndeBeschaftigungsstatus` tinyint,
+`DauerArbeitslosigkeit` tinyint,
+`BeginnSozialeKontakte` tinyint,
+`BeginnKontaktPartner` tinyint,
+`BeginnKontaktMindKinder` tinyint,
+`BeginnKontaktVolljahrKinderElternVerwandten` tinyint,
+`BeginnKontaktFreundenBekannten` tinyint,
+`BeginnKontaktSelbsthilfe` tinyint,
+`BeginnKontaktSonstige` tinyint,
+`EndeSozialeKontakte` tinyint,
+`EndeKontaktPartner` tinyint,
+`EndeKontaktMindKinder` tinyint,
+`EndeKontaktVolljahrKinderElternVerwandten` tinyint,
+`EndeKontaktFreundenBekannten` tinyint,
+`EndeKontaktSelbsthilfe` tinyint,
+`EndeKontaktSonstige` tinyint,
+`BeginnKrankenversicherung` tinyint,
+`EndeKrankenversicherung` tinyint,
+`BeginnKontaktArzt` tinyint,
+`EndeKontaktArzt` tinyint,
+`VorlageSchwerbehindertenausweises` tinyint,
+`Bundesland` tinyint DEFAULT NULL,
+`IsWohnungslosenhilfe` tinyint,
+`ArtDesHilfeangebots` tinyint,
+`Betreuungsbeginn` datetime DEFAULT NULL,
+`Betreuungsende` datetime DEFAULT NULL,
+`BetreuungsdauerInTagen` int DEFAULT NULL,
+`ArtDerBeendigung` tinyint,
+`Geburtsdatum` datetime DEFAULT NULL,
+`Geschlechtidentitat` tinyint,
+`Staatsangehorigkeit` SMALLINT DEFAULT NULL,
+`Aufenthaltsstatus` tinyint,
+`Migrationshintergrund` tinyint,
+`HochsterSchulabschluss` tinyint,
+`Familienstand` tinyint,
+`Haushaltsstruktur` tinyint,
+`EigeneMindKinderAuserhalbHaushaltsstruktur` tinyint,
+PRIMARY KEY (`Oid`),
+CONSTRAINT `FK_CUSTOMERWOHNHILFE_CUSTOMER` FOREIGN KEY (`CustomerOid`) REFERENCES `customer` (`Oid`) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=latin1;
\ No newline at end of file
diff --git a/Service/DCEntityMapper/CustomerDC_Customer.cs b/Service/DCEntityMapper/CustomerDC_Customer.cs
index 65e1f8f5c..18d8d2586 100644
--- a/Service/DCEntityMapper/CustomerDC_Customer.cs
+++ b/Service/DCEntityMapper/CustomerDC_Customer.cs
@@ -130,6 +130,7 @@ namespace BeWo.Service.DCEntityMapper
 			pDataContract.AssessmentSheetCategoryDCs = MapperFactory.AssessmentSheetCategoryDC_AssessmentSheetCategory.MapToNewDCs(pEntity.AssessmentSheetCategoryList);
 
 			pDataContract.CustomerVermittlungArbeitDC = MapperFactory.CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.MapToNewDCs(pEntity.CustomerVermittlungArbeiten);
+			pDataContract.CustomerWohnhilfeDC = MapperFactory.CustomerWohnhilfeDC_CustomerWohnhilfe.MapToNewDCs(pEntity.CustomerWohnhilfen);
 
 			return pDataContract;
 		}
@@ -290,11 +291,12 @@ namespace BeWo.Service.DCEntityMapper
 		    MapperFactory.ArbeitszeitDC_Arbeitszeit.MergeWithEntitys(pDataContract.Arbeitszeiten, pEntity.Arbeitszeiten);
 
 			MapperFactory.CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.MergeWithEntitys(pDataContract.CustomerVermittlungArbeitDC, pEntity.CustomerVermittlungArbeiten);
+			if (pEntity.CustomerVermittlungArbeiten is IList<CustomerVermittlungArbeit> lv && lv.Any())
+				lv.DoForEach(x => x.Customer = pEntity);
 
-			var v = pEntity.CustomerVermittlungArbeiten;
-
-			if (v is object && v.Any())
-				v.DoForEach(x => x.Customer = pEntity);
+			MapperFactory.CustomerWohnhilfeDC_CustomerWohnhilfe.MergeWithEntitys(pDataContract.CustomerWohnhilfeDC, pEntity.CustomerWohnhilfen);
+			if (pEntity.CustomerWohnhilfen is IList<CustomerWohnhilfe> lw && lw.Any())
+				lw.DoForEach(x => x.Customer = pEntity);
 
 			return pEntity;
 		}
diff --git a/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs
new file mode 100644
index 000000000..7c6bdf354
--- /dev/null
+++ b/Service/DCEntityMapper/CustomerWohnhilfeDC_CustomerWohnhilfe.cs
@@ -0,0 +1,174 @@
+using System.Collections.Generic;
+using System.Linq;
+
+using BeWo.Data.Access;
+using BeWo.Data.Entities;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Wohnhilfe;
+
+namespace BeWo.Service.DCEntityMapper
+{
+	public class CustomerWohnhilfeDC_CustomerWohnhilfe : AbstractIDCEntityMapper<CustomerWohnhilfe, CustomerWohnhilfeDC>
+	{
+		public override CustomerWohnhilfeDC MergeWithDC(CustomerWohnhilfe pEntity, CustomerWohnhilfeDC pDataContract)
+		{
+			pDataContract.Oid = pEntity.Oid;
+			pDataContract.Version = pEntity.Version;
+			pDataContract.Notice = pEntity.Notice;
+			pDataContract.Displayname = pEntity.Displayname;
+			pDataContract.BereichBundDC = new CustomerWohnhilfeBereichBundDC
+			{
+				Verbandszugehorigkeit = pEntity.Verbandszugehorigkeit,
+				Geschlecht = pEntity.Geschlecht,
+				AlterAmStichtag = pEntity.AlterAmStichtag,
+				Haushaltsgrosse = pEntity.Haushaltsgrosse,
+				BerichtseinheitID = pEntity.BerichtseinheitID,
+				Unterbringungsart = pEntity.Unterbringungsart,
+				OrtDerEinrichtung = pEntity.OrtDerEinrichtung,
+				Angebot = pEntity.Angebot
+			};
+			pDataContract.BereichEinkommenUndArbeitDC = new CustomerWohnhilfeBereichEinkommenUndArbeitDC
+			{
+				BeginnEinkommenssituation = pEntity.BeginnEinkommenssituation,
+				EndeEinkommenssituation = pEntity.EndeEinkommenssituation,
+				BeginnAufstockungEinkommen = pEntity.BeginnAufstockungEinkommen,
+				EndeAufstockungEinkommen = pEntity.EndeAufstockungEinkommen,
+				BeginnEigenesBankkonto = pEntity.BeginnEigenesBankkonto,
+				EndeEigenesBankkonto = pEntity.EndeEigenesBankkonto,
+				Uberschuldung = pEntity.Uberschuldung,
+				Berufsabschluss = pEntity.Berufsabschluss,
+				ErwerbsfahigkeitSinnSGB = pEntity.ErwerbsfahigkeitSinnSGB,
+				BeginnBeschaftigungsstatus = pEntity.BeginnBeschaftigungsstatus,
+				EndeBeschaftigungsstatus = pEntity.EndeBeschaftigungsstatus,
+				DauerArbeitslosigkeit = pEntity.DauerArbeitslosigkeit
+			};
+			pDataContract.BereichSozialeKontakteDC = new CustomerWohnhilfeBereichSozialeKontakteDC
+			{
+				BeginnSozialeKontakte = pEntity.BeginnSozialeKontakte,
+				BeginnKontaktPartner = pEntity.BeginnKontaktPartner,
+				BeginnKontaktMindKinder = pEntity.BeginnKontaktMindKinder,
+				BeginnKontaktVolljahrKinderElternVerwandten = pEntity.BeginnKontaktVolljahrKinderElternVerwandten,
+				BeginnKontaktFreundenBekannten = pEntity.BeginnKontaktFreundenBekannten,
+				BeginnKontaktSelbsthilfe = pEntity.BeginnKontaktSelbsthilfe,
+				BeginnKontaktSonstige = pEntity.BeginnKontaktSonstige,
+				EndeSozialeKontakte = pEntity.EndeSozialeKontakte,
+				EndeKontaktPartner = pEntity.EndeKontaktPartner,
+				EndeKontaktMindKinder = pEntity.EndeKontaktMindKinder,
+				EndeKontaktVolljahrKinderElternVerwandten = pEntity.EndeKontaktVolljahrKinderElternVerwandten,
+				EndeKontaktFreundenBekannten = pEntity.EndeKontaktFreundenBekannten,
+				EndeKontaktSelbsthilfe = pEntity.EndeKontaktSelbsthilfe,
+				EndeKontaktSonstige = pEntity.EndeKontaktSonstige,
+				BeginnKrankenversicherung = pEntity.BeginnKrankenversicherung,
+				EndeKrankenversicherung = pEntity.EndeKrankenversicherung,
+				BeginnKontaktArzt = pEntity.BeginnKontaktArzt,
+				EndeKontaktArzt = pEntity.EndeKontaktArzt,
+				VorlageSchwerbehindertenausweises = pEntity.VorlageSchwerbehindertenausweises
+			};
+			pDataContract.BereichSozialstrukturDC = new CustomerWohnhilfeBereichSozialstrukturDC
+			{
+				Bundesland = pEntity.Bundesland,
+				IsWohnungslosenhilfe = pEntity.IsWohnungslosenhilfe,
+				ArtDesHilfeangebots = pEntity.ArtDesHilfeangebots,
+				Betreuungsbeginn = pEntity.Betreuungsbeginn,
+				Betreuungsende = pEntity.Betreuungsende,
+				BetreuungsdauerInTagen = pEntity.BetreuungsdauerInTagen,
+				ArtDerBeendigung = pEntity.ArtDerBeendigung,
+				Geburtsdatum = pEntity.Geburtsdatum,
+				Geschlechtidentitat = pEntity.Geschlechtidentitat,
+				Staatsangehorigkeit = pEntity.Staatsangehorigkeit,
+				Aufenthaltsstatus = pEntity.Aufenthaltsstatus,
+				Migrationshintergrund = pEntity.Migrationshintergrund,
+				HochsterSchulabschluss = pEntity.HochsterSchulabschluss,
+				Familienstand = pEntity.Familienstand,
+				Haushaltsstruktur = pEntity.Haushaltsstruktur,
+				EigeneMindKinderAuserhalbHaushaltsstruktur = pEntity.EigeneMindKinderAuserhalbHaushaltsstruktur
+			};
+
+			return pDataContract;
+		}
+
+		public override CustomerWohnhilfe MergeWithEntity(CustomerWohnhilfeDC pDataContract, CustomerWohnhilfe pEntity)
+		{
+			pEntity.Oid = pDataContract.Oid;
+			pEntity.Version = pDataContract.Version;
+			pEntity.Notice = pDataContract.Notice;
+
+			pEntity.Displayname = pDataContract.Displayname;
+
+			pEntity.Verbandszugehorigkeit = pDataContract.BereichBundDC.Verbandszugehorigkeit;
+			pEntity.Geschlecht = pDataContract.BereichBundDC.Geschlecht;
+			pEntity.AlterAmStichtag = pDataContract.BereichBundDC.AlterAmStichtag;
+			pEntity.Haushaltsgrosse = pDataContract.BereichBundDC.Haushaltsgrosse;
+			pEntity.BerichtseinheitID = pDataContract.BereichBundDC.BerichtseinheitID;
+			pEntity.Unterbringungsart = pDataContract.BereichBundDC.Unterbringungsart;
+			pEntity.OrtDerEinrichtung = pDataContract.BereichBundDC.OrtDerEinrichtung;
+			pEntity.Angebot = pDataContract.BereichBundDC.Angebot;
+			pEntity.BeginnEinkommenssituation = pDataContract.BereichEinkommenUndArbeitDC.BeginnEinkommenssituation;
+			pEntity.EndeEinkommenssituation = pDataContract.BereichEinkommenUndArbeitDC.EndeEinkommenssituation;
+			pEntity.BeginnAufstockungEinkommen = pDataContract.BereichEinkommenUndArbeitDC.BeginnAufstockungEinkommen;
+			pEntity.EndeAufstockungEinkommen = pDataContract.BereichEinkommenUndArbeitDC.EndeAufstockungEinkommen;
+			pEntity.BeginnEigenesBankkonto = pDataContract.BereichEinkommenUndArbeitDC.BeginnEigenesBankkonto;
+			pEntity.EndeEigenesBankkonto = pDataContract.BereichEinkommenUndArbeitDC.EndeEigenesBankkonto;
+			pEntity.Uberschuldung = pDataContract.BereichEinkommenUndArbeitDC.Uberschuldung;
+			pEntity.Berufsabschluss = pDataContract.BereichEinkommenUndArbeitDC.Berufsabschluss;
+			pEntity.ErwerbsfahigkeitSinnSGB = pDataContract.BereichEinkommenUndArbeitDC.ErwerbsfahigkeitSinnSGB;
+			pEntity.BeginnBeschaftigungsstatus = pDataContract.BereichEinkommenUndArbeitDC.BeginnBeschaftigungsstatus;
+			pEntity.EndeBeschaftigungsstatus = pDataContract.BereichEinkommenUndArbeitDC.EndeBeschaftigungsstatus;
+			pEntity.DauerArbeitslosigkeit = pDataContract.BereichEinkommenUndArbeitDC.DauerArbeitslosigkeit;
+			pEntity.BeginnSozialeKontakte = pDataContract.BereichSozialeKontakteDC.BeginnSozialeKontakte;
+			pEntity.BeginnKontaktPartner = pDataContract.BereichSozialeKontakteDC.BeginnKontaktPartner;
+			pEntity.BeginnKontaktMindKinder = pDataContract.BereichSozialeKontakteDC.BeginnKontaktMindKinder;
+			pEntity.BeginnKontaktVolljahrKinderElternVerwandten = pDataContract.BereichSozialeKontakteDC.BeginnKontaktVolljahrKinderElternVerwandten;
+			pEntity.BeginnKontaktFreundenBekannten = pDataContract.BereichSozialeKontakteDC.BeginnKontaktFreundenBekannten;
+			pEntity.BeginnKontaktSelbsthilfe = pDataContract.BereichSozialeKontakteDC.BeginnKontaktSelbsthilfe;
+			pEntity.BeginnKontaktSonstige = pDataContract.BereichSozialeKontakteDC.BeginnKontaktSonstige;
+			pEntity.EndeSozialeKontakte = pDataContract.BereichSozialeKontakteDC.EndeSozialeKontakte;
+			pEntity.EndeKontaktPartner = pDataContract.BereichSozialeKontakteDC.EndeKontaktPartner;
+			pEntity.EndeKontaktMindKinder = pDataContract.BereichSozialeKontakteDC.EndeKontaktMindKinder;
+			pEntity.EndeKontaktVolljahrKinderElternVerwandten = pDataContract.BereichSozialeKontakteDC.EndeKontaktVolljahrKinderElternVerwandten;
+			pEntity.EndeKontaktFreundenBekannten = pDataContract.BereichSozialeKontakteDC.EndeKontaktFreundenBekannten;
+			pEntity.EndeKontaktSelbsthilfe = pDataContract.BereichSozialeKontakteDC.EndeKontaktSelbsthilfe;
+			pEntity.EndeKontaktSonstige = pDataContract.BereichSozialeKontakteDC.EndeKontaktSonstige;
+			pEntity.BeginnKrankenversicherung = pDataContract.BereichSozialeKontakteDC.BeginnKrankenversicherung;
+			pEntity.EndeKrankenversicherung = pDataContract.BereichSozialeKontakteDC.EndeKrankenversicherung;
+			pEntity.BeginnKontaktArzt = pDataContract.BereichSozialeKontakteDC.BeginnKontaktArzt;
+			pEntity.EndeKontaktArzt = pDataContract.BereichSozialeKontakteDC.EndeKontaktArzt;
+			pEntity.VorlageSchwerbehindertenausweises = pDataContract.BereichSozialeKontakteDC.VorlageSchwerbehindertenausweises;
+			pEntity.Bundesland = pDataContract.BereichSozialstrukturDC.Bundesland;
+			pEntity.ArtDesHilfeangebots = pDataContract.BereichSozialstrukturDC.ArtDesHilfeangebots;
+			pEntity.Betreuungsbeginn = pDataContract.BereichSozialstrukturDC.Betreuungsbeginn;
+			pEntity.Betreuungsende = pDataContract.BereichSozialstrukturDC.Betreuungsende;
+			pEntity.BetreuungsdauerInTagen = pDataContract.BereichSozialstrukturDC.BetreuungsdauerInTagen;
+			pEntity.ArtDerBeendigung = pDataContract.BereichSozialstrukturDC.ArtDerBeendigung;
+			pEntity.Geburtsdatum = pDataContract.BereichSozialstrukturDC.Geburtsdatum;
+			pEntity.Geschlechtidentitat = pDataContract.BereichSozialstrukturDC.Geschlechtidentitat;
+			pEntity.Staatsangehorigkeit = pDataContract.BereichSozialstrukturDC.Staatsangehorigkeit;
+			pEntity.Aufenthaltsstatus = pDataContract.BereichSozialstrukturDC.Aufenthaltsstatus;
+			pEntity.Migrationshintergrund = pDataContract.BereichSozialstrukturDC.Migrationshintergrund;
+			pEntity.HochsterSchulabschluss = pDataContract.BereichSozialstrukturDC.HochsterSchulabschluss;
+			pEntity.Familienstand = pDataContract.BereichSozialstrukturDC.Familienstand;
+			pEntity.Haushaltsstruktur = pDataContract.BereichSozialstrukturDC.Haushaltsstruktur;
+			pEntity.EigeneMindKinderAuserhalbHaushaltsstruktur = pDataContract.BereichSozialstrukturDC.EigeneMindKinderAuserhalbHaushaltsstruktur;
+
+			if (pDataContract.BereichSozialstrukturDC.IsWohnungslosenhilfe.HasValue)
+				pEntity.IsWohnungslosenhilfe = pDataContract.BereichSozialstrukturDC.IsWohnungslosenhilfe.Value;
+			else
+				pEntity.IsWohnungslosenhilfe = true;
+
+			return pEntity;
+		}
+
+		protected override bool AreDCAndEntityEqual(CustomerWohnhilfeDC pDC, CustomerWohnhilfe pEntity)
+		{
+			if (pDC.Oid == null)
+			{
+				return false;
+			}
+
+			return pDC.Oid == pEntity.Oid;
+		}
+	}
+}
diff --git a/Service/DCEntityMapper/MapperFactory.cs b/Service/DCEntityMapper/MapperFactory.cs
index 0905bafdd..928e205bc 100644
--- a/Service/DCEntityMapper/MapperFactory.cs
+++ b/Service/DCEntityMapper/MapperFactory.cs
@@ -306,6 +306,8 @@ namespace BeWo.Service.DCEntityMapper
 
         private static CustomerVermittlungArbeitDC_CustomerVermittlungArbeit _CustomerVermittlungArbeitDC_CustomerVermittlungArbeit;
 
+        private static CustomerWohnhilfeDC_CustomerWohnhilfe _CustomerWohnhilfeDC_CustomerWohnhilfe;
+
         public static MedRecordDC_MedRecord MedRecordDC_MedRecord =>
              _MedRecordDC_MedRecord ?? (_MedRecordDC_MedRecord = new MedRecordDC_MedRecord());
 
@@ -768,5 +770,8 @@ namespace BeWo.Service.DCEntityMapper
         
         public static CustomerVermittlungArbeitDC_CustomerVermittlungArbeit CustomerVermittlungArbeitDC_CustomerVermittlungArbeit =>
             _CustomerVermittlungArbeitDC_CustomerVermittlungArbeit ?? (_CustomerVermittlungArbeitDC_CustomerVermittlungArbeit = new CustomerVermittlungArbeitDC_CustomerVermittlungArbeit());
+        
+        public static CustomerWohnhilfeDC_CustomerWohnhilfe CustomerWohnhilfeDC_CustomerWohnhilfe =>
+            _CustomerWohnhilfeDC_CustomerWohnhilfe ?? (_CustomerWohnhilfeDC_CustomerWohnhilfe = new CustomerWohnhilfeDC_CustomerWohnhilfe());
     }
 }
\ No newline at end of file
diff --git a/Service/Service.csproj b/Service/Service.csproj
index c486f25f5..2e33fead2 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -228,6 +228,7 @@
     <Compile Include="DCEntityMapper\BargeldtransaktionshistoryDC_Bargeldtransaktionshistory.cs" />
     <Compile Include="DCEntityMapper\ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs" />
     <Compile Include="DCEntityMapper\CustomerVermittlungArbeitDC_CustomerVermittlungArbeit.cs" />
+    <Compile Include="DCEntityMapper\CustomerWohnhilfeDC_CustomerWohnhilfe.cs" />
     <Compile Include="DCEntityMapper\ImageDC_Image.cs" />
     <Compile Include="DCEntityMapper\DienstvertretungDC_Dienstvertretung.cs" />
     <Compile Include="DCEntityMapper\DokumentvorlageDC_Dokumentvorlage.cs" />
diff --git a/Shared/Core/Utils.cs b/Shared/Core/Utils.cs
index d7cb73579..ce20f6383 100644
--- a/Shared/Core/Utils.cs
+++ b/Shared/Core/Utils.cs
@@ -1118,6 +1118,27 @@ namespace BS.Shared.Core
 
             return string.Format("{0:n" + decimalPlaces + "} {1}", dValue, SizeSuffixes[i]);
         }
+
+
+        public static int GetAge(DateTime birthday)
+            => GetAge(birthday, DateTime.Today);
+        public static int GetAge(DateTime birthday, DateTime compareTo)
+		{
+            if (compareTo <= birthday)
+                return -1;
+
+            // https://stackoverflow.com/a/1595311
+            int age = compareTo.Year - birthday.Year;
+
+            // For leap years we need this
+            if (birthday > compareTo.AddYears(-age))
+                age--;
+            // Don't use:
+            // if (birthDate.AddYears(age) > now) 
+            //     age--;
+
+            return age;
+        }
     }
 
     public struct NullCompareResult
diff --git a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichBundDC.cs b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichBundDC.cs
index 15b93dc35..2062a60b3 100644
--- a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichBundDC.cs
+++ b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichBundDC.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BS.Shared.DataContracts.Wohnhilfe
 {
-    public class CustomerWohnhilfeBereichBundDC : BeWoDataContract
+    public class CustomerWohnhilfeBereichBundDC : IDataContract
     {
         [DataMember] public Verbandszugehorigkeit? Verbandszugehorigkeit { get; set; }
         [DataMember] public Geschlecht? Geschlecht { get; set; }
diff --git a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitDC.cs b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitDC.cs
index 3a2f44482..b68c8e713 100644
--- a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitDC.cs
+++ b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichEinkommenUndArbeitDC.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BS.Shared.DataContracts.Wohnhilfe
 {
-    public class CustomerWohnhilfeBereichEinkommenUndArbeitDC : BeWoDataContract
+    public class CustomerWohnhilfeBereichEinkommenUndArbeitDC : IDataContract
     {
         [DataMember] public Einkommenssituation BeginnEinkommenssituation { get; set; }
         [DataMember] public Einkommenssituation EndeEinkommenssituation { get; set; }
diff --git a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteDC.cs b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteDC.cs
index 1915dde09..0b5f36c64 100644
--- a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteDC.cs
+++ b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialeKontakteDC.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BS.Shared.DataContracts.Wohnhilfe
 {
-    public class CustomerWohnhilfeBereichSozialeKontakteDC : BeWoDataContract
+    public class CustomerWohnhilfeBereichSozialeKontakteDC : IDataContract
     {
         [DataMember] public WohnhilfeBoolData BeginnSozialeKontakte { get; set; }
         [DataMember] public bool BeginnKontaktPartner { get; set; }
diff --git a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturDC.cs b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturDC.cs
index 158293a5f..cae9af8bf 100644
--- a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturDC.cs
+++ b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeBereichSozialstrukturDC.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BS.Shared.DataContracts.Wohnhilfe
 {
-    public class CustomerWohnhilfeBereichSozialstrukturDC : BeWoDataContract
+    public class CustomerWohnhilfeBereichSozialstrukturDC : IDataContract
     {
         [DataMember] public Bundesland? Bundesland { get; set; }
         [DataMember] public bool? IsWohnungslosenhilfe { get; set; }
diff --git a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeDC.cs b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeDC.cs
index 6ef4950d5..0853697a8 100644
--- a/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeDC.cs
+++ b/Shared/DataContracts/Wohnhilfe/CustomerWohnhilfeDC.cs
@@ -12,7 +12,7 @@ namespace BS.Shared.DataContracts.Wohnhilfe
 {
     public class CustomerWohnhilfeDC : BeWoDataContract
     {
-        [DataMember] public string Dispalyname { get; set; }
+        [DataMember] public string Displayname { get; set; }
         [DataMember] public CustomerWohnhilfeBereichBundDC BereichBundDC { get; set; }
         [DataMember] public CustomerWohnhilfeBereichEinkommenUndArbeitDC BereichEinkommenUndArbeitDC { get; set; }
         [DataMember] public CustomerWohnhilfeBereichSozialeKontakteDC BereichSozialeKontakteDC { get; set; }

From 95f40644333ff8f750e6d229cb59ffd3ddbe6c80 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Wed, 25 Sep 2024 09:41:03 +0200
Subject: [PATCH 15/22] LyvieKupfer/ServiceInvoiceReport.cs - Anpassung Text

---
 ReportImp/LyvieKupfer/ServiceInvoiceReport.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReportImp/LyvieKupfer/ServiceInvoiceReport.cs b/ReportImp/LyvieKupfer/ServiceInvoiceReport.cs
index 71e3e4941..6a61f0ebd 100644
--- a/ReportImp/LyvieKupfer/ServiceInvoiceReport.cs
+++ b/ReportImp/LyvieKupfer/ServiceInvoiceReport.cs
@@ -28,7 +28,7 @@ namespace LyvieKupfer
                     {
                         foreach (var ii in sip.ServiceInvoiceItems)
                         {
-                            hours = ii.Hours.Value;
+                            hours += ii.Hours.Value;
                         }
                     }
                 }

From e5228a08ae3379de53e51bd74b5ffb0b7a3558ae Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Wed, 25 Sep 2024 09:41:27 +0200
Subject: [PATCH 16/22] AWOMuensterlandRecklinghausen/SbdRechnung2024.cs -
 Anpassung Text bei Differenzrechnung

---
 .../SbdRechnung2024.cs                            | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs
index e28bde9cd..bb995a588 100644
--- a/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs
+++ b/ReportImp/AWOMuensterlandRecklinghausen/SbdRechnung2024.cs
@@ -27,12 +27,10 @@ namespace AWOMuensterlandRecklinghausen
 
         public void SetReportDataSource(ServiceInvoiceRO pRO)
         {
-          
             //CreateAbrechnungsItems(pRO);
             SetzeEmpfaengerAdresse(pRO);
             SetzeBetraege(pRO);
             this.bindingSource1.DataSource = pRO;
-
         }
 
         private void SetzeBetraege(ServiceInvoiceRO pRO)
@@ -87,17 +85,10 @@ namespace AWOMuensterlandRecklinghausen
                         {
                             if (!String.IsNullOrEmpty(ii.ServiceDescription) && ii.ServiceDescription.StartsWith("Rechnungsdifferenz")
                                 && pRO.InvoiceBase.SupportConceptOid.HasValue)
-                            {
-                                var sc = DAOFactory.GenericDAO.GetByID<SupportConcept>(pRO.InvoiceBase.SupportConceptOid.Value);
-                                if (sc != null)
+                            {                               
+                                if (!pRO.Notice.IsNullOrEmpty())
                                 {
-                                    var cb2sc = sc.CostBearer2SupportConceptList.Where(s => s.SupportConcept.Oid == pRO.InvoiceBase.SupportConceptOid.Value).FirstOrDefault();
-                                    var scap = cb2sc.ApprovalPeriodList.Where(ap => ap.ServiceCategory != null && ap.ServiceCategory.Name.Contains("Interne") &&
-                                        ap.StartDate < pRO.AccountingPeriodEnd && ap.EndDate > pRO.AccountingPeriodStart).FirstOrDefault();
-                                    if (!scap.Notice.IsNullOrEmpty())
-                                    {
-                                        lblEndtext.Text = scap.Notice + "\n \n" + lblEndtext.Text;
-                                    }
+                                    lblEndtext.Text = pRO.Notice + "\n \n" + lblEndtext.Text;
                                 }
                             }
                         }

From b9ac06c0ce6d74ce5f26ee103f98b999e91550f8 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Wed, 25 Sep 2024 11:02:02 +0200
Subject: [PATCH 17/22] Entity List null

---
 Data/Entities/Customer.cs | 606 +++++++++++++++++++-------------------
 1 file changed, 308 insertions(+), 298 deletions(-)

diff --git a/Data/Entities/Customer.cs b/Data/Entities/Customer.cs
index 4fbfc0d91..00e4d643b 100644
--- a/Data/Entities/Customer.cs
+++ b/Data/Entities/Customer.cs
@@ -8,115 +8,117 @@ namespace BeWo.Data.Entities
 {
 	public class Customer : BeWoEntityBase
 	{
-        public static string PropertyName_AbsenceTimes                   = "AbsenceTimes";
-        public static string PropertyName_Ansprechpartner                = "Ansprechpartner";
-        public static string PropertyName_AssessmentSheetCategoryList    = "AssessmentSheetCategoryList";
-        public static string PropertyName_Childs                         = "Childs";
-        public static string PropertyName_Customer2CostBearerList        = "Customer2CostBearerList";
-        public static string PropertyName_Customer2PersonList            = "Customer2PersonList";
-        public static string PropertyName_Customer2OrganisationList      = "Customer2OrganisationList";
-        public static string PropertyName_DebitorNumber                  = "DebitorNumber";
-        public static string PropertyName_CostCenter                     = "CostCenter";
-        public static string PropertyName_Diagnosis                      = "Diagnosis";
-        public static string PropertyName_Diagnosis2CustomerList         = "Diagnosis2CustomerList";
-        public static string PropertyName_Employee2CustomerList          = "Employee2CustomerList";
-        public static string PropertyName_FamilyData                     = "FamilyData";
-        public static string PropertyName_Team2CustomerList              = "Team2CustomerList";
-        public static string PropertyName_EquityContribution             = "EquityContribution";
-        public static string PropertyName_ICD10Diagnosis                 = "ICD10Diagnosis";
-        public static string PropertyName_IsAdvisedOrAttended            = "IsAdvisedOrAttended";
-        public static string PropertyName_Medication                     = "Medication";
-        public static string PropertyName_Jugendamt                      = "Jugendamt";
-        public static string PropertyName_Person                         = "Person";
-        public static string PropertyName_PlacementList                  = "PlacementList";
-        public static string PropertyName_ReferenceNumber                = "ReferenceNumber";
-        public static string PropertyName_ServiceRecordList              = "ServiceRecordList";
-        public static string PropertyName_SupportConcepts                = "SupportConcepts";
-        public static string PropertyName_TerminationDate                = "TerminationDate";
-        public static string PropertyName_TerminationReason              = "TerminationReason";
-        public static string PropertyName_ValueList                      = "ValueList";
-        public static string PropertyName_VarFieldValueList              = "VarFieldValueList";
-        public static string PropertyName_Medikamentenverordnungslisten  = "Medikamentenverordnungslisten";
-        public static string PropertyName_AssistanceBegin                = "AssistanceBegin";
-        public static string PropertyName_AusstVersAmt                   = "AusstVersAmt";
-        public static string PropertyName_AusweisGueltigVon              = "AusweisGueltigVon";
-        public static string PropertyName_AusweisGueltigBis              = "AusweisGueltigBis";
-        public static string PropertyName_AusweisUnbefristetGueltig      = "AusweisUnbefristetGueltig";
-        public static string PropertyName_AusweisAktenzeichen			 = "AusweisAktenzeichen";
-        public static string PropertyName_BeiblattGueltigBis             = "BeiblattGueltigBis";
-        public static string PropertyName_GradDerBehinderung             = "GradDerBehinderung";
-        public static string PropertyName_MerkzeichenListe               = "MerkzeichenListe";
-        public static string PropertyName_BehinderungsartenListe         = "BehinderungsartenListe";
-	    public static string PropertyName_CustomerAlias                  = "CustomerAlias";
-        public static string PropertyName_Pflegegrad                     = "Pflegegrad";
-        public static string PropertyName_IsMigrant                      = "IsMigrant";
-	    public static string PropertyName_Nationalitaet                  = "Nationalitaet";
-	    public static string PropertyName_AufenthaltsStatus              = "AufenthaltsStatus";
-	    public static string PropertyName_VertretungGewuenscht           = "VertretungGewuenscht";
-        public static string PropertyName_AbWelchemKrankheitsTag         = "AbWelchemKrankheitsTag ";
-        public static string PropertyName_VertretungDringendErforderlich = "VertretungGewuenscht";
-	    public static string PropertyName_Arbeitszeit                    = "Arbeitszeit";
-	    public static string PropertyName_HealthInsurance				 = "Krankenkasse";
-		public static string PropertyName_InsuranceNumber				 = "InsuranceNumber";
-		public static string PropertyName_VersichertenStatus             = "Versichertenstatus";
+		public static string PropertyName_AbsenceTimes = "AbsenceTimes";
+		public static string PropertyName_Ansprechpartner = "Ansprechpartner";
+		public static string PropertyName_AssessmentSheetCategoryList = "AssessmentSheetCategoryList";
+		public static string PropertyName_Childs = "Childs";
+		public static string PropertyName_Customer2CostBearerList = "Customer2CostBearerList";
+		public static string PropertyName_Customer2PersonList = "Customer2PersonList";
+		public static string PropertyName_Customer2OrganisationList = "Customer2OrganisationList";
+		public static string PropertyName_DebitorNumber = "DebitorNumber";
+		public static string PropertyName_CostCenter = "CostCenter";
+		public static string PropertyName_Diagnosis = "Diagnosis";
+		public static string PropertyName_Diagnosis2CustomerList = "Diagnosis2CustomerList";
+		public static string PropertyName_Employee2CustomerList = "Employee2CustomerList";
+		public static string PropertyName_FamilyData = "FamilyData";
+		public static string PropertyName_Team2CustomerList = "Team2CustomerList";
+		public static string PropertyName_EquityContribution = "EquityContribution";
+		public static string PropertyName_ICD10Diagnosis = "ICD10Diagnosis";
+		public static string PropertyName_IsAdvisedOrAttended = "IsAdvisedOrAttended";
+		public static string PropertyName_Medication = "Medication";
+		public static string PropertyName_Jugendamt = "Jugendamt";
+		public static string PropertyName_Person = "Person";
+		public static string PropertyName_PlacementList = "PlacementList";
+		public static string PropertyName_ReferenceNumber = "ReferenceNumber";
+		public static string PropertyName_ServiceRecordList = "ServiceRecordList";
+		public static string PropertyName_SupportConcepts = "SupportConcepts";
+		public static string PropertyName_TerminationDate = "TerminationDate";
+		public static string PropertyName_TerminationReason = "TerminationReason";
+		public static string PropertyName_ValueList = "ValueList";
+		public static string PropertyName_VarFieldValueList = "VarFieldValueList";
+		public static string PropertyName_Medikamentenverordnungslisten = "Medikamentenverordnungslisten";
+		public static string PropertyName_AssistanceBegin = "AssistanceBegin";
+		public static string PropertyName_AusstVersAmt = "AusstVersAmt";
+		public static string PropertyName_AusweisGueltigVon = "AusweisGueltigVon";
+		public static string PropertyName_AusweisGueltigBis = "AusweisGueltigBis";
+		public static string PropertyName_AusweisUnbefristetGueltig = "AusweisUnbefristetGueltig";
+		public static string PropertyName_AusweisAktenzeichen = "AusweisAktenzeichen";
+		public static string PropertyName_BeiblattGueltigBis = "BeiblattGueltigBis";
+		public static string PropertyName_GradDerBehinderung = "GradDerBehinderung";
+		public static string PropertyName_MerkzeichenListe = "MerkzeichenListe";
+		public static string PropertyName_BehinderungsartenListe = "BehinderungsartenListe";
+		public static string PropertyName_CustomerAlias = "CustomerAlias";
+		public static string PropertyName_Pflegegrad = "Pflegegrad";
+		public static string PropertyName_IsMigrant = "IsMigrant";
+		public static string PropertyName_Nationalitaet = "Nationalitaet";
+		public static string PropertyName_AufenthaltsStatus = "AufenthaltsStatus";
+		public static string PropertyName_VertretungGewuenscht = "VertretungGewuenscht";
+		public static string PropertyName_AbWelchemKrankheitsTag = "AbWelchemKrankheitsTag ";
+		public static string PropertyName_VertretungDringendErforderlich = "VertretungGewuenscht";
+		public static string PropertyName_Arbeitszeit = "Arbeitszeit";
+		public static string PropertyName_HealthInsurance = "Krankenkasse";
+		public static string PropertyName_InsuranceNumber = "InsuranceNumber";
+		public static string PropertyName_VersichertenStatus = "Versichertenstatus";
 
-		private IList<AbsenceTime>                  _AbsenceTimes;
-        private Person                              _Ansprechpartner;
-        private IList<AssessmentSheetCategory>      _AssessmentSheetCategoryList;
-        private string                              _Childs;
-		private string                              _CostCenter;
-        private IList<Customer2CostBearer>          _Customer2CostBearerList;
-        private IList<Customer2Organisation>        _Customer2OrganisationList;
-		private IList<Customer2Person>              _Customer2PersonList;
-        private string                              _DebitorNumber;
-		private string                              _Diagnosis;
-        private IList<Diagnosis2Customer>           _Diagnosis2CustomerList;
-        private IList<Employee2Customer>            _Employee2CustomerList;
-		private string                              _Environment;
-        private decimal?                            _EquityContribution;
-        private FamilyData                          _FamilyData;
-        private string                              _ICD10Diagnosis;
-        private bool?                               _IsAdvisedOrAttended;
-        private Organisation                        _Jugendamt;
-		private string                              _Medication;
+		private IList<AbsenceTime> _AbsenceTimes;
+		private Person _Ansprechpartner;
+		private IList<AssessmentSheetCategory> _AssessmentSheetCategoryList;
+		private string _Childs;
+		private string _CostCenter;
+		private IList<Customer2CostBearer> _Customer2CostBearerList;
+		private IList<Customer2Organisation> _Customer2OrganisationList;
+		private IList<Customer2Person> _Customer2PersonList;
+		private string _DebitorNumber;
+		private string _Diagnosis;
+		private IList<Diagnosis2Customer> _Diagnosis2CustomerList;
+		private IList<Employee2Customer> _Employee2CustomerList;
+		private string _Environment;
+		private decimal? _EquityContribution;
+		private FamilyData _FamilyData;
+		private string _ICD10Diagnosis;
+		private bool? _IsAdvisedOrAttended;
+		private Organisation _Jugendamt;
+		private string _Medication;
 		private IList<Medikamentenverordnungsliste> _Medikamentenverordnungslisten;
-        private Person                              _Person;
-        private IList<Placement>                    _PlacementList;
-        private string                              _ReferenceNumber;
-        private IList<ServiceRecord>                _ServiceRecordList;
-        private IList<SupportConcept>               _SupportConcepts;
-		private IList<Team2Customer>                _Team2CustomerList;
-        private DateTime?                           _TerminationDate;
-        private ValueListEntry                      _TerminationReason;
-        private IList<ValueListEntry2Object>        _ValueList;
-        private IList<VarFieldValue>                _VarFieldValueList;
-        private DateTime?                           _AssistanceBegin;
-	    private string                              _AusstVersAmt;
-        private DateTime?                           _AusweisGueltigVon;
-        private DateTime?                           _AusweisGueltigBis;
-        private bool?                               _AusweisUnbefristetGueltig;
-	    private string                              _AusweisAktenzeichen;
-        private DateTime?                           _BeiblattGueltigBis;
-		private string                              _GradDerBehinderung;
-        private IList<Merkzeichen>                  _MerkzeichenListe;
-        private IList<Behinderungsart>              _BehinderungsartenListe;
-	    private string                              _CustomerAlias;
-        private Pflegegrad?                         _Pflegegrad;
-	    private bool                                _VertretungGewuenscht;
-	    private int                                 _AbWelchemKrankheitsTag;
-	    private bool                                _VertretungDringendErforderlich;
-	    private IList<Arbeitszeit>					_Arbeitszeit;
-        private SubstitutionNeed                    _SubstitutionNeed;
-        private string								_HealthInsurance;
-        private string								_InsuranceNumber;
-		private string                              _VersichertenStatus;
+		private Person _Person;
+		private IList<Placement> _PlacementList;
+		private string _ReferenceNumber;
+		private IList<ServiceRecord> _ServiceRecordList;
+		private IList<SupportConcept> _SupportConcepts;
+		private IList<Team2Customer> _Team2CustomerList;
+		private DateTime? _TerminationDate;
+		private ValueListEntry _TerminationReason;
+		private IList<ValueListEntry2Object> _ValueList;
+		private IList<VarFieldValue> _VarFieldValueList;
+		private DateTime? _AssistanceBegin;
+		private string _AusstVersAmt;
+		private DateTime? _AusweisGueltigVon;
+		private DateTime? _AusweisGueltigBis;
+		private bool? _AusweisUnbefristetGueltig;
+		private string _AusweisAktenzeichen;
+		private DateTime? _BeiblattGueltigBis;
+		private string _GradDerBehinderung;
+		private IList<Merkzeichen> _MerkzeichenListe;
+		private IList<Behinderungsart> _BehinderungsartenListe;
+		private string _CustomerAlias;
+		private Pflegegrad? _Pflegegrad;
+		private bool _VertretungGewuenscht;
+		private int _AbWelchemKrankheitsTag;
+		private bool _VertretungDringendErforderlich;
+		private IList<Arbeitszeit> _Arbeitszeit;
+		private SubstitutionNeed _SubstitutionNeed;
+		private string _HealthInsurance;
+		private string _InsuranceNumber;
+		private string _VersichertenStatus;
+		private IList<CustomerVermittlungArbeit> _CustomerVermittlungArbeiten;
+		private IList<CustomerWohnhilfe> _CustomerWohnhilfen;
 
-        public Customer()
+		public Customer()
 		{
 			_Tid = TableID.Customer;
 		}
 
-		
+
 		public virtual int? DistanceInMeter { get; set; }
 
 		public virtual IList<AbsenceTime> AbsenceTimes
@@ -284,16 +286,16 @@ namespace BeWo.Data.Entities
 			}
 		}
 
-        public virtual Pflegegrad? Pflegegrad
-        {
-            get { return _Pflegegrad; }
+		public virtual Pflegegrad? Pflegegrad
+		{
+			get { return _Pflegegrad; }
 
-            set
-            {
-                if (AreDifferent(_Pflegegrad, value))
-                    _Pflegegrad = value;
-            }
-        }
+			set
+			{
+				if (AreDifferent(_Pflegegrad, value))
+					_Pflegegrad = value;
+			}
+		}
 
 		public virtual IList<Team2Customer> Team2CustomerList
 		{
@@ -317,7 +319,7 @@ namespace BeWo.Data.Entities
 				}
 			}
 		}
-		
+
 		public virtual string ICD10Diagnosis
 		{
 			get { return _ICD10Diagnosis; }
@@ -470,18 +472,18 @@ namespace BeWo.Data.Entities
 			}
 		}
 
-        public virtual DateTime? AssistanceBegin
-        {
-            get { return _AssistanceBegin; }
+		public virtual DateTime? AssistanceBegin
+		{
+			get { return _AssistanceBegin; }
 
-            set
-            {
-                if (AreDifferent(_AssistanceBegin, value))
-                {
-                    _AssistanceBegin = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_AssistanceBegin, value))
+				{
+					_AssistanceBegin = value;
+				}
+			}
+		}
 
 		public virtual ValueListEntry TerminationReason
 		{
@@ -541,58 +543,58 @@ namespace BeWo.Data.Entities
 
 			return lResult;
 		}
-        
-        public virtual string AusstVersAmt
-        {
-            get { return _AusstVersAmt; }
 
-            set
-            {
-                if (AreDifferent(_AusstVersAmt, value))
-                {
-                    _AusstVersAmt = value;
-                }
-            }
-        }
+		public virtual string AusstVersAmt
+		{
+			get { return _AusstVersAmt; }
 
-        public virtual DateTime? AusweisGueltigVon
-        {
-            get { return _AusweisGueltigVon; }
+			set
+			{
+				if (AreDifferent(_AusstVersAmt, value))
+				{
+					_AusstVersAmt = value;
+				}
+			}
+		}
 
-            set
-            {
-                if (AreDifferent(_AusweisGueltigVon, value))
-                {
-                    _AusweisGueltigVon = value;
-                }
-            }
-        }
+		public virtual DateTime? AusweisGueltigVon
+		{
+			get { return _AusweisGueltigVon; }
 
-        public virtual DateTime? AusweisGueltigBis
-        {
-            get { return _AusweisGueltigBis; }
+			set
+			{
+				if (AreDifferent(_AusweisGueltigVon, value))
+				{
+					_AusweisGueltigVon = value;
+				}
+			}
+		}
 
-            set
-            {
-                if (AreDifferent(_AusweisGueltigBis, value))
-                {
-                    _AusweisGueltigBis = value;
-                }
-            }
-        }
+		public virtual DateTime? AusweisGueltigBis
+		{
+			get { return _AusweisGueltigBis; }
 
-        public virtual bool? AusweisUnbefristetGueltig
-        {
-            get { return _AusweisUnbefristetGueltig; }
+			set
+			{
+				if (AreDifferent(_AusweisGueltigBis, value))
+				{
+					_AusweisGueltigBis = value;
+				}
+			}
+		}
 
-            set
-            {
-                if (AreDifferent(_AusweisUnbefristetGueltig, value))
-                {
-                    _AusweisUnbefristetGueltig = value;
-                }
-            }
-        }
+		public virtual bool? AusweisUnbefristetGueltig
+		{
+			get { return _AusweisUnbefristetGueltig; }
+
+			set
+			{
+				if (AreDifferent(_AusweisUnbefristetGueltig, value))
+				{
+					_AusweisUnbefristetGueltig = value;
+				}
+			}
+		}
 
 		public virtual string AusweisAktenzeichen
 		{
@@ -608,134 +610,134 @@ namespace BeWo.Data.Entities
 		}
 
 		public virtual DateTime? BeiblattGueltigBis
-        {
-            get { return _BeiblattGueltigBis; }
+		{
+			get { return _BeiblattGueltigBis; }
 
-            set
-            {
-                if (AreDifferent(_BeiblattGueltigBis, value))
-                {
-                    _BeiblattGueltigBis = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_BeiblattGueltigBis, value))
+				{
+					_BeiblattGueltigBis = value;
+				}
+			}
+		}
 
-        public virtual string GradDerBehinderung
-        {
-            get { return _GradDerBehinderung; }
+		public virtual string GradDerBehinderung
+		{
+			get { return _GradDerBehinderung; }
 
-            set
-            {
-                if (AreDifferent(_GradDerBehinderung, value))
-                {
-                    _GradDerBehinderung = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_GradDerBehinderung, value))
+				{
+					_GradDerBehinderung = value;
+				}
+			}
+		}
 
-        public virtual IList<Behinderungsart> BehinderungsartenListe
-        {
-            get { return _BehinderungsartenListe; }
+		public virtual IList<Behinderungsart> BehinderungsartenListe
+		{
+			get { return _BehinderungsartenListe; }
 
-            set
-            {
-                if (AreDifferent(_BehinderungsartenListe, value))
-                {
-                    _BehinderungsartenListe = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_BehinderungsartenListe, value))
+				{
+					_BehinderungsartenListe = value;
+				}
+			}
+		}
 
-        public virtual IList<Merkzeichen> MerkzeichenListe
-        {
-            get { return _MerkzeichenListe; }
+		public virtual IList<Merkzeichen> MerkzeichenListe
+		{
+			get { return _MerkzeichenListe; }
 
-            set
-            {
-                if (AreDifferent(_MerkzeichenListe, value))
-                {
-                    _MerkzeichenListe = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_MerkzeichenListe, value))
+				{
+					_MerkzeichenListe = value;
+				}
+			}
+		}
 
-	    public virtual string CustomerAlias
-	    {
-            get { return _CustomerAlias; }
+		public virtual string CustomerAlias
+		{
+			get { return _CustomerAlias; }
 
-	        set
-	        {
-	            if (AreDifferent(_CustomerAlias, value))
-	            {
-	                _CustomerAlias = value;
-	            }
-	        }
-	    }
+			set
+			{
+				if (AreDifferent(_CustomerAlias, value))
+				{
+					_CustomerAlias = value;
+				}
+			}
+		}
 
-        public virtual bool VertretungGewuenscht
-        {
-            get { return _VertretungGewuenscht; }
+		public virtual bool VertretungGewuenscht
+		{
+			get { return _VertretungGewuenscht; }
 
-            set
-            {
-                if (AreDifferent(_VertretungGewuenscht, value))
-                {
-                    _VertretungGewuenscht = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_VertretungGewuenscht, value))
+				{
+					_VertretungGewuenscht = value;
+				}
+			}
+		}
 
-        public virtual bool VertretungDringendErforderlich
-        {
-            get { return _VertretungDringendErforderlich; }
+		public virtual bool VertretungDringendErforderlich
+		{
+			get { return _VertretungDringendErforderlich; }
 
-            set
-            {
-                if (AreDifferent(_VertretungDringendErforderlich, value))
-                {
-                    _VertretungDringendErforderlich = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_VertretungDringendErforderlich, value))
+				{
+					_VertretungDringendErforderlich = value;
+				}
+			}
+		}
 
-	    public virtual int AbWelchemKrankheitsTag
-        {
-            get { return _AbWelchemKrankheitsTag;}
+		public virtual int AbWelchemKrankheitsTag
+		{
+			get { return _AbWelchemKrankheitsTag; }
 
-	        set
-	        {
-                if (AreDifferent(_AbWelchemKrankheitsTag, value))
-                {
-                    _AbWelchemKrankheitsTag = value;
-                }
-            }
-	    }
+			set
+			{
+				if (AreDifferent(_AbWelchemKrankheitsTag, value))
+				{
+					_AbWelchemKrankheitsTag = value;
+				}
+			}
+		}
 
-        public virtual SubstitutionNeed SubstitutionNeed
-        {
-            get => _SubstitutionNeed;
+		public virtual SubstitutionNeed SubstitutionNeed
+		{
+			get => _SubstitutionNeed;
 
-            set
-            {
-                if(AreDifferent(_SubstitutionNeed, value))
-                {
-                    _SubstitutionNeed = value;
-                }
-            }
-        }
+			set
+			{
+				if (AreDifferent(_SubstitutionNeed, value))
+				{
+					_SubstitutionNeed = value;
+				}
+			}
+		}
 
-	    public virtual IList<Arbeitszeit> Arbeitszeiten
-	    {
-	        get { return _Arbeitszeit ?? (_Arbeitszeit = new List<Arbeitszeit>()); }
+		public virtual IList<Arbeitszeit> Arbeitszeiten
+		{
+			get { return _Arbeitszeit ?? (_Arbeitszeit = new List<Arbeitszeit>()); }
 
-	        set
-	        {
-	            if (AreDifferent(_Arbeitszeit, value))
-	            {
-	                _Arbeitszeit = value;
-	            }
-	        }
-	    }
+			set
+			{
+				if (AreDifferent(_Arbeitszeit, value))
+				{
+					_Arbeitszeit = value;
+				}
+			}
+		}
 
 		public virtual string HealthInsurance
 		{
@@ -777,36 +779,44 @@ namespace BeWo.Data.Entities
 		}
 
 		public virtual bool Pflege { get; set; }
-	    public virtual bool Toilettengang { get; set; }
-	    public virtual bool Aggressiv { get; set; }
-	    public virtual bool Hygienebelehrung { get; set; }
-	    public virtual string Schutzstufe { get; set; }
+		public virtual bool Toilettengang { get; set; }
+		public virtual bool Aggressiv { get; set; }
+		public virtual bool Hygienebelehrung { get; set; }
+		public virtual string Schutzstufe { get; set; }
 
 		public virtual string Uebernahmeort { get; set; }
 		public virtual string Verhalten { get; set; }
 		public virtual string Betreuungsbedarf { get; set; }
 		public virtual string BemerkungenSbd { get; set; }
 		public virtual string TeamSimpleString
-        {
-            get
-            {
-                if (Team2CustomerList == null)
-                    return null;
+		{
+			get
+			{
+				if (Team2CustomerList == null)
+					return null;
 
-                string name = "";
+				string name = "";
 
-                foreach (var t2c in Team2CustomerList)
-                {
-                    if (name.Length > 0)
-                        name += ", ";
-                    name = t2c.Team.Name;
-                }
+				foreach (var t2c in Team2CustomerList)
+				{
+					if (name.Length > 0)
+						name += ", ";
+					name = t2c.Team.Name;
+				}
 
-                return name;
-            }
-        }
+				return name;
+			}
+		}
 
-		public virtual IList<CustomerVermittlungArbeit> CustomerVermittlungArbeiten { get; set; }
-		public virtual IList<CustomerWohnhilfe> CustomerWohnhilfen { get; set; }
+		public virtual IList<CustomerVermittlungArbeit> CustomerVermittlungArbeiten
+		{
+			get => _CustomerVermittlungArbeiten ?? (_CustomerVermittlungArbeiten = new List<CustomerVermittlungArbeit>());
+			set => _CustomerVermittlungArbeiten = value;
+		}
+		public virtual IList<CustomerWohnhilfe> CustomerWohnhilfen
+		{
+			get => _CustomerWohnhilfen ?? (_CustomerWohnhilfen = new List<CustomerWohnhilfe>());
+			set => _CustomerWohnhilfen = value;
+		}
 	}
 }
\ No newline at end of file

From 2b7b2f71b616f853d6f4af1bd7af2f217d5a0977 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Wed, 25 Sep 2024 13:35:24 +0200
Subject: [PATCH 18/22] comment

---
 BeWo/DebugConfig.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/BeWo/DebugConfig.cs b/BeWo/DebugConfig.cs
index 6e7cd30c9..21e3a9ef7 100644
--- a/BeWo/DebugConfig.cs
+++ b/BeWo/DebugConfig.cs
@@ -37,6 +37,9 @@ namespace BeWo
         public bool AutoLogin { get; set; }
         public UIContext? SelectView { get; set; }
         /// <summary>
+        /// Beschreibt den Index der jeweils gewählten View (UIContext)
+        /// 
+        /// Z.b.:
         /// Customer:
         /// - Details: 0
         /// - ...: 1

From 4349772a395fb9ca4e3877c590e0ae3a01fe9a76 Mon Sep 17 00:00:00 2001
From: Christian <christian.baeurle@beyondsoft.de>
Date: Wed, 25 Sep 2024 16:57:03 +0200
Subject: [PATCH 19/22] Neue Klasse AiSettings

---
 BeWo/AI/View/AiChatView.xaml                  | 19 +++++++++++++++--
 BeWo/AI/View/AiChatView.xaml.cs               | 10 +++++++++
 BeWoPlanerMobil/BeWoPlanerMobil.csproj.user   |  2 +-
 Data/Data.csproj                              |  2 ++
 Data/Entities/AiSettings.cs                   | 19 +++++++++++++++++
 Data/Mappings/AiSettings.hbm.xml              | 20 ++++++++++++++++++
 Host/Host.csproj.user                         |  2 +-
 Model/Changes_alle_fuer_neue_db.txt           | 18 ++++++++++++++++
 .../AkggMid/Service/CustomCustomerService.cs  | 20 +++++++++++++-----
 Service/Plugins/AiService.cs                  |  5 +++++
 Service/Plugins/CustomerService.cs            |  8 +++++++
 .../ServiceContracts/IOperationsService.cs    |  5 +++++
 .../OperationsServiceImp.cs                   | 15 +++++++++++++
 Shared/BeWoEntityEnums.cs                     |  3 ++-
 Shared/DataContracts/AiSettingsDC.cs          | 21 +++++++++++++++++++
 .../ClientPartials/CompactSupportConceptDC.cs |  7 ++++++-
 .../Compact/CompactSupportConceptDC.cs        |  3 ++-
 Shared/Shared.csproj                          |  1 +
 18 files changed, 168 insertions(+), 12 deletions(-)
 create mode 100644 Data/Entities/AiSettings.cs
 create mode 100644 Data/Mappings/AiSettings.hbm.xml
 create mode 100644 Shared/DataContracts/AiSettingsDC.cs

diff --git a/BeWo/AI/View/AiChatView.xaml b/BeWo/AI/View/AiChatView.xaml
index ad41ae224..a345a4664 100644
--- a/BeWo/AI/View/AiChatView.xaml
+++ b/BeWo/AI/View/AiChatView.xaml
@@ -35,11 +35,26 @@
 
                 <Grid Margin="5">
                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="Auto"></RowDefinition>
                         <RowDefinition Height="*"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <Label Content="{t:Translate Formulieren Sie hier Ihre Anfrage}"></Label>
-                    <TextBox x:Name="TextBoxAnfrage" Grid.Row="1" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"></TextBox>
+                    <Button Grid.Row="0" Content="Einstellungen" HorizontalAlignment="Left" Click="btnSettings_Click"/>
+                    <Popup Grid.Row="0" Grid.RowSpan="3" StaysOpen="True" Placement="MousePoint" Width="290" Height="80" Closed="popup_Closed" x:Name="PopupTemplate">
+                        <Grid Background="{StaticResource ControlBackground}" Margin="2,2,2,2">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Label Grid.Row="0" Content="{t:Translate Datensatz Template}"></Label>
+                            <TextBox x:Name="TextBoxTemplate" Grid.Row="2" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"></TextBox>
+                        </Grid>
+                    </Popup>
+                    <Label Grid.Row="1" Content="{t:Translate Formulieren Sie hier Ihre Anfrage}"></Label>
+                    <TextBox x:Name="TextBoxAnfrage" Grid.Row="2" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"></TextBox>
                 </Grid>
             </dxlc:LayoutGroup>
             <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True">
diff --git a/BeWo/AI/View/AiChatView.xaml.cs b/BeWo/AI/View/AiChatView.xaml.cs
index 535d21ed6..14f6dad66 100644
--- a/BeWo/AI/View/AiChatView.xaml.cs
+++ b/BeWo/AI/View/AiChatView.xaml.cs
@@ -115,5 +115,15 @@ namespace BeWo.AI.View
         {
             CloseButtonClicked?.Invoke();
         }
+
+        private void btnSettings_Click(object sender, RoutedEventArgs e)
+        {
+            PopupTemplate.IsOpen = true;
+        }
+
+        private void popup_Closed(object sender, EventArgs e)
+        {
+            
+        }
     }
 }
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
index 2763ebb1b..033eb78ef 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj.user
@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 9525a2fbc..c09eb63e6 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -206,6 +206,7 @@
     <Compile Include="Access\UserDAO.cs" />
     <Compile Include="ASPHibernateSessionManager.cs" />
     <Compile Include="DefaultHibernateSessionManager.cs" />
+    <Compile Include="Entities\AiSettings.cs" />
     <Compile Include="Entities\TwoFactorCode.cs" />
     <Compile Include="Entities\AbwesenheitsInformationPrint.cs" />
     <Compile Include="Entities\AddressHistory.cs" />
@@ -773,6 +774,7 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="Mappings\TwoFactorCode.hbm.xml" />
+    <EmbeddedResource Include="Mappings\AiSettings.hbm.xml" />
     <Content Include="Mappings\Timesheet2Mail.hbm.xml" />
     <EmbeddedResource Include="Mappings\ContactHistory.hbm.xml">
       <SubType>Designer</SubType>
diff --git a/Data/Entities/AiSettings.cs b/Data/Entities/AiSettings.cs
new file mode 100644
index 000000000..292d050f9
--- /dev/null
+++ b/Data/Entities/AiSettings.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+
+using BS.Shared;
+
+namespace BeWo.Data.Entities
+{
+    public class AiSettings : BeWoEntityBase
+    {
+        
+        public AiSettings()
+        {
+            this._Tid = TableID.AbsenceReason;
+        }
+
+        public virtual int SettingsType { get; set; }
+
+        public virtual string Settings { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Data/Mappings/AiSettings.hbm.xml b/Data/Mappings/AiSettings.hbm.xml
new file mode 100644
index 000000000..85a0fd036
--- /dev/null
+++ b/Data/Mappings/AiSettings.hbm.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
+  <class name="BeWo.Data.Entities.AiSettings, BeWo.Data" table="AiSettings">
+    <id name="Oid" column="Oid" type="Int64" unsaved-value="null">
+      <generator class="identity" />
+    </id>
+    <version type="Int64" column="Version" name="Version" />
+    <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
+    <property column="Notice" type="String" name="Notice" length="1024" />
+    <property column="InsTs" type="DateTime" name="InsTs" />
+    <property column="InsUser" type="String" name="InsUser" length="256" />
+	<property column="UpdTs" type="DateTime" name="UpdTs" />
+    <property column="UdpUser" type="String" name="UdpUser" length="256" />
+    <property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
+    <property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
+	  <property name="SettingsType" type="Int32" />
+	  <property name="Settings" type="String"  />
+  </class>
+</hibernate-mapping>
\ No newline at end of file
diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user
index 5ee002517..f8b116048 100644
--- a/Host/Host.csproj.user
+++ b/Host/Host.csproj.user
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <NameOfLastUsedPublishProfile>BeWo2.0</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
diff --git a/Model/Changes_alle_fuer_neue_db.txt b/Model/Changes_alle_fuer_neue_db.txt
index 42ace5517..2a88abd31 100644
--- a/Model/Changes_alle_fuer_neue_db.txt
+++ b/Model/Changes_alle_fuer_neue_db.txt
@@ -1231,3 +1231,21 @@ ADD COLUMN `Fullname` VARCHAR(1024) NULL DEFAULT NULL AFTER `Filename`;
 
 ALTER TABLE `organisation` 
 ADD COLUMN `BusinessPartnerId` VARCHAR(256) NULL DEFAULT NULL AFTER `Leistungserbringergruppe`;
+
+CREATE TABLE `aisettings` (
+  `Oid` bigint NOT NULL AUTO_INCREMENT,
+  `Tid` int NOT NULL,
+  `Description` varchar(256) DEFAULT NULL,
+  `Notice` varchar(1024) DEFAULT NULL,
+  `InsTs` datetime DEFAULT NULL,
+  `InsUser` varchar(256) DEFAULT NULL,
+  `Version` bigint DEFAULT NULL,
+  `UpdTs` datetime DEFAULT NULL,
+  `UdpUser` varchar(256) DEFAULT NULL,
+  `IsActive` tinyint DEFAULT NULL,
+  `SystemEntryID` int DEFAULT NULL,
+  `SettingsType` int DEFAULT NULL,
+  `Settings` MEDIUMTEXT DEFAULT NULL,
+  PRIMARY KEY (`Oid`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
diff --git a/ReportImp/AkggMid/Service/CustomCustomerService.cs b/ReportImp/AkggMid/Service/CustomCustomerService.cs
index 6348ca46b..6acdca42d 100644
--- a/ReportImp/AkggMid/Service/CustomCustomerService.cs
+++ b/ReportImp/AkggMid/Service/CustomCustomerService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 
 using BeWo.Data.Access;
@@ -12,12 +13,21 @@ namespace AkggMid.Service
 {
 	public class CustomCustomerService : CustomerService
 	{
-  //      public override List<CompactSupportConceptDC> GetAllActiveSupportConceptCostbearer(bool onlyApproved, bool onlyWithAssignedCostbearer, long employeeOid)
+		//      public override List<CompactSupportConceptDC> GetAllActiveSupportConceptCostbearer(bool onlyApproved, bool onlyWithAssignedCostbearer, long employeeOid)
 		//{
-  //          var liste = base.GetAllActiveSupportConceptCostbearer(onlyApproved, onlyWithAssignedCostbearer, employeeOid);
+		//          var liste = base.GetAllActiveSupportConceptCostbearer(onlyApproved, onlyWithAssignedCostbearer, employeeOid);
+
+		//          return liste.Where(a => a.CustomerFullName.StartsWith("A")).ToList();
+		//   
+
+		protected override string GetDefaultBrush(SupportConcept sc, CostBearer2SupportConcept c2s)
+		{
+			if (c2s.StartDate.HasValue && c2s.StartDate > DateTime.Now)
+			{
+				return "#FF70A0FF";
+			}
+			return base.GetDefaultBrush(sc, c2s);
+		}
 
-  //          return liste.Where(a => a.CustomerFullName.StartsWith("A")).ToList();
-  //      }
-        
 	}
 }
\ No newline at end of file
diff --git a/Service/Plugins/AiService.cs b/Service/Plugins/AiService.cs
index e811923f4..c3836596c 100644
--- a/Service/Plugins/AiService.cs
+++ b/Service/Plugins/AiService.cs
@@ -144,6 +144,11 @@ namespace BeWo.Service.Plugins
 
             return context.ToString();
         }
+
+        internal AiSettingsDC GetAiSettings(int settingsId)
+        {
+            throw new NotImplementedException();
+        }
     }
 
 }
\ No newline at end of file
diff --git a/Service/Plugins/CustomerService.cs b/Service/Plugins/CustomerService.cs
index de08adaf1..eda7c19b7 100644
--- a/Service/Plugins/CustomerService.cs
+++ b/Service/Plugins/CustomerService.cs
@@ -808,6 +808,7 @@ namespace BeWo.Service.Plugins
 
 			foreach (CostBearer2SupportConcept iCBRel in pEntity.CostBearer2SupportConceptList)
 			{
+				dc.DefaultBrush = GetDefaultBrush(pEntity, iCBRel);
 				if (!dc.CostBearerRelOids.Contains(iCBRel.Oid.Value))
 				{
 					var costBearer = new CompactCostBearerDC();
@@ -857,6 +858,12 @@ namespace BeWo.Service.Plugins
 			return System.Windows.Media.Brushes.Red.ToString();
 		}
 
+		protected virtual string GetDefaultBrush(SupportConcept sc, CostBearer2SupportConcept c2s)
+		{
+			//Nur zum Überschreiben nötig
+			return null;
+		}
+
 		private Dictionary<long, long> CreateTeamOidDict(long employeeOid)
 		{
 			var teamOids = new Dictionary<long, long>();
@@ -1158,6 +1165,7 @@ namespace BeWo.Service.Plugins
 
 			dc.NearlyExpiredBrush = GetBrushForNearlyExpiredSupportConcept();
 			dc.ExpiredBrush = GetBrushForExpiredSupportConcept();
+			dc.DefaultBrush = GetDefaultBrush(sc, cb2sc);
 
 			var costBearer = new CompactCostBearerDC();
 
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index f87cc6f3b..a76d11145 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -1379,5 +1379,10 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         AiChatDC CreateAiQueryForObjects(AiChatDC acdc, long objectTid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        AiSettingsDC GetAiSettings(int settingsId);
+
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 68c733cc8..e61f45a22 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -8963,6 +8963,21 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
+
+        public AiSettingsDC GetAiSettings(int settingsId)
+        {
+            try
+            {
+                var s = PluginLoader.FindClass<AiService>();
+
+                return s.GetAiSettings(settingsId);
+
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
     }
 
     public class ServiceRecord2SignatureStates
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index c24829b2b..ebd0ba958 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -176,7 +176,8 @@ namespace BS.Shared
         WohneinheitBelegung = 169,
         CustomerFalldaten = 170,
         Image = 171,
-        TwoFactorCode = 172
+        TwoFactorCode = 172,
+        AiSettings = 173
     }
 
     public enum SystemEntryID
diff --git a/Shared/DataContracts/AiSettingsDC.cs b/Shared/DataContracts/AiSettingsDC.cs
new file mode 100644
index 000000000..caf1b6431
--- /dev/null
+++ b/Shared/DataContracts/AiSettingsDC.cs
@@ -0,0 +1,21 @@
+using System.Runtime.Serialization;
+
+namespace BS.Shared.DataContracts
+{
+    [DataContract]
+    public partial class AiSettingsDC : IDataContract
+    {
+        [DataMember]
+        public long? Oid { get; set; }
+
+        [DataMember]
+        public long? Version { get; set; }
+
+        [DataMember]
+        public int SettingsType { get; set; }
+
+        [DataMember]
+        public string Settings { get; set; }
+
+    }
+}
\ No newline at end of file
diff --git a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
index 4036e9e13..8e2f1e2d2 100644
--- a/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
+++ b/Shared/DataContracts/Compact/ClientPartials/CompactSupportConceptDC.cs
@@ -215,7 +215,12 @@ namespace BS.Shared.DataContracts.Compact
                 }
                 else
                 {
-                    return new SolidColorBrush(Color.FromRgb(160, 160, 160));
+                    var color = Color.FromRgb(160, 160, 160);
+                    if (!String.IsNullOrEmpty(this.DefaultBrush))
+                    {
+                        color = (Color)ColorConverter.ConvertFromString(this.DefaultBrush);
+                    }
+                    return new SolidColorBrush(color);
                 }
             }
         }
diff --git a/Shared/DataContracts/Compact/CompactSupportConceptDC.cs b/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
index e93a0f2f7..17b6e6b57 100644
--- a/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
+++ b/Shared/DataContracts/Compact/CompactSupportConceptDC.cs
@@ -75,6 +75,7 @@ namespace BS.Shared.DataContracts.Compact
         public string NearlyExpiredBrush { get; set; }
         [DataMember]
         public string ExpiredBrush { get; set; }
-
+        [DataMember]
+        public string DefaultBrush { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Shared/Shared.csproj b/Shared/Shared.csproj
index 7c000e8cd..0bf1dcc25 100644
--- a/Shared/Shared.csproj
+++ b/Shared/Shared.csproj
@@ -161,6 +161,7 @@
     <Compile Include="Core\ObservableSortCollection.cs" />
     <Compile Include="Core\WohnheimbuchungsIntervall.cs" />
     <Compile Include="DataContracts\AbsenceOverviewFilterDC.cs" />
+    <Compile Include="DataContracts\AiSettingsDC.cs" />
     <Compile Include="DataContracts\AiChatDC.cs" />
     <Compile Include="DataContracts\AbwesenheitsInformationDC.cs" />
     <Compile Include="DataContracts\AbwesenheitsInformationPrintDC.cs" />

From 4fd511f5d24746ae9b78a7bac80e949c121806d6 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Thu, 26 Sep 2024 10:18:31 +0200
Subject: [PATCH 20/22] AwoDortmund/Export/DiamantExporter.cs - Bugfix im Sql

---
 ReportImp/AwoDortmund/Export/DiamantExporter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReportImp/AwoDortmund/Export/DiamantExporter.cs b/ReportImp/AwoDortmund/Export/DiamantExporter.cs
index 69b9fc965..82c040566 100644
--- a/ReportImp/AwoDortmund/Export/DiamantExporter.cs
+++ b/ReportImp/AwoDortmund/Export/DiamantExporter.cs
@@ -761,7 +761,7 @@ INNER JOIN `person` p on c.`PersonOid` = p.`Oid`
 INNER JOIN invoicebase ib on ib.costbearer2supportconceptoid = cb2sc.oid
 inner join serviceinvoice si on si.invoicebaseoid = ib.oid
 inner join serviceinvoiceperiod sip on sip.serviceinvoiceoid = si.oid
-WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and ib.isactive = 1 and ib.type <> 1 and ib.InvoiceId <> 'RechnungSoziotherapie'
+WHERE c.`IsActive` = 1 AND sc.`IsActive` = 1 and ib.isactive = 1 and ib.type <> 1 and isnull(InvoiceId)
 and ib.`AccountingPeriodEnd` >= ':Monat_Start' AND ib.`AccountingPeriodStart` < ':Monat_End'
 ORDER BY p.`LastName`, p.`FirstName`, cb2sc.`ApprovedStartDate`
 ";

From 8f8fb76f096619efaeb3dcd2596ad45e6bce1343 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Thu, 26 Sep 2024 10:18:55 +0200
Subject: [PATCH 21/22] SkmViersen/SammelrechnungSeite1 - Abfangen
 Differenzrechnung

---
 ReportImp/SkmViersen/SammelrechnungSeite1.cs  |  5 ++-
 .../SammelrechnungSeite2.Designer.cs          |  2 ++
 ReportImp/SkmViersen/SammelrechnungSeite2.cs  | 32 ++++++++-----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/ReportImp/SkmViersen/SammelrechnungSeite1.cs b/ReportImp/SkmViersen/SammelrechnungSeite1.cs
index ff00d2272..d6c5bc79e 100644
--- a/ReportImp/SkmViersen/SammelrechnungSeite1.cs
+++ b/ReportImp/SkmViersen/SammelrechnungSeite1.cs
@@ -22,8 +22,11 @@ namespace SkmViersen
         public void SetReportDataSource(ServiceInvoiceRO pRO)
         {
             Customer customer = null;
-            if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0)
+            if (pRO.ServiceInvoicePeriods != null && pRO.ServiceInvoicePeriods.Count > 0 
+                && pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems != null && !pRO.ServiceInvoicePeriods[0].ServiceInvoiceItems[0].ServiceDescription.Contains("Rechnungsdifferenz"))
+            {
                 customer = pRO.ServiceInvoicePeriods[0].CostBearer2SupportConcept.SupportConcept.Customer;
+            }
             if (customer == null && pRO.CustomerOid.HasValue)
             {
                 customer = DAOFactory.GenericDAO.GetByID<Customer>(pRO.CustomerOid.Value);
diff --git a/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs b/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs
index 61202939e..058afef8b 100644
--- a/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs
+++ b/ReportImp/SkmViersen/SammelrechnungSeite2.Designer.cs
@@ -540,6 +540,8 @@ namespace SkmViersen
             this.xrTableCell42.BorderColor = System.Drawing.Color.DarkGray;
             this.xrTableCell42.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell42.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
             this.xrTableCell42.Name = "xrTableCell42";
             this.xrTableCell42.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);
             this.xrTableCell42.StylePriority.UseBorderColor = false;
diff --git a/ReportImp/SkmViersen/SammelrechnungSeite2.cs b/ReportImp/SkmViersen/SammelrechnungSeite2.cs
index b218ed9cb..789aafe07 100644
--- a/ReportImp/SkmViersen/SammelrechnungSeite2.cs
+++ b/ReportImp/SkmViersen/SammelrechnungSeite2.cs
@@ -29,30 +29,26 @@ namespace SkmViersen
                     {
                         foreach (var ii in sip.ServiceInvoiceItems)
                         {
-                            var u = ii.UnitCount ?? 0;
-
-                            if (!String.IsNullOrEmpty(ii.RateFactor))
+                            if (!String.IsNullOrEmpty(ii.ServiceDescription) && !ii.ServiceDescription.StartsWith("Rechnungsdifferenz"))
                             {
-                                var rfStr = ii.RateFactor.Replace("%", "").Replace(",00", "").Trim();
-                                int rfInt = 0;
-                                Int32.TryParse(rfStr, out rfInt);
-                                decimal rateFactor = (100m + rfInt) / 100m;
-                                ii.RateFactor = Math.Round(rateFactor, 2, MidpointRounding.AwayFromZero).ToString();
-                                u *= rateFactor;
-                                ii.UnitCountString = Math.Round(u, 2, MidpointRounding.AwayFromZero).ToString();
+                                ii.ServiceDescription = "Betreuungsarbeit";
+                                var u = ii.UnitCount ?? 0;
+
+                                if (!String.IsNullOrEmpty(ii.RateFactor))
+                                {
+                                    var rfStr = ii.RateFactor.Replace("%", "").Replace(",00", "").Trim();
+                                    int rfInt = 0;
+                                    Int32.TryParse(rfStr, out rfInt);
+                                    decimal rateFactor = (100m + rfInt) / 100m;
+                                    ii.RateFactor = Math.Round(rateFactor, 2, MidpointRounding.AwayFromZero).ToString();
+                                    u *= rateFactor;
+                                    ii.UnitCountString = Math.Round(u, 2, MidpointRounding.AwayFromZero).ToString();
+                                }
                             }
                         }
                     }
                 }
             }
-			//if (start.Month == end.Month && start.Year == end.Year)
-			//{
-			//	lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Monat {0:MMMM yyyy} folgende erbrachte Tätigkeiten:", start);
-			//}
-			//else
-			//{
-			//	lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end);
-			//}
 
             var handy = pRO.InvoiceBase.SenderContactInformations.Where(c => c.ContactType == ContactType.business_MobilePhone).FirstOrDefault();
             if (handy != null)

From 098b73fe9c16725ef75686a7f829e600a3be0a85 Mon Sep 17 00:00:00 2001
From: Alexandra <alexandra.becker@ownsoft.de>
Date: Thu, 26 Sep 2024 10:19:39 +0200
Subject: [PATCH 22/22] AWOMuensterlandRecklinghausen/Finanzauswertung.cs als
 Rechnungscheck

---
 .../AWOMuensterlandRecklinghausen.csproj      |  10 +
 .../Finanzauswertung.cs                       |  67 ++
 .../Finanzauswertung.designer.cs              | 965 ++++++++++++++++++
 .../Finanzauswertung.resx                     | 120 +++
 4 files changed, 1162 insertions(+)
 create mode 100644 ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.cs
 create mode 100644 ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.designer.cs
 create mode 100644 ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.resx

diff --git a/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj b/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj
index 6b3d87fb1..6535c4d08 100644
--- a/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj
+++ b/ReportImp/AWOMuensterlandRecklinghausen/AWOMuensterlandRecklinghausen.csproj
@@ -64,6 +64,12 @@
     <Compile Include="Export\QueryListReport.Designer.cs">
       <DependentUpon>QueryListReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Finanzauswertung.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Finanzauswertung.designer.cs">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+    </Compile>
     <Compile Include="SBUmsatzerprobung.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -205,6 +211,10 @@
       <DependentUpon>QueryListReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Finanzauswertung.resx">
+      <DependentUpon>Finanzauswertung.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="SBUmsatzerprobung.resx">
       <DependentUpon>SBUmsatzerprobung.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.cs b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.cs
new file mode 100644
index 000000000..261aa029f
--- /dev/null
+++ b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.cs
@@ -0,0 +1,67 @@
+using System;
+using BeWo.Report;
+using BeWo.Report.ReportObjects;
+
+namespace AWOMuensterlandRecklinghausen
+{
+	public partial class Finanzauswertung : DevExpress.XtraReports.UI.XtraReport, IBeWoReport<FinanceRO>
+    {
+        public Finanzauswertung()
+        {
+            InitializeComponent();
+        }
+
+		public void SetReportDataSource(FinanceRO pRO)
+        {
+            pRO.CalculateBillableAmountInReportTimeSpan();
+			pRO.CalculatePaidAmountInReportTimeSpan();
+
+			if (pRO.ReportStartDate.HasValue && pRO.ReportEndDate.HasValue)
+			{
+				DateTime start = pRO.ReportStartDate.Value;
+				DateTime end = pRO.ReportEndDate.Value;
+
+				if (start.Year == end.Year && start.Month == end.Month && start.Day == 1 &&
+				    end.Day == DateTime.DaysInMonth(end.Year, end.Month))
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:MMMM yyyy}", start);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:MMMM}", start);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:MMMM}", start);
+				}
+				else
+				{
+					lblTitel.Text = String.Format("Finanzauswertung {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellBewilligtImZeitraumHeader.Text = String.Format("bewilligte FLS {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					cellGeleistetImZeitraumHeader.Text = String.Format("geleistete Std. {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+					//cellFehlkontakteHeader.Text = String.Format("Fehl-\nkontakte {0:dd.MM.yyyy}-{1:dd.MM.yyyy}", start, end);
+				}
+			}
+			else
+			{
+				cellBewilligtImZeitraumHeader.Visible = false;
+				cellBewilligteFLSImBereich.Visible = false;
+				cellGeleistetImBereich.Visible = false;
+				cellGeleistetImZeitraumHeader.Visible = false;
+			}
+
+			if (pRO.GruppierungLeistungskategorie && pRO.SupportConceptFinanceList != null)
+			{
+				GroupHeader1.Visible = true;
+				GroupFooter1.Visible = true;
+				foreach (var scRo in pRO.SupportConceptFinanceList)
+				{
+					if (String.IsNullOrEmpty(scRo.Leistungskategorie))
+					{
+						scRo.GruppierungsKategorie = " ";
+					}
+					else
+					{
+						scRo.GruppierungsKategorie = String.Format("Leistungskategorie {0}", scRo.Leistungskategorie);
+					}
+				}
+			}
+
+			this.bindingSource1.DataSource = pRO;
+        }
+	}
+}
diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.designer.cs b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.designer.cs
new file mode 100644
index 000000000..6002a90eb
--- /dev/null
+++ b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.designer.cs
@@ -0,0 +1,965 @@
+using BeWo.Report.ReportObjects;
+namespace AWOMuensterlandRecklinghausen
+{
+    partial class Finanzauswertung
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary3 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary4 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary5 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary6 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary7 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary8 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary9 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary10 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary11 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary12 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary13 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary14 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.Detail1 = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligteFLSImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImBereich = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell24 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.lblTitel = new DevExpress.XtraReports.UI.XRLabel();
+            this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand();
+            this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell35 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell36 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell37 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell38 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable1 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellBewilligtImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.cellGeleistetImZeitraumHeader = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.GroupFooter2 = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.pageFooterBand1 = new DevExpress.XtraReports.UI.PageFooterBand();
+            this.xrPageInfo2 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.xrPageInfo1 = new DevExpress.XtraReports.UI.XRPageInfo();
+            this.Title = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.FieldCaption = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.PageInfo = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.DataField = new DevExpress.XtraReports.UI.XRControlStyle();
+            this.fieldFLS = new DevExpress.XtraReports.UI.CalculatedField();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell39 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.openAmountReportTime = new DevExpress.XtraReports.UI.CalculatedField();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.Expanded = false;
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // Detail1
+            // 
+            this.Detail1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable2});
+            this.Detail1.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.Detail1.HeightF = 25F;
+            this.Detail1.KeepTogetherWithDetailReports = true;
+            this.Detail1.Name = "Detail1";
+            this.Detail1.StylePriority.UseFont = false;
+            // 
+            // xrTable2
+            // 
+            this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable2.Name = "xrTable2";
+            this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow2});
+            this.xrTable2.SizeF = new System.Drawing.SizeF(892.7083F, 25F);
+            this.xrTable2.StylePriority.UseBorders = false;
+            this.xrTable2.StylePriority.UseFont = false;
+            this.xrTable2.StylePriority.UsePadding = false;
+            this.xrTable2.StylePriority.UseTextAlignment = false;
+            this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow2
+            // 
+            this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell6,
+            this.xrTableCell7,
+            this.xrTableCell14,
+            this.xrTableCell12,
+            this.cellBewilligteFLSImBereich,
+            this.cellGeleistetImBereich,
+            this.xrTableCell26,
+            this.xrTableCell8,
+            this.xrTableCell24});
+            this.xrTableRow2.Name = "xrTableRow2";
+            this.xrTableRow2.Weight = 1D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Multiline = true;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Text = "[CustomerName]\r\n[SupportConceptTimeSpanString]";
+            this.xrTableCell6.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell7
+            // 
+            this.xrTableCell7.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.CostBearerName")});
+            this.xrTableCell7.Name = "xrTableCell7";
+            this.xrTableCell7.StylePriority.UseTextAlignment = false;
+            this.xrTableCell7.Text = "Mitarbeiter/in";
+            this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell7.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell14
+            // 
+            this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours", "{0:0.00}")});
+            this.xrTableCell14.Name = "xrTableCell14";
+            this.xrTableCell14.StylePriority.UseTextAlignment = false;
+            this.xrTableCell14.Text = "xrTableCell14";
+            this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell14.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell12
+            // 
+            this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours", "{0:0.00}")});
+            this.xrTableCell12.Name = "xrTableCell12";
+            this.xrTableCell12.StylePriority.UseTextAlignment = false;
+            this.xrTableCell12.Text = "xrTableCell12";
+            this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell12.Weight = 0.35450516999471204D;
+            // 
+            // cellBewilligteFLSImBereich
+            // 
+            this.cellBewilligteFLSImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan", "{0:0.00}")});
+            this.cellBewilligteFLSImBereich.Name = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.StylePriority.UseTextAlignment = false;
+            this.cellBewilligteFLSImBereich.Text = "cellBewilligteFLSImBereich";
+            this.cellBewilligteFLSImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellBewilligteFLSImBereich.Weight = 0.31019202369719984D;
+            // 
+            // cellGeleistetImBereich
+            // 
+            this.cellGeleistetImBereich.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan", "{0:0.00}")});
+            this.cellGeleistetImBereich.Name = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImBereich.Text = "cellGeleistetImBereich";
+            this.cellGeleistetImBereich.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.cellGeleistetImBereich.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell26
+            // 
+            this.xrTableCell26.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan", "{0:c}")});
+            this.xrTableCell26.Name = "xrTableCell26";
+            this.xrTableCell26.StylePriority.UseTextAlignment = false;
+            this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell26.Weight = 0.36856870721468521D;
+            // 
+            // xrTableCell8
+            // 
+            this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
+            this.xrTableCell8.Multiline = true;
+            this.xrTableCell8.Name = "xrTableCell8";
+            this.xrTableCell8.StylePriority.UseTextAlignment = false;
+            this.xrTableCell8.Text = "xrTableCell8";
+            this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell8.TextFormatString = "{0:c}";
+            this.xrTableCell8.Weight = 0.36856945707114541D;
+            // 
+            // xrTableCell24
+            // 
+            this.xrTableCell24.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.openAmountReportTime")});
+            this.xrTableCell24.Multiline = true;
+            this.xrTableCell24.Name = "xrTableCell24";
+            this.xrTableCell24.StylePriority.UseTextAlignment = false;
+            this.xrTableCell24.Text = "xrTableCell24";
+            this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell24.TextFormatString = "{0:c}";
+            this.xrTableCell24.Weight = 0.39284569702388022D;
+            // 
+            // lblTitel
+            // 
+            this.lblTitel.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.lblTitel.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.lblTitel.Name = "lblTitel";
+            this.lblTitel.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblTitel.SizeF = new System.Drawing.SizeF(825.0001F, 23F);
+            this.lblTitel.StylePriority.UseFont = false;
+            this.lblTitel.Text = "Finanzauswertung";
+            // 
+            // DetailReport
+            // 
+            this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail1,
+            this.GroupFooter1,
+            this.GroupHeader2,
+            this.GroupFooter2,
+            this.GroupHeader1});
+            this.DetailReport.DataMember = "SupportConceptFinanceList";
+            this.DetailReport.DataSource = this.bindingSource1;
+            this.DetailReport.Level = 0;
+            this.DetailReport.Name = "DetailReport";
+            // 
+            // GroupFooter1
+            // 
+            this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable4});
+            this.GroupFooter1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.GroupFooter1.HeightF = 25F;
+            this.GroupFooter1.Name = "GroupFooter1";
+            this.GroupFooter1.StylePriority.UseFont = false;
+            this.GroupFooter1.Visible = false;
+            // 
+            // xrTable4
+            // 
+            this.xrTable4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable4.Name = "xrTable4";
+            this.xrTable4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow4});
+            this.xrTable4.SizeF = new System.Drawing.SizeF(892.7083F, 25F);
+            this.xrTable4.StylePriority.UseBorders = false;
+            this.xrTable4.StylePriority.UseFont = false;
+            this.xrTable4.StylePriority.UsePadding = false;
+            this.xrTable4.StylePriority.UseTextAlignment = false;
+            this.xrTable4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow4
+            // 
+            this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell28,
+            this.xrTableCell31,
+            this.xrTableCell35,
+            this.xrTableCell36,
+            this.xrTableCell37,
+            this.xrTableCell38,
+            this.xrTableCell41,
+            this.xrTableCell29,
+            this.xrTableCell30});
+            this.xrTableRow4.Name = "xrTableRow4";
+            this.xrTableRow4.Weight = 1D;
+            // 
+            // xrTableCell28
+            // 
+            this.xrTableCell28.CanGrow = false;
+            this.xrTableCell28.Multiline = true;
+            this.xrTableCell28.Name = "xrTableCell28";
+            this.xrTableCell28.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.CanGrow = false;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell31.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell35
+            // 
+            this.xrTableCell35.CanGrow = false;
+            this.xrTableCell35.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell35.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell35.Name = "xrTableCell35";
+            this.xrTableCell35.StylePriority.UseFont = false;
+            this.xrTableCell35.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:0.00}";
+            xrSummary1.IgnoreNullValues = true;
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell35.Summary = xrSummary1;
+            this.xrTableCell35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell35.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell36
+            // 
+            this.xrTableCell36.CanGrow = false;
+            this.xrTableCell36.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell36.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell36.Name = "xrTableCell36";
+            this.xrTableCell36.StylePriority.UseFont = false;
+            this.xrTableCell36.StylePriority.UseTextAlignment = false;
+            xrSummary2.FormatString = "{0:0.00}";
+            xrSummary2.IgnoreNullValues = true;
+            xrSummary2.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell36.Summary = xrSummary2;
+            this.xrTableCell36.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell36.Weight = 0.35450516999471215D;
+            // 
+            // xrTableCell37
+            // 
+            this.xrTableCell37.CanGrow = false;
+            this.xrTableCell37.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell37.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell37.Name = "xrTableCell37";
+            this.xrTableCell37.StylePriority.UseFont = false;
+            this.xrTableCell37.StylePriority.UseTextAlignment = false;
+            xrSummary3.FormatString = "{0:0.00}";
+            xrSummary3.IgnoreNullValues = true;
+            xrSummary3.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell37.Summary = xrSummary3;
+            this.xrTableCell37.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell37.Weight = 0.31019202369719984D;
+            // 
+            // xrTableCell38
+            // 
+            this.xrTableCell38.CanGrow = false;
+            this.xrTableCell38.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
+            this.xrTableCell38.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell38.Name = "xrTableCell38";
+            this.xrTableCell38.StylePriority.UseFont = false;
+            this.xrTableCell38.StylePriority.UseTextAlignment = false;
+            xrSummary4.FormatString = "{0:0.00}";
+            xrSummary4.IgnoreNullValues = true;
+            xrSummary4.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell38.Summary = xrSummary4;
+            this.xrTableCell38.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell38.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell41
+            // 
+            this.xrTableCell41.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell41.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell41.Name = "xrTableCell41";
+            this.xrTableCell41.StylePriority.UseFont = false;
+            this.xrTableCell41.StylePriority.UseTextAlignment = false;
+            xrSummary5.FormatString = "{0:c}";
+            xrSummary5.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell41.Summary = xrSummary5;
+            this.xrTableCell41.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell41.Weight = 0.36856870721468521D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
+            this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell29.Multiline = true;
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.StylePriority.UseFont = false;
+            this.xrTableCell29.StylePriority.UseTextAlignment = false;
+            xrSummary6.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell29.Summary = xrSummary6;
+            this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell29.TextFormatString = "{0:c}";
+            this.xrTableCell29.Weight = 0.36856945707114541D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.openAmountReportTime")});
+            this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell30.Multiline = true;
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseFont = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            xrSummary7.FormatString = "{0:c}";
+            xrSummary7.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell30.Summary = xrSummary7;
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell30.Weight = 0.39284569702388022D;
+            // 
+            // GroupHeader2
+            // 
+            this.GroupHeader2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable1});
+            this.GroupHeader2.HeightF = 50F;
+            this.GroupHeader2.Name = "GroupHeader2";
+            this.GroupHeader2.RepeatEveryPage = true;
+            // 
+            // xrTable1
+            // 
+            this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable1.Name = "xrTable1";
+            this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow1});
+            this.xrTable1.SizeF = new System.Drawing.SizeF(892.7083F, 50F);
+            this.xrTable1.StylePriority.UseBorders = false;
+            this.xrTable1.StylePriority.UseFont = false;
+            this.xrTable1.StylePriority.UsePadding = false;
+            this.xrTable1.StylePriority.UseTextAlignment = false;
+            this.xrTable1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow1
+            // 
+            this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell2,
+            this.xrTableCell13,
+            this.xrTableCell11,
+            this.cellBewilligtImZeitraumHeader,
+            this.cellGeleistetImZeitraumHeader,
+            this.xrTableCell25,
+            this.xrTableCell3,
+            this.xrTableCell17});
+            this.xrTableRow1.Name = "xrTableRow1";
+            this.xrTableRow1.Weight = 1.3953493323567705D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Text = "KlientIn/Hilfeplan";
+            this.xrTableCell1.Weight = 0.65261207928425036D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            this.xrTableCell2.Text = "Kostenträger";
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell2.Weight = 0.5220895665938059D;
+            // 
+            // xrTableCell13
+            // 
+            this.xrTableCell13.Name = "xrTableCell13";
+            this.xrTableCell13.StylePriority.UseTextAlignment = false;
+            this.xrTableCell13.Text = "Bis dato bewilligte FLS";
+            this.xrTableCell13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell13.Weight = 0.34805961298674093D;
+            // 
+            // xrTableCell11
+            // 
+            this.xrTableCell11.Name = "xrTableCell11";
+            this.xrTableCell11.StylePriority.UseTextAlignment = false;
+            this.xrTableCell11.Text = "Bis dato geleistete FLS";
+            this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell11.Weight = 0.34805961285908948D;
+            // 
+            // cellBewilligtImZeitraumHeader
+            // 
+            this.cellBewilligtImZeitraumHeader.Name = "cellBewilligtImZeitraumHeader";
+            this.cellBewilligtImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellBewilligtImZeitraumHeader.Text = "bewilligte FLS";
+            this.cellBewilligtImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellBewilligtImZeitraumHeader.Weight = 0.3045519081026955D;
+            // 
+            // cellGeleistetImZeitraumHeader
+            // 
+            this.cellGeleistetImZeitraumHeader.Name = "cellGeleistetImZeitraumHeader";
+            this.cellGeleistetImZeitraumHeader.StylePriority.UseTextAlignment = false;
+            this.cellGeleistetImZeitraumHeader.Text = "geleistete FLS";
+            this.cellGeleistetImZeitraumHeader.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.cellGeleistetImZeitraumHeader.Weight = 0.30455243916761571D;
+            // 
+            // xrTableCell25
+            // 
+            this.xrTableCell25.Name = "xrTableCell25";
+            this.xrTableCell25.StylePriority.UseTextAlignment = false;
+            this.xrTableCell25.Text = "Errechneter Betrag";
+            this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell25.Weight = 0.36186833386075445D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Multiline = true;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.StylePriority.UseTextAlignment = false;
+            this.xrTableCell3.Text = "In Rechnung gestellt";
+            this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell3.Weight = 0.36186831279035137D;
+            // 
+            // xrTableCell17
+            // 
+            this.xrTableCell17.Multiline = true;
+            this.xrTableCell17.Name = "xrTableCell17";
+            this.xrTableCell17.StylePriority.UseTextAlignment = false;
+            this.xrTableCell17.Text = "Noch nicht abgerechnet";
+            this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell17.Weight = 0.38570297193542397D;
+            // 
+            // GroupFooter2
+            // 
+            this.GroupFooter2.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.GroupFooter2.HeightF = 0F;
+            this.GroupFooter2.Level = 1;
+            this.GroupFooter2.Name = "GroupFooter2";
+            this.GroupFooter2.StylePriority.UseFont = false;
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel1});
+            this.GroupHeader1.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] {
+            new DevExpress.XtraReports.UI.GroupField("GruppierungsKategorie", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)});
+            this.GroupHeader1.HeightF = 43.75F;
+            this.GroupHeader1.Level = 1;
+            this.GroupHeader1.Name = "GroupHeader1";
+            this.GroupHeader1.Visible = false;
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.GruppierungsKategorie")});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00001F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(825.0001F, 23F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.Text = "xrLabel1";
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.lblTitel});
+            this.ReportHeader.HeightF = 52.08333F;
+            this.ReportHeader.Name = "ReportHeader";
+            // 
+            // pageFooterBand1
+            // 
+            this.pageFooterBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPageInfo2,
+            this.xrPageInfo1});
+            this.pageFooterBand1.HeightF = 48F;
+            this.pageFooterBand1.Name = "pageFooterBand1";
+            // 
+            // xrPageInfo2
+            // 
+            this.xrPageInfo2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo2.LocationFloat = new DevExpress.Utils.PointFloat(796.7803F, 25F);
+            this.xrPageInfo2.Name = "xrPageInfo2";
+            this.xrPageInfo2.SizeF = new System.Drawing.SizeF(95.00006F, 23F);
+            this.xrPageInfo2.StyleName = "PageInfo";
+            this.xrPageInfo2.StylePriority.UseFont = false;
+            this.xrPageInfo2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrPageInfo2.TextFormatString = "Seite {0} von {1}";
+            // 
+            // xrPageInfo1
+            // 
+            this.xrPageInfo1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrPageInfo1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F);
+            this.xrPageInfo1.Name = "xrPageInfo1";
+            this.xrPageInfo1.PageInfo = DevExpress.XtraPrinting.PageInfo.DateTime;
+            this.xrPageInfo1.SizeF = new System.Drawing.SizeF(270.0002F, 23F);
+            this.xrPageInfo1.StyleName = "PageInfo";
+            this.xrPageInfo1.StylePriority.UseFont = false;
+            // 
+            // Title
+            // 
+            this.Title.BackColor = System.Drawing.Color.White;
+            this.Title.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.Title.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.Title.BorderWidth = 1F;
+            this.Title.Font = new DevExpress.Drawing.DXFont("Times New Roman", 24F);
+            this.Title.ForeColor = System.Drawing.Color.Black;
+            this.Title.Name = "Title";
+            // 
+            // FieldCaption
+            // 
+            this.FieldCaption.BackColor = System.Drawing.Color.White;
+            this.FieldCaption.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.FieldCaption.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.FieldCaption.BorderWidth = 1F;
+            this.FieldCaption.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.FieldCaption.ForeColor = System.Drawing.Color.Black;
+            this.FieldCaption.Name = "FieldCaption";
+            // 
+            // PageInfo
+            // 
+            this.PageInfo.BackColor = System.Drawing.Color.White;
+            this.PageInfo.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.PageInfo.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.PageInfo.BorderWidth = 1F;
+            this.PageInfo.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.PageInfo.ForeColor = System.Drawing.Color.Black;
+            this.PageInfo.Name = "PageInfo";
+            // 
+            // DataField
+            // 
+            this.DataField.BackColor = System.Drawing.Color.White;
+            this.DataField.BorderColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.DataField.BorderWidth = 1F;
+            this.DataField.Font = new DevExpress.Drawing.DXFont("Times New Roman", 8F);
+            this.DataField.ForeColor = System.Drawing.SystemColors.ControlText;
+            this.DataField.Name = "DataField";
+            // 
+            // fieldFLS
+            // 
+            this.fieldFLS.DataMember = "FLSReportGroups";
+            this.fieldFLS.DataSource = this.bindingSource1;
+            this.fieldFLS.Expression = "[TotalFLM] / 60";
+            this.fieldFLS.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal;
+            this.fieldFLS.Name = "fieldFLS";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.HeightF = 50F;
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 30F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable3});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.ReportFooter.HeightF = 25F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrTable3
+            // 
+            this.xrTable3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 3, 0, 0, 100F);
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow3});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(892.7083F, 25F);
+            this.xrTable3.StylePriority.UseBorders = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            this.xrTable3.StylePriority.UsePadding = false;
+            this.xrTable3.StylePriority.UseTextAlignment = false;
+            this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrTableRow3
+            // 
+            this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell15,
+            this.xrTableCell16,
+            this.xrTableCell20,
+            this.xrTableCell21,
+            this.xrTableCell22,
+            this.xrTableCell23,
+            this.xrTableCell27,
+            this.xrTableCell32,
+            this.xrTableCell39});
+            this.xrTableRow3.Name = "xrTableRow3";
+            this.xrTableRow3.Weight = 1D;
+            // 
+            // xrTableCell15
+            // 
+            this.xrTableCell15.CanGrow = false;
+            this.xrTableCell15.Multiline = true;
+            this.xrTableCell15.Name = "xrTableCell15";
+            this.xrTableCell15.Weight = 0.66469718772399189D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.CanGrow = false;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.StylePriority.UseTextAlignment = false;
+            this.xrTableCell16.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell16.Weight = 0.5317577529262556D;
+            // 
+            // xrTableCell20
+            // 
+            this.xrTableCell20.CanGrow = false;
+            this.xrTableCell20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHours")});
+            this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell20.Name = "xrTableCell20";
+            this.xrTableCell20.StylePriority.UseFont = false;
+            this.xrTableCell20.StylePriority.UseTextAlignment = false;
+            xrSummary8.FormatString = "{0:0.00}";
+            xrSummary8.IgnoreNullValues = true;
+            xrSummary8.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell20.Summary = xrSummary8;
+            this.xrTableCell20.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell20.Weight = 0.35450517012236349D;
+            // 
+            // xrTableCell21
+            // 
+            this.xrTableCell21.CanGrow = false;
+            this.xrTableCell21.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableHours")});
+            this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell21.Name = "xrTableCell21";
+            this.xrTableCell21.StylePriority.UseFont = false;
+            this.xrTableCell21.StylePriority.UseTextAlignment = false;
+            xrSummary9.FormatString = "{0:0.00}";
+            xrSummary9.IgnoreNullValues = true;
+            xrSummary9.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell21.Summary = xrSummary9;
+            this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell21.Weight = 0.35450516999471215D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.CanGrow = false;
+            this.xrTableCell22.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.ApprovedHoursInReportTimeSpan")});
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UseTextAlignment = false;
+            xrSummary10.FormatString = "{0:0.00}";
+            xrSummary10.IgnoreNullValues = true;
+            xrSummary10.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell22.Summary = xrSummary10;
+            this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell22.Weight = 0.31019202369719984D;
+            // 
+            // xrTableCell23
+            // 
+            this.xrTableCell23.CanGrow = false;
+            this.xrTableCell23.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.StundenNichtFehlkontakteInReportTimeSpan")});
+            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell23.Name = "xrTableCell23";
+            this.xrTableCell23.StylePriority.UseFont = false;
+            this.xrTableCell23.StylePriority.UseTextAlignment = false;
+            xrSummary11.FormatString = "{0:0.00}";
+            xrSummary11.IgnoreNullValues = true;
+            xrSummary11.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell23.Summary = xrSummary11;
+            this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell23.Weight = 0.31019202366528686D;
+            // 
+            // xrTableCell27
+            // 
+            this.xrTableCell27.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.BillableAmountInReportTimeSpan")});
+            this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell27.Name = "xrTableCell27";
+            this.xrTableCell27.StylePriority.UseFont = false;
+            this.xrTableCell27.StylePriority.UseTextAlignment = false;
+            xrSummary12.FormatString = "{0:c}";
+            xrSummary12.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell27.Summary = xrSummary12;
+            this.xrTableCell27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell27.Weight = 0.368569207118992D;
+            // 
+            // xrTableCell32
+            // 
+            this.xrTableCell32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.AmountPaidInReportTimeSpan")});
+            this.xrTableCell32.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell32.Multiline = true;
+            this.xrTableCell32.Name = "xrTableCell32";
+            this.xrTableCell32.StylePriority.UseFont = false;
+            this.xrTableCell32.StylePriority.UseTextAlignment = false;
+            xrSummary13.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell32.Summary = xrSummary13;
+            this.xrTableCell32.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell32.TextFormatString = "{0:c}";
+            this.xrTableCell32.Weight = 0.36856895716683863D;
+            // 
+            // xrTableCell39
+            // 
+            this.xrTableCell39.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "SupportConceptFinanceList.openAmountReportTime")});
+            this.xrTableCell39.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrTableCell39.Multiline = true;
+            this.xrTableCell39.Name = "xrTableCell39";
+            this.xrTableCell39.StylePriority.UseFont = false;
+            this.xrTableCell39.StylePriority.UseTextAlignment = false;
+            xrSummary14.FormatString = "{0:c}";
+            xrSummary14.Running = DevExpress.XtraReports.UI.SummaryRunning.Report;
+            this.xrTableCell39.Summary = xrSummary14;
+            this.xrTableCell39.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
+            this.xrTableCell39.Weight = 0.39284569702388022D;
+            // 
+            // openAmountReportTime
+            // 
+            this.openAmountReportTime.DataMember = "SupportConceptFinanceList";
+            this.openAmountReportTime.Expression = "[BillableAmountInReportTimeSpan]-[AmountPaidInReportTimeSpan]";
+            this.openAmountReportTime.Name = "openAmountReportTime";
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.FinanceRO);
+            // 
+            // Finanzauswertung
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.DetailReport,
+            this.ReportHeader,
+            this.pageFooterBand1,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter});
+            this.CalculatedFields.AddRange(new DevExpress.XtraReports.UI.CalculatedField[] {
+            this.openAmountReportTime});
+            this.DataSource = this.bindingSource1;
+            this.Landscape = true;
+            this.Margins = new DevExpress.Drawing.DXMargins(45F, 40F, 50F, 30F);
+            this.PageHeight = 827;
+            this.PageWidth = 1169;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.StyleSheet.AddRange(new DevExpress.XtraReports.UI.XRControlStyle[] {
+            this.Title,
+            this.FieldCaption,
+            this.PageInfo,
+            this.DataField});
+            this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
+        }
+
+        #endregion
+
+        private DevExpress.XtraReports.UI.DetailBand Detail;
+        private System.Windows.Forms.BindingSource bindingSource1;
+        private DevExpress.XtraReports.UI.DetailBand Detail1;
+        private DevExpress.XtraReports.UI.DetailReportBand DetailReport;
+        private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader;
+        private DevExpress.XtraReports.UI.PageFooterBand pageFooterBand1;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo2;
+        private DevExpress.XtraReports.UI.XRPageInfo xrPageInfo1;
+        private DevExpress.XtraReports.UI.XRControlStyle Title;
+        private DevExpress.XtraReports.UI.XRControlStyle FieldCaption;
+        private DevExpress.XtraReports.UI.XRControlStyle PageInfo;
+        private DevExpress.XtraReports.UI.XRControlStyle DataField;
+        private DevExpress.XtraReports.UI.CalculatedField fieldFLS;
+        private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1;
+        private DevExpress.XtraReports.UI.BottomMarginBand bottomMarginBand1;
+        private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
+        private DevExpress.XtraReports.UI.XRLabel lblTitel;
+        private DevExpress.XtraReports.UI.XRTable xrTable2;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
+        private DevExpress.XtraReports.UI.XRTable xrTable1;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
+        private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell14;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell13;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligteFLSImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImBereich;
+		private DevExpress.XtraReports.UI.XRTableCell cellBewilligtImZeitraumHeader;
+		private DevExpress.XtraReports.UI.XRTableCell cellGeleistetImZeitraumHeader;
+		private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter2;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell25;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell26;
+        private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader1;
+        private DevExpress.XtraReports.UI.XRLabel xrLabel1;
+        private DevExpress.XtraReports.UI.XRTable xrTable4;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow4;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell35;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell36;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell37;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell38;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell41;
+        private DevExpress.XtraReports.UI.XRTable xrTable3;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell16;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell20;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell21;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
+        private DevExpress.XtraReports.UI.CalculatedField openAmountReportTime;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell8;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell24;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell3;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell17;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell32;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell39;
+    }
+}
diff --git a/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.resx b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.resx
new file mode 100644
index 000000000..d58980a38
--- /dev/null
+++ b/ReportImp/AWOMuensterlandRecklinghausen/Finanzauswertung.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file