Compare commits
2 Commits
78dec5aa2c
...
5a8cbe8716
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a8cbe8716 | ||
|
|
1aefa425e0 |
@@ -163,13 +163,14 @@
|
||||
<Border x:Name="CategoryValidationBorder"
|
||||
Margin="0 5 0 0"
|
||||
BorderThickness="1"
|
||||
Padding="1"
|
||||
CornerRadius="7.5"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent">
|
||||
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}"
|
||||
BorderBrush="Transparent"
|
||||
SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
|
||||
DropDownOpened="DropDownOpened"
|
||||
DropDownClosed="DropDownClosed"
|
||||
@@ -184,12 +185,14 @@
|
||||
<Border x:Name="QuickTicketValidationBorder"
|
||||
Margin="0 5 0 0"
|
||||
BorderThickness="1"
|
||||
Padding="1"
|
||||
CornerRadius="7.5"
|
||||
Background="Transparent"
|
||||
BorderBrush="Transparent">
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
|
||||
<ComboBox x:Name="QuickTicketSelection"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="0"
|
||||
SelectedIndex="0"
|
||||
SelectionChanged="QuickTicketSelection_SelectionChanged"
|
||||
PreviewKeyDown="Combobox_PreviewKeyDown"
|
||||
@@ -304,10 +307,17 @@
|
||||
SelectedInternIcon="status_bad"
|
||||
VerticalAlignment="Bottom" />
|
||||
</StackPanel>
|
||||
<ComboBox x:Name="TicketStatusCombobox"
|
||||
<Border x:Name="TicketStatusValidationBorder"
|
||||
Margin="0 5 0 0"
|
||||
BorderThickness="1"
|
||||
Padding="1"
|
||||
CornerRadius="7.5"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
|
||||
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
|
||||
<ComboBox x:Name="TicketStatusCombobox"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="0"
|
||||
DropDownOpened="DropDownOpened"
|
||||
DropDownClosed="DropDownClosed"
|
||||
PreviewKeyDown="Combobox_PreviewKeyDown"
|
||||
@@ -327,6 +337,7 @@
|
||||
Visibility="{Binding EnableForwardTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Forward" />
|
||||
</ComboBox>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
|
||||
@@ -71,12 +71,22 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
private const string CategoryTableNameLegacy = "M42Wpm-Ticket-CloseCase-Categories";
|
||||
private string activeCategoryTableName = CategoryTableNamePrimary;
|
||||
|
||||
private static readonly Brush SharedValidationBorderBrush = CreateValidationBrush();
|
||||
private static Brush CreateValidationBrush()
|
||||
{
|
||||
var brush = new SolidColorBrush(Color.FromRgb(0xF5, 0x7C, 0x73));
|
||||
if (brush.CanFreeze)
|
||||
brush.Freeze();
|
||||
return brush;
|
||||
}
|
||||
|
||||
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);
|
||||
private readonly Brush validationErrorBrush = SharedValidationBorderBrush;
|
||||
private Brush defaultTicketStatusBorderBrush;
|
||||
|
||||
public bool IsTicket
|
||||
{
|
||||
@@ -433,6 +443,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();
|
||||
|
||||
@@ -2014,18 +2025,18 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
}
|
||||
|
||||
|
||||
if (a.Tag != null || !TicketStatusCombobox.IsVisible)
|
||||
bool ticketActionHasError = TicketStatusCombobox.IsVisible && a.Tag == null;
|
||||
if (!ticketActionHasError)
|
||||
{
|
||||
//TicketStatusCombobox.Tag = "noerror";
|
||||
if (_errors.ContainsKey(propertyName))
|
||||
_errors.Remove(propertyName);
|
||||
}
|
||||
else
|
||||
else if (!_errors.ContainsKey(propertyName))
|
||||
{
|
||||
//TicketStatusCombobox.Tag = "error";
|
||||
if (!_errors.ContainsKey(propertyName))
|
||||
_errors.Add(propertyName, cMultiLanguageSupport.GetItem("Dialog.CloseCase.ValidationErrorTicketActionEmpty"));
|
||||
}
|
||||
UpdateTicketStatusValidationVisualState(ticketActionHasError);
|
||||
|
||||
if (a.Tag == null)
|
||||
ShowAssetWarningTicketAction = false;
|
||||
else if (
|
||||
@@ -2196,7 +2207,7 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
}
|
||||
else
|
||||
{
|
||||
CaseNotesPreviewBorder.BorderBrush = new SolidColorBrush(Colors.Red);
|
||||
CaseNotesPreviewBorder.BorderBrush = SharedValidationBorderBrush;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2334,7 +2345,7 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
// if (selectedItem.Tag == null)
|
||||
// {
|
||||
// // Setze die Hintergrundfarbe auf Rot, um einen Validierungsfehler anzuzeigen
|
||||
// comboBox.BorderBrush = new SolidColorBrush(Colors.Red);
|
||||
// comboBox.BorderBrush = SharedValidationBorderBrush;
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
@@ -2414,7 +2425,7 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
if (string.IsNullOrWhiteSpace(text))
|
||||
{
|
||||
// Setze die Hintergrundfarbe auf Rot, um einen Validierungsfehler anzuzeigen
|
||||
textBox.BorderBrush = new SolidColorBrush(Colors.Red);
|
||||
textBox.BorderBrush = SharedValidationBorderBrush;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2432,7 +2443,7 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
if (notEmpty && string.IsNullOrWhiteSpace(_textBlock.Text))
|
||||
{
|
||||
_retVal = true;
|
||||
_borderCaseNores = new SolidColorBrush(Colors.Red);
|
||||
_borderCaseNores = SharedValidationBorderBrush;
|
||||
}
|
||||
CaseNotesPreviewBorder.BorderBrush = _borderCaseNores;
|
||||
return _retVal;
|
||||
@@ -2447,7 +2458,7 @@ namespace FasdDesktopUi.Basics.UserControls
|
||||
if (hasError)
|
||||
{
|
||||
// Setze die Hintergrundfarbe auf Rot, um einen Validierungsfehler anzuzeigen
|
||||
textBox.BorderBrush = new SolidColorBrush(Colors.Red);
|
||||
textBox.BorderBrush = SharedValidationBorderBrush;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -2483,6 +2494,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
|
||||
|
||||
Reference in New Issue
Block a user