Modernize customer panel UI and add agent workflow rules

This commit is contained in:
Meik
2026-03-05 10:17:33 +01:00
parent 4013fa8e32
commit d954f26686
16 changed files with 581 additions and 309 deletions

View File

@@ -8,7 +8,7 @@
mc:Ignorable="d"
d:DesignWidth="320"
FontSize="12"
FontFamily="Arial"
FontFamily="Segoe UI"
Cursor="Hand"
MouseLeftButtonDown="OnMouseLeftButtonDownClicked"
>
@@ -16,8 +16,15 @@
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</UserControl.Resources>
<Border BorderThickness="1.5" x:Name="HighlightAnnouncementBorder" CornerRadius="1" MouseEnter="OnAnnMouseEnter" MouseLeave="OnAnnMouseLeave">
<Grid Background="White" Height="auto">
<Border BorderThickness="1"
x:Name="HighlightAnnouncementBorder"
BorderBrush="{DynamicResource cardBorderColor}"
Background="{DynamicResource cardBackgroundColor}"
CornerRadius="12"
MouseEnter="OnAnnMouseEnter"
MouseLeave="OnAnnMouseLeave">
<Grid Background="Transparent"
Height="auto">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="5"/>
@@ -33,10 +40,10 @@
<Grid Background="{Binding Path=PrioColor}" Grid.RowSpan="3" x:Name="annColor"></Grid>
<DockPanel Grid.Column="1" >
<Image Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}" Margin="5,0,0,0" />
<TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
<TextBlock x:Name="txtDate" Grid.Row="0" Margin="10,0,5,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Text="{Binding Path=CreatedDate,StringFormat={}{0:dd.MM.yyyy},FallbackValue='01.01.2021'}"></TextBlock>
</DockPanel>
<Image x:Name="imgOpen" Grid.Row="0" Grid.Column="2" Source="{DynamicResource appbar_new_window}" Width="30" ToolTip="{x:Static resx:Resources.CallAnnonceDetails}" Cursor="Hand"/>
<Image x:Name="imgOpen" Grid.Row="0" Grid.Column="2" Source="{DynamicResource appbar_new_window}" Width="20" Margin="0,2,8,0" ToolTip="{x:Static resx:Resources.CallAnnonceDetails}" Cursor="Hand"/>
<TextBlock x:Name="txtSubject"
Grid.Row="1"
Grid.ColumnSpan="2"
@@ -45,6 +52,7 @@
Text="{Binding Path=Subject,FallbackValue='test Announcement'}"
VerticalAlignment="Center"
FontWeight="Bold"
Foreground="{DynamicResource sectionTitleColor}"
ClipToBounds="True"/>
<TextBlock x:Name="txtContent"
Grid.Row="2"
@@ -52,6 +60,7 @@
Margin="15,10,10,0"
VerticalAlignment="Center"
Text="{Binding Path=Text,FallbackValue='test text'}"
Foreground="{DynamicResource subtleTextColor}"
TextWrapping="Wrap"
TextTrimming="CharacterEllipsis"
LineStackingStrategy="BlockLineHeight"
@@ -66,6 +75,7 @@
Margin="15,5,10,0"
VerticalAlignment="Center"
FontStyle="Italic"
Foreground="{DynamicResource subtleTextColor}"
TextWrapping="Wrap"
TextTrimming="CharacterEllipsis"
LineStackingStrategy="BlockLineHeight"

View File

@@ -172,12 +172,18 @@ namespace C4IT_CustomerPanel.UserControls
private void OnAnnMouseEnter(object sender, MouseEventArgs e)
{
HighlightAnnouncementBorder.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2d45fb"));
if (Application.Current.TryFindResource("itemHoverBorderColor") is SolidColorBrush hoverBrush)
{
HighlightAnnouncementBorder.BorderBrush = hoverBrush;
}
}
private void OnAnnMouseLeave(object sender, MouseEventArgs e)
{
HighlightAnnouncementBorder.BorderBrush = new SolidColorBrush(Colors.White);
if (Application.Current.TryFindResource("cardBorderColor") is SolidColorBrush defaultBrush)
{
HighlightAnnouncementBorder.BorderBrush = defaultBrush;
}
}
private void OnMouseLeftButtonDownClicked(object sender, MouseButtonEventArgs e)

View File

