aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/FSE/Tango.FSE.UI
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-05-22 18:54:00 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-05-22 18:54:00 +0300
commitb981d43669a2cdcd9f7971e897ded9f1422f5b31 (patch)
treeb42b4dcf7a74788d0ae5388c96311a9ecb9c8047 /Software/Visual_Studio/FSE/Tango.FSE.UI
parent7b97669957c3de66ffbad0dba26db1396c679a48 (diff)
downloadTango-b981d43669a2cdcd9f7971e897ded9f1422f5b31.tar.gz
Tango-b981d43669a2cdcd9f7971e897ded9f1422f5b31.zip
FSE, update Job length for Eureka. GeneralInformation in PPC ( about) - added rows.
Related Work Items: #8423
Diffstat (limited to 'Software/Visual_Studio/FSE/Tango.FSE.UI')
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobProgressRingTileView.xaml2
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs11
-rw-r--r--Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTileView.xaml2
3 files changed, 13 insertions, 2 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobProgressRingTileView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobProgressRingTileView.xaml
index 62e7c4798..c021b0a15 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobProgressRingTileView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobProgressRingTileView.xaml
@@ -9,6 +9,6 @@
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=local:RemoteJobProgressRingTile, IsDesignTimeCreatable=False}">
<Grid Margin="30">
- <controls:RunningJobRingProgress RunningJobStatus="{Binding RunningJobStatus}" IsRunning="{Binding IsRunning}" />
+ <controls:RunningJobRingProgress RunningJobStatus="{Binding RunningJobStatus}" IsRunning="{Binding IsRunning}" IsEureka ="{Binding IsEureka}" />
</Grid>
</UserControl>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
index 650818c22..453a0892e 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTile.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Media;
using Tango.BL.Entities;
+using Tango.BL.Enumerations;
using Tango.FSE.Common;
using Tango.Integration.Operation;
using Tango.PPC.Shared.Jobs;
@@ -42,6 +43,15 @@ namespace Tango.FSE.UI.Tiles.RemoteJob
set { _isRunning = value; RaisePropertyChangedAuto(); }
}
+ private bool _isEureka;
+
+ public bool IsEureka
+ {
+ get { return _isEureka; }
+ set { _isEureka = value; RaisePropertyChangedAuto(); }
+ }
+
+
public RemoteJobTile()
{
Name = "Remote Job";
@@ -113,6 +123,7 @@ namespace Tango.FSE.UI.Tiles.RemoteJob
Handler.StatusChanged += Handler_StatusChanged;
Job = e.JobHandler.Job;
IsRunning = true;
+ IsEureka = MachineProvider.MachineOperator.MachineType == MachineTypes.Eureka;
}
private void Handler_StatusChanged(object sender, RunningJobStatus status)
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTileView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTileView.xaml
index ee05314ce..1323c9298 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTileView.xaml
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Tiles/RemoteJob/RemoteJobTileView.xaml
@@ -10,7 +10,7 @@
<Grid TextElement.Foreground="{StaticResource FSE_PrimaryAccentBrush}">
<Viewbox Width="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=ActualWidth}">
<Border Background="#292929" CornerRadius="10" VerticalAlignment="Bottom" Padding="20 0" Width="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=ActualWidth}">
- <controls:RunningJobViewer IsRunning="{Binding IsRunning}" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" IsActive="True" Margin="30 10" Height="90" />
+ <controls:RunningJobViewer IsRunning="{Binding IsRunning}" Job="{Binding Job}" RunningJobStatus="{Binding RunningJobStatus}" IsEureka="{Binding IsEureka}" IsActive="True" Margin="30 10" Height="90" />
</Border>
</Viewbox>
</Grid>