aktueller stand

FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml

@@ -179,7 +179,7 @@
                                 Style="{StaticResource MandatoryFieldBorderStyle}">
                             <local:HierarchicalSelectionControl x:Name="CategorySelectionControl"
                                                                 SelectedItem="{Binding SelectedCategory, ElementName=CloseCaseDialogUc, Mode=TwoWay}"
-                                                                ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                                                ComboBoxBackground="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                                                                 BorderBrush="Transparent"
                                                                 BorderThickness="0"
                                                                 SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
@@ -196,7 +196,7 @@
                             <Border x:Name="QuickTicketValidationBorder"
                                     Style="{StaticResource MandatoryFieldBorderStyle}">
                                 <ComboBox x:Name="QuickTicketSelection"
-                                         Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                         Background="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                                          BorderBrush="Transparent"
                                          BorderThickness="0"
                                          SelectedIndex="0"
@@ -317,7 +317,7 @@
                     <Border x:Name="TicketStatusValidationBorder"
                             Style="{StaticResource MandatoryFieldBorderStyle}">
                         <ComboBox x:Name="TicketStatusCombobox"
-                                  Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                  Background="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                                   BorderBrush="Transparent"
                                   BorderThickness="0"
                                   DropDownOpened="DropDownOpened"

FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs

@@ -87,6 +87,9 @@ namespace FasdDesktopUi.Basics.UserControls
         private Brush defaultQuickTicketBorderBrush;
         private readonly Brush validationErrorBrush = SharedValidationBorderBrush;
         private Brush defaultTicketStatusBorderBrush;
+        private Thickness? defaultCategoryBorderThickness;
+        private Thickness? defaultQuickTicketBorderThickness;
+        private Thickness? defaultTicketStatusBorderThickness;
 
         public bool AreCaseNotesMandatory =>
             cFasdCockpitConfig.Instance?.Global?.TicketConfiguration?.NotesMandatory ?? false;
@@ -2484,10 +2487,15 @@ namespace FasdDesktopUi.Basics.UserControls
 
             if (defaultCategoryBorderBrush == null)
                 defaultCategoryBorderBrush = CategoryValidationBorder.BorderBrush?.CloneCurrentValue();
+            if (defaultCategoryBorderThickness == null)
+                defaultCategoryBorderThickness = CategoryValidationBorder.BorderThickness;
 
             CategoryValidationBorder.BorderBrush = hasError
                 ? validationErrorBrush
                 : defaultCategoryBorderBrush;
+            CategoryValidationBorder.BorderThickness = hasError
+                ? new Thickness(1)
+                : defaultCategoryBorderThickness ?? new Thickness(0);
         }
 
         private void UpdateQuickTicketValidationVisualState(bool hasError)
@@ -2497,10 +2505,15 @@ namespace FasdDesktopUi.Basics.UserControls
 
             if (defaultQuickTicketBorderBrush == null)
                 defaultQuickTicketBorderBrush = QuickTicketValidationBorder.BorderBrush?.CloneCurrentValue();
+            if (defaultQuickTicketBorderThickness == null)
+                defaultQuickTicketBorderThickness = QuickTicketValidationBorder.BorderThickness;
 
             QuickTicketValidationBorder.BorderBrush = hasError
                 ? validationErrorBrush
                 : defaultQuickTicketBorderBrush;
+            QuickTicketValidationBorder.BorderThickness = hasError
+                ? new Thickness(1)
+                : defaultQuickTicketBorderThickness ?? new Thickness(0);
         }
 
         private void UpdateTicketStatusValidationVisualState(bool hasError)
@@ -2510,10 +2523,15 @@ namespace FasdDesktopUi.Basics.UserControls
 
             if (defaultTicketStatusBorderBrush == null)
                 defaultTicketStatusBorderBrush = TicketStatusValidationBorder.BorderBrush?.CloneCurrentValue();
+            if (defaultTicketStatusBorderThickness == null)
+                defaultTicketStatusBorderThickness = TicketStatusValidationBorder.BorderThickness;
 
             TicketStatusValidationBorder.BorderBrush = hasError
                 ? validationErrorBrush
                 : defaultTicketStatusBorderBrush;
+            TicketStatusValidationBorder.BorderThickness = hasError
+                ? new Thickness(1)
+                : defaultTicketStatusBorderThickness ?? new Thickness(0);
         }
 
 

FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml

@@ -23,7 +23,7 @@
         <Border x:Name="ErrorTypeValidationBorder"
                 Style="{StaticResource MandatoryFieldBorderStyle}">
             <ComboBox x:Name="ErrorTypeComboBox"
-                      Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                      Background="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                       BorderBrush="Transparent"
                       BorderThickness="0"
                       SelectionChanged="ErrorTypeComboBox_SelectionChanged"

FasdDesktopUi/Basics/UserControls/Ticket/CloseTicketDialog.xaml.cs

@@ -32,6 +32,7 @@ namespace FasdDesktopUi.Basics.UserControls
             return brush;
         }
         private Brush defaultErrorTypeBorderBrush;
+        private Thickness? defaultErrorTypeBorderThickness;
         #region Properties
 
         public event EventHandler ErrorTypeValueChanged;