@@ -7,9 +7,9 @@
xmlns:resx="clr-namespace:C4IT_CustomerPanel.Properties"
mc:Ignorable="d"
d:DesignHeight="500" d:DesignWidth="800">
<Grid x:Name="GridMain" x:FieldModifier="private"
Width="500"
>
<Grid x:Name="GridMain"
x:FieldModifier="private"
Width="500">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="100*" />
<ColumnDefinition Width="185*" />
@@ -20,51 +20,62 @@
<RowDefinition Height="6*" />
<RowDefinition Height="7*" />
</Grid.RowDefinitions>
<Canvas x:Name="Canvas" x:FieldModifier="private"
Grid.Column="1"
Grid.ColumnSpan="2"
Grid.Row="0">
<Canvas x:Name="Canvas"
x:FieldModifier="private"
Grid.Column="1"
Grid.ColumnSpan="2"
Grid.Row="0">
<Image Source="{DynamicResource appbar_newspaper}"
Width="48"
x:Name="icoNewspaper_Inline" x:FieldModifier="private" />
Width="36"
Height="36"
Margin="0,6,0,0"
x:Name="icoNewspaper_Inline"
x:FieldModifier="private" />
<Label Content="{x:Static resx:Resources.announcement}"
FontSize="16"
Canvas.Top="10"
Canvas.Left="40"
Foreground="{DynamicResource mainForeground}" />
<ScrollViewer x:Name="CanvasAnnouncements" x:FieldModifier="private"
Canvas.Top="50"
Canvas.Left="10"
Visibility="Visible"
MinHeight="60"
MaxHeight="480"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" />
FontSize="19"
FontWeight="SemiBold"
Canvas.Top="8"
Canvas.Left="40"
Foreground="{DynamicResource sectionTitleColor}" />
<ScrollViewer x:Name="CanvasAnnouncements"
x:FieldModifier="private"
Canvas.Top="56"
Canvas.Left="0"
Visibility="Visible"
MinHeight="60"
MaxHeight="470"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto" />
<StackPanel Canvas.Top="50"
Canvas.Left="10"
x:Name="NoAnnouncement" x:FieldModifier="private"
Background="White"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
Height="50">
<TextBlock Text="{x:Static resx:Resources.noannouncement}"
Margin="25,5,10,0"
Foreground="Black" />
Canvas.Left="0"
x:Name="NoAnnouncement"
x:FieldModifier="private"
Background="Transparent"
Width="{Binding ActualWidth, ElementName=Canvas, Mode=OneWay}"
Height="58">
<Border Margin="2,6,2,0"
BorderThickness="1"
CornerRadius="10"
BorderBrush="{DynamicResource cardBorderColor}"
Background="{DynamicResource cardBackgroundColor}">
<TextBlock Text="{x:Static resx:Resources.noannouncement}"
Margin="18,12,10,0"
Foreground="{DynamicResource subtleTextColor}" />
</Border>
</StackPanel>
<Image Source="{DynamicResource appbar_list_check}"
x:Name="buttonReadAllAnnouncements" x:FieldModifier="private"
Tag="readAllAnnouncements"
Cursor="Hand"
PreviewMouseDown="ReadAll_PreviewMouseDown"
Grid.Column="2"
RenderTransformOrigin="1.536,1.429"
Height="32"
Width="32"
Canvas.Left="338"
Canvas.Top="10" />
x:Name="buttonReadAllAnnouncements"
x:FieldModifier="private"
Tag="readAllAnnouncements"
Cursor="Hand"
PreviewMouseDown="ReadAll_PreviewMouseDown"
Grid.Column="2"
RenderTransformOrigin="1.536,1.429"
Height="24"
Width="24"
Canvas.Left="338"
Canvas.Top="14" />
</Canvas>
</Grid>

View File

