fix roter rahmen

This commit is contained in:
Meik
2025-11-13 13:00:26 +01:00
parent 78dec5aa2c
commit 1aefa425e0
2 changed files with 76 additions and 50 deletions

View File

@@ -77,6 +77,7 @@ namespace FasdDesktopUi.Basics.UserControls
private Brush defaultCategoryBorderBrush;
private Brush defaultQuickTicketBorderBrush;
private readonly Brush validationErrorBrush = new SolidColorBrush(Colors.Red);
private Brush defaultTicketStatusBorderBrush;
public bool IsTicket
{
@@ -433,6 +434,7 @@ namespace FasdDesktopUi.Basics.UserControls
this.Loaded += CloseCaseDialogWithTicket_Loaded;
defaultCategoryBorderBrush = CategoryValidationBorder?.BorderBrush?.CloneCurrentValue();
defaultQuickTicketBorderBrush = QuickTicketValidationBorder?.BorderBrush?.CloneCurrentValue();
defaultTicketStatusBorderBrush = TicketStatusValidationBorder?.BorderBrush?.CloneCurrentValue();
if (validationErrorBrush is Freezable freezableBrush && freezableBrush.CanFreeze)
freezableBrush.Freeze();
@@ -2000,9 +2002,9 @@ namespace FasdDesktopUi.Basics.UserControls
validateComboboxNotEmpty(TicketStatusCombobox);
if (!(TicketStatusCombobox.SelectedItem is ComboBoxItem a))
break;
enumTicketStatus currenTicketStatus = enumTicketStatus.Unknown;
var currentTicketActivityType = SelectedTicket?.Infos.FirstOrDefault(x => x.Key == "ActivityType").Value;
enumTicketStatus currenTicketStatus = enumTicketStatus.Unknown;
var currentTicketActivityType = SelectedTicket?.Infos.FirstOrDefault(x => x.Key == "ActivityType").Value;
if (SelectedTicket != null && SelectedTicket.Infos.TryGetValue("StatusId", out var statusIdString))
{
@@ -2014,22 +2016,22 @@ namespace FasdDesktopUi.Basics.UserControls
}
if (a.Tag != null || !TicketStatusCombobox.IsVisible)
{
//TicketStatusCombobox.Tag = "noerror";
if (_errors.ContainsKey(propertyName))
_errors.Remove(propertyName);
}
else
{
//TicketStatusCombobox.Tag = "error";
if (!_errors.ContainsKey(propertyName))
_errors.Add(propertyName, cMultiLanguageSupport.GetItem("Dialog.CloseCase.ValidationErrorTicketActionEmpty"));
}
if (a.Tag == null)
ShowAssetWarningTicketAction = false;
else if (
!string.Equals(a.Tag.ToString(), "Forward", StringComparison.InvariantCultureIgnoreCase)
bool ticketActionHasError = TicketStatusCombobox.IsVisible && a.Tag == null;
if (!ticketActionHasError)
{
if (_errors.ContainsKey(propertyName))
_errors.Remove(propertyName);
}
else if (!_errors.ContainsKey(propertyName))
{
_errors.Add(propertyName, cMultiLanguageSupport.GetItem("Dialog.CloseCase.ValidationErrorTicketActionEmpty"));
}
UpdateTicketStatusValidationVisualState(ticketActionHasError);
if (a.Tag == null)
ShowAssetWarningTicketAction = false;
else if (
!string.Equals(a.Tag.ToString(), "Forward", StringComparison.InvariantCultureIgnoreCase)
&& !string.Equals(a.Tag.ToString(), "Save", StringComparison.InvariantCultureIgnoreCase)
&& string.Equals(currentTicketActivityType, "SPSActivityTypeTicket", StringComparison.InvariantCultureIgnoreCase)
)
@@ -2483,6 +2485,19 @@ namespace FasdDesktopUi.Basics.UserControls
: defaultQuickTicketBorderBrush;
}
private void UpdateTicketStatusValidationVisualState(bool hasError)
{
if (TicketStatusValidationBorder == null)
return;
if (defaultTicketStatusBorderBrush == null)
defaultTicketStatusBorderBrush = TicketStatusValidationBorder.BorderBrush?.CloneCurrentValue();
TicketStatusValidationBorder.BorderBrush = hasError
? validationErrorBrush
: defaultTicketStatusBorderBrush;
}
#region DropDown