Meik/C4IT-F4SD-Client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added pflichtfelder, fix zum roten rand ausstehend

Browse Source
This commit is contained in:
Meik
2025-11-13 11:36:47 +01:00
parent 069d5919cb
commit c218dbe139
3 changed files with 149 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
View File

@@ -175,15 +175,16 @@
Margin="0 10 0 0" Margin="0 10 0 0"
Foreground="{DynamicResource FontColor.Menu.Categories}" /> Foreground="{DynamicResource FontColor.Menu.Categories}" />
<ComboBox x:Name="QuickTicketSelection" <ComboBox x:Name="QuickTicketSelection"
Margin="0 5 0 0" Margin="0 5 0 0"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}" BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
SelectedIndex="0" SelectedIndex="0"
PreviewKeyDown="Combobox_PreviewKeyDown" SelectionChanged="QuickTicketSelection_SelectionChanged"
DropDownOpened="DropDownOpened" PreviewKeyDown="Combobox_PreviewKeyDown"
DropDownClosed="DropDownClosed"> DropDownOpened="DropDownOpened"
</ComboBox> DropDownClosed="DropDownClosed">
</ComboBox>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock x:Name="SetOrUpdateComputerInTicketLabel" <TextBlock x:Name="SetOrUpdateComputerInTicketLabel"

166
FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
View File

