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:42:48 +01:00
parent c218dbe139
commit 86aea836a9
3 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
2025-11-13 11_35_00-Clipboard.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

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

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

@@ -431,8 +431,8 @@ namespace FasdDesktopUi.Basics.UserControls
InitializeComponent(); InitializeComponent();
this.Unloaded += CloseCaseDialogWithTicket_Unloaded; this.Unloaded += CloseCaseDialogWithTicket_Unloaded;
this.Loaded += CloseCaseDialogWithTicket_Loaded; this.Loaded += CloseCaseDialogWithTicket_Loaded;
defaultCategoryBorderBrush = CategorySelectionControl?.BorderBrush?.CloneCurrentValue(); defaultCategoryBorderBrush = CategoryValidationBorder?.BorderBrush?.CloneCurrentValue();
defaultQuickTicketBorderBrush = QuickTicketSelection?.BorderBrush?.CloneCurrentValue(); defaultQuickTicketBorderBrush = QuickTicketValidationBorder?.BorderBrush?.CloneCurrentValue();
if (validationErrorBrush is Freezable freezableBrush && freezableBrush.CanFreeze) if (validationErrorBrush is Freezable freezableBrush && freezableBrush.CanFreeze)
freezableBrush.Freeze(); freezableBrush.Freeze();
@@ -2459,26 +2459,26 @@ namespace FasdDesktopUi.Basics.UserControls
private void UpdateCategoryValidationVisualState(bool hasError) private void UpdateCategoryValidationVisualState(bool hasError)
{ {
if (CategorySelectionControl == null) if (CategoryValidationBorder == null)
return; return;
if (defaultCategoryBorderBrush == null) if (defaultCategoryBorderBrush == null)
defaultCategoryBorderBrush = CategorySelectionControl.BorderBrush?.CloneCurrentValue(); defaultCategoryBorderBrush = CategoryValidationBorder.BorderBrush?.CloneCurrentValue();
CategorySelectionControl.BorderBrush = hasError CategoryValidationBorder.BorderBrush = hasError
? validationErrorBrush ? validationErrorBrush
: defaultCategoryBorderBrush; : defaultCategoryBorderBrush;
} }
private void UpdateQuickTicketValidationVisualState(bool hasError) private void UpdateQuickTicketValidationVisualState(bool hasError)
{ {
if (QuickTicketSelection == null) if (QuickTicketValidationBorder == null)
return; return;
if (defaultQuickTicketBorderBrush == null) if (defaultQuickTicketBorderBrush == null)
defaultQuickTicketBorderBrush = QuickTicketSelection.BorderBrush?.CloneCurrentValue(); defaultQuickTicketBorderBrush = QuickTicketValidationBorder.BorderBrush?.CloneCurrentValue();
QuickTicketSelection.BorderBrush = hasError QuickTicketValidationBorder.BorderBrush = hasError
? validationErrorBrush ? validationErrorBrush
: defaultQuickTicketBorderBrush; : defaultQuickTicketBorderBrush;
} }