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

required fields reworked

Browse Source
This commit is contained in:
Meik
2025-11-13 15:59:31 +01:00
parent 7f14de43ce
commit 27425f5dde
2 changed files with 87 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,16 +59,49 @@
</Style> </Style>
<ControlTemplate x:Key="ValidationErrorTemplate"> <ControlTemplate x:Key="ValidationErrorTemplate">
<Border BorderBrush="Red" <Border BorderBrush="Red"
BorderThickness="1" BorderThickness="1"
CornerRadius="7.5"> CornerRadius="7.5">
<TextBlock Text="{Binding ErrorContent}" <TextBlock Text="{Binding ErrorContent}"
Foreground="White" Foreground="White"
Padding="2" /> Padding="2" />
</Border> </Border>
</ControlTemplate> </ControlTemplate>
</UserControl.Resources>
<Style x:Key="MandatoryFieldLabelStyle"
TargetType="TextBlock">
<Setter Property="FontWeight"
Value="Bold" />
<Setter Property="Margin"
Value="0 10 0 0" />
<Setter Property="Foreground"
Value="{DynamicResource FontColor.Menu.Categories}" />
</Style>
<Style x:Key="MandatoryFieldBorderStyle"
TargetType="Border">
<Setter Property="Margin"
Value="0 5 0 0" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="1" />
<Setter Property="CornerRadius"
Value="7.5" />
<Setter Property="Background"
Value="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" />
<Setter Property="BorderBrush"
Value="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}" />
</Style>
<Style x:Key="MandatoryEditableTextBoxStyle"
TargetType="TextBox"
BasedOn="{StaticResource Customizable.Editable.TextBox.EditOnly}">
<Setter Property="AutomationProperties.IsRequiredForForm"
Value="True" />
</Style>
</UserControl.Resources>
<ScrollViewer Height="570" <ScrollViewer Height="570"
Padding="0 0 5 0" Padding="0 0 5 0"
@@ -154,19 +187,12 @@
</Popup> </Popup>
</StackPanel> </StackPanel>
<StackPanel x:Name="MainStack"> <StackPanel x:Name="MainStack">
<StackPanel x:Name="CategoryLabelPanel"> <StackPanel x:Name="CategoryLabelPanel">
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Category}" <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Category}"
FontWeight="Bold" Style="{StaticResource MandatoryFieldLabelStyle}" />
Margin="0 10 0 0" </StackPanel>
Foreground="{DynamicResource FontColor.Menu.Categories}" />
</StackPanel>
<Border x:Name="CategoryValidationBorder" <Border x:Name="CategoryValidationBorder"
Margin="0 5 0 0" Style="{StaticResource MandatoryFieldBorderStyle}">
BorderThickness="1"
Padding="1"
CornerRadius="7.5"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
<local:HierarchicalSelectionControl x:Name="CategorySelectionControl" <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}"
@@ -174,21 +200,16 @@
SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}" SearchPlaceholderText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Searchbar.Placeholder}"
DropDownOpened="DropDownOpened" DropDownOpened="DropDownOpened"
DropDownClosed="DropDownClosed" DropDownClosed="DropDownClosed"
PreviewKeyDown="Combobox_PreviewKeyDown" /> PreviewKeyDown="Combobox_PreviewKeyDown"
AutomationProperties.IsRequiredForForm="True"
AutomationProperties.HelpText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ValidationErrorCategoryEmpty}" />
</Border> </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" Style="{StaticResource MandatoryFieldLabelStyle}" />
Margin="0 10 0 0"
Foreground="{DynamicResource FontColor.Menu.Categories}" />
<Border x:Name="QuickTicketValidationBorder" <Border x:Name="QuickTicketValidationBorder"
Margin="0 5 0 0" Style="{StaticResource MandatoryFieldBorderStyle}">
BorderThickness="1"
Padding="1"
CornerRadius="7.5"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
<ComboBox x:Name="QuickTicketSelection" <ComboBox x:Name="QuickTicketSelection"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="Transparent" BorderBrush="Transparent"
@@ -197,7 +218,9 @@
SelectionChanged="QuickTicketSelection_SelectionChanged" SelectionChanged="QuickTicketSelection_SelectionChanged"
PreviewKeyDown="Combobox_PreviewKeyDown" PreviewKeyDown="Combobox_PreviewKeyDown"
DropDownOpened="DropDownOpened" DropDownOpened="DropDownOpened"
DropDownClosed="DropDownClosed"> DropDownClosed="DropDownClosed"
AutomationProperties.IsRequiredForForm="True"
AutomationProperties.HelpText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ValidationErrorQuickCallEmpty}">
</ComboBox> </ComboBox>
</Border> </Border>
</StackPanel> </StackPanel>
@@ -272,17 +295,16 @@
</StackPanel> </StackPanel>
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Summary}" <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Summary}"
FontWeight="Bold" Style="{StaticResource MandatoryFieldLabelStyle}" />
Margin="0 10 0 0"
Foreground="{DynamicResource FontColor.Menu.Categories}" />
<TextBox x:Name="TicketSummaryTextBox" <TextBox x:Name="TicketSummaryTextBox"
Margin="0 5 0 10" Margin="0 5 0 10"
Style="{DynamicResource Customizable.Editable.TextBox.EditOnly}" Style="{StaticResource MandatoryEditableTextBoxStyle}"
Padding="7.5 5" Padding="7.5 5"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
TextChanged="TicketSummaryTextBox_TextChanged" /> TextChanged="TicketSummaryTextBox_TextChanged"
AutomationProperties.HelpText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ValidationErrorSummaryEmpty}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
@@ -295,9 +317,9 @@
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.TitleColumn}"> Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.TitleColumn}">
<StackPanel> <StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status}" <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status}"
FontWeight="Bold" Style="{StaticResource MandatoryFieldLabelStyle}"
Foreground="{DynamicResource FontColor.Menu.Categories}" /> Margin="0" />
<ico:AdaptableIcon x:Name="WarningTicketAction" <ico:AdaptableIcon x:Name="WarningTicketAction"
Visibility="{Binding ShowAssetWarningTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}" Visibility="{Binding ShowAssetWarningTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
ToolTip="" ToolTip=""
@@ -308,12 +330,7 @@
VerticalAlignment="Bottom" /> VerticalAlignment="Bottom" />
</StackPanel> </StackPanel>
<Border x:Name="TicketStatusValidationBorder" <Border x:Name="TicketStatusValidationBorder"
Margin="0 5 0 0" Style="{StaticResource MandatoryFieldBorderStyle}">
BorderThickness="1"
Padding="1"
CornerRadius="7.5"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="{DynamicResource BackgroundColor.Menu.SubCategory.Hover}">
<ComboBox x:Name="TicketStatusCombobox" <ComboBox x:Name="TicketStatusCombobox"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
BorderBrush="Transparent" BorderBrush="Transparent"
@@ -322,7 +339,9 @@
DropDownClosed="DropDownClosed" DropDownClosed="DropDownClosed"
PreviewKeyDown="Combobox_PreviewKeyDown" PreviewKeyDown="Combobox_PreviewKeyDown"
SelectionChanged="TicketStatusCombobox_SelectionChanged" SelectionChanged="TicketStatusCombobox_SelectionChanged"
SelectedIndex="0"> SelectedIndex="0"
AutomationProperties.IsRequiredForForm="True"
AutomationProperties.HelpText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ValidationErrorTicketActionEmpty}">
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Select}" /> <ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Select}" />
<ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Close}" <ComboBoxItem Content="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Status.Close}"
Visibility="{Binding EnableCloseTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}" Visibility="{Binding EnableCloseTicketAction, ElementName=CloseCaseDialogUc, Converter={StaticResource BooleanToVisibility}}"
@@ -414,16 +433,18 @@
BorderThickness="0.9" BorderThickness="0.9"
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}" Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
MaxHeight="45"> MaxHeight="45">
<TextBlock x:Name="CaseNotesPreview" <TextBlock x:Name="CaseNotesPreview"
MaxWidth="420" MaxWidth="420"
MaxHeight="20" MaxHeight="20"
Margin="-35 -5 -25 5" Margin="-35 -5 -25 5"
Padding="5 3 0 0" Padding="5 3 0 0"
Foreground="{DynamicResource FontColor.Menu.Categories}" Foreground="{DynamicResource FontColor.Menu.Categories}"
FontSize="13" FontSize="13"
Cursor="Pen" Cursor="Pen"
MouseLeftButtonUp="EditCaseNotesButton_MouseLeftButtonUp" AutomationProperties.IsRequiredForForm="{Binding AreCaseNotesMandatory, ElementName=CloseCaseDialogUc}"
TouchDown="EditCaseNotesButton_TouchDown"/> AutomationProperties.HelpText="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.ValidationErrorCaseNoteEmpty}"
MouseLeftButtonUp="EditCaseNotesButton_MouseLeftButtonUp"
TouchDown="EditCaseNotesButton_TouchDown"/>
</Border> </Border>
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Transfer.CopyTemplates}" <TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=Dialog.CloseCase.Transfer.CopyTemplates}"

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

@@ -87,6 +87,9 @@ namespace FasdDesktopUi.Basics.UserControls
private Brush defaultQuickTicketBorderBrush; private Brush defaultQuickTicketBorderBrush;
private readonly Brush validationErrorBrush = SharedValidationBorderBrush; private readonly Brush validationErrorBrush = SharedValidationBorderBrush;
private Brush defaultTicketStatusBorderBrush; private Brush defaultTicketStatusBorderBrush;
public bool AreCaseNotesMandatory =>
cFasdCockpitConfig.Instance?.Global?.TicketConfiguration?.NotesMandatory ?? false;
public bool IsTicket public bool IsTicket
{ {