@@ -14,15 +14,25 @@
<Style TargetType="Button"
x:Key="ButtonStyle">
<Setter Property="Foreground"
Value="{DynamicResource navForeground}" />
Value="{DynamicResource buttonTextColor}" />
<Setter Property="Background"
Value="{DynamicResource inactiveButtonColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource panelBorderColor}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="12,6" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center"
VerticalAlignment="Center" />
VerticalAlignment="Center"
Margin="{TemplateBinding Padding}" />
</Border>
</ControlTemplate>
</Setter.Value>
@@ -32,9 +42,36 @@
Value="True">
<Setter Property="Background"
Value="{DynamicResource activeButtonColor}" />
<Setter Property="Foreground"
Value="White" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="InfoTextBoxStyle"
TargetType="{x:Type TextBox}">
<Setter Property="Foreground"
Value="{DynamicResource sectionTitleColor}" />
<Setter Property="Background"
Value="{DynamicResource inputBackgroundColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource inputBorderColor}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="8,3" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="8">
<ScrollViewer x:Name="PART_ContentHost" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<!--ComputerInformation-->
@@ -64,9 +101,9 @@
Grid.Row="1"
Height="70">
<Image Source="{DynamicResource appbar_monitor}"
Height="48"
Height="34"
x:Name="icoComputer_Inline" x:FieldModifier="private" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblComputername" x:FieldModifier="private"
Content="{x:Static resx:Resources.computername}"
FontSize="16"
@@ -76,12 +113,12 @@
Width="300"
FontSize="16"
VerticalAlignment="Center"
Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtComputername" x:FieldModifier="private"
IsReadOnly="true"
Canvas.Top="45"
Height="25"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
Background="White" />
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}"
Height="25"
@@ -98,9 +135,9 @@
Grid.Row="2"
Height="70">
<Image Source="{DynamicResource appbar_network}"
Height="48"
Height="34"
x:Name="icoNetwork_Inline" x:FieldModifier="private" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16"
x:Name="LblIpaddress" x:FieldModifier="private"
Content="{x:Static resx:Resources.ipaddress}"
@@ -111,11 +148,11 @@
Height="25"
VerticalAlignment="Center"
FontSize="16"
Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtIpaddress" x:FieldModifier="private"
IsReadOnly="true"
Canvas.Top="45"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
Background="White" />
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}"
Height="25"
@@ -133,9 +170,9 @@
Height="70"
x:Name="CanvasHostname" x:FieldModifier="private">
<Image Source="{DynamicResource appbar_remotehost}"
Height="48"
Height="34"
x:Name="icoHost_Inline" x:FieldModifier="private"/>
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblHostname" x:FieldModifier="private"
Content="{x:Static resx:Resources.Hostname}"
FontSize="16"
@@ -145,12 +182,12 @@
Width="300"
FontSize="16"
VerticalAlignment="Center"
Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtHostname" x:FieldModifier="private"
IsReadOnly="true"
Canvas.Top="45"
Height="25"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
Background="White" />
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}"
Height="25"
@@ -167,9 +204,9 @@
Grid.Row="4"
Height="70">
<Image Source="{DynamicResource appbar_people}"
Height="48"
Height="34"
x:Name="icoUser_Inline" x:FieldModifier="private" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16"
x:Name="LblUsername" x:FieldModifier="private"
Content="{x:Static resx:Resources.username}"
@@ -180,12 +217,12 @@
Height="25"
VerticalAlignment="Center"
FontSize="16"
Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtUsername" x:FieldModifier="private"
IsEnabled="true"
IsReadOnly="true"
Canvas.Top="45"
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick"
Background="White" />
PreviewMouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}"
Height="25"
@@ -202,10 +239,10 @@
Grid.Row="5"
Height="70">
<Image Source="{DynamicResource appbar_reset}"
Height="48"
Height="34"
x:Name="icoRestart_Inline" x:FieldModifier="private"
Tag="MAINICO" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="16"
x:Name="LblLastreboot" x:FieldModifier="private"
Content="{x:Static resx:Resources.lastreboot}"
@@ -216,11 +253,11 @@
Height="25"
VerticalAlignment="Center"
FontSize="16"
Style="{StaticResource InfoTextBoxStyle}"
x:Name="TxtLastreboot" x:FieldModifier="private"
IsReadOnly="true"
Canvas.Top="45"
MouseDoubleClick="Info_TXT_OnMouseDoubleClick"
Background="White" />
MouseDoubleClick="Info_TXT_OnMouseDoubleClick" />
<Image Cursor="Hand"
Source="{DynamicResource appbar_page_copy}"
Height="25"
@@ -237,10 +274,10 @@
Grid.Row="6"
Height="70">
<Image Source="{DynamicResource appbar_folder_ellipsis}"
Height="48"
Height="34"
x:Name="icoDrive_Inline" x:FieldModifier="private"
Tag="MAINICO" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblDrives" x:FieldModifier="private"
Content="{x:Static resx:Resources.drives}"
FontSize="16"
@@ -273,7 +310,7 @@
Grid.Row="7"
Height="70">
<Label Content="{x:Static resx:Resources.genReportHeader}"
Foreground="{DynamicResource mainForeground}"
Foreground="{DynamicResource sectionTitleColor}"
Canvas.Left="53"
Canvas.Top="15"
FontSize="16"
@@ -286,7 +323,7 @@
<ColumnDefinition Width="43*" />
<ColumnDefinition Width="57*" />
</Grid.ColumnDefinitions>
<Button Foreground="{DynamicResource navForeground}"
<Button Foreground="{DynamicResource buttonTextColor}"
HorizontalAlignment="Left"
Style="{StaticResource ButtonStyle}"
Width="250"
@@ -301,7 +338,7 @@
<Grid Width="300"
Canvas.Left="15"
Canvas.Top="110">
<Button Foreground="{DynamicResource navForeground}"
<Button Foreground="{DynamicResource buttonTextColor}"
HorizontalAlignment="Center"
Style="{StaticResource ButtonStyle}"
Width="250"
@@ -340,16 +377,16 @@
Opacity="0"
Visibility="Collapsed">
<Border BorderThickness="1"
BorderBrush="Black"
CornerRadius="3"
Background="{DynamicResource inactiveButtonColor}"
BorderBrush="{DynamicResource panelBorderColor}"
CornerRadius="10"
Background="{DynamicResource cardBackgroundColor}"
Width="250"
VerticalAlignment="Center"
HorizontalAlignment="Center"
Panel.ZIndex="100">
<TextBlock Text="{x:Static resx:Resources.copied}"
Foreground="White"
FontSize="16"
Foreground="{DynamicResource sectionTitleColor}"
FontSize="15"
Height="25"
VerticalAlignment="Center"
HorizontalAlignment="Center" />