@@ -103,6 +104,7 @@ namespace FasdDesktopUi.Basics.UserControls
         {
             InitializeComponent();
             defaultErrorTypeBorderBrush = ErrorTypeValidationBorder?.BorderBrush?.CloneCurrentValue();
+            defaultErrorTypeBorderThickness = ErrorTypeValidationBorder?.BorderThickness;
         }
 
         protected override void OnInitialized(EventArgs e)
@@ -219,8 +221,11 @@ namespace FasdDesktopUi.Basics.UserControls
 
             if (defaultErrorTypeBorderBrush == null)
                 defaultErrorTypeBorderBrush = ErrorTypeValidationBorder.BorderBrush?.CloneCurrentValue();
+            if (defaultErrorTypeBorderThickness == null)
+                defaultErrorTypeBorderThickness = ErrorTypeValidationBorder.BorderThickness;
 
             ErrorTypeValidationBorder.BorderBrush = hasError ? ValidationBrush : defaultErrorTypeBorderBrush;
+            ErrorTypeValidationBorder.BorderThickness = hasError ? new Thickness(1) : defaultErrorTypeBorderThickness ?? new Thickness(0);
         }
     }
 }

FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml

@@ -24,7 +24,7 @@
                 Style="{StaticResource MandatoryFieldBorderStyle}">
             <local:ComboBoxPageable x:Name="RoleSelectionControl"
                                     SelectedItem="{Binding ElementName=ForwardTicketDialogUc, Path=SelectedRole, Mode=TwoWay}"
-                                    ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                    ComboBoxBackground="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                                     BorderBrush="Transparent"
                                     BorderThickness="0" />
         </Border>
@@ -38,7 +38,7 @@
                 Style="{StaticResource MandatoryFieldBorderStyle}">
             <local:ComboBoxPageable x:Name="PersonSelectionControl"
                                     SelectedItem="{Binding ElementName=ForwardTicketDialogUc, Path=SelectedPerson, Mode=TwoWay}"
-                                    ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                    ComboBoxBackground="{Binding Background, RelativeSource={RelativeSource AncestorType=Border}}"
                                     BorderBrush="Transparent"
                                     BorderThickness="0" />
         </Border>

FasdDesktopUi/Basics/UserControls/Ticket/ForwardTicketDialog.xaml.cs

@@ -26,6 +26,8 @@ namespace FasdDesktopUi.Basics.UserControls
 
         private Brush defaultRoleBorderBrush;
         private Brush defaultPersonBorderBrush;
+        private Thickness? defaultRoleBorderThickness;
+        private Thickness? defaultPersonBorderThickness;
 
         string lastPersonSearch = string.Empty;
         string lastRoleSearch = string.Empty;
@@ -89,6 +91,8 @@ namespace FasdDesktopUi.Basics.UserControls
             _dataProvider = dataProvider;
             defaultRoleBorderBrush = RoleValidationBorder?.BorderBrush?.CloneCurrentValue();
             defaultPersonBorderBrush = PersonValidationBorder?.BorderBrush?.CloneCurrentValue();
+            defaultRoleBorderThickness = RoleValidationBorder?.BorderThickness;
+            defaultPersonBorderThickness = PersonValidationBorder?.BorderThickness;
             UpdateResponsibleSelectionValidationState(true);
         }
 
@@ -216,7 +220,10 @@ namespace FasdDesktopUi.Basics.UserControls
                 {
                     if (defaultRoleBorderBrush == null)
                         defaultRoleBorderBrush = RoleValidationBorder.BorderBrush?.CloneCurrentValue();
+                    if (defaultRoleBorderThickness == null)
+                        defaultRoleBorderThickness = RoleValidationBorder.BorderThickness;
                     RoleValidationBorder.BorderBrush = hasError ? ValidationBrush : defaultRoleBorderBrush;
+                    RoleValidationBorder.BorderThickness = hasError ? new Thickness(1) : defaultRoleBorderThickness ?? new Thickness(0);
                 }
 
                 if (PersonValidationBorder != null)
@@ -224,6 +231,9 @@ namespace FasdDesktopUi.Basics.UserControls
                     if (defaultPersonBorderBrush == null)
                         defaultPersonBorderBrush = PersonValidationBorder.BorderBrush?.CloneCurrentValue();
                     PersonValidationBorder.BorderBrush = hasError ? ValidationBrush : defaultPersonBorderBrush;
+                    if (defaultPersonBorderThickness == null)
+                        defaultPersonBorderThickness = PersonValidationBorder.BorderThickness;
+                    PersonValidationBorder.BorderThickness = hasError ? new Thickness(1) : defaultPersonBorderThickness ?? new Thickness(0);
                 }
             }
             catch (Exception E)

FasdDesktopUi/ResourceDictionaries/DetailsPageResources/CustomizableResources.xaml

@@ -52,7 +52,7 @@
         <Setter Property="Margin"
                 Value="0 5 0 0" />
         <Setter Property="BorderThickness"
-                Value="1" />
+                Value="0" />
         <Setter Property="Padding"
                 Value="0" />
         <Setter Property="CornerRadius"