aktueller Stand
This commit is contained in:
Meik
@@ -1,14 +1,17 @@
|
||||
<UserControl x:Class="FasdDesktopUi.Basics.UserControls.QuickTip.QuickTipStatusMonitor"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:uc="clr-namespace:FasdDesktopUi.Basics.UserControls"
|
||||
xmlns:local="clr-namespace:FasdDesktopUi.Basics.UserControls.QuickTip"
|
||||
xmlns:ico="clr-namespace:FasdDesktopUi.Basics.UserControls.AdaptableIcon;assembly=F4SD-AdaptableIcon"
|
||||
xmlns:icod="clr-namespace:F4SD_AdaptableIcon;assembly=F4SD-AdaptableIcon"
|
||||
xmlns:gif="http://wpfanimatedgif.codeplex.com"
|
||||
xmlns:converter="clr-namespace:FasdDesktopUi.Basics.Converter"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450" d:DesignWidth="400"
|
||||
mc:Ignorable="d"
|
||||
d:DesignHeight="450"
|
||||
d:DesignWidth="400"
|
||||
MinWidth="400"
|
||||
MinHeight="200"
|
||||
IsVisibleChanged="QuickTipStatusMonitorUc_IsVisibleChanged"
|
||||
@@ -16,116 +19,122 @@
|
||||
|
||||
<UserControl.Resources>
|
||||
<converter:LanguageDefinitionsConverter x:Key="LanguageConverter" />
|
||||
<Style x:Key="BorderButtonWithText" TargetType="Border">
|
||||
<Setter Property="CornerRadius" Value="5"/>
|
||||
<Setter Property="Background" Value="{DynamicResource Color.AppBackground}"/>
|
||||
<Setter Property="Height" Value="35"/>
|
||||
<EventSetter Event="MouseEnter" Handler="ButtonBorder_MouseEnter"/>
|
||||
<EventSetter Event="MouseLeave" Handler="ButtonBorder_MouseLeave"/>
|
||||
<Style x:Key="BorderButtonWithText"
|
||||
TargetType="Border">
|
||||
<Setter Property="CornerRadius"
|
||||
Value="5" />
|
||||
<Setter Property="Background"
|
||||
Value="{DynamicResource Color.AppBackground}" />
|
||||
<Setter Property="Height"
|
||||
Value="35" />
|
||||
<EventSetter Event="MouseEnter"
|
||||
Handler="ButtonBorder_MouseEnter" />
|
||||
<EventSetter Event="MouseLeave"
|
||||
Handler="ButtonBorder_MouseLeave" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Background" Value="{DynamicResource BackgroundColor.Menu.MainCategory}"/>
|
||||
<Trigger Property="IsMouseOver"
|
||||
Value="True">
|
||||
<Setter Property="Background"
|
||||
Value="{DynamicResource BackgroundColor.Menu.MainCategory}" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
</UserControl.Resources>
|
||||
|
||||
<Border CornerRadius="10"
|
||||
Padding="10"
|
||||
Margin="0 0 0 10"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
VerticalAlignment="Top">
|
||||
<Grid>
|
||||
<uc:Badge Panel.ZIndex="999"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
Margin="10" />
|
||||
|
||||
<DockPanel>
|
||||
<DockPanel LastChildFill="False" DockPanel.Dock="Top">
|
||||
<Border CornerRadius="10"
|
||||
Padding="10"
|
||||
Margin="0 0 0 10"
|
||||
Background="{DynamicResource BackgroundColor.DetailsPage.DataHistory.ValueColumn}"
|
||||
VerticalAlignment="Top">
|
||||
|
||||
<ico:AdaptableIcon
|
||||
x:Name="HeadingIcon"
|
||||
DockPanel.Dock="Left"
|
||||
Style="{DynamicResource Menu.MenuBar.PinnedIcon.Base}"
|
||||
VerticalAlignment="Center"
|
||||
Margin="7.5 0 0 0"
|
||||
BorderPadding="0"
|
||||
IconHeight="15"
|
||||
IconWidth="15"
|
||||
SelectedInternIcon="{Binding QuickTipIcon.Intern, ElementName=QuickTipStatusMonitorUc}"
|
||||
SelectedMaterialIcon="{Binding QuickTipIcon.Material, ElementName=QuickTipStatusMonitorUc}"/>
|
||||
<DockPanel>
|
||||
<DockPanel LastChildFill="False"
|
||||
DockPanel.Dock="Top">
|
||||
|
||||
<TextBlock
|
||||
x:Name="HeadingText"
|
||||
Text="{Binding QuickTipName, ElementName=QuickTipStatusMonitorUc}"
|
||||
DockPanel.Dock="Left"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10" />
|
||||
<ico:AdaptableIcon x:Name="HeadingIcon"
|
||||
DockPanel.Dock="Left"
|
||||
Style="{DynamicResource Menu.MenuBar.PinnedIcon.Base}"
|
||||
VerticalAlignment="Center"
|
||||
Margin="7.5 0 0 0"
|
||||
BorderPadding="0"
|
||||
IconHeight="15"
|
||||
IconWidth="15"
|
||||
SelectedInternIcon="{Binding QuickTipIcon.Intern, ElementName=QuickTipStatusMonitorUc}"
|
||||
SelectedMaterialIcon="{Binding QuickTipIcon.Material, ElementName=QuickTipStatusMonitorUc}" />
|
||||
|
||||
<TextBlock x:Name="HeadingText"
|
||||
Text="{Binding QuickTipName, ElementName=QuickTipStatusMonitorUc}"
|
||||
DockPanel.Dock="Left"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Left"
|
||||
Margin="10" />
|
||||
|
||||
</DockPanel>
|
||||
|
||||
<Grid Margin="0,5,0,0"
|
||||
DockPanel.Dock="Bottom">
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="1.5*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="1.5*" />
|
||||
<ColumnDefinition Width="*" />
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border x:Name="CompleteButton"
|
||||
Grid.Column="1"
|
||||
Style="{DynamicResource BorderButtonWithText}"
|
||||
MouseLeftButtonUp="CompleteButton_Click"
|
||||
TouchDown="CompleteButton_Click">
|
||||
|
||||
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=QuickTips.Complete}"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" />
|
||||
|
||||
</Border>
|
||||
|
||||
<Border x:Name="CancelButton"
|
||||
Grid.Column="3"
|
||||
Style="{DynamicResource BorderButtonWithText}"
|
||||
MouseLeftButtonUp="CancelButton_Click"
|
||||
TouchDown="CancelButton_Click">
|
||||
|
||||
<TextBlock Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=QuickTips.Cancel}"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center" />
|
||||
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
||||
<TextBlock x:Name="StepCountTextBlock"
|
||||
TextAlignment="Center"
|
||||
Text="0 von 0 Schritten abgeschlossen"
|
||||
Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
|
||||
DockPanel.Dock="Bottom" />
|
||||
|
||||
<ScrollViewer x:Name="QuickTipElementViewer"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
DockPanel.Dock="Top">
|
||||
<StackPanel x:Name="QuickTipElementPanel">
|
||||
|
||||
</StackPanel>
|
||||
|
||||
</ScrollViewer>
|
||||
|
||||
</DockPanel>
|
||||
|
||||
|
||||
|
||||
<Grid Margin="0,5,0,0" DockPanel.Dock="Bottom">
|
||||
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="1.5*"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
<Border
|
||||
x:Name="CompleteButton"
|
||||
Grid.Column="1"
|
||||
Style="{DynamicResource BorderButtonWithText}"
|
||||
MouseLeftButtonUp="CompleteButton_Click"
|
||||
TouchDown="CompleteButton_Click">
|
||||
|
||||
<TextBlock
|
||||
Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=QuickTips.Complete}"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center"/>
|
||||
|
||||
</Border>
|
||||
|
||||
<Border
|
||||
x:Name="CancelButton"
|
||||
Grid.Column="3"
|
||||
Style="{DynamicResource BorderButtonWithText}"
|
||||
MouseLeftButtonUp="CancelButton_Click"
|
||||
TouchDown="CancelButton_Click">
|
||||
|
||||
<TextBlock
|
||||
Text="{Binding Converter={StaticResource LanguageConverter}, ConverterParameter=QuickTips.Cancel}"
|
||||
Style="{DynamicResource DetailsPage.DataHistory.TitleColumn.OverviewTitle}"
|
||||
VerticalAlignment="Center"
|
||||
HorizontalAlignment="Center"/>
|
||||
|
||||
</Border>
|
||||
|
||||
</Grid>
|
||||
|
||||
<TextBlock
|
||||
x:Name="StepCountTextBlock"
|
||||
TextAlignment="Center"
|
||||
Text="0 von 0 Schritten abgeschlossen"
|
||||
Foreground="{DynamicResource FontColor.DetailsPage.DataHistory.Value}"
|
||||
DockPanel.Dock="Bottom"/>
|
||||
|
||||
<ScrollViewer
|
||||
x:Name="QuickTipElementViewer"
|
||||
VerticalScrollBarVisibility="Auto"
|
||||
DockPanel.Dock="Top">
|
||||
<StackPanel
|
||||
x:Name="QuickTipElementPanel">
|
||||
|
||||
</StackPanel>
|
||||
|
||||
</ScrollViewer>
|
||||
|
||||
</DockPanel>
|
||||
|
||||
</Border>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using C4IT.FASD.Base;
|
||||
using C4IT.F4SD.SupportCaseProtocoll.Models;
|
||||
using C4IT.FASD.Base;
|
||||
using C4IT.MultiLanguage;
|
||||
using F4SD_AdaptableIcon;
|
||||
using F4SD_AdaptableIcon.Enums;
|
||||
@@ -254,7 +255,9 @@ namespace FasdDesktopUi.Basics.UserControls.QuickTip
|
||||
return;
|
||||
|
||||
bool wasSuccessfull = step.SuccessState == enumQuickActionSuccess.finished || step.SuccessState == enumQuickActionSuccess.successfull;
|
||||
F4SDProtocoll.Instance.Add(new QuickTipStepProtocollEntry(step.StepData.QuickTipElementDefinition, wasSuccessfull));
|
||||
ProtocollEntryBase protocollEntry = QuickTipStepProtocollEntryOutput.GetQuickTipStepProtocollEntry(step.StepData.QuickTipElementDefinition, wasSuccessfull);
|
||||
|
||||
F4SDProtocoll.Instance.Add(protocollEntry);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user