View File

@@ -23,11 +23,14 @@
Grid.ColumnSpan="2"
Grid.Row="0">
<Image Source="{DynamicResource appbar_star}"
Width="48"
Width="36"
Height="36"
Margin="0,6,0,0"
Tag="MAINICO" />
<Label Foreground="{DynamicResource mainForeground}"
FontSize="16"
Canvas.Top="10"
<Label Foreground="{DynamicResource sectionTitleColor}"
FontSize="19"
FontWeight="SemiBold"
Canvas.Top="8"
Canvas.Left="40"
Content="{x:Static resx:Resources.CustomLink}" />
</Canvas>
@@ -37,7 +40,7 @@
<StackPanel x:Name="CustomLinkPanel"
x:FieldModifier="private"
Orientation="Vertical"
Canvas.Top="50" />
Canvas.Top="56" />
</Canvas>
</Grid>
</UserControl>

View File

@@ -6,7 +6,15 @@
xmlns:local="clr-namespace:C4IT_CustomerPanel.UserControls"
mc:Ignorable="d"
d:DesignHeight="50" d:DesignWidth="400" Loaded="UserControl_Loaded" SizeChanged="UserControl_SizeChanged">
<Grid Background="White">
<Border x:Name="ProgressRect" Background="#FFBEE6FD" Width="100" HorizontalAlignment="Left"/>
<Grid Background="Transparent">
<Border Background="{DynamicResource inputBackgroundColor}"
BorderBrush="{DynamicResource inputBorderColor}"
BorderThickness="1"
CornerRadius="8" />
<Border x:Name="ProgressRect"
Width="100"
HorizontalAlignment="Left"
CornerRadius="8"
Background="{DynamicResource accentColor}" />
</Grid>
</UserControl>

View File

