fix roter rahmen
This commit is contained in:
Meik
@@ -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,31 +307,39 @@
|
||||
SelectedInternIcon="status_bad"
|
||||
VerticalAlignment="Bottom" />
|
||||
</StackPanel>
|
||||
<ComboBox x:Name="TicketStatusCombobox"
|
||||
Margin="0 5 0 0"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}"
|
||||
DropDownOpened="DropDownOpened"
|
||||
DropDownClosed="DropDownClosed"
|
||||
PreviewKeyDown="Combobox_PreviewKeyDown"
|
||||
SelectionChanged="TicketStatusCombobox_SelectionChanged"
|
||||
SelectedIndex="0">
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Select}" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Close}"
|
||||
Visibility="{Binding EnableCloseTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Close" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Save}"
|
||||
Visibility="{Binding EnableSaveTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Save" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.OnHold}"
|
||||
Visibility="{Binding EnableHoldTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="OnHold" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Forward}"
|
||||
Visibility="{Binding EnableForwardTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Forward" />
|
||||
</ComboBox>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
<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}">
|
||||
<ComboBox x:Name="TicketStatusCombobox"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
BorderBrush="Transparent"
|
||||
BorderThickness="0"
|
||||
DropDownOpened="DropDownOpened"
|
||||
DropDownClosed="DropDownClosed"
|
||||
PreviewKeyDown="Combobox_PreviewKeyDown"
|
||||
SelectionChanged="TicketStatusCombobox_SelectionChanged"
|
||||
SelectedIndex="0">
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Select}" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Close}"
|
||||
Visibility="{Binding EnableCloseTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Close" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Save}"
|
||||
Visibility="{Binding EnableSaveTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Save" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.OnHold}"
|
||||
Visibility="{Binding EnableHoldTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="OnHold" />
|
||||
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Forward}"
|
||||
Visibility="{Binding EnableForwardTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
|
||||
Tag="Forward" />
|
||||
</ComboBox>
|
||||
</Border>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
<Border x:Name="DynamicStatusAdditionBorder"
|
||||
Visibility="Collapsed"
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user