From 2286f81808f293cb2ae2564d0b94d6c779c0d0bc Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Thu, 15 May 2025 14:02:09 +0200
Subject: [PATCH] Design 2

---
 BeWo/View/Detail/OrganisationView.xaml | 229 +++++++++++++------------
 1 file changed, 116 insertions(+), 113 deletions(-)

diff --git a/BeWo/View/Detail/OrganisationView.xaml b/BeWo/View/Detail/OrganisationView.xaml
index f073ef800..d5823f6d4 100644
--- a/BeWo/View/Detail/OrganisationView.xaml
+++ b/BeWo/View/Detail/OrganisationView.xaml
@@ -640,139 +640,33 @@
                                                     Weitere IK's ermitteln
                                                 </Button>
 
+
                                                 <Label
                                                     Grid.Row="3"
                                                     Grid.Column="0"
                                                     VerticalAlignment="Center"
-                                                    ToolTip="Bezeichnung Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
-                                                    Datenannahmestelle
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_bezdatenannahmestelle"
-                                                    Grid.Row="3"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=BezDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
-
-                                                <Label
-                                                    Grid.Row="4"
-                                                    Grid.Column="0"
-                                                    VerticalAlignment="Center"
-                                                    ToolTip="Hausanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
-                                                    Hausanschrift
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_hausanschrift"
-                                                    Grid.Row="4"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
-
-                                                <Label
-                                                    Grid.Row="5"
-                                                    Grid.Column="0"
-                                                    VerticalAlignment="Center"
-                                                    ToolTip="Postfachanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
-                                                    Postfachanschrift
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_postfachanschrift"
-                                                    Grid.Row="5"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
-
-                                                <Label
-                                                    Grid.Row="6"
-                                                    Grid.Column="0"
-                                                    VerticalAlignment="Center"
-                                                    ToolTip="Großkundenanschrift der Datenannahmestelle"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
-                                                    Großkundenanschrift
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_großkundenanschrift"
-                                                    Grid.Row="6"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
-                                                    ToolTipService.ShowOnDisabled="True"
-                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
-
-                                                <Label
-                                                    Grid.Row="7"
-                                                    Grid.Column="0"
-                                                    VerticalAlignment="Center">
-                                                    IK Datenannahmestelle
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_ikdatenannahmestelle"
-                                                    Grid.Row="7"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    ToolTipService.ShowOnDisabled="True" />
-                                                <Label
-                                                    Grid.Row="8"
-                                                    Grid.Column="0"
-                                                    VerticalAlignment="Center">
-                                                    IK Kostenträger
-                                                </Label>
-                                                <TextBox
-                                                    x:Name="txt_ikkostentrager"
-                                                    Grid.Row="8"
-                                                    Grid.Column="1"
-                                                    Foreground="{Binding Path=IKKostentrager, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    IsEnabled="False"
-                                                    Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}"
-                                                    ToolTip="{Binding Path=IKKostentrager, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
-                                                    ToolTipService.ShowOnDisabled="True" />
-
-                                                <Label
-                                                    Grid.Row="0"
-                                                    Grid.Column="3"
-                                                    VerticalAlignment="Center"
                                                     Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
                                                     Ausblenden
                                                 </Label>
                                                 <CheckBox
-                                                    Grid.Row="0"
-                                                    Grid.Column="4"
+                                                    Grid.Row="3"
+                                                    Grid.Column="1"
                                                     IsChecked="{Binding GkvAusblenden, UpdateSourceTrigger=PropertyChanged}"
                                                     Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
 
                                                 <Label
                                                     x:Name="label_verfahrensstufe"
-                                                    Grid.Row="1"
-                                                    Grid.Column="3"
+                                                    Grid.Row="4"
+                                                    Grid.Column="0"
                                                     VerticalAlignment="Center"
                                                     Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
                                                     Verfahrensstufe
                                                 </Label>
                                                 <StackPanel
                                                     x:Name="radiobuttons_verfahrensstufe"
-                                                    Grid.Row="1"
+                                                    Grid.Row="4"
                                                     Grid.RowSpan="3"
-                                                    Grid.Column="4"
+                                                    Grid.Column="1"
                                                     Margin="0,4,0,0"
                                                     Orientation="Vertical"
                                                     Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
@@ -801,6 +695,115 @@
                                                         Echt
                                                     </RadioButton>
                                                 </StackPanel>
+
+                                                <Label
+                                                    Grid.Row="0"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center"
+                                                    ToolTip="Bezeichnung Datenannahmestelle"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Datenannahmestelle
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_bezdatenannahmestelle"
+                                                    Grid.Row="0"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=BezDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=BezDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    ToolTipService.ShowOnDisabled="True"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+
+                                                <Label
+                                                    Grid.Row="1"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center"
+                                                    ToolTip="Hausanschrift der Datenannahmestelle"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Hausanschrift
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_hausanschrift"
+                                                    Grid.Row="1"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    ToolTipService.ShowOnDisabled="True"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+
+                                                <Label
+                                                    Grid.Row="2"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center"
+                                                    ToolTip="Postfachanschrift der Datenannahmestelle"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Postfachanschrift
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_postfachanschrift"
+                                                    Grid.Row="2"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    ToolTipService.ShowOnDisabled="True"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+
+                                                <Label
+                                                    Grid.Row="3"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center"
+                                                    ToolTip="Großkundenanschrift der Datenannahmestelle"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}">
+                                                    Großkundenanschrift
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_großkundenanschrift"
+                                                    Grid.Row="3"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationBezDatenannahmestelle}}"
+                                                    ToolTipService.ShowOnDisabled="True"
+                                                    Visibility="{Binding Converter={StaticResource UserPermission2VisibleConverter}, ConverterParameter={x:Static core:SettingsKeys.AllowGkvAbrechnung}}" />
+
+                                                <Label
+                                                    Grid.Row="4"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center">
+                                                    IK Datenannahmestelle
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_ikdatenannahmestelle"
+                                                    Grid.Row="4"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=IKDatenannahmestelle, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=IKDatenannahmestelle, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
+                                                    ToolTipService.ShowOnDisabled="True" />
+                                                <Label
+                                                    Grid.Row="5"
+                                                    Grid.Column="3"
+                                                    VerticalAlignment="Center">
+                                                    IK Kostenträger
+                                                </Label>
+                                                <TextBox
+                                                    x:Name="txt_ikkostentrager"
+                                                    Grid.Row="5"
+                                                    Grid.Column="4"
+                                                    Foreground="{Binding Path=IKKostentrager, Converter={StaticResource Validation2BrushConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
+                                                    IsEnabled="False"
+                                                    Text="{Binding Path=IKKostentrager, UpdateSourceTrigger=PropertyChanged}"
+                                                    ToolTip="{Binding Path=IKKostentrager, Converter={StaticResource Validation2TooltipConverter}, ConverterParameter={x:Static shared:ValidationType.OrganisationIKNumber}}"
+                                                    ToolTipService.ShowOnDisabled="True" />
+
+
                                             </Grid>
                                         </GroupBox>
                                         <GroupBox