@@ -9,14 +9,21 @@
mc:Ignorable="d"
d:DesignWidth="320"
FontSize="12"
FontFamily="Arial"
FontFamily="Segoe UI"
Cursor="Hand"
>
<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BoolToVis" />
</UserControl.Resources>
<Border BorderThickness="1.5" x:Name="HighlightIncidentBorder" CornerRadius="1" MouseEnter="OnIncidentMouseEnter" MouseLeave="OnIncidentMouseLeave">
<Grid Background="White" Height="auto">
<Border BorderThickness="1"
x:Name="HighlightIncidentBorder"
BorderBrush="{DynamicResource cardBorderColor}"
Background="{DynamicResource cardBackgroundColor}"
CornerRadius="12"
MouseEnter="OnIncidentMouseEnter"
MouseLeave="OnIncidentMouseLeave">
<Grid Background="Transparent"
Height="auto">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
@@ -29,24 +36,24 @@
</Grid.ColumnDefinitions>
<DockPanel Margin="-10,0,0,0">
<Image Margin="5,0,5,0" Source="pack://application:,,,/Resources/StateOverlays/OverlayNewContentButton.png" Panel.ZIndex="18" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="signal" Width="15px" Cursor="Hand" ToolTip="{x:Static resx:Resources.removeMarkup}"/>
<TextBlock x:Name="txtTicketType" Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Width="95"></TextBlock>
<TextBlock x:Name="txtTicketType" Margin="5,0,0,0" Grid.Column="0" HorizontalAlignment="Left" Text="{Binding Path=TicketType,FallbackValue='Störung'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="95"></TextBlock>
</DockPanel>
<DockPanel Grid.Column="1" Margin="10,0,0,0">
<TextBlock x:Name="txtState" HorizontalAlignment="Center" Text="{Binding Path=State, FallbackValue='State'}" FontStyle="Italic"></TextBlock>
<TextBlock x:Name="txtState" HorizontalAlignment="Center" Text="{Binding Path=State, FallbackValue='State'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}"></TextBlock>
<Grid Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,6,0" Width="26" x:Name="sortByState" Visibility="Collapsed">
<TextBlock Text="&#11206;" Margin="12,0,0,0" x:Name="descState" FontSize="14" Tag="5" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
<TextBlock Text="&#11205;" x:Name="ascState" FontSize="14" Tag="4" Margin="0,0,10,0" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
</Grid>
</DockPanel>
<TextBlock x:Name="txtID" Grid.Column="2" HorizontalAlignment="Right" Cursor="Hand" TextDecorations="Underline" Foreground="#1E72C7" ToolTip="{x:Static resx:Resources.CallTicketDetails}" Text="{Binding Path=TicketNumber, FallbackValue='TCK0004'}" Margin="0,0,22,0"></TextBlock>
<TextBlock x:Name="txtID" Grid.Column="2" HorizontalAlignment="Right" Cursor="Hand" TextDecorations="Underline" Foreground="{DynamicResource accentColor}" ToolTip="{x:Static resx:Resources.CallTicketDetails}" Text="{Binding Path=TicketNumber, FallbackValue='TCK0004'}" Margin="0,0,22,0"></TextBlock>
<Grid Grid.Column="2" HorizontalAlignment="Right" Width="25" x:Name="sortByTicketNumber" Visibility="Collapsed" Margin="0,0,-3,0">
<TextBlock Text="&#11206;" Margin="12,0,0,0" x:Name="descTicketnumber" FontSize="14" Tag="1" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
<TextBlock Text="&#11205;" x:Name="ascTicketnumber" FontSize="14" Margin="0,0,13,0" Tag="0" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />
</Grid>
</Grid>
<TextBlock x:Name="txtContent" Grid.Row="1" VerticalAlignment="Top" Margin="8,12,5,24" FontWeight="Bold" TextWrapping="Wrap" Text="{Binding Path=Subject,FallbackValue='test Ticket'}"></TextBlock>
<TextBlock x:Name="txtCreatedDate" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Text="{Binding Path=CreatedDate, StringFormat={}{0:dd.MM.yyyy HH:mm}, FallbackValue='Datum'}" FontStyle="Italic" Width="100" Margin="0,32,27,6"></TextBlock>
<TextBlock Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="txtLastAction" Grid.Row="1" HorizontalAlignment="Right" FontStyle="Italic" Width="165" Margin="0,32,145,4" Text="{Binding Path=LastJournalEntryActionText,FallbackValue='test Ticket'}"></TextBlock>
<TextBlock x:Name="txtContent" Grid.Row="1" VerticalAlignment="Top" Margin="8,12,5,24" FontWeight="Bold" Foreground="{DynamicResource sectionTitleColor}" TextWrapping="Wrap" Text="{Binding Path=Subject,FallbackValue='test Ticket'}"></TextBlock>
<TextBlock x:Name="txtCreatedDate" Grid.Row="1" VerticalAlignment="Bottom" HorizontalAlignment="Right" Text="{Binding Path=CreatedDate, StringFormat={}{0:dd.MM.yyyy HH:mm}, FallbackValue='Datum'}" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="100" Margin="0,32,27,6"></TextBlock>
<TextBlock Visibility="{Binding Path=IsUnread, Converter={StaticResource BoolToVis}}" x:Name="txtLastAction" Grid.Row="1" HorizontalAlignment="Right" FontStyle="Italic" Foreground="{DynamicResource subtleTextColor}" Width="165" Margin="0,32,145,4" Text="{Binding Path=LastJournalEntryActionText,FallbackValue='test Ticket'}"></TextBlock>
<Grid HorizontalAlignment="Right" Width="25" Grid.Row="1" x:Name="sortByCreatedDate" Visibility="Collapsed" VerticalAlignment="Bottom" Height="16" Margin="0,0,0,4">
<TextBlock Text="&#11206;" Margin="12,0,0,0" x:Name="descCreatedDate" FontSize="14" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" Tag="3"/>
<TextBlock Text="&#11205;" x:Name="ascCreatedDate" Tag="2" FontSize="14" Margin="0,0,13,0" PreviewMouseDown="orderBy_PreviewMouseDown" Cursor="Hand" />