@@ -74,6 +74,9 @@ namespace FasdDesktopUi.Basics.UserControls
private ObservableCollection<HierarchicalSelectionItem> categoryHierarchy = new ObservableCollection<HierarchicalSelectionItem>(); private ObservableCollection<HierarchicalSelectionItem> categoryHierarchy = new ObservableCollection<HierarchicalSelectionItem>();
private readonly Dictionary<string, HierarchicalSelectionItem> categoryLookup = new Dictionary<string, HierarchicalSelectionItem>(StringComparer.OrdinalIgnoreCase); private readonly Dictionary<string, HierarchicalSelectionItem> categoryLookup = new Dictionary<string, HierarchicalSelectionItem>(StringComparer.OrdinalIgnoreCase);
private bool isCategoryLoading; private bool isCategoryLoading;
private Brush defaultCategoryBorderBrush;
private Brush defaultQuickTicketBorderBrush;
private readonly Brush validationErrorBrush = new SolidColorBrush(Colors.Red);
public bool IsTicket public bool IsTicket
{ {
@@ -230,7 +233,10 @@ namespace FasdDesktopUi.Basics.UserControls
private static void OnSelectedCategoryChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) private static void OnSelectedCategoryChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
if (d is CloseCaseDialogWithTicket instance) if (d is CloseCaseDialogWithTicket instance)
{
instance.LogSelectedCategoryChanged(e.NewValue as HierarchicalSelectionItem); instance.LogSelectedCategoryChanged(e.NewValue as HierarchicalSelectionItem);
instance.ValidateProperty("SelectedCategory");
}
} }
#endregion #endregion
@@ -403,9 +409,11 @@ namespace FasdDesktopUi.Basics.UserControls
me.UpdateTicketComponentVisibility(); me.UpdateTicketComponentVisibility();
await me.InitializeCategorySelectionAsync(); await me.InitializeCategorySelectionAsync();
await me.UpdateQuickCallsComboBoxAsync(); await me.UpdateQuickCallsComboBoxAsync();
} me.ValidateProperty("SelectedCategory");
catch (Exception E) me.ValidateProperty("QuickTicketSelection");
{ }
catch (Exception E)
{
LogException(E); LogException(E);
} }
@@ -418,14 +426,18 @@ namespace FasdDesktopUi.Basics.UserControls
private TicketCompletion parentWindow; private TicketCompletion parentWindow;
public CloseCaseDialogWithTicket() public CloseCaseDialogWithTicket()
{ {
InitializeComponent(); InitializeComponent();
this.Unloaded += CloseCaseDialogWithTicket_Unloaded; this.Unloaded += CloseCaseDialogWithTicket_Unloaded;
this.Loaded += CloseCaseDialogWithTicket_Loaded; this.Loaded += CloseCaseDialogWithTicket_Loaded;
defaultCategoryBorderBrush = CategorySelectionControl?.BorderBrush?.CloneCurrentValue();
DependencyPropertyDescriptor dpd = defaultQuickTicketBorderBrush = QuickTicketSelection?.BorderBrush?.CloneCurrentValue();
DependencyPropertyDescriptor.FromProperty(TextBlock.TextProperty, typeof(TextBlock)); if (validationErrorBrush is Freezable freezableBrush && freezableBrush.CanFreeze)
freezableBrush.Freeze();
DependencyPropertyDescriptor dpd =
DependencyPropertyDescriptor.FromProperty(TextBlock.TextProperty, typeof(TextBlock));
dpd?.AddValueChanged(CaseNotesPreview, TicketCaseNotesTextBlock_TextChanged); dpd?.AddValueChanged(CaseNotesPreview, TicketCaseNotesTextBlock_TextChanged);
@@ -444,10 +456,12 @@ namespace FasdDesktopUi.Basics.UserControls
parentWindow.SetButtonStateYes(false, "Initial gesperrt."); parentWindow.SetButtonStateYes(false, "Initial gesperrt.");
parentWindow.SetButtonStateNo(true, cMultiLanguageSupport.GetItem("Dialog.CloseCase.Cancel")); parentWindow.SetButtonStateNo(true, cMultiLanguageSupport.GetItem("Dialog.CloseCase.Cancel"));
ValidateProperty("TicketSummaryTextBox"); ValidateProperty("TicketSummaryTextBox");
ValidateProperty("TicketStatusCombobox"); ValidateProperty("TicketStatusCombobox");
ValidateProperty("CaseNotesPreview"); ValidateProperty("CaseNotesPreview");
} ValidateProperty("SelectedCategory");
ValidateProperty("QuickTicketSelection");
}
private void CloseCaseDialogWithTicket_Unloaded(object sender, RoutedEventArgs e) private void CloseCaseDialogWithTicket_Unloaded(object sender, RoutedEventArgs e)
{ {
Window parentWindow = Window.GetWindow(this); Window parentWindow = Window.GetWindow(this);
@@ -937,6 +951,7 @@ namespace FasdDesktopUi.Basics.UserControls
finally finally
{ {
isCategoryLoading = false; isCategoryLoading = false;
ValidateProperty("SelectedCategory");
} }
} }
@@ -1125,13 +1140,14 @@ namespace FasdDesktopUi.Basics.UserControls
}); });
} }
QuickTicketSelection.ItemsSource = quickCallListe; QuickTicketSelection.ItemsSource = quickCallListe;
QuickTicketSelection.SelectedItem = quickCallListe QuickTicketSelection.SelectedItem = quickCallListe
.FirstOrDefault(x => x.ID == "7bbe64e2-94d0-ee11-4285-00155d010a04"); .FirstOrDefault(x => x.ID == "7bbe64e2-94d0-ee11-4285-00155d010a04");
} ValidateProperty("QuickTicketSelection");
catch (Exception e) }
{ catch (Exception e)
{
LogException(e); LogException(e);
} }
} }
@@ -1980,10 +1996,10 @@ namespace FasdDesktopUi.Basics.UserControls
} }
break; break;
case "TicketStatusCombobox": case "TicketStatusCombobox":
validateComboboxNotEmpty(TicketStatusCombobox); validateComboboxNotEmpty(TicketStatusCombobox);
if (!(TicketStatusCombobox.SelectedItem is ComboBoxItem a)) if (!(TicketStatusCombobox.SelectedItem is ComboBoxItem a))
break; break;
enumTicketStatus currenTicketStatus = enumTicketStatus.Unknown; enumTicketStatus currenTicketStatus = enumTicketStatus.Unknown;
var currentTicketActivityType = SelectedTicket?.Infos.FirstOrDefault(x => x.Key == "ActivityType").Value; var currentTicketActivityType = SelectedTicket?.Infos.FirstOrDefault(x => x.Key == "ActivityType").Value;
@@ -2041,12 +2057,47 @@ namespace FasdDesktopUi.Basics.UserControls
else else
{ {
ShowAssetWarningTicketAction = false; ShowAssetWarningTicketAction = false;
} }
break; break;
} case "SelectedCategory":
bool categoryIsVisible = CategorySelectionControl?.IsVisible ?? false;
return new List<string>(_errors.Values); 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;
}
return new List<string>(_errors.Values);
} }
@@ -2388,9 +2439,9 @@ namespace FasdDesktopUi.Basics.UserControls
} }
private static void setTextboxErrorState(object sender, bool hasError) private static void setTextboxErrorState(object sender, bool hasError)
{ {
if (sender is TextBox textBox) if (sender is TextBox textBox)
{ {
// Überprüfe den Inhalt und setze die Hintergrundfarbe entsprechend // Überprüfe den Inhalt und setze die Hintergrundfarbe entsprechend
if (hasError) if (hasError)
@@ -2403,9 +2454,35 @@ namespace FasdDesktopUi.Basics.UserControls
// Setze die ursprüngliche Hintergrundfarbe zurück, wenn die Validierung erfolgreich ist // Setze die ursprüngliche Hintergrundfarbe zurück, wenn die Validierung erfolgreich ist
textBox.BorderBrush = (SolidColorBrush)new BrushConverter().ConvertFromString("#DEE2E6"); textBox.BorderBrush = (SolidColorBrush)new BrushConverter().ConvertFromString("#DEE2E6");
} }
} }
} }
private void UpdateCategoryValidationVisualState(bool hasError)
{
if (CategorySelectionControl == null)
return;
if (defaultCategoryBorderBrush == null)
defaultCategoryBorderBrush = CategorySelectionControl.BorderBrush?.CloneCurrentValue();
CategorySelectionControl.BorderBrush = hasError
? validationErrorBrush
: defaultCategoryBorderBrush;
}
private void UpdateQuickTicketValidationVisualState(bool hasError)
{
if (QuickTicketSelection == null)
return;
if (defaultQuickTicketBorderBrush == null)
defaultQuickTicketBorderBrush = QuickTicketSelection.BorderBrush?.CloneCurrentValue();
QuickTicketSelection.BorderBrush = hasError
? validationErrorBrush
: defaultQuickTicketBorderBrush;
}
#region DropDown #region DropDown
@@ -2453,10 +2530,15 @@ namespace FasdDesktopUi.Basics.UserControls
} }
} }
private void ComputerSelection_SelectionChanged(object sender, SelectionChangedEventArgs e) private void ComputerSelection_SelectionChanged(object sender, SelectionChangedEventArgs e)
{ {
SelectedComputer = (cF4sdApiSearchResultRelation)ComputerSelection.SelectedItem; SelectedComputer = (cF4sdApiSearchResultRelation)ComputerSelection.SelectedItem;
} }
private void QuickTicketSelection_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
ValidateProperty("QuickTicketSelection");
}
private void TransferCaseNotesCheck_Unchecked(object sender, RoutedEventArgs e) private void TransferCaseNotesCheck_Unchecked(object sender, RoutedEventArgs e)
{ {

22
FasdDesktopUi/Config/LanguageDefinitions.xml
View File

@@ -1578,13 +1578,21 @@
<Language Lang="DE">Fehler: </Language> <Language Lang="DE">Fehler: </Language>
</UIItem> </UIItem>
<UIItem Name="Dialog.CloseCase.ValidationErrorSummaryEmpty"> <UIItem Name="Dialog.CloseCase.ValidationErrorSummaryEmpty">
<Language Lang="EN">Fill summary</Language> <Language Lang="EN">Fill summary</Language>
<Language Lang="DE">Zusammenfassung angeben</Language> <Language Lang="DE">Zusammenfassung angeben</Language>
</UIItem> </UIItem>
<UIItem Name="Dialog.CloseCase.ValidationErrorCategoryEmpty">
<UIItem Name="Dialog.CloseCase.ValidationErrorSolutionEmpty"> <Language Lang="EN">Select a category</Language>
<Language Lang="EN">Fill solution</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>
<Language Lang="DE">Lösung angeben</Language> <Language Lang="DE">Lösung angeben</Language>
</UIItem> </UIItem>