FSE, update Job length for Eureka. GeneralInformation in PPC ( about) - added rows.

Related Work Items: #8423

3 files changed, 18 insertions, 5 deletions

diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
index 24ddc80bf..3d616f957 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Models/StopModel.cs
@@ -29,6 +29,7 @@ namespace Tango.FSE.Statistics.Models
         public JobRunExtendedInfo ExtendedInfo { get; set; }
         public bool IsAdvancedMode { get; set; }
         public VectorFineTuningRunModel FineTuningModel { get; set; }
+        public bool IsEureka { get; set; }
 
         public bool IsFineTuning
         {
@@ -163,7 +164,18 @@ namespace Tango.FSE.Statistics.Models
 
         public String LogicalLength
         {
-            get { return JobRun.NumberOfUnits > 1 ? $"{JobRun.JobLogicalLength} x{JobRun.NumberOfUnits}" : JobRun.JobLogicalLength.ToString(); }
+            get { var length = IsEureka ? JobRun.JobLogicalLength * 4 : JobRun.JobLogicalLength;
+                return JobRun.NumberOfUnits > 1 ? $"{length} x{JobRun.NumberOfUnits}" : length.ToString(); }
+        }
+
+        public double JobLength
+        {
+            get { return IsEureka ? JobRun.JobLength * 4 : JobRun.JobLength; }
+        }
+
+        public double EndPosition
+        {
+            get { return IsEureka ? JobRun.EndPosition * 4 : JobRun.EndPosition; }
         }
 
         public String FineTuningMeasured
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
index d77b0b5a1..ae4444f06 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/ViewModels/MainViewVM.cs
@@ -422,6 +422,7 @@ namespace Tango.FSE.Statistics.ViewModels
                     stop.ThreadName = rmlName;
                     stop.IsAdvancedMode = !BuildProvider.IsTwineRSM && CurrentUser.HasRole(Roles.FSEAdvancedTechnician);
                     stop.FineTuningModel = fineTuningModel;
+                    stop.IsEureka = MachineProvider.MachineOperator.MachineType == MachineTypes.Eureka;
 
                     if (fineTuningModel != null)
                     {
@@ -735,11 +736,11 @@ namespace Tango.FSE.Statistics.ViewModels
                 model.JobName = stop.JobRun.JobName;
                 model.JobKind = ((JobDesignations)stop.JobRun.JobDesignation).ToDescription();
                 model.Thread = stop.ThreadName;
-                model.Length = ((int)stop.JobRun.JobLogicalLength).ToString();
+                model.Length = stop.LogicalLength;
                 model.NumberOfUnits = stop.JobRun.NumberOfUnits.ToString();
                 model.StartTime = stop.JobRun.StartDate.ToLocalTime().ToString();
                 model.Duration = stop.Duration.ToStringUnlimitedHours();
-                model.EndPosition = stop.JobRun.EndPosition.ToString();
+                model.EndPosition = stop.EndPosition.ToString();
                 model.Status = ((JobRunStatus)stop.JobRun.Status).ToString();
                 model.SegmentIndex = stop.SegmentIndex.ToString();
                 model.Offset = stop.StartMeters.ToString();
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
index 5f0ceaa5a..88b460ab1 100644
--- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
+++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Statistics/Views/MainView.xaml
@@ -138,13 +138,13 @@
                                                                         <TextBlock>
                                                                             <Run>Actual Length:</Run>
                                                                             <LineBreak/>
-                                                                            <Run Text="{Binding Items[0].Items[0].JobRun.JobLength}"></Run>
+                                                                            <Run Text="{Binding Items[0].Items[0].JobLength, Mode=OneWay}"></Run>
                                                                         </TextBlock>
                                                                     </TextBlock.ToolTip>
                                                                 </TextBlock>
                                                                 <TextBlock Text="{Binding Items[0].Items[0].JobRun.StartDate,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" VerticalAlignment="Center" Width="120"></TextBlock>
                                                                 <TextBlock Text="{Binding Items[0].Items[0].Duration,Mode=OneWay,Converter={StaticResource TotalDyeTimeConverter}}" VerticalAlignment="Center" Width="100"></TextBlock>
-                                                                <TextBlock Text="{Binding Items[0].Items[0].JobRun.EndPosition,StringFormat=N1}" VerticalAlignment="Center" Width="80"></TextBlock>
+                                                                <TextBlock Text="{Binding Items[0].Items[0].EndPosition,StringFormat=N1}" VerticalAlignment="Center" Width="80"></TextBlock>
                                                             </StackPanel>
 
                                                             <Grid Visibility="{Binding IsAdvancedMode,Converter={StaticResource BooleanToVisibilityConverter}}" DataContext="{Binding Items[0].Items[0]}" Width="250" Margin="0 0 50 5" HorizontalAlignment="Right" VerticalAlignment="Bottom">