View File

@@ -167,12 +167,18 @@ namespace C4IT_CustomerPanel.UserControls
private void OnIncidentMouseEnter(object sender, MouseEventArgs e)
{
HighlightIncidentBorder.BorderBrush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#2d45fb"));
if (Application.Current.TryFindResource("itemHoverBorderColor") is SolidColorBrush hoverBrush)
{
HighlightIncidentBorder.BorderBrush = hoverBrush;
}
}
private void OnIncidentMouseLeave(object sender, MouseEventArgs e)
{
HighlightIncidentBorder.BorderBrush = new SolidColorBrush(Colors.White);
if (Application.Current.TryFindResource("cardBorderColor") is SolidColorBrush defaultBrush)
{
HighlightIncidentBorder.BorderBrush = defaultBrush;
}
}
}

View File

@@ -12,15 +12,27 @@
<Style TargetType="Button"
x:Key="ButtonStyle">
<Setter Property="Foreground"
Value="{DynamicResource navForeground}" />
Value="{DynamicResource buttonTextColor}" />
<Setter Property="Background"
Value="{DynamicResource inactiveButtonColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource panelBorderColor}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="12,6" />
<Setter Property="Cursor"
Value="Hand" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center"
VerticalAlignment="Center" />
VerticalAlignment="Center"
Margin="{TemplateBinding Padding}" />
</Border>
</ControlTemplate>
</Setter.Value>
@@ -30,6 +42,8 @@
Value="True">
<Setter Property="Background"
Value="{DynamicResource activeButtonColor}" />
<Setter Property="Foreground"
Value="White" />
</Trigger>
</Style.Triggers>
</Style>
@@ -57,16 +71,19 @@
Grid.ColumnSpan="2"
Grid.Row="0">
<Image Source="{DynamicResource appbar_clipboard_variant_text}"
Width="48"
Width="36"
Height="36"
Margin="0,6,0,0"
Tag="MAINICO" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
Content="{x:Static resx:Resources.incidents}"
FontSize="16"
Canvas.Top="10"
FontSize="19"
FontWeight="SemiBold"
Canvas.Top="8"
Canvas.Left="40" />
<ScrollViewer x:Name="CanvasIncident"
Canvas.Top="50"
Canvas.Left="10"
Canvas.Top="56"
Canvas.Left="0"
MaxHeight="460"
MinHeight="60"
HorizontalScrollBarVisibility="Disabled"
@@ -74,16 +91,22 @@
Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
Visibility="Visible" />
<StackPanel x:Name="NoIncident"
Background="White"
Background="Transparent"
Width="{Binding ActualWidth, ElementName=Canvas2, Mode=OneWay}"
Height="50"
Height="58"
Canvas.Top="50"
Canvas.Left="10">
<TextBlock Text="{x:Static resx:Resources.noincidents}"
Margin="25,5,10,0"
Foreground="Black" />
Canvas.Left="0">
<Border Margin="2,6,2,0"
BorderThickness="1"
CornerRadius="10"
BorderBrush="{DynamicResource cardBorderColor}"
Background="{DynamicResource cardBackgroundColor}">
<TextBlock Text="{x:Static resx:Resources.noincidents}"
Margin="18,12,10,0"
Foreground="{DynamicResource subtleTextColor}" />
</Border>
</StackPanel>
<Button Foreground="{DynamicResource navForeground}"
<Button Foreground="{DynamicResource buttonTextColor}"
Style="{StaticResource ButtonStyle}"
Canvas.Top="450"
Canvas.Left="62"
@@ -103,8 +126,8 @@
Margin="153,10,0,8"
PreviewMouseDown="ReadAll_PreviewMouseDown"
RenderTransformOrigin="1.536,1.429"
Height="32"
Width="32"
Height="24"
Width="24"
ToolTip="{x:Static resx:Resources.removeMarkups}" />
</Grid>
</UserControl>

View File

@@ -12,15 +12,25 @@
<Style TargetType="Button"
x:Key="ButtonStyle">
<Setter Property="Foreground"
Value="{DynamicResource navForeground}" />
Value="{DynamicResource buttonTextColor}" />
<Setter Property="Background"
Value="{DynamicResource inactiveButtonColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource panelBorderColor}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="12,6" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border Background="{TemplateBinding Background}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="10">
<ContentPresenter HorizontalAlignment="Center"
VerticalAlignment="Center" />
VerticalAlignment="Center"
Margin="{TemplateBinding Padding}" />
</Border>
</ControlTemplate>
</Setter.Value>
@@ -30,9 +40,36 @@
Value="True">
<Setter Property="Background"
Value="{DynamicResource activeButtonColor}" />
<Setter Property="Foreground"
Value="White" />
</Trigger>
</Style.Triggers>
</Style>
<Style x:Key="SearchTextBoxStyle"
TargetType="{x:Type TextBox}">
<Setter Property="Foreground"
Value="{DynamicResource sectionTitleColor}" />
<Setter Property="Background"
Value="{DynamicResource inputBackgroundColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource inputBorderColor}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="Padding"
Value="8,3" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type TextBox}">
<Border Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="8">
<ScrollViewer x:Name="PART_ContentHost" />
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</UserControl.Resources>
<Grid x:Name="GridSsp"
@@ -57,28 +94,31 @@
Grid.Row="0"
Height="70">
<Image Source="{DynamicResource appbar_magnify}"
Width="48"
Width="36"
Height="36"
Margin="0,6,0,0"
Tag="MAINICO" />
<Label Foreground="{DynamicResource mainForeground}"
<Label Foreground="{DynamicResource sectionTitleColor}"
x:Name="LblSearch"
x:FieldModifier="private"
Content="{x:Static resx:Resources.search}"
FontSize="16"
Canvas.Top="10"
FontSize="19"
FontWeight="SemiBold"
Canvas.Top="8"
Canvas.Left="40" />
<StackPanel Orientation="Horizontal"
Width="350"
Canvas.Top="45"
Canvas.Left="10">
Canvas.Top="50"
Canvas.Left="0">
<TextBox x:Name="TxtSearchTerm"
x:FieldModifier="private"
Style="{StaticResource SearchTextBoxStyle}"
Width="320"
Background="White"
Height="25"
FontSize="16"
Height="30"
FontSize="14"
Panel.ZIndex="1110"
KeyDown="OnSearchBoxEnter"
Margin="5,0,0,0" />
Margin="2,0,0,0" />
<Image Source="../Resources/icons/light/appbar.magnify.png"
Width="48"
PreviewMouseDown="OnSearchClicked"
@@ -97,10 +137,10 @@
Canvas.Left="15"
Height="40"
Content="Self Service Portal"
FontSize="18"
FontSize="16"
Canvas.Top="40"
Click="OnSSPLinkClicked" />
<Button Foreground="{DynamicResource navForeground}"
<Button Foreground="{DynamicResource buttonTextColor}"
x:Name="BtnMyserviceLink"
x:FieldModifier="private"
Style="{StaticResource ButtonStyle}"
@@ -109,7 +149,7 @@
Height="40"
Content="{x:Static resx:Resources.myservices}"
Tag="LABEL"
FontSize="18"
FontSize="16"
Canvas.Top="90"
Click="OnMyServiceLinkClicked" />
<!--<Separator Canvas.Left="15" Width="320" Canvas.Top="140" Height="2" />-->