added pflichtfelder, fix zum roten rand ausstehend

FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml

@@ -160,30 +160,46 @@
                                   Margin="0 10 0 0"
                                   Foreground="{DynamicResource FontColor.Menu.Categories}" />
                         </StackPanel>
-                        <local:HierarchicalSelectionControl x:Name="CategorySelectionControl"
-                                                            Margin="0 5 0 0"
-                                                            SelectedItem="{Binding SelectedCategory, ElementName=CloseCaseDialogUc, Mode=TwoWay}"
-                                                            ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
-                                                            BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
-                                                            SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
-                                                            DropDownOpened="DropDownOpened"
-                                                            DropDownClosed="DropDownClosed"
-                                                            PreviewKeyDown="Combobox_PreviewKeyDown" />
+                        <Border x:Name="CategoryValidationBorder"
+                                Margin="0 5 0 0"
+                                Padding="1"
+                                BorderThickness="1"
+                                CornerRadius="7.5"
+                                Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
+                            <local:HierarchicalSelectionControl x:Name="CategorySelectionControl"
+                                                                SelectedItem="{Binding SelectedCategory, ElementName=CloseCaseDialogUc, Mode=TwoWay}"
+                                                                ComboBoxBackground="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                                                BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
+                                                                SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
+                                                                DropDownOpened="DropDownOpened"
+                                                                DropDownClosed="DropDownClosed"
+                                                                PreviewKeyDown="Combobox_PreviewKeyDown" />
+                        </Border>
                         <StackPanel>
                             <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Template}"
                                   FontWeight="Bold"
                                   Margin="0 10 0 0"
                                   Foreground="{DynamicResource FontColor.Menu.Categories}" />
 
-                            <ComboBox x:Name="QuickTicketSelection"
-                                 Margin="0 5 0 0"
-                                 Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
-                                 BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
-                                 SelectedIndex="0"
-                                 PreviewKeyDown="Combobox_PreviewKeyDown"
-                                 DropDownOpened="DropDownOpened"
-                                 DropDownClosed="DropDownClosed">
-                            </ComboBox>
+                            <Border x:Name="QuickTicketValidationBorder"
+                                    Margin="0 5 0 0"
+                                    Padding="1"
+                                    BorderThickness="1"
+                                    CornerRadius="7.5"
+                                    Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                    BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
+                                <ComboBox x:Name="QuickTicketSelection"
+                                     Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
+                                     BorderBrush="Transparent"
+                                     BorderThickness="0"
+                                     SelectedIndex="0"
+                                     SelectionChanged="QuickTicketSelection_SelectionChanged"
+                                     PreviewKeyDown="Combobox_PreviewKeyDown"
+                                     DropDownOpened="DropDownOpened"
+                                     DropDownClosed="DropDownClosed">
+                                </ComboBox>
+                            </Border>
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
                             <TextBlock x:Name="SetOrUpdateComputerInTicketLabel"

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

@@ -74,6 +74,9 @@ namespace FasdDesktopUi.Basics.UserControls
         private ObservableCollection<HierarchicalSelectionItem> categoryHierarchy = new ObservableCollection<HierarchicalSelectionItem>();
         private readonly Dictionary<string, HierarchicalSelectionItem> categoryLookup = new Dictionary<string, HierarchicalSelectionItem>(StringComparer.OrdinalIgnoreCase);
         private bool isCategoryLoading;
+        private Brush defaultCategoryBorderBrush;
+        private Brush defaultQuickTicketBorderBrush;
+        private readonly Brush validationErrorBrush = new SolidColorBrush(Colors.Red);
 
         public bool IsTicket
         {
@@ -230,7 +233,10 @@ namespace FasdDesktopUi.Basics.UserControls
         private static void OnSelectedCategoryChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is CloseCaseDialogWithTicket instance)
+            {
                 instance.LogSelectedCategoryChanged(e.NewValue as HierarchicalSelectionItem);
+                instance.ValidateProperty("SelectedCategory");
+            }
         }
 
         #endregion
@@ -403,6 +409,8 @@ namespace FasdDesktopUi.Basics.UserControls
                 me.UpdateTicketComponentVisibility();
                 await me.InitializeCategorySelectionAsync();
                 await me.UpdateQuickCallsComboBoxAsync();
+                me.ValidateProperty("SelectedCategory");
+                me.ValidateProperty("QuickTicketSelection");
             }
             catch (Exception E)
             {
@@ -423,6 +431,10 @@ namespace FasdDesktopUi.Basics.UserControls
             InitializeComponent();
             this.Unloaded += CloseCaseDialogWithTicket_Unloaded;
             this.Loaded += CloseCaseDialogWithTicket_Loaded;
+            defaultCategoryBorderBrush = CategoryValidationBorder?.BorderBrush?.CloneCurrentValue();
+            defaultQuickTicketBorderBrush = QuickTicketValidationBorder?.BorderBrush?.CloneCurrentValue();
+            if (validationErrorBrush is Freezable freezableBrush && freezableBrush.CanFreeze)
+                freezableBrush.Freeze();
 
             DependencyPropertyDescriptor dpd =
                 DependencyPropertyDescriptor.FromProperty(TextBlock.TextProperty, typeof(TextBlock));
@@ -447,6 +459,8 @@ namespace FasdDesktopUi.Basics.UserControls
             ValidateProperty("TicketSummaryTextBox");
             ValidateProperty("TicketStatusCombobox");
             ValidateProperty("CaseNotesPreview");
+            ValidateProperty("SelectedCategory");
+            ValidateProperty("QuickTicketSelection");
         }
         private void CloseCaseDialogWithTicket_Unloaded(object sender, RoutedEventArgs e)
         {
@@ -937,6 +951,7 @@ namespace FasdDesktopUi.Basics.UserControls
             finally
             {
                 isCategoryLoading = false;
+                ValidateProperty("SelectedCategory");
             }
         }
 
@@ -1129,6 +1144,7 @@ namespace FasdDesktopUi.Basics.UserControls
 
                 QuickTicketSelection.SelectedItem = quickCallListe
                     .FirstOrDefault(x => x.ID == "7bbe64e2-94d0-ee11-4285-00155d010a04");
+                ValidateProperty("QuickTicketSelection");
             }
             catch (Exception e)
             {
@@ -2043,6 +2059,41 @@ namespace FasdDesktopUi.Basics.UserControls
                         ShowAssetWarningTicketAction = false;
                     }
 
+                    break;
+                case "SelectedCategory":
+                    bool categoryIsVisible = CategorySelectionControl?.IsVisible ?? false;
+                    bool categoryHasError = categoryIsVisible && SelectedCategory == null;
+                    UpdateCategoryValidationVisualState(categoryHasError);
+
+                    if (categoryHasError)
+                    {
+                        if (!_errors.ContainsKey(propertyName))
+                            _errors.Add(propertyName, cMultiLanguageSupport.GetItem("Dialog.CloseCase.ValidationErrorCategoryEmpty"));
+                    }
+                    else
+                    {
+                        if (_errors.ContainsKey(propertyName))
+                            _errors.Remove(propertyName);
+                    }
+
+                    break;
+                case "QuickTicketSelection":
+                    bool quickCallIsVisible = QuickTicketSelection?.IsVisible ?? false;
+                    bool quickCallSelected = QuickTicketSelection?.SelectedItem is QuickCallEntry selectedQuickCall && !string.IsNullOrWhiteSpace(selectedQuickCall.ID);
+                    bool quickCallHasError = quickCallIsVisible && !quickCallSelected;
+                    UpdateQuickTicketValidationVisualState(quickCallHasError);
+
+                    if (quickCallHasError)
+                    {
+                        if (!_errors.ContainsKey(propertyName))
+                            _errors.Add(propertyName, cMultiLanguageSupport.GetItem("Dialog.CloseCase.ValidationErrorQuickCallEmpty"));
+                    }
+                    else
+                    {
+                        if (_errors.ContainsKey(propertyName))
+                            _errors.Remove(propertyName);
+                    }
+
                     break;
             }
 
@@ -2406,6 +2457,32 @@ namespace FasdDesktopUi.Basics.UserControls
             }
         }
 
+        private void UpdateCategoryValidationVisualState(bool hasError)
+        {
+            if (CategoryValidationBorder == null)
+                return;
+
+            if (defaultCategoryBorderBrush == null)
+                defaultCategoryBorderBrush = CategoryValidationBorder.BorderBrush?.CloneCurrentValue();
+
+            CategoryValidationBorder.BorderBrush = hasError
+                ? validationErrorBrush
+                : defaultCategoryBorderBrush;
+        }
+
+        private void UpdateQuickTicketValidationVisualState(bool hasError)
+        {
+            if (QuickTicketValidationBorder == null)
+                return;
+
+            if (defaultQuickTicketBorderBrush == null)
+                defaultQuickTicketBorderBrush = QuickTicketValidationBorder.BorderBrush?.CloneCurrentValue();
+
+            QuickTicketValidationBorder.BorderBrush = hasError
+                ? validationErrorBrush
+                : defaultQuickTicketBorderBrush;
+        }
+
 
 
         #region DropDown
@@ -2458,6 +2535,11 @@ namespace FasdDesktopUi.Basics.UserControls
             SelectedComputer = (cF4sdApiSearchResultRelation)ComputerSelection.SelectedItem;
         }
 
+        private void QuickTicketSelection_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            ValidateProperty("QuickTicketSelection");
+        }
+
         private void TransferCaseNotesCheck_Unchecked(object sender, RoutedEventArgs e)
         {
             try

FasdDesktopUi/Config/LanguageDefinitions.xml

@@ -1582,6 +1582,14 @@
     <Language Lang="EN">Fill summary</Language>
     <Language Lang="DE">Zusammenfassung angeben</Language>
   </UIItem>
+  <UIItem Name="Dialog.CloseCase.ValidationErrorCategoryEmpty">
+    <Language Lang="EN">Select a category</Language>
+    <Language Lang="DE">Kategorie auswählen</Language>
+  </UIItem>
+  <UIItem Name="Dialog.CloseCase.ValidationErrorQuickCallEmpty">
+    <Language Lang="EN">Select a quickcall template</Language>
+    <Language Lang="DE">Quickcall auswählen</Language>
+  </UIItem>
 
   <UIItem Name="Dialog.CloseCase.ValidationErrorSolutionEmpty">
     <Language Lang="EN">Fill solution